From 0e4920cb0dcb1dc20ca041fdee4cb6228bbac118 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Nov 2022 14:27:14 +1100
Subject: [PATCH 001/178] feat: add bencoded/decoded + tests

---
 ts/session/utils/Bencoding.ts               | 270 ++++++++++++++++++++
 ts/test/session/unit/utils/Bencoded_test.ts | 246 ++++++++++++++++++
 2 files changed, 516 insertions(+)
 create mode 100644 ts/session/utils/Bencoding.ts
 create mode 100644 ts/test/session/unit/utils/Bencoded_test.ts

diff --git a/ts/session/utils/Bencoding.ts b/ts/session/utils/Bencoding.ts
new file mode 100644
index 000000000..6bdf56c8f
--- /dev/null
+++ b/ts/session/utils/Bencoding.ts
@@ -0,0 +1,270 @@
+import { from_string, to_string } from 'libsodium-wrappers-sumo';
+import { isArray, isEmpty, isNumber, isPlainObject, isString, toNumber } from 'lodash';
+import { StringUtils } from '.';
+
+const e = 'e'; // end of whatever was before
+const l = 'l'; // list of values
+const i = 'i'; // start of integer
+const d = 'd'; // start of dictionary
+const colon = ':';
+
+const eCode = e.charCodeAt(0); // end of whatever was before
+const lCode = l.charCodeAt(0); // list of values
+const iCode = i.charCodeAt(0); // start of integer
+const dCode = d.charCodeAt(0); // start of dictionary
+const colonCode = colon.charCodeAt(0);
+
+interface BencodeDictType {
+  [key: string]: BencodeElementType;
+}
+
+type BencodeArrayType = Array<BencodeElementType>;
+
+type BencodeElementType = number | string | BencodeDictType | BencodeArrayType;
+const NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+
+export class BDecode {
+  private readonly content: Uint8Array;
+  private currentParsingIndex = 0;
+  private readonly parsedContent: BencodeElementType;
+
+  constructor(content: Uint8Array | string) {
+    this.content = isString(content) ? from_string(content) : content;
+    this.parsedContent = this.parseContent();
+  }
+
+  public getParsedContent() {
+    return this.parsedContent;
+  }
+
+  /**
+   * Decode an int from a byte array starting with charCode of `i` and ending with charCode `e`
+   */
+  private parseInt(): number {
+    if (this.currentParsingIndex >= this.content.length) {
+      throw new Error('parseInt: out of bounds');
+    }
+    if (this.content[this.currentParsingIndex] !== iCode) {
+      throw new Error('parseInt: not the start of an int');
+    }
+
+    this.currentParsingIndex++; // drop `i`
+    const startIntStr = this.currentParsingIndex; // save the start of the int
+    const nextEndSeparator = this.content.indexOf(eCode, this.currentParsingIndex);
+    if (nextEndSeparator === -1) {
+      throw new Error('parseInt: not an int to be parsed here: no end separator');
+    }
+
+    const parsed = toNumber(to_string(this.content.slice(startIntStr, nextEndSeparator)));
+
+    if (!isFinite(parsed)) {
+      throw new Error(`parseInt: could not parse number ${parsed}`);
+    }
+    this.currentParsingIndex = nextEndSeparator;
+    this.currentParsingIndex++; // drop the 'e'
+
+    return parsed;
+  }
+
+  parseList(): BencodeArrayType {
+    const parsed: BencodeArrayType = [];
+
+    if (this.currentParsingIndex >= this.content.length) {
+      throw new Error('parseList: out of bounds');
+    }
+    if (this.content[this.currentParsingIndex] !== lCode) {
+      throw new Error('parseList: not the start of a list');
+    }
+
+    this.currentParsingIndex++; // drop `l`
+
+    while (
+      this.currentParsingIndex < this.content.length &&
+      this.content[this.currentParsingIndex] !== eCode
+    ) {
+      parsed.push(this.parseBlock());
+    }
+    this.currentParsingIndex++; // drop the 'e'
+
+    return parsed;
+  }
+
+  private parseDict() {
+    const parsed: BencodeDictType = {};
+
+    if (this.currentParsingIndex >= this.content.length) {
+      throw new Error('parseDict: out of bounds');
+    }
+    if (this.content[this.currentParsingIndex] !== dCode) {
+      throw new Error('parseDict: not the start of a dict');
+    }
+
+    this.currentParsingIndex++; // drop `d`
+
+    while (
+      this.currentParsingIndex < this.content.length &&
+      this.content[this.currentParsingIndex] !== eCode
+    ) {
+      const key = this.parseString();
+      const value = this.parseBlock();
+      parsed[key] = value;
+    }
+    this.currentParsingIndex++; // drop the 'e'
+
+    return parsed;
+  }
+
+  /**
+   * Decode a string element from iterator assumed to have structure `length:data`
+   */
+  private parseString(): string {
+    if (this.currentParsingIndex >= this.content.length) {
+      throw new Error('parseString: out of bounds');
+    }
+
+    // this.currentParsingIndex++;
+    const separatorIndex = this.content.indexOf(colonCode, this.currentParsingIndex);
+    if (separatorIndex === -1) {
+      throw new Error('parseString: cannot parse string without separator');
+    }
+    const strLength = toNumber(
+      to_string(this.content.slice(this.currentParsingIndex, separatorIndex))
+    );
+    if (!isFinite(strLength)) {
+      throw new Error('parseString: cannot parse string without length');
+    }
+
+
+    if (strLength === 0) {
+      return '';
+    }
+
+    if (strLength > this.content.length - separatorIndex - 1) {
+      throw new Error(
+        'parseString: length is too long considering what we have left on this string'
+      );
+    }
+    const strContent = this.content.slice(separatorIndex + 1, separatorIndex + 1 + strLength);
+    this.currentParsingIndex = separatorIndex + 1 + strLength;
+    return StringUtils.decode(strContent, 'utf8');
+  }
+
+  private parseContent() {
+    return this.parseBlock();
+  }
+
+  private parseBlock() {
+    let parsed: BencodeElementType;
+    if (this.content.length < this.currentParsingIndex) {
+      throw new Error('Out of bounds');
+    }
+    if (this.content[this.currentParsingIndex] === lCode) {
+      parsed = this.parseList();
+    } else if (this.content[this.currentParsingIndex] === dCode) {
+      parsed = this.parseDict();
+    } else if (this.content[this.currentParsingIndex] === iCode) {
+      parsed = this.parseInt();
+    } else if (NUMBERS.some(num => this.content[this.currentParsingIndex] === num.charCodeAt(0))) {
+      parsed = this.parseString();
+    } else {
+      throw new Error(
+        `parseBlock: Could not parse charCode at ${this.currentParsingIndex}: ${
+          this.content[this.currentParsingIndex]
+        }. Length: ${this.content.length}`
+      );
+    }
+
+    return parsed;
+  }
+}
+
+export class BEncode {
+  private readonly input: BencodeElementType;
+
+  private readonly bencodedContent: Uint8Array;
+
+  constructor(content: BencodeElementType) {
+    this.input = content;
+    this.bencodedContent = this.encodeContent();
+  }
+
+  public getBencodedContent() {
+    return this.bencodedContent;
+  }
+
+  private encodeItem(item: BencodeElementType): Uint8Array {
+
+    if (isNumber(item) && isFinite(item)) {
+      return from_string(`i${item}e`);
+    }
+
+    if (isNumber(item)) {
+      throw new Error('encodeItem not finite number');
+    }
+
+    if (isString(item)) {
+      const content = new Uint8Array(StringUtils.encode(item, 'utf8'));
+
+      const contentLengthLength = `${content.length}`.length;
+      const toReturn = new Uint8Array(content.length + 1 + contentLengthLength);
+
+      toReturn.set(from_string(`${content.length}`));
+      toReturn.set([colonCode], contentLengthLength);
+      toReturn.set(content, contentLengthLength + 1);
+      return toReturn;
+    }
+
+    if (isArray(item)) {
+      let content = new Uint8Array();
+      for (let index = 0; index < item.length; index++) {
+        const encodedItem = this.encodeItem(item[index]);
+        const encodedItemLength = encodedItem.length;
+        const existingContentLength = content.length;
+        const newContent = new Uint8Array(existingContentLength + encodedItemLength);
+        newContent.set(content);
+        newContent.set(encodedItem, content.length);
+        content = newContent;
+      }
+      const toReturn = new Uint8Array(content.length + 2);
+      toReturn.set([lCode]);
+      toReturn.set(content, 1);
+      toReturn.set([eCode], content.length + 1);
+
+      return toReturn;
+    }
+
+    if (isPlainObject(item)) {
+      // bencoded objects keys must be sorted lexicographically
+      const sortedKeys = Object.keys(item).sort();
+      let content = new Uint8Array();
+
+      sortedKeys.forEach(key => {
+        const value = item[key];
+
+        const encodedKey = this.encodeItem(key);
+        const encodedValue = this.encodeItem(value);
+        const newContent = new Uint8Array(content.length + encodedKey.length + encodedValue.length);
+        newContent.set(content);
+        newContent.set(encodedKey, content.length);
+        newContent.set(encodedValue, content.length + encodedKey.length);
+        content = newContent;
+      });
+      const toReturn = new Uint8Array(content.length + 2);
+      toReturn.set([dCode]);
+      toReturn.set(content, 1);
+      toReturn.set([eCode], content.length + 1);
+
+      return toReturn;
+    }
+
+    throw new Error(`encodeItem: unknown type to encode ${typeof item}`);
+  }
+
+  private encodeContent(): Uint8Array {
+    if (!this.input || (isEmpty(this.input) && !isNumber(this.input))) {
+      return new Uint8Array();
+    }
+
+    return this.encodeItem(this.input);
+  }
+}
diff --git a/ts/test/session/unit/utils/Bencoded_test.ts b/ts/test/session/unit/utils/Bencoded_test.ts
new file mode 100644
index 000000000..57092ab35
--- /dev/null
+++ b/ts/test/session/unit/utils/Bencoded_test.ts
@@ -0,0 +1,246 @@
+// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+import chai from 'chai';
+
+import chaiAsPromised from 'chai-as-promised';
+import { from_string } from 'libsodium-wrappers-sumo';
+import { StringUtils } from '../../../../session/utils';
+import { BDecode, BEncode } from '../../../../session/utils/Bencoding';
+chai.use(chaiAsPromised as any);
+
+const { expect } = chai;
+
+describe('Bencoding: BDecode Utils', () => {
+  describe('From a string', () => {
+    describe('parseInt', () => {
+      it('parse 12', () => {
+        expect(new BDecode('i12e').getParsedContent()).to.equal(12);
+      });
+
+      it('parse 0', () => {
+        expect(new BDecode('ie').getParsedContent()).to.equal(0);
+      });
+
+      it('parse 12232332', () => {
+        expect(new BDecode('i12232332e').getParsedContent()).to.equal(12232332);
+      });
+
+      it('parse 12232332 even if extra characters', () => {
+        expect(new BDecode('i12232332eoverflow.d').getParsedContent()).to.equal(12232332);
+      });
+
+      it('throws invalid start', () => {
+        expect(() => new BDecode('d12232332e').getParsedContent()).to.throw();
+      });
+
+      it('throws invalid end', () => {
+        expect(() => new BDecode('i12232332d').getParsedContent()).to.throw();
+      });
+
+      it('throws invalid integer', () => {
+        expect(() => new BDecode('i1223233qw2e').getParsedContent()).to.throw();
+      });
+    });
+
+    describe('parseString', () => {
+      it('parse short string ', () => {
+        expect(new BDecode('1:a').getParsedContent()).to.equal('a');
+      });
+
+      it('parse string with emojis ', () => {
+        expect(new BDecode('8:🎃🥸').getParsedContent()).to.equal('🎃🥸');
+        expect(new BDecode('26:❤️‍🔥❤️‍🔥').getParsedContent()).to.equal('❤️‍🔥❤️‍🔥');
+      });
+
+      it('parse non ascii string', () => {
+        expect(new BDecode('48:転キハ連月ざれ地周りを報最こもろ').getParsedContent()).to.equal(
+          '転キハ連月ざれ地周りを報最こもろ'
+        );
+      });
+
+      it('parse longer string', () => {
+        expect(
+          new BDecode(
+            "320:Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic"
+          ).getParsedContent()
+        ).to.equal(
+          "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic"
+        );
+      });
+
+      it('throw if no separator ', () => {
+        expect(() => new BDecode('1aa').getParsedContent()).to.throw();
+      });
+
+      it('throw if first part is not a number ', () => {
+        expect(() => new BDecode('1a1:aa').getParsedContent()).to.throw();
+      });
+
+      it('throw if length brings us way out of range ', () => {
+        expect(() => new BDecode('322:aa').getParsedContent()).to.throw();
+      });
+
+      it('throw if length brings us just out of range ', () => {
+        expect(() => new BDecode('3:aa').getParsedContent()).to.throw();
+      });
+    });
+  });
+
+  describe('parseDict', () => {
+    it('parse single entry dict with string `d3:bar4:spame`', () => {
+      expect(new BDecode('d3:bar4:spame').getParsedContent()).to.deep.equal({ bar: 'spam' });
+    });
+
+    it('parse single entry dict with multiple strings `d3:bar4:spam5:barre2:twe`', () => {
+      expect(new BDecode('d3:bar4:spam5:barre2:twe').getParsedContent()).to.deep.equal({
+        bar: 'spam',
+        barre: 'tw',
+      });
+    });
+
+    it('parse multiple entries dict and int', () => {
+      expect(new BDecode('d3:bar4:spam3:fooi42ee').getParsedContent()).to.deep.equal({
+        bar: 'spam',
+        foo: 42,
+      });
+    });
+
+    it('parse multiple entries with ints', () => {
+      expect(new BDecode('d3:bari999e3:fooi42ee').getParsedContent()).to.deep.equal({
+        bar: 999,
+        foo: 42,
+      });
+    });
+
+    it('parse single entry with emoji', () => {
+      expect(new BDecode('d3:bar8:🎃🥸e').getParsedContent()).to.deep.equal({
+        bar: '🎃🥸',
+      });
+    });
+  });
+
+  describe('parseList', () => {
+    it('parse single entry', () => {
+      expect(new BDecode('l4:spame').getParsedContent()).to.deep.equal(['spam']);
+    });
+
+    it('parse multiple entries ', () => {
+      expect(new BDecode('l4:spam2:spe').getParsedContent()).to.deep.equal(['spam', 'sp']);
+    });
+
+    it('parse multiple entries witrh int and strings ', () => {
+      expect(new BDecode('l4:spam2:spi42e2:42e').getParsedContent()).to.deep.equal([
+        'spam',
+        'sp',
+        42,
+        '42',
+      ]);
+    });
+
+    it('parse list with dict included ', () => {
+      expect(new BDecode('ld3:bari999e3:fooi42eee').getParsedContent()).to.deep.equal([
+        {
+          bar: 999,
+          foo: 42,
+        },
+      ]);
+    });
+
+    it('parse list with mulitple dict included ', () => {
+      expect(
+        new BDecode('ld3:bari999e3:fooi42eed3:rabi111e3:offi2312eee').getParsedContent()
+      ).to.deep.equal([
+        {
+          bar: 999,
+          foo: 42,
+        },
+        {
+          rab: 111,
+          off: 2312,
+        },
+      ]);
+    });
+
+    it('parse dict with list included ', () => {
+      expect(new BDecode('d2:dili42ei24e4:key7ee').getParsedContent()).to.deep.equal({
+        di: [42, 24, 'key7'],
+      });
+    });
+
+    it('parse dict with multiple lists included ', () => {
+      expect(new BDecode('d2:dili42ei24e4:key7e4:secol4:key7ee').getParsedContent()).to.deep.equal({
+        di: [42, 24, 'key7'],
+        seco: ['key7'],
+      });
+    });
+  });
+});
+
+describe('Bencoding: BEncode Utils', () => {
+  it('encode single string', () => {
+    expect(new BEncode('abcdef').getBencodedContent()).to.deep.equal(
+      new Uint8Array(StringUtils.encode('6:abcdef', 'utf8'))
+    );
+  });
+
+  it('encode single string emoji', () => {
+    expect(new BEncode('🎃🥸').getBencodedContent()).to.deep.equal(
+      new Uint8Array(StringUtils.encode('8:🎃🥸', 'utf8'))
+    );
+  });
+
+  it('encode single int', () => {
+    expect(new BEncode(12).getBencodedContent()).to.deep.equal(from_string('i12e'));
+  });
+
+  it('encode array with one int', () => {
+    expect(new BEncode([12]).getBencodedContent()).to.deep.equal(from_string('li12ee'));
+  });
+
+  it('encode array with multiple int', () => {
+    expect(new BEncode([12, 34, 5678]).getBencodedContent()).to.deep.equal(
+      from_string('li12ei34ei5678ee')
+    );
+  });
+
+  it('encode array with different types', () => {
+    expect(new BEncode([12, '34', 5678]).getBencodedContent()).to.deep.equal(
+      from_string('li12e2:34i5678ee')
+    );
+  });
+
+  it('encode dict with one item', () => {
+    expect(new BEncode({ dict: '123' }).getBencodedContent()).to.deep.equal(
+      from_string('d4:dict3:123e')
+    );
+  });
+
+  it('encode dict with several items', () => {
+    expect(new BEncode({ dict: '123', dict2: '1234' }).getBencodedContent()).to.deep.equal(
+      from_string('d4:dict3:1235:dict24:1234e')
+    );
+  });
+
+  it('encode dict with several items with arrays', () => {
+    expect(new BEncode({ dict1: [1, 2, 3], dict2: [4, 5, 6] }).getBencodedContent()).to.deep.equal(
+      from_string('d5:dict1li1ei2ei3ee5:dict2li4ei5ei6eee')
+    );
+  });
+
+  it('encode dict with several items but sort them', () => {
+    expect(new BEncode({ dict2: 'second', dict1: 'first' }).getBencodedContent()).to.deep.equal(
+      from_string('d5:dict15:first5:dict26:seconde')
+    );
+  });
+
+  it('encode dict with array with dict', () => {
+    expect(new BEncode({ dict: [{ a: 'b', c: 'd' }] }).getBencodedContent()).to.deep.equal(
+      from_string('d4:dictld1:a1:b1:c1:deee')
+    );
+  });
+
+  it('encode dict with array with dict with emojis', () => {
+    expect(new BEncode({ dict: [{ a: 'b', c: '🎃🥸' }] }).getBencodedContent()).to.deep.equal(
+      from_string('d4:dictld1:a1:b1:c8:🎃🥸eee')
+    );
+  });
+});

From d7bcf1026fd78172529a5114eb3b6f84000756c2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 7 Nov 2022 11:17:42 +1100
Subject: [PATCH 002/178] fix: refactor snodeRPC to use snode batching

---
 preload.js                                    |   2 +-
 protos/SignalService.proto                    |  64 +-
 ts/components/MainViewController.tsx          |  45 --
 ts/components/dialog/DeleteAccountModal.tsx   |   4 +-
 ts/components/leftpane/ActionsPanel.tsx       |   2 +-
 .../leftpane/overlay/OverlayClosedGroup.tsx   |  38 +-
 .../leftpane/overlay/OverlayMessage.tsx       |   7 +-
 .../settings/section/CategoryAppearance.tsx   |   2 +-
 .../conversations/unsendingInteractions.ts    |   4 +-
 ts/models/conversation.ts                     |   4 +-
 ts/models/conversationAttributes.ts           |   6 +
 ts/models/message.ts                          |   4 +-
 ts/node/database_utility.ts                   |   7 +
 ts/node/migration/sessionMigrations.ts        |  19 +
 ts/node/sql.ts                                |   9 +-
 ts/receiver/callMessage.ts                    |   6 +-
 ts/receiver/closedGroups.ts                   | 209 ------
 ts/receiver/contentMessage.ts                 |   2 +-
 .../opengroupV2/OpenGroupPollingUtils.ts      |   4 +-
 .../opengroupV2/OpenGroupServerPoller.ts      |   6 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |   1 +
 ts/session/apis/snode_api/SNodeAPI.ts         | 614 +-----------------
 .../apis/snode_api/SnodeRequestTypes.ts       | 112 ++++
 ts/session/apis/snode_api/batchRequest.ts     |  67 ++
 ts/session/apis/snode_api/getNetworkTime.ts   |  79 +++
 .../apis/snode_api/getServiceNodesList.ts     | 124 ++++
 ts/session/apis/snode_api/getSwarmFor.ts      | 120 ++++
 ts/session/apis/snode_api/onions.ts           |  12 +-
 ts/session/apis/snode_api/onsResolve.ts       | 145 +++++
 ts/session/apis/snode_api/retrieveRequest.ts  | 141 ++++
 ts/session/apis/snode_api/sessionRpc.ts       |  16 +-
 ts/session/apis/snode_api/snodePool.ts        |   8 +-
 ts/session/apis/snode_api/storeMessage.ts     |  56 ++
 ts/session/apis/snode_api/swarmPolling.ts     |  65 +-
 ts/session/conversations/createClosedGroup.ts | 235 +++++++
 ts/session/crypto/index.ts                    |  18 +
 ts/session/group/closed-group.ts              |  29 +-
 ...ClosedGroupEncryptionPairRequestMessage.ts |  15 -
 .../group/v3/GroupAdminGroupMessage.ts        |  55 ++
 .../group/v3/GroupInviteMessage.ts            |  48 ++
 .../group/v3/GroupMemberLeftMessage.ts        |  18 +
 .../controlMessage/group/v3/GroupMessage.ts   |  18 +
 .../group/v3/GroupPromoteMessage.ts           |  34 +
 .../ClosedGroupVisibleMessage.ts              |   5 +
 ts/session/onions/onionPath.ts                |   6 +-
 ts/session/sending/MessageQueue.ts            |   4 +-
 ts/session/sending/MessageSender.ts           |  38 +-
 ts/session/types/PubKey.ts                    |  29 +-
 ts/session/utils/calling/CallManager.ts       |   8 +-
 .../ClosedGroupChatMessage_test.ts            |  14 +-
 .../v3/GroupAdminGroupMessage_test.ts         | 123 ++++
 .../v3/GroupInviteMessage_test.ts             |  89 +++
 .../v3/GroupMemberLeftMessage_test.ts         |  52 ++
 .../v3/GroupPromoteMessage_test.ts            |  60 ++
 .../session/unit/onion/OnionErrors_test.ts    |  11 +-
 ts/test/session/unit/onion/OnionPaths_test.ts |   3 +-
 .../unit/sending/MessageSender_test.ts        |   4 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   | 110 +---
 ts/test/test-utils/utils/pubkey.ts            |   9 +
 ts/window.d.ts                                |   2 +-
 60 files changed, 1941 insertions(+), 1100 deletions(-)
 create mode 100644 ts/session/apis/snode_api/SnodeRequestTypes.ts
 create mode 100644 ts/session/apis/snode_api/batchRequest.ts
 create mode 100644 ts/session/apis/snode_api/getNetworkTime.ts
 create mode 100644 ts/session/apis/snode_api/getServiceNodesList.ts
 create mode 100644 ts/session/apis/snode_api/getSwarmFor.ts
 create mode 100644 ts/session/apis/snode_api/onsResolve.ts
 create mode 100644 ts/session/apis/snode_api/retrieveRequest.ts
 create mode 100644 ts/session/apis/snode_api/storeMessage.ts
 create mode 100644 ts/session/conversations/createClosedGroup.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
 rename ts/test/session/unit/messages/{ => closed_groups}/ClosedGroupChatMessage_test.ts (84%)
 create mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
 create mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
 create mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
 create mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts

diff --git a/preload.js b/preload.js
index 5a46a4120..4e1accf36 100644
--- a/preload.js
+++ b/preload.js
@@ -29,7 +29,7 @@ window.sessionFeatureFlags = {
   useTestNet: Boolean(
     process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('testnet')
   ),
-  useSettingsThemeSwitcher: true,
+  useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
   debug: {
     debugFileServerRequests: false,
     debugNonSnodeRequests: false,
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index d94cbdfc5..bc4c3baa9 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -1,4 +1,5 @@
 package signalservice;
+syntax = "proto2";
 
 
 message Envelope {
@@ -72,6 +73,43 @@ message DataExtractionNotification {
   optional uint64 timestamp = 2;
 }
 
+message GroupInviteMessage {
+  required string         name              = 1;
+  required bytes          memberPrivateKey  = 2;
+}
+
+// this will replace our closedGroupControlMessage but we will need to keep both for some time
+message GroupMessage {
+  optional GroupAdminMessage           adminMessage         = 31;
+  optional GroupMemberLeftMessage      memberLeftMessage    = 32;
+  optional GroupInviteMessage          inviteMessage        = 33;
+  optional GroupPromoteMessage         promoteMessage       = 34;
+}
+
+message GroupPromoteMessage {
+  required bytes          privateKey        = 1; // this is the group admins key
+}
+
+message GroupAdminMessage {
+  enum Type {
+    DELETE_GROUP                   = 1; // members, groupSignature
+    DELETE_GROUP_ALL_MEMBERS       = 2;  // groupSignature
+    DELETE_MESSAGES_ALL_MEMBERS    = 3;  // groupSignature
+    DELETE_ATTACHMENTS_ALL_MEMBERS = 4;  // groupSignature
+  }
+
+  // @required
+  required Type           type              = 1;
+  repeated bytes          members           = 2;
+  // @required
+  required bytes          groupSignature    = 3; // used by every members to make sure incoming admin action can be trusted
+}
+
+message GroupMemberLeftMessage {
+ // the pubkey of the member who left is already in the senderIdentity
+}
+
+
 message DataMessage {
 
   enum Flags {
@@ -130,17 +168,16 @@ message DataMessage {
   message ClosedGroupControlMessage {
 
 	  enum Type {
-	    NEW                           = 1; // publicKey, name, encryptionKeyPair, members, admins, expireTimer
-      ENCRYPTION_KEY_PAIR           = 3; // publicKey, wrappers
-      NAME_CHANGE                   = 4; // name
-      MEMBERS_ADDED                 = 5; // members
-      MEMBERS_REMOVED               = 6; // members
+	    NEW                           = 1;  // TODO: should get rid of this once closed group redesign has been released for a while
+      ENCRYPTION_KEY_PAIR           = 3;  // TODO: should get rid of this once closed group redesign has been released for a while
+      NAME_CHANGE                   = 4;  // TODO: should get rid of this once closed group redesign has been released for a while
+      MEMBERS_ADDED                 = 5;  // TODO: should get rid of this once closed group redesign has been released for a while
+      MEMBERS_REMOVED               = 6;  // TODO: should get rid of this once closed group redesign has been released for a while
       MEMBER_LEFT                   = 7;
-      ENCRYPTION_KEY_PAIR_REQUEST   = 8;
+      ENCRYPTION_KEY_PAIR_REQUEST   = 8;  // TODO: should get rid of this once closed group redesign has been released for a while
 	  }
 
-
-
+    // TODO:  should get rid of this once closed group redesign has been released for a while
 	  message KeyPairWrapper {
 	    // @required
 	    required bytes publicKey        = 1; // The public key of the user the key pair is meant for
@@ -152,14 +189,15 @@ message DataMessage {
 	  required Type           type              = 1;
 	  optional bytes          publicKey         = 2;
 	  optional string         name              = 3;
-	  optional KeyPair        encryptionKeyPair = 4;
+	  optional KeyPair        encryptionKeyPair = 4; // TODO:  should get rid of this once closed group redesign has been released for a while
 	  repeated bytes          members           = 5;
-	  repeated bytes          admins            = 6;
-	  repeated KeyPairWrapper wrappers          = 7;
-    optional uint32         expireTimer       = 8;
+	  repeated bytes          admins            = 6; // TODO: should get rid of this once closed group redesign has been released for a while
+	  repeated KeyPairWrapper wrappers          = 7; // TODO: should get rid of this once closed group redesign has been released for a while
+    optional uint32         expireTimer       = 8; // TODO: should get rid of this once closed group redesign has been released for a while
 	}
 
 
+
   optional string                    body                      = 1;
   repeated AttachmentPointer         attachments               = 2;
   optional GroupContext              group                     = 3;
@@ -174,6 +212,7 @@ message DataMessage {
   optional OpenGroupInvitation       openGroupInvitation       = 102;
   optional ClosedGroupControlMessage closedGroupControlMessage = 104;
   optional string                    syncTarget                = 105;
+  optional GroupMessage              groupMessage              = 120;
 }
 
 message CallMessage {
@@ -279,3 +318,4 @@ message GroupContext {
   repeated string            admins  = 6;
 }
 
+
diff --git a/ts/components/MainViewController.tsx b/ts/components/MainViewController.tsx
index dcbf8c278..c96a10458 100644
--- a/ts/components/MainViewController.tsx
+++ b/ts/components/MainViewController.tsx
@@ -1,9 +1,5 @@
 import React from 'react';
 
-import { ToastUtils } from '../session/utils';
-import { createClosedGroup as createClosedGroupV2 } from '../receiver/closedGroups';
-import { VALIDATION } from '../session/constants';
-
 export class MessageView extends React.Component {
   public render() {
     return (
@@ -27,44 +23,3 @@ export class MessageView extends React.Component {
     );
   }
 }
-
-// /////////////////////////////////////
-// //////////// Management /////////////
-// /////////////////////////////////////
-
-/**
- * Returns true if the group was indead created
- */
-async function createClosedGroup(
-  groupName: string,
-  groupMemberIds: Array<string>
-): Promise<boolean> {
-  // Validate groupName and groupMembers length
-  if (groupName.length === 0) {
-    ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort'));
-
-    return false;
-  } else if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
-    ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong'));
-    return false;
-  }
-
-  // >= because we add ourself as a member AFTER this. so a 10 group is already invalid as it will be 11 with ourself
-  // the same is valid with groups count < 1
-
-  if (groupMemberIds.length < 1) {
-    ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember'));
-    return false;
-  } else if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
-    ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize'));
-    return false;
-  }
-
-  await createClosedGroupV2(groupName, groupMemberIds);
-
-  return true;
-}
-
-export const MainViewController = {
-  createClosedGroup,
-};
diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index ce7e42f77..35809a7d0 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { ed25519Str } from '../../session/onions/onionPath';
-import { forceNetworkDeletion } from '../../session/apis/snode_api/SNodeAPI';
+import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI';
 import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/syncUtils';
 import { updateConfirmModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { SpacerLG } from '../basic/Text';
@@ -58,7 +58,7 @@ async function deleteEverythingAndNetworkData() {
     // a bit of duplicate code below, but it's easier to follow every case like that (helped with returns)
 
     // send deletion message to the network
-    const potentiallyMaliciousSnodes = await forceNetworkDeletion();
+    const potentiallyMaliciousSnodes = await SnodeAPI.forceNetworkDeletion();
     if (potentiallyMaliciousSnodes === null) {
       window?.log?.warn('DeleteAccount => forceNetworkDeletion failed');
 
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index e71510f3a..75301958c 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -36,7 +36,6 @@ import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
 import { loadDefaultRooms } from '../../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getOpenGroupManager } from '../../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
-import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { SessionIconButton } from '../icon';
 import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
@@ -47,6 +46,7 @@ import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_a
 import { switchThemeTo } from '../../themes/switchTheme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { isDarkTheme } from '../../state/selectors/theme';
+import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index 61492b53d..a6ca63040 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -12,13 +12,14 @@ import { OverlayHeader } from './OverlayHeader';
 import { resetOverlayMode } from '../../../state/ducks/section';
 import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations';
 import { SpacerLG } from '../../basic/Text';
-import { MainViewController } from '../../MainViewController';
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { SessionSearchInput } from '../../SessionSearchInput';
 import { getSearchResults, isSearching } from '../../../state/selectors/search';
 import { useSet } from '../../../hooks/useSet';
 import { VALIDATION } from '../../../session/constants';
+import { ToastUtils } from '../../../session/utils';
+import { createClosedGroup } from '../../../session/conversations/createClosedGroup';
 
 const StyledMemberListNoContacts = styled.div`
   font-family: var(--font-font-mono);
@@ -52,6 +53,39 @@ const NoContacts = () => {
   );
 };
 
+/**
+ * Makes some validity check and return true if the group was indead created
+ */
+async function createClosedGroupWithToasts(
+  groupName: string,
+  groupMemberIds: Array<string>
+): Promise<boolean> {
+  // Validate groupName and groupMembers length
+  if (groupName.length === 0) {
+    ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort'));
+
+    return false;
+  } else if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
+    ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong'));
+    return false;
+  }
+
+  // >= because we add ourself as a member AFTER this. so a 10 group is already invalid as it will be 11 with ourself
+  // the same is valid with groups count < 1
+
+  if (groupMemberIds.length < 1) {
+    ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember'));
+    return false;
+  } else if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
+    ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize'));
+    return false;
+  }
+
+  await createClosedGroup(groupName, groupMemberIds, window.sessionFeatureFlags.useClosedGroupV3);
+
+  return true;
+}
+
 export const OverlayClosedGroup = () => {
   const dispatch = useDispatch();
   const privateContactsPubkeys = useSelector(getPrivateContactsPubkeys);
@@ -73,7 +107,7 @@ export const OverlayClosedGroup = () => {
       return;
     }
     setLoading(true);
-    const groupCreated = await MainViewController.createClosedGroup(groupName, selectedMemberIds);
+    const groupCreated = await createClosedGroupWithToasts(groupName, selectedMemberIds);
     if (groupCreated) {
       closeOverlay();
       return;
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index d4d708cbc..724d260b0 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -9,8 +9,6 @@ import { OverlayHeader } from './OverlayHeader';
 import { resetOverlayMode } from '../../../state/ducks/section';
 import { PubKey } from '../../../session/types';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
-import { SNodeAPI } from '../../../session/apis/snode_api';
-import { onsNameRegex } from '../../../session/apis/snode_api/SNodeAPI';
 import { getConversationController } from '../../../session/conversations';
 import { ToastUtils, UserUtils } from '../../../session/utils';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
@@ -20,6 +18,7 @@ import { Flex } from '../../basic/Flex';
 import { SessionIconButton } from '../../icon';
 import { SpacerMD } from '../../basic/Text';
 import styled from 'styled-components';
+import { ONSResolve } from '../../../session/apis/snode_api/onsResolve';
 
 const SessionIDDescription = styled.div`
   color: var(--text-secondary-color);
@@ -87,14 +86,14 @@ export const OverlayMessage = () => {
     }
 
     // this might be an ONS, validate the regex first
-    const mightBeOnsName = new RegExp(onsNameRegex, 'g').test(pubkeyorOnsTrimmed);
+    const mightBeOnsName = new RegExp(ONSResolve.onsNameRegex, 'g').test(pubkeyorOnsTrimmed);
     if (!mightBeOnsName) {
       ToastUtils.pushToastError('invalidPubKey', window.i18n('invalidNumberError'));
       return;
     }
     setLoading(true);
     try {
-      const resolvedSessionID = await SNodeAPI.getSessionIDForOnsName(pubkeyorOnsTrimmed);
+      const resolvedSessionID = await ONSResolve.getSessionIDForOnsName(pubkeyorOnsTrimmed);
       if (PubKey.validateWithErrorNoBlinding(resolvedSessionID)) {
         throw new Error('Got a resolved ONS but the returned entry is not a vlaid SessionID');
       }
diff --git a/ts/components/settings/section/CategoryAppearance.tsx b/ts/components/settings/section/CategoryAppearance.tsx
index c593fe806..d665b607a 100644
--- a/ts/components/settings/section/CategoryAppearance.tsx
+++ b/ts/components/settings/section/CategoryAppearance.tsx
@@ -19,7 +19,7 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null
 
     return (
       <>
-        {window.sessionFeatureFlags.useSettingsThemeSwitcher && <SettingsThemeSwitcher />}
+        <SettingsThemeSwitcher />
         <ZoomingSessionSlider />
         {isHideMenuBarSupported() && (
           <SessionToggleWithDescription
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 777997400..4a713613e 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -6,7 +6,7 @@ import { getMessageQueue } from '../../session';
 import { getConversationController } from '../../session/conversations';
 import { UnsendMessage } from '../../session/messages/outgoing/controlMessage/UnsendMessage';
 import { ed25519Str } from '../../session/onions/onionPath';
-import { networkDeleteMessages } from '../../session/apis/snode_api/SNodeAPI';
+import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI';
 import { PubKey } from '../../session/types';
 import { ToastUtils, UserUtils } from '../../session/utils';
 import { resetSelectedMessageIds } from '../../state/ducks/conversations';
@@ -100,7 +100,7 @@ export async function deleteMessagesFromSwarmOnly(messages: Array<MessageModel>)
   try {
     const deletionMessageHashes = compact(messages.map(m => m.get('messageHash')));
     if (deletionMessageHashes.length > 0) {
-      const errorOnSnode = await networkDeleteMessages(deletionMessageHashes);
+      const errorOnSnode = await SnodeAPI.networkDeleteMessages(deletionMessageHashes);
       return errorOnSnode === null || errorOnSnode.length === 0;
     }
     window.log?.warn(
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 820bab980..9b41bca29 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -55,7 +55,6 @@ import { ed25519Str } from '../session/onions/onionPath';
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { IMAGE_JPEG } from '../types/MIME';
 import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils';
-import { getNowWithNetworkOffset } from '../session/apis/snode_api/SNodeAPI';
 import { createLastMessageUpdate } from '../types/Conversation';
 import {
   ReplyingToMessageProps,
@@ -96,6 +95,7 @@ import {
 import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
 import { Reaction } from '../types/Reaction';
 import { Reactions } from '../util/reactions';
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -915,7 +915,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const { attachments, body, groupInvitation, preview, quote } = msg;
     this.clearTypingTimers();
     const expireTimer = this.get('expireTimer');
-    const networkTimestamp = getNowWithNetworkOffset();
+    const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
     window?.log?.info(
       'Sending message to conversation',
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 69a8e8599..c701180db 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -3,6 +3,7 @@ import { LastMessageStatusType } from '../state/ducks/conversations';
 
 export enum ConversationTypeEnum {
   GROUP = 'group',
+  CLOSED_GROUP = 'groupv3',
   PRIVATE = 'private',
 }
 
@@ -65,6 +66,11 @@ export interface ConversationAttributes {
 
   /** The open group chat this conversation originated from (if from closed group) */
   conversationIdOrigin?: string;
+
+  /**
+   * When we create a closed group v3 or get promoted to admim, we need to save the private key of that closed group.
+   */
+  identityPrivateKey?: string;
 }
 
 /**
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 2096133ee..0b66676d4 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -86,7 +86,6 @@ import { Notifications } from '../util/notifications';
 import { Storage } from '../util/storage';
 import { LinkPreviews } from '../util/linkPreviews';
 import { roomHasBlindEnabled } from '../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
-import { getNowWithNetworkOffset } from '../session/apis/snode_api/SNodeAPI';
 import {
   findCachedBlindedIdFromUnblinded,
   getUsBlindedInThatServer,
@@ -95,6 +94,7 @@ import {
 import { QUOTED_TEXT_MAX_LENGTH } from '../session/constants';
 import { ReactionList } from '../types/Reaction';
 import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata';
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 // tslint:disable: cyclomatic-complexity
 
 /**
@@ -890,7 +890,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       if (conversation.isPublic()) {
         const openGroupParams: VisibleMessageParams = {
           identifier: this.id,
-          timestamp: getNowWithNetworkOffset(),
+          timestamp: GetNetworkTime.getNowWithNetworkOffset(),
           lokiProfile: UserUtils.getOurProfile(),
           body,
           attachments,
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 17039750e..3b8dca00f 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -76,6 +76,7 @@ const allowedKeysFormatRowOfConversation = [
   'avatarInProfile',
   'displayNameInProfile',
   'conversationIdOrigin',
+  'identityPrivateKey',
 ];
 
 export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
@@ -168,6 +169,11 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
     convo.active_at = 0;
   }
 
+  convo.identityPrivateKey = row.identityPrivateKey;
+  if (!convo.identityPrivateKey) {
+    convo.identityPrivateKey = undefined;
+  }
+
   return convo;
 }
 
@@ -204,6 +210,7 @@ const allowedKeysOfConversationAttributes = [
   'avatarInProfile',
   'displayNameInProfile',
   'conversationIdOrigin',
+  'identityPrivateKey',
 ];
 
 /**
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 8c2ed8b40..8f3b7980f 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -79,6 +79,7 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToSessionSchemaVersion27,
   updateToSessionSchemaVersion28,
   updateToSessionSchemaVersion29,
+  updateToSessionSchemaVersion30,
 ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
@@ -1204,6 +1205,24 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
+function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 30;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
+  // this column will only be set when this is a closed group v3 and we are the admin/got promoted to admin
+  db.transaction(() => {
+    db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE}
+      ADD COLUMN identityPrivateKey TEXT;
+      `);
+    writeSessionSchemaVersion(targetVersion, db);
+  })();
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+}
+
 // function printTableColumns(table: string, db: BetterSqlite3.Database) {
 //   console.info(db.pragma(`table_info('${table}');`));
 // }
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 0f6fd847d..c4ca98047 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -426,6 +426,7 @@ function getConversationCount() {
 // tslint:disable-next-line: max-func-body-length
 function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3.Database) {
   const formatted = assertValidConversationAttributes(data);
+  console.warn('formatted', formatted);
 
   const {
     id,
@@ -460,6 +461,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     avatarInProfile,
     displayNameInProfile,
     conversationIdOrigin,
+    identityPrivateKey,
   } = formatted;
 
   const maxLength = 300;
@@ -503,7 +505,8 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
   didApproveMe,
   avatarInProfile,
   displayNameInProfile,
-  conversationIdOrigin
+  conversationIdOrigin,
+  identityPrivateKey
 	) values (
 	    $id,
 	    $active_at,
@@ -536,7 +539,8 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       $didApproveMe,
       $avatarInProfile,
       $displayNameInProfile,
-      $conversationIdOrigin
+      $conversationIdOrigin,
+      $identityPrivateKey
       )`
     )
     .run({
@@ -575,6 +579,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       avatarInProfile,
       displayNameInProfile,
       conversationIdOrigin,
+      identityPrivateKey,
     });
 }
 
diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts
index 2ca0a3a28..a2bf6e293 100644
--- a/ts/receiver/callMessage.ts
+++ b/ts/receiver/callMessage.ts
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { SignalService } from '../protobuf';
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 import { TTL_DEFAULT } from '../session/constants';
 import { CallManager, UserUtils } from '../session/utils';
 import { removeFromCache } from './cache';
 import { EnvelopePlus } from './types';
-import { getNowWithNetworkOffset } from '../session/apis/snode_api/SNodeAPI';
 
 export async function handleCallMessage(
   envelope: EnvelopePlus,
@@ -49,7 +49,9 @@ export async function handleCallMessage(
   }
 
   if (type === SignalService.CallMessage.Type.OFFER) {
-    if (Math.max(sentTimestamp - getNowWithNetworkOffset()) > TTL_DEFAULT.CALL_MESSAGE) {
+    if (
+      Math.max(sentTimestamp - GetNetworkTime.getNowWithNetworkOffset()) > TTL_DEFAULT.CALL_MESSAGE
+    ) {
       window?.log?.info('Dropping incoming OFFER callMessage sent a while ago: ', sentTimestamp);
       await removeFromCache(envelope);
 
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 3bff86a59..754d60092 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -6,30 +6,17 @@ import { toHex } from '../session/utils/String';
 import { getConversationController } from '../session/conversations';
 import * as ClosedGroup from '../session/group/closed-group';
 import { BlockedNumberController } from '../util';
-import {
-  generateClosedGroupPublicKey,
-  generateCurve25519KeyPairWithoutPrefix,
-} from '../session/crypto';
 import { getMessageQueue } from '../session';
 import { decryptWithSessionProtocol } from './contentMessage';
 import { Data } from '../../ts/data/data';
-import {
-  ClosedGroupNewMessage,
-  ClosedGroupNewMessageParams,
-} from '../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 
 import { ECKeyPair, HexKeyPair } from './keypairs';
 import { UserUtils } from '../session/utils';
 import { ConversationModel } from '../models/conversation';
 import _ from 'lodash';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils';
 import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
 import { queueAllCachedFromSource } from './receiver';
-import { openConversationWithMessages } from '../state/ducks/conversations';
 import { getSwarmPollingInstance } from '../session/apis/snode_api';
-import { MessageModel } from '../models/message';
-
-import { updateConfirmModal } from '../state/ducks/modalDialog';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 
@@ -902,199 +889,3 @@ async function sendLatestKeyPairToUsers(
     })
   );
 }
-
-export async function createClosedGroup(groupName: string, members: Array<string>) {
-  const setOfMembers = new Set(members);
-
-  const ourNumber = UserUtils.getOurPubKeyFromCache();
-  // Create Group Identity
-  // Generate the key pair that'll be used for encryption and decryption
-  // Generate the group's public key
-  const groupPublicKey = await generateClosedGroupPublicKey();
-  const encryptionKeyPair = await generateCurve25519KeyPairWithoutPrefix();
-  if (!encryptionKeyPair) {
-    throw new Error('Could not create encryption keypair for new closed group');
-  }
-  // Ensure the current uses' primary device is included in the member list
-  setOfMembers.add(ourNumber.key);
-  const listOfMembers = [...setOfMembers];
-
-  // Create the group
-  const convo = await getConversationController().getOrCreateAndWait(
-    groupPublicKey,
-    ConversationTypeEnum.GROUP
-  );
-
-  const admins = [ourNumber.key];
-
-  const existingExpireTimer = 0;
-
-  const groupDetails: ClosedGroup.GroupInfo = {
-    id: groupPublicKey,
-    name: groupName,
-    members: listOfMembers,
-    admins,
-    activeAt: Date.now(),
-    expireTimer: existingExpireTimer,
-  };
-
-  // used for UI only, adding of a message to remind who is in the group and the name of the group
-  const groupDiff: ClosedGroup.GroupDiff = {
-    newName: groupName,
-    joiningMembers: listOfMembers,
-  };
-
-  const dbMessage = await ClosedGroup.addUpdateMessage(
-    convo,
-    groupDiff,
-    UserUtils.getOurPubKeyStrFromCache(),
-    Date.now()
-  );
-  await convo.setIsApproved(true, false);
-  // be sure to call this before sending the message.
-  // the sending pipeline needs to know from GroupUtils when a message is for a medium group
-  await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
-  await convo.commit();
-  convo.updateLastMessage();
-
-  // Send a closed group update message to all members individually
-  const allInvitesSent = await sendToGroupMembers(
-    listOfMembers,
-    groupPublicKey,
-    groupName,
-    admins,
-    encryptionKeyPair,
-    dbMessage,
-    existingExpireTimer
-  );
-
-  if (allInvitesSent) {
-    const newHexKeypair = encryptionKeyPair.toHexKeyPair();
-
-    const isHexKeyPairSaved = await addKeyPairToCacheAndDBIfNeeded(groupPublicKey, newHexKeypair);
-
-    if (isHexKeyPairSaved) {
-      window?.log?.info('Dropping already saved keypair for group', groupPublicKey);
-    }
-
-    // Subscribe to this group id
-    getSwarmPollingInstance().addGroupId(new PubKey(groupPublicKey));
-  }
-
-  await forceSyncConfigurationNowIfNeeded();
-
-  await openConversationWithMessages({ conversationKey: groupPublicKey, messageId: null });
-}
-
-/**
- * Sends a group invite message to each member of the group.
- * @returns Array of promises for group invite messages sent to group members
- */
-async function sendToGroupMembers(
-  listOfMembers: Array<string>,
-  groupPublicKey: string,
-  groupName: string,
-  admins: Array<string>,
-  encryptionKeyPair: ECKeyPair,
-  dbMessage: MessageModel,
-  existingExpireTimer: number,
-  isRetry: boolean = false
-): Promise<any> {
-  const promises = createInvitePromises(
-    listOfMembers,
-    groupPublicKey,
-    groupName,
-    admins,
-    encryptionKeyPair,
-    dbMessage,
-    existingExpireTimer
-  );
-  window?.log?.info(`Creating a new group and an encryptionKeyPair for group ${groupPublicKey}`);
-  // evaluating if all invites sent, if failed give the option to retry failed invites via modal dialog
-  const inviteResults = await Promise.all(promises);
-  const allInvitesSent = _.every(inviteResults, inviteResult => inviteResult !== false);
-
-  if (allInvitesSent) {
-    // if (true) {
-    if (isRetry) {
-      const invitesTitle =
-        inviteResults.length > 1
-          ? window.i18n('closedGroupInviteSuccessTitlePlural')
-          : window.i18n('closedGroupInviteSuccessTitle');
-
-      window.inboxStore?.dispatch(
-        updateConfirmModal({
-          title: invitesTitle,
-          message: window.i18n('closedGroupInviteSuccessMessage'),
-          hideCancel: true,
-        })
-      );
-    }
-    return allInvitesSent;
-  } else {
-    // Confirmation dialog that recursively calls sendToGroupMembers on resolve
-
-    window.inboxStore?.dispatch(
-      updateConfirmModal({
-        title:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailTitlePlural')
-            : window.i18n('closedGroupInviteFailTitle'),
-        message:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailMessagePlural')
-            : window.i18n('closedGroupInviteFailMessage'),
-        okText: window.i18n('closedGroupInviteOkText'),
-        onClickOk: async () => {
-          const membersToResend: Array<string> = new Array<string>();
-          inviteResults.forEach((result, index) => {
-            const member = listOfMembers[index];
-            // group invite must always contain the admin member.
-            if (result !== true || admins.includes(member)) {
-              membersToResend.push(member);
-            }
-          });
-          if (membersToResend.length > 0) {
-            const isRetrySend = true;
-            await sendToGroupMembers(
-              membersToResend,
-              groupPublicKey,
-              groupName,
-              admins,
-              encryptionKeyPair,
-              dbMessage,
-              existingExpireTimer,
-              isRetrySend
-            );
-          }
-        },
-      })
-    );
-  }
-  return allInvitesSent;
-}
-
-function createInvitePromises(
-  listOfMembers: Array<string>,
-  groupPublicKey: string,
-  groupName: string,
-  admins: Array<string>,
-  encryptionKeyPair: ECKeyPair,
-  dbMessage: MessageModel,
-  existingExpireTimer: number
-) {
-  return listOfMembers.map(async m => {
-    const messageParams: ClosedGroupNewMessageParams = {
-      groupId: groupPublicKey,
-      name: groupName,
-      members: listOfMembers,
-      admins,
-      keypair: encryptionKeyPair,
-      timestamp: Date.now(),
-      identifier: dbMessage.id,
-      expireTimer: existingExpireTimer,
-    };
-    const message = new ClosedGroupNewMessage(messageParams);
-    return getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(m), message);
-  });
-}
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index ff29d76a3..7ea6fbf33 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -134,7 +134,7 @@ async function decryptForClosedGroup(envelope: EnvelopePlus, ciphertext: ArrayBu
  * or a message sent to a closed group.
  *
  * We do not unpad the result here, as in the case of the keypair wrapper, there is not padding.
- * Instead, it is the called who needs to removeMessagePadding() the content.
+ * Instead, it is the caller who needs to removeMessagePadding() the content.
  */
 export async function decryptWithSessionProtocol(
   envelope: EnvelopePlus,
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
index c9466e040..71fa1c459 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
@@ -5,7 +5,7 @@ import { UserUtils } from '../../../utils';
 import { fromHexToArray } from '../../../utils/String';
 import { getSodiumRenderer } from '../../../crypto';
 import { SogsBlinding } from '../sogsv3/sogsBlinding';
-import { getNowWithNetworkOffset } from '../../snode_api/SNodeAPI';
+import { GetNetworkTime } from '../../snode_api/getNetworkTime';
 
 export type OpenGroupRequestHeaders = {
   'X-SOGS-Pubkey': string;
@@ -41,7 +41,7 @@ const getOurOpenGroupHeaders = async (
 
   const nonce = (await getSodiumRenderer()).randombytes_buf(16);
 
-  const timestamp = Math.floor(getNowWithNetworkOffset() / 1000);
+  const timestamp = Math.floor(GetNetworkTime.getNowWithNetworkOffset() / 1000);
   return SogsBlinding.getOpenGroupHeaders({
     signingKeys,
     serverPK: fromHexToArray(serverPublicKey),
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index 19025eacd..73717359f 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -372,7 +372,7 @@ export class OpenGroupServerPoller {
 export const getRoomAndUpdateLastFetchTimestamp = async (
   conversationId: string,
   newMessages: Array<OpenGroupMessageV2 | OpenGroupMessageV4>,
-  subRequest: SubRequestMessagesObjectType
+  _subRequest: SubRequestMessagesObjectType
 ) => {
   const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversationId);
   if (!roomInfos || !roomInfos.serverUrl || !roomInfos.roomId) {
@@ -382,9 +382,7 @@ export const getRoomAndUpdateLastFetchTimestamp = async (
   if (!newMessages.length) {
     // if we got no new messages, just write our last update timestamp to the db
     roomInfos.lastFetchTimestamp = Date.now();
-    window?.log?.info(
-      `No new messages for ${subRequest?.roomId}:${subRequest?.sinceSeqNo}... just updating our last fetched timestamp`
-    );
+    window?.log?.info();
     await OpenGroupData.saveV2OpenGroupRoom(roomInfos);
     return null;
   }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 731fb6f34..b51047417 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -38,6 +38,7 @@ import { processMessagesUsingCache } from './sogsV3MutationCache';
 import { destroyMessagesAndUpdateRedux } from '../../../../util/expiringMessages';
 import { sogsRollingDeletions } from './sogsRollingDeletions';
 
+
 /**
  * Get the convo matching those criteria and make sure it is an opengroup convo, or return null.
  * If you get null, you most likely need to cancel the processing of whatever you are doing
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index 6be2c8246..48b2080d5 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -1,593 +1,19 @@
 import { snodeRpc } from './sessionRpc';
 
-import {
-  getRandomSnode,
-  getSwarmFor,
-  minSnodePoolCount,
-  requiredSnodesForAgreement,
-} from './snodePool';
+import { getSwarmFor } from './snodePool';
 import { getSodiumRenderer } from '../../crypto';
-import _, { isEmpty, range } from 'lodash';
+import _, { compact, sample } from 'lodash';
 import pRetry from 'p-retry';
-import {
-  fromBase64ToArray,
-  fromHexToArray,
-  fromUInt8ArrayToBase64,
-  stringToUint8Array,
-  toHex,
-} from '../../utils/String';
+import { fromBase64ToArray, fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { Snode } from '../../../data/data';
-import { updateIsOnline } from '../../../state/ducks/onion';
 import { ed25519Str } from '../../onions/onionPath';
 import { StringUtils, UserUtils } from '../../utils';
-import { SnodePool } from '.';
-import { handleHardforkResult } from './hfHandling';
-
-// ONS name can have [a-zA-Z0-9_-] except that - is not allowed as start or end
-// do not define a regex but rather create it on the fly to avoid https://stackoverflow.com/questions/3891641/regex-test-only-works-every-other-time
-export const onsNameRegex = '^\\w([\\w-]*[\\w])?$';
+import { GetNetworkTime } from './getNetworkTime';
 
 export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.';
 
-let latestTimestampOffset = Number.MAX_SAFE_INTEGER;
-
-function handleTimestampOffset(_request: string, snodeTimestamp: number) {
-  if (snodeTimestamp && _.isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) {
-    // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value
-    const now = Date.now();
-    if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) {
-      window?.log?.info(`first timestamp offset received:  ${now - snodeTimestamp}ms`);
-    }
-    latestTimestampOffset = now - snodeTimestamp;
-  }
-}
-
-/**
- * This function has no use to be called except during tests.
- * @returns the current offset we have with the rest of the network.
- */
-export function getLatestTimestampOffset() {
-  if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) {
-    window.log.warn('latestTimestampOffset is not set yet');
-    return 0;
-  }
-  // window.log.info('latestTimestampOffset is ', latestTimestampOffset);
-
-  return latestTimestampOffset;
-}
-
-export function getNowWithNetworkOffset() {
-  // make sure to call exports here, as we stub the exported one for testing.
-  return Date.now() - exports.getLatestTimestampOffset();
-}
-
-export type SendParams = {
-  pubKey: string;
-  ttl: string;
-  timestamp: string;
-  data: string;
-  isSyncMessage?: boolean;
-  messageId?: string;
-  namespace: number;
-};
-
-/**
- * get snodes for pubkey from random snode. Uses an existing snode
- */
-async function requestSnodesForPubkeyWithTargetNodeRetryable(
-  pubKey: string,
-  targetNode: Snode
-): Promise<Array<Snode>> {
-  const params = {
-    pubKey,
-  };
-
-  const result = await snodeRpc({
-    method: 'get_snodes_for_pubkey',
-    params,
-    targetNode,
-    associatedWith: pubKey,
-  });
-  if (!result) {
-    window?.log?.warn(
-      `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value`,
-      result
-    );
-    throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid result');
-  }
-
-  if (result.status !== 200) {
-    window?.log?.warn('Status is not 200 for get_snodes_for_pubkey');
-    throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid status code');
-  }
-
-  try {
-    const json = JSON.parse(result.body);
-
-    if (!json.snodes) {
-      // we hit this when snode gives 500s
-      window?.log?.warn(
-        `SessionSnodeAPI::requestSnodesForPubkeyRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value for snodes`,
-        result
-      );
-      throw new Error('Invalid json (empty)');
-    }
-
-    const snodes = json.snodes.filter((tSnode: any) => tSnode.ip !== '0.0.0.0');
-    handleTimestampOffset('get_snodes_for_pubkey', json.t);
-    return snodes;
-  } catch (e) {
-    throw new Error('Invalid json');
-  }
-}
-
-async function requestSnodesForPubkeyWithTargetNode(
-  pubKey: string,
-  targetNode: Snode
-): Promise<Array<Snode>> {
-  // don't catch exception in here. we want them to bubble up
-
-  // this is the level where our targetNode is supposed to be valid. We retry a few times with this one.
-  // if all our retries fails, we retry from the caller of this function with a new target node.
-  return pRetry(
-    async () => {
-      return requestSnodesForPubkeyWithTargetNodeRetryable(pubKey, targetNode);
-    },
-    {
-      retries: 3,
-      factor: 2,
-      minTimeout: 100,
-      maxTimeout: 2000,
-      onFailedAttempt: e => {
-        window?.log?.warn(
-          `requestSnodesForPubkeyWithTargetNode attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
-        );
-      },
-    }
-  );
-}
-
-async function requestSnodesForPubkeyRetryable(pubKey: string): Promise<Array<Snode>> {
-  // don't catch exception in here. we want them to bubble up
-
-  // this is the level where our targetNode is not yet known. We retry a few times with a new one everytime.
-  // the idea is that the requestSnodesForPubkeyWithTargetNode will remove a failing targetNode
-  return pRetry(
-    async () => {
-      const targetNode = await getRandomSnode();
-
-      return requestSnodesForPubkeyWithTargetNode(pubKey, targetNode);
-    },
-    {
-      retries: 3,
-      factor: 2,
-      minTimeout: 100,
-      maxTimeout: 4000,
-      onFailedAttempt: e => {
-        window?.log?.warn(
-          `requestSnodesForPubkeyRetryable attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
-        );
-      },
-    }
-  );
-}
-
-export async function requestSnodesForPubkey(pubKey: string): Promise<Array<Snode>> {
-  try {
-    // catch exception in here only.
-    // the idea is that the pretry will retry a few times each calls, except if an AbortError is thrown.
-
-    // if all retry fails, we will end up in the catch below when the last exception thrown
-    return await requestSnodesForPubkeyRetryable(pubKey);
-  } catch (e) {
-    window?.log?.error('SessionSnodeAPI::requestSnodesForPubkey - error', e);
-
-    return [];
-  }
-}
-
-export async function getSessionIDForOnsName(onsNameCase: string) {
-  const validationCount = 3;
-
-  const onsNameLowerCase = onsNameCase.toLowerCase();
-  const sodium = await getSodiumRenderer();
-  const nameAsData = stringToUint8Array(onsNameLowerCase);
-  const nameHash = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData);
-  const base64EncodedNameHash = fromUInt8ArrayToBase64(nameHash);
-
-  const params = {
-    endpoint: 'ons_resolve',
-    params: {
-      type: 0,
-      name_hash: base64EncodedNameHash,
-    },
-  };
-  // we do this request with validationCount snodes
-  const promises = range(0, validationCount).map(async () => {
-    const targetNode = await getRandomSnode();
-    const result = await snodeRpc({ method: 'oxend_request', params, targetNode });
-    if (!result || result.status !== 200 || !result.body) {
-      throw new Error('ONSresolve:Failed to resolve ONS');
-    }
-    let parsedBody;
-
-    try {
-      parsedBody = JSON.parse(result.body);
-      handleTimestampOffset('ons_resolve', parsedBody.t);
-    } catch (e) {
-      window?.log?.warn('ONSresolve: failed to parse ons result body', result.body);
-      throw new Error('ONSresolve: json ONS resovle');
-    }
-    const intermediate = parsedBody?.result;
-
-    if (!intermediate || !intermediate?.encrypted_value) {
-      throw new Error('ONSresolve: no encrypted_value');
-    }
-    const hexEncodedCipherText = intermediate?.encrypted_value;
-
-    const isArgon2Based = !Boolean(intermediate?.nonce);
-    const ciphertext = fromHexToArray(hexEncodedCipherText);
-    let sessionIDAsData: Uint8Array;
-    let nonce: Uint8Array;
-    let key: Uint8Array;
-
-    if (isArgon2Based) {
-      // Handle old Argon2-based encryption used before HF16
-      const salt = new Uint8Array(sodium.crypto_pwhash_SALTBYTES);
-      nonce = new Uint8Array(sodium.crypto_secretbox_NONCEBYTES);
-      try {
-        const keyHex = sodium.crypto_pwhash(
-          sodium.crypto_secretbox_KEYBYTES,
-          onsNameLowerCase,
-          salt,
-          sodium.crypto_pwhash_OPSLIMIT_MODERATE,
-          sodium.crypto_pwhash_MEMLIMIT_MODERATE,
-          sodium.crypto_pwhash_ALG_ARGON2ID13,
-          'hex'
-        );
-        if (!keyHex) {
-          throw new Error('ONSresolve: key invalid argon2');
-        }
-        key = fromHexToArray(keyHex);
-      } catch (e) {
-        throw new Error('ONSresolve: Hashing failed');
-      }
-
-      sessionIDAsData = sodium.crypto_secretbox_open_easy(ciphertext, nonce, key);
-      if (!sessionIDAsData) {
-        throw new Error('ONSresolve: Decryption failed');
-      }
-
-      return toHex(sessionIDAsData);
-    }
-
-    // not argon2Based
-    const hexEncodedNonce = intermediate.nonce as string;
-    if (!hexEncodedNonce) {
-      throw new Error('ONSresolve: No hexEncodedNonce');
-    }
-    nonce = fromHexToArray(hexEncodedNonce);
-
-    try {
-      key = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData, nameHash);
-      if (!key) {
-        throw new Error('ONSresolve: Hashing failed');
-      }
-    } catch (e) {
-      window?.log?.warn('ONSresolve: hashing failed', e);
-      throw new Error('ONSresolve: Hashing failed');
-    }
-
-    sessionIDAsData = sodium.crypto_aead_xchacha20poly1305_ietf_decrypt(
-      null,
-      ciphertext,
-      null,
-      nonce,
-      key
-    );
-
-    if (!sessionIDAsData) {
-      throw new Error('ONSresolve: Decryption failed');
-    }
-
-    return toHex(sessionIDAsData);
-  });
-
-  try {
-    // if one promise throws, we end un the catch case
-    const allResolvedSessionIds = await Promise.all(promises);
-    if (allResolvedSessionIds?.length !== validationCount) {
-      throw new Error('ONSresolve: Validation failed');
-    }
-
-    // assert all the returned session ids are the same
-    if (_.uniq(allResolvedSessionIds).length !== 1) {
-      throw new Error('ONSresolve: Validation failed');
-    }
-    return allResolvedSessionIds[0];
-  } catch (e) {
-    window.log.warn('ONSresolve: error', e);
-    throw e;
-  }
-}
-
-/**
- * Try to fetch from 3 different snodes an updated list of snodes.
- * If we get less than 24 common snodes in those result, we consider the request to failed and an exception is thrown.
- * The three snode we make the request to is randomized.
- * This function is to be called with a pRetry so that if one snode does not reply anything, another might be choose next time.
- * Return the list of nodes all snodes agreed on.
- */
-export async function getSnodePoolFromSnodes() {
-  const existingSnodePool = await SnodePool.getSnodePoolFromDBOrFetchFromSeed();
-  if (existingSnodePool.length <= minSnodePoolCount) {
-    window?.log?.warn(
-      'getSnodePoolFromSnodes: Cannot get snodes list from snodes; not enough snodes',
-      existingSnodePool.length
-    );
-    throw new Error(
-      `Cannot get snodes list from snodes; not enough snodes even after refetching from seed', ${existingSnodePool.length}`
-    );
-  }
-
-  // Note intersectionWith only works with 3 at most array to find the common snodes.
-  const nodesToRequest = _.sampleSize(existingSnodePool, 3);
-  const results = await Promise.all(
-    nodesToRequest.map(async node => {
-      /**
-       * this call is already retried if the snode does not reply
-       * (at least when onion requests are enabled)
-       * this request might want to rebuild a path if the snode length gets < minSnodePoolCount during the
-       * retries, so we need to make sure this does not happen.
-       *
-       * Remember that here, we are trying to fetch from snodes the updated list of snodes to rebuild a path.
-       * If we don't disable rebuilding a path below, this gets to a chicken and egg problem.
-       */
-      return TEST_getSnodePoolFromSnode(node);
-    })
-  );
-
-  // we want those at least `requiredSnodesForAgreement` snodes common between all the result
-  const commonSnodes = _.intersectionWith(
-    results[0],
-    results[1],
-    results[2],
-    (s1: Snode, s2: Snode) => {
-      return s1.ip === s2.ip && s1.port === s2.port;
-    }
-  );
-  // We want the snodes to agree on at least this many snodes
-  if (commonSnodes.length < requiredSnodesForAgreement) {
-    throw new Error(
-      `Inconsistent snode pools. We did not get at least ${requiredSnodesForAgreement} in common`
-    );
-  }
-  return commonSnodes;
-}
-
-/**
- * Returns a list of unique snodes got from the specified targetNode.
- * This function won't try to rebuild a path if at some point we don't have enough snodes.
- * This is exported for testing purpose only
- */
-// tslint:disable-next-line: function-name
-export async function TEST_getSnodePoolFromSnode(targetNode: Snode): Promise<Array<Snode>> {
-  const params = {
-    endpoint: 'get_service_nodes',
-    params: {
-      active_only: true,
-      fields: {
-        public_ip: true,
-        storage_port: true,
-        pubkey_x25519: true,
-        pubkey_ed25519: true,
-      },
-    },
-  };
-  const result = await snodeRpc({
-    method: 'oxend_request',
-    params,
-    targetNode,
-  });
-  if (!result || result.status !== 200) {
-    throw new Error('Invalid result');
-  }
-
-  try {
-    const json = JSON.parse(result.body);
-
-    if (!json || !json.result || !json.result.service_node_states?.length) {
-      window?.log?.error('getSnodePoolFromSnode - invalid result from snode', result.body);
-      return [];
-    }
-
-    // Filter 0.0.0.0 nodes which haven't submitted uptime proofs
-    const snodes = json.result.service_node_states
-      .filter((snode: any) => snode.public_ip !== '0.0.0.0')
-      .map((snode: any) => ({
-        ip: snode.public_ip,
-        port: snode.storage_port,
-        pubkey_x25519: snode.pubkey_x25519,
-        pubkey_ed25519: snode.pubkey_ed25519,
-      })) as Array<Snode>;
-    handleTimestampOffset('get_service_nodes', json.t);
-
-    // we the return list by the snode is already made of uniq snodes
-    return _.compact(snodes);
-  } catch (e) {
-    window?.log?.error('Invalid json response');
-    return [];
-  }
-}
-
-export async function storeOnNode(
-  targetNode: Snode,
-  params: SendParams
-): Promise<string | null | boolean> {
-  try {
-    // no retry here. If an issue is with the path this is handled in lokiOnionFetch
-    // if there is an issue with the targetNode, we still send a few times this request to a few snodes in // already so it's handled
-    const result = await snodeRpc({
-      method: 'store',
-      params,
-      targetNode,
-      associatedWith: params.pubKey,
-    });
-
-    if (!result || result.status !== 200 || !result.body) {
-      return false;
-    }
-
-    try {
-      const parsed = JSON.parse(result.body);
-      handleTimestampOffset('store', parsed.t);
-      await handleHardforkResult(parsed);
-
-      const messageHash = parsed.hash;
-      if (messageHash) {
-        return messageHash;
-      }
-
-      return true;
-    } catch (e) {
-      window?.log?.warn('Failed to parse "store" result: ', e.msg);
-    }
-    return false;
-  } catch (e) {
-    window?.log?.warn('store - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`);
-    throw e;
-  }
-}
-
-async function getRetrieveSignatureParams(
-  params: RetrieveRequestParams
-): Promise<{ timestamp: number; signature: string; pubkey_ed25519: string } | null> {
-  const ourPubkey = UserUtils.getOurPubKeyFromCache();
-  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
-
-  if (isEmpty(params?.pubKey) || ourPubkey.key !== params.pubKey || !ourEd25519Key) {
-    return null;
-  }
-  const hasNamespace = params.namespace && params.namespace !== 0;
-  const namespace = params.namespace || 0;
-  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
-
-  const signatureTimestamp = getNowWithNetworkOffset();
-
-  const verificationData = hasNamespace
-    ? StringUtils.encode(`retrieve${namespace}${signatureTimestamp}`, 'utf8')
-    : StringUtils.encode(`retrieve${signatureTimestamp}`, 'utf8');
-  const message = new Uint8Array(verificationData);
-
-  const sodium = await getSodiumRenderer();
-  try {
-    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
-    const signatureBase64 = fromUInt8ArrayToBase64(signature);
-
-    const namespaceObject = hasNamespace ? { namespace } : {};
-
-    return {
-      timestamp: signatureTimestamp,
-      signature: signatureBase64,
-      pubkey_ed25519: ourEd25519Key.pubKey,
-      ...namespaceObject,
-    };
-  } catch (e) {
-    window.log.warn('getSignatureParams failed with: ', e.message);
-    return null;
-  }
-}
-
-type RetrieveRequestParams = {
-  pubKey: string;
-  lastHash: string;
-  namespace?: number;
-};
-
-/** */
-export async function retrieveNextMessages(
-  targetNode: Snode,
-  lastHash: string,
-  associatedWith: string,
-  namespace?: number
-): Promise<Array<any>> {
-  const params: RetrieveRequestParams = {
-    pubKey: associatedWith,
-    lastHash: lastHash || '',
-    namespace,
-  };
-
-  const signatureParams = (await getRetrieveSignatureParams(params)) || {};
-
-  // let exceptions bubble up
-  // no retry for this one as this a call we do every few seconds while polling for messages
-  const result = await snodeRpc({
-    method: 'retrieve',
-    params: { ...signatureParams, ...params },
-    targetNode,
-    associatedWith,
-    timeout: 4000,
-  });
-
-  if (!result) {
-    window?.log?.warn(
-      `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
-    );
-    throw new Error(
-      `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
-    );
-  }
-
-  if (result.status !== 200) {
-    window?.log?.warn('retrieveNextMessages result is not 200');
-    throw new Error(
-      `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port}`
-    );
-  }
-
-  try {
-    const json = JSON.parse(result.body);
-    if (!window.inboxStore?.getState().onionPaths.isOnline) {
-      window.inboxStore?.dispatch(updateIsOnline(true));
-    }
-
-    handleTimestampOffset('retrieve', json.t);
-    await handleHardforkResult(json);
-
-    return json.messages || [];
-  } catch (e) {
-    window?.log?.warn('exception while parsing json of nextMessage:', e);
-    if (!window.inboxStore?.getState().onionPaths.isOnline) {
-      window.inboxStore?.dispatch(updateIsOnline(true));
-    }
-    throw new Error(
-      `_retrieveNextMessages - exception while parsing json of nextMessage ${targetNode.ip}:${targetNode.port}: ${e?.message}`
-    );
-  }
-}
-
-/**
- * Makes a post to a node to receive the timestamp info. If non-existant, returns -1
- * @param snode Snode to send request to
- * @returns timestamp of the response from snode
- */
-// tslint:disable-next-line: variable-name
-export const getNetworkTime = async (snode: Snode): Promise<string | number> => {
-  const response = await snodeRpc({ method: 'info', params: {}, targetNode: snode });
-  if (!response || !response.body) {
-    throw new Error('getNetworkTime returned empty response or body');
-  }
-  const body = JSON.parse(response.body);
-  const timestamp = body?.timestamp;
-  if (!timestamp) {
-    throw new Error(`getNetworkTime returned invalid timestamp: ${timestamp}`);
-  }
-  handleTimestampOffset('getNetworkTime', timestamp);
-  return timestamp;
-};
-
 // tslint:disable-next-line: max-func-body-length
-export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
+const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();
 
@@ -603,7 +29,7 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
     const maliciousSnodes = await pRetry(
       async () => {
         const userSwarm = await getSwarmFor(userX25519PublicKey);
-        const snodeToMakeRequestTo: Snode | undefined = _.sample(userSwarm);
+        const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm);
         const edKeyPrivBytes = fromHexToArray(edKeyPriv);
 
         if (!snodeToMakeRequestTo) {
@@ -613,7 +39,7 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
 
         return pRetry(
           async () => {
-            const timestamp = await exports.getNetworkTime(snodeToMakeRequestTo);
+            const timestamp = await GetNetworkTime.getNetworkTime(snodeToMakeRequestTo);
 
             const verificationData = StringUtils.encode(`delete_all${timestamp}`, 'utf8');
             const message = new Uint8Array(verificationData);
@@ -661,7 +87,7 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                 );
               }
               // results will only contains the snode pubkeys which returned invalid/empty results
-              const results: Array<string> = _.compact(
+              const results: Array<string> = compact(
                 swarmAsArray.map(snode => {
                   const snodePubkey = snode[0];
                   const snodeJson = snode[1];
@@ -721,7 +147,7 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
           },
           {
             retries: 3,
-            minTimeout: exports.TEST_getMinTimeout(),
+            minTimeout: SnodeAPI.TEST_getMinTimeout(),
             onFailedAttempt: e => {
               window?.log?.warn(
                 `delete_all INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
@@ -732,7 +158,7 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
       },
       {
         retries: 3,
-        minTimeout: exports.TEST_getMinTimeout(),
+        minTimeout: SnodeAPI.TEST_getMinTimeout(),
         onFailedAttempt: e => {
           window?.log?.warn(
             `delete_all OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}`
@@ -749,15 +175,13 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
 };
 
 // tslint:disable-next-line: variable-name
-export const TEST_getMinTimeout = () => 500;
+const TEST_getMinTimeout = () => 500;
 
 /**
  * Locally deletes message and deletes message on the network (all nodes that contain the message)
  */
 // tslint:disable-next-line: max-func-body-length
-export const networkDeleteMessages = async (
-  hashes: Array<string>
-): Promise<Array<string> | null> => {
+const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();
 
@@ -773,7 +197,7 @@ export const networkDeleteMessages = async (
     const maliciousSnodes = await pRetry(
       async () => {
         const userSwarm = await getSwarmFor(userX25519PublicKey);
-        const snodeToMakeRequestTo: Snode | undefined = _.sample(userSwarm);
+        const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm);
         const edKeyPrivBytes = fromHexToArray(edKeyPriv);
 
         if (!snodeToMakeRequestTo) {
@@ -828,7 +252,7 @@ export const networkDeleteMessages = async (
                 );
               }
               // results will only contains the snode pubkeys which returned invalid/empty results
-              const results: Array<string> = _.compact(
+              const results: Array<string> = compact(
                 swarmAsArray.map(snode => {
                   const snodePubkey = snode[0];
                   const snodeJson = snode[1];
@@ -894,7 +318,7 @@ export const networkDeleteMessages = async (
           },
           {
             retries: 3,
-            minTimeout: exports.TEST_getMinTimeout(),
+            minTimeout: SnodeAPI.TEST_getMinTimeout(),
             onFailedAttempt: e => {
               window?.log?.warn(
                 `delete INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
@@ -905,7 +329,7 @@ export const networkDeleteMessages = async (
       },
       {
         retries: 3,
-        minTimeout: exports.TEST_getMinTimeout(),
+        minTimeout: SnodeAPI.TEST_getMinTimeout(),
         onFailedAttempt: e => {
           window?.log?.warn(
             `delete OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
@@ -920,3 +344,9 @@ export const networkDeleteMessages = async (
     return null;
   }
 };
+
+export const SnodeAPI = {
+  TEST_getMinTimeout,
+  networkDeleteMessages,
+  forceNetworkDeletion,
+};
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
new file mode 100644
index 000000000..4716d05bd
--- /dev/null
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -0,0 +1,112 @@
+export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } };
+
+type RetrieveMaxCountSize = { max_count?: number; max_size?: number };
+type RetrieveAlwaysNeeded = {
+  pubkey: string;
+  namespace: number;
+  last_hash: string;
+  timestamp: number;
+};
+
+export type RetrievePubkeySubRequestType = {
+  method: 'retrieve';
+  params: {
+    signature: string;
+    pubkey_ed25519: string;
+    namespace: number;
+  } & RetrieveAlwaysNeeded &
+    RetrieveMaxCountSize;
+};
+
+export type RetrieveSubKeySubRequestType = {
+  method: 'retrieve';
+  params: {
+    subkey: string; // 32-byte hex encoded string
+    signature: string;
+    namespace: number;
+  } & RetrieveAlwaysNeeded &
+    RetrieveMaxCountSize;
+};
+
+export type RetrieveSubRequestType = RetrievePubkeySubRequestType | RetrieveSubKeySubRequestType;
+
+// FIXME those store types are not right
+// type StoreAlwaysNeeded = { pubkey: string; timestamp: number; data: string };
+
+// type StoreUnauthenticatedSubRequest = {
+//   method: 'store';
+//   params: {
+//     ttl?: string; // required, unless expiry is given
+//     expiry?: number; // required, unless ttl is given
+//     namespace: -60 | -50 | -40 | -30 | -20 | -10 | 0 | 10 | 20 | 30 | 40 | 50 | 60; // we can only store without authentication on namespaces divisible by 10 (...-60...0...60...)
+//   } & StoreAlwaysNeeded;
+// };
+
+// type StoreAuthenticatedSubRequest = {
+//   method: 'store';
+//   params: {
+//     ttl?: string; // required, unless expiry is given
+//     expiry?: number; // required, unless ttl is given
+//     subkey?: string;
+//     signature: string; // base64 encoded
+//     pubkey_ed25519: string;
+//     sig_timestamp?: number;
+//   } & StoreAlwaysNeeded;
+// };
+
+/**
+ * OXEND_REQUESTS
+ */
+export type OnsResolveSubRequest = {
+  method: 'oxend_request';
+  params: {
+    endpoint: 'ons_resolve';
+    params: {
+      type: 0;
+      name_hash: string; // base64EncodedNameHash
+    };
+  };
+};
+
+export type GetServiceNodesSubRequest = {
+  method: 'oxend_request';
+  params: {
+    endpoint: 'get_service_nodes';
+    params: {
+      active_only: true;
+      fields: {
+        public_ip: true;
+        storage_port: true;
+        pubkey_x25519: true;
+        pubkey_ed25519: true;
+      };
+    };
+  };
+};
+
+export type StoreOnNodeParams = {
+  pubkey: string;
+  ttl: string;
+  timestamp: string;
+  data: string;
+  namespace: number;
+};
+
+export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams };
+export type NetworkTimeSubRequest = { method: 'info'; params: {} };
+
+export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest;
+
+export type SnodeApiSubRequests =
+  | RetrieveSubRequestType
+  | SwarmForSubRequest
+  | OxendSubRequest
+  | StoreOnNodeSubRequest
+  | NetworkTimeSubRequest;
+
+export type NonEmptyArray<T> = [T, ...T[]];
+
+export type NotEmptyArrayOfBatchResults = NonEmptyArray<{
+  code: number;
+  body: Record<string, any>;
+}>;
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
new file mode 100644
index 000000000..0aa5ba6cd
--- /dev/null
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -0,0 +1,67 @@
+import { isArray } from 'lodash';
+import { Snode } from '../../../data/data';
+import { SnodeResponse } from './onions';
+import { snodeRpc } from './sessionRpc';
+import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequestTypes';
+
+/**
+ * This is the equivalent to the batch send on sogs. The target node  runs each sub request and returns a list of all the sub status and bodies.
+ * If the global status code is not 200, an exception is thrown.
+ * The body is already parsed from json and is enforced to be an Array of at least one element
+ * @param subRequests the list of requests to do
+ * @param targetNode the node to do the request to, once all the onion routing is done
+ * @param timeout
+ * @param associatedWith
+ * @returns
+ */
+export async function doSnodeBatchRequest(
+  subRequests: Array<SnodeApiSubRequests>,
+  targetNode: Snode,
+  timeout: number,
+  associatedWith?: string
+): Promise<NotEmptyArrayOfBatchResults> {
+  const result = await snodeRpc({
+    method: 'batch',
+    params: { requests: subRequests },
+    targetNode,
+    associatedWith,
+    timeout,
+  });
+  if (!result) {
+    window?.log?.warn(
+      `doSnodeBatchRequest - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
+    );
+    throw new Error(
+      `doSnodeBatchRequest - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
+    );
+  }
+  const decoded = decodeBatchRequest(result);
+
+  return decoded;
+}
+
+/**
+ * Make sure the global batch status code is 200, parse the content as json and return it
+ */
+function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchResults {
+  try {
+    if (snodeResponse.status !== 200) {
+      throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`);
+    }
+    const parsed = JSON.parse(snodeResponse.body);
+
+    if (!isArray(parsed.results)) {
+      throw new Error(`decodeBatchRequest results is not an array`);
+    }
+
+    if (!parsed.results.length) {
+      throw new Error('decodeBatchRequest results an empty array');
+    }
+
+    return parsed.results;
+  } catch (e) {
+    window.log.error('decodeBatchRequest failed with ', e.message);
+    throw e;
+  }
+  // "{"results":[{"body":"retrieve signature verification failed","code":401}]}"
+}
diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts
new file mode 100644
index 000000000..c6876188c
--- /dev/null
+++ b/ts/session/apis/snode_api/getNetworkTime.ts
@@ -0,0 +1,79 @@
+/**
+ * Makes a post to a node to receive the timestamp info. If non-existant, returns -1
+ * @param snode Snode to send request to
+ * @returns timestamp of the response from snode
+ */
+
+import { isNumber } from 'lodash';
+import { Snode } from '../../../data/data';
+import { doSnodeBatchRequest } from './batchRequest';
+import { NetworkTimeSubRequest } from './SnodeRequestTypes';
+
+function getNetworkTimeSubRequests(): Array<NetworkTimeSubRequest> {
+  const request: NetworkTimeSubRequest = { method: 'info', params: {} };
+
+  return [request];
+}
+
+// tslint:disable-next-line: variable-name
+const getNetworkTime = async (snode: Snode): Promise<string | number> => {
+  const subRequests = getNetworkTimeSubRequests();
+  const result = await doSnodeBatchRequest(subRequests, snode, 4000);
+  if (!result || !result.length) {
+    window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result);
+    throw new Error('getNetworkTime: Invalid result');
+  }
+
+  const firstResult = result[0];
+
+  if (firstResult.code !== 200) {
+    window?.log?.warn('Status is not 200 for getNetworkTime but: ', firstResult.code);
+    throw new Error('getNetworkTime: Invalid status code');
+  }
+
+  const timestamp = firstResult?.body?.timestamp;
+  if (!timestamp) {
+    throw new Error(`getNetworkTime returned invalid timestamp: ${timestamp}`);
+  }
+  GetNetworkTime.handleTimestampOffsetFromNetwork('getNetworkTime', timestamp);
+  return timestamp;
+};
+
+let latestTimestampOffset = Number.MAX_SAFE_INTEGER;
+
+function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: number) {
+  if (snodeTimestamp && isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) {
+    // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value
+    const now = Date.now();
+    if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) {
+      window?.log?.info(`first timestamp offset received:  ${now - snodeTimestamp}ms`);
+    }
+    latestTimestampOffset = now - snodeTimestamp;
+  }
+}
+
+/**
+ * This function has no use to be called except during tests.
+ * @returns the current offset we have with the rest of the network.
+ */
+function getLatestTimestampOffset() {
+  if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) {
+    window.log.warn('latestTimestampOffset is not set yet');
+    return 0;
+  }
+  // window.log.info('latestTimestampOffset is ', latestTimestampOffset);
+
+  return latestTimestampOffset;
+}
+
+function getNowWithNetworkOffset() {
+  // make sure to call exports here, as we stub the exported one for testing.
+  return Date.now() - GetNetworkTime.getLatestTimestampOffset();
+}
+
+export const GetNetworkTime = {
+  getNetworkTime,
+  handleTimestampOffsetFromNetwork,
+  getLatestTimestampOffset,
+  getNowWithNetworkOffset,
+};
diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts
new file mode 100644
index 000000000..ffc46c06e
--- /dev/null
+++ b/ts/session/apis/snode_api/getServiceNodesList.ts
@@ -0,0 +1,124 @@
+import _, { intersectionWith, sampleSize } from 'lodash';
+import { SnodePool } from '.';
+import { Snode } from '../../../data/data';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool';
+import { GetServiceNodesSubRequest } from './SnodeRequestTypes';
+
+function buildSnodeListRequests(): Array<GetServiceNodesSubRequest> {
+  const request: GetServiceNodesSubRequest = {
+    method: 'oxend_request',
+    params: {
+      endpoint: 'get_service_nodes',
+      params: {
+        active_only: true,
+        fields: {
+          public_ip: true,
+          storage_port: true,
+          pubkey_x25519: true,
+          pubkey_ed25519: true,
+        },
+      },
+    },
+  };
+  return [request];
+}
+
+/**
+ * Returns a list of unique snodes got from the specified targetNode.
+ * This function won't try to rebuild a path if at some point we don't have enough snodes.
+ * This is exported for testing purpose only.
+ */
+async function getSnodePoolFromSnode(targetNode: Snode): Promise<Array<Snode>> {
+  const requests = buildSnodeListRequests();
+  const results = await doSnodeBatchRequest(requests, targetNode, 4000);
+
+  const firstResult = results[0];
+
+  if (!firstResult || firstResult.code !== 200) {
+    throw new Error('Invalid result');
+  }
+
+  try {
+    const json = firstResult.body;
+
+    if (!json || !json.result || !json.result.service_node_states?.length) {
+      window?.log?.error('getSnodePoolFromSnode - invalid result from snode', firstResult);
+      return [];
+    }
+
+    // Filter 0.0.0.0 nodes which haven't submitted uptime proofs
+    const snodes = json.result.service_node_states
+      .filter((snode: any) => snode.public_ip !== '0.0.0.0')
+      .map((snode: any) => ({
+        ip: snode.public_ip,
+        port: snode.storage_port,
+        pubkey_x25519: snode.pubkey_x25519,
+        pubkey_ed25519: snode.pubkey_ed25519,
+      })) as Array<Snode>;
+    GetNetworkTime.handleTimestampOffsetFromNetwork('get_service_nodes', json.t);
+
+    // we the return list by the snode is already made of uniq snodes
+    return _.compact(snodes);
+  } catch (e) {
+    window?.log?.error('Invalid json response');
+    return [];
+  }
+}
+
+/**
+ * Try to fetch from 3 different snodes an updated list of snodes.
+ * If we get less than 24 common snodes in those result, we consider the request to failed and an exception is thrown.
+ * The three snode we make the request to is randomized.
+ * This function is to be called with a pRetry so that if one snode does not reply anything, another might be choose next time.
+ * Return the list of nodes all snodes agreed on.
+ */
+async function getSnodePoolFromSnodes() {
+  const existingSnodePool = await SnodePool.getSnodePoolFromDBOrFetchFromSeed();
+  if (existingSnodePool.length <= minSnodePoolCount) {
+    window?.log?.warn(
+      'getSnodePoolFromSnodes: Cannot get snodes list from snodes; not enough snodes',
+      existingSnodePool.length
+    );
+    throw new Error(
+      `Cannot get snodes list from snodes; not enough snodes even after refetching from seed', ${existingSnodePool.length}`
+    );
+  }
+
+  // Note intersectionWith only works with 3 at most array to find the common snodes.
+  const nodesToRequest = sampleSize(existingSnodePool, 3);
+  const results = await Promise.all(
+    nodesToRequest.map(async node => {
+      /**
+       * this call is already retried if the snode does not reply
+       * (at least when onion requests are enabled)
+       * this request might want to rebuild a path if the snode length gets < minSnodePoolCount during the
+       * retries, so we need to make sure this does not happen.
+       *
+       * Remember that here, we are trying to fetch from snodes the updated list of snodes to rebuild a path.
+       * If we don't disable rebuilding a path below, this gets to a chicken and egg problem.
+       */
+      return ServiceNodesList.getSnodePoolFromSnode(node);
+    })
+  );
+
+  // we want those at least `requiredSnodesForAgreement` snodes common between all the result
+  const commonSnodes = intersectionWith(
+    results[0],
+    results[1],
+    results[2],
+    (s1: Snode, s2: Snode) => {
+      return s1.ip === s2.ip && s1.port === s2.port;
+    }
+  );
+  // We want the snodes to agree on at least this many snodes
+  if (commonSnodes.length < requiredSnodesForAgreement) {
+    throw new Error(
+      `Inconsistent snode pools. We did not get at least ${requiredSnodesForAgreement} in common`
+    );
+  }
+  return commonSnodes;
+}
+
+export const ServiceNodesList = { getSnodePoolFromSnode, getSnodePoolFromSnodes };
diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts
new file mode 100644
index 000000000..d9561be6a
--- /dev/null
+++ b/ts/session/apis/snode_api/getSwarmFor.ts
@@ -0,0 +1,120 @@
+import { isArray } from 'lodash';
+import pRetry from 'p-retry';
+import { Snode } from '../../../data/data';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { getRandomSnode } from './snodePool';
+import { SwarmForSubRequest } from './SnodeRequestTypes';
+
+function buildSwarmForSubRequests(pubkey: string): Array<SwarmForSubRequest> {
+  return [{ method: 'get_swarm', params: { pubkey } }];
+}
+
+/**
+ * get snodes for pubkey from random snode. Uses an existing snode
+ */
+async function requestSnodesForPubkeyWithTargetNodeRetryable(
+  pubkey: string,
+  targetNode: Snode
+): Promise<Array<Snode>> {
+  const subRequests = buildSwarmForSubRequests(pubkey);
+
+  const result = await doSnodeBatchRequest(subRequests, targetNode, 4000, pubkey);
+
+  if (!result || !result.length) {
+    window?.log?.warn(
+      `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value`,
+      result
+    );
+    throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid result');
+  }
+
+  const firstResult = result[0];
+
+  if (firstResult.code !== 200) {
+    window?.log?.warn('Status is not 200 for get_swarm but: ', firstResult.code);
+    throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid status code');
+  }
+
+  try {
+    const body = firstResult.body;
+    if (!body.snodes || !isArray(body.snodes) || !body.snodes.length) {
+      window?.log?.warn(
+        `SessionSnodeAPI::requestSnodesForPubkeyRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value for snodes`,
+        result
+      );
+      throw new Error('requestSnodesForPubkey: Invalid json (empty)');
+    }
+
+    const snodes = body.snodes.filter((tSnode: any) => tSnode.ip !== '0.0.0.0');
+    GetNetworkTime.handleTimestampOffsetFromNetwork('get_swarm', body.t);
+    return snodes;
+  } catch (e) {
+    throw new Error('Invalid json');
+  }
+}
+
+async function requestSnodesForPubkeyWithTargetNode(
+  pubKey: string,
+  targetNode: Snode
+): Promise<Array<Snode>> {
+  // don't catch exception in here. we want them to bubble up
+
+  // this is the level where our targetNode is supposed to be valid. We retry a few times with this one.
+  // if all our retries fails, we retry from the caller of this function with a new target node.
+  return pRetry(
+    async () => {
+      return requestSnodesForPubkeyWithTargetNodeRetryable(pubKey, targetNode);
+    },
+    {
+      retries: 3,
+      factor: 2,
+      minTimeout: 100,
+      maxTimeout: 2000,
+      onFailedAttempt: e => {
+        window?.log?.warn(
+          `requestSnodesForPubkeyWithTargetNode attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+        );
+      },
+    }
+  );
+}
+
+async function requestSnodesForPubkeyRetryable(pubKey: string): Promise<Array<Snode>> {
+  // don't catch exception in here. we want them to bubble up
+
+  // this is the level where our targetNode is not yet known. We retry a few times with a new one everytime.
+  // the idea is that the requestSnodesForPubkeyWithTargetNode will remove a failing targetNode
+  return pRetry(
+    async () => {
+      const targetNode = await getRandomSnode();
+
+      return requestSnodesForPubkeyWithTargetNode(pubKey, targetNode);
+    },
+    {
+      retries: 3,
+      factor: 2,
+      minTimeout: 100,
+      maxTimeout: 4000,
+      onFailedAttempt: e => {
+        window?.log?.warn(
+          `requestSnodesForPubkeyRetryable attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+        );
+      },
+    }
+  );
+}
+
+export async function requestSnodesForPubkeyFromNetwork(pubKey: string): Promise<Array<Snode>> {
+  try {
+    // catch exception in here only.
+    // the idea is that the pretry will retry a few times each calls, except if an AbortError is thrown.
+
+    // if all retry fails, we will end up in the catch below when the last exception thrown
+    return await requestSnodesForPubkeyRetryable(pubKey);
+  } catch (e) {
+    window?.log?.error('SessionSnodeAPI::requestSnodesForPubkey - error', e);
+
+    return [];
+  }
+}
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index e0aab38cb..824d53d5b 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -48,6 +48,12 @@ export interface SnodeResponse {
   status?: number;
 }
 
+export interface SnodeParsedResponse {
+  bodyBinary: Uint8Array | null;
+  body: string;
+  status?: number;
+}
+
 // v4 onion request have a weird string and binary content, so better get it as binary to extract just the string part
 export interface SnodeResponseV4 {
   bodyBinary: Uint8Array | null;
@@ -978,14 +984,14 @@ const sendOnionRequestNoRetries = async ({
       !isString(finalDestOptions.body) && finalDestOptions.body ? finalDestOptions.body : null;
     if (isRequestToSnode) {
       if (useV4) {
-        throw new Error('snoderpc calls cannot be v4 for now.');
+        throw new Error('sendOnionRequestNoRetries calls cannot be v4 for now.');
       }
       if (!isString(finalDestOptions.body)) {
         window.log.warn(
-          'snoderpc calls should only take body as string: ',
+          'sendOnionRequestNoRetries calls should only take body as string: ',
           typeof finalDestOptions.body
         );
-        throw new Error('snoderpc calls should only take body as string.');
+        throw new Error('sendOnionRequestNoRetries calls should only take body as string.');
       }
       // delete finalDestOptions.body;
       // not sure if that's strictly the same thing in this context
diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts
new file mode 100644
index 000000000..13b66a083
--- /dev/null
+++ b/ts/session/apis/snode_api/onsResolve.ts
@@ -0,0 +1,145 @@
+import _, { range } from 'lodash';
+import { getSodiumRenderer } from '../../crypto';
+import {
+  stringToUint8Array,
+  fromUInt8ArrayToBase64,
+  fromHexToArray,
+  toHex,
+} from '../../utils/String';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { getRandomSnode } from './snodePool';
+import { OnsResolveSubRequest } from './SnodeRequestTypes';
+
+// ONS name can have [a-zA-Z0-9_-] except that - is not allowed as start or end
+// do not define a regex but rather create it on the fly to avoid https://stackoverflow.com/questions/3891641/regex-test-only-works-every-other-time
+const onsNameRegex = '^\\w([\\w-]*[\\w])?$';
+
+function buildOnsResolveRequests(base64EncodedNameHash: string): Array<OnsResolveSubRequest> {
+  const request: OnsResolveSubRequest = {
+    method: 'oxend_request',
+    params: {
+      endpoint: 'ons_resolve',
+      params: { type: 0, name_hash: base64EncodedNameHash },
+    },
+  };
+  return [request];
+}
+
+async function getSessionIDForOnsName(onsNameCase: string) {
+  const validationCount = 3;
+
+  const onsNameLowerCase = onsNameCase.toLowerCase();
+  const sodium = await getSodiumRenderer();
+  const nameAsData = stringToUint8Array(onsNameLowerCase);
+  const nameHash = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData);
+  const base64EncodedNameHash = fromUInt8ArrayToBase64(nameHash);
+
+  const onsResolveRequests = buildOnsResolveRequests(base64EncodedNameHash);
+
+  // we do this request with validationCount snodes
+  const promises = range(0, validationCount).map(async () => {
+    const targetNode = await getRandomSnode();
+
+    const results = await doSnodeBatchRequest(onsResolveRequests, targetNode, 4000);
+    const firstResult = results[0];
+    if (!firstResult || firstResult.code !== 200 || !firstResult.body) {
+      throw new Error('ONSresolve:Failed to resolve ONS');
+    }
+    const parsedBody = firstResult.body;
+    GetNetworkTime.handleTimestampOffsetFromNetwork('ons_resolve', parsedBody.t);
+
+    const intermediate = parsedBody?.result;
+
+    if (!intermediate || !intermediate?.encrypted_value) {
+      throw new Error('ONSresolve: no encrypted_value');
+    }
+    const hexEncodedCipherText = intermediate?.encrypted_value;
+
+    const isArgon2Based = !Boolean(intermediate?.nonce);
+    const ciphertext = fromHexToArray(hexEncodedCipherText);
+    let sessionIDAsData: Uint8Array;
+    let nonce: Uint8Array;
+    let key: Uint8Array;
+
+    if (isArgon2Based) {
+      // Handle old Argon2-based encryption used before HF16
+      const salt = new Uint8Array(sodium.crypto_pwhash_SALTBYTES);
+      nonce = new Uint8Array(sodium.crypto_secretbox_NONCEBYTES);
+      try {
+        const keyHex = sodium.crypto_pwhash(
+          sodium.crypto_secretbox_KEYBYTES,
+          onsNameLowerCase,
+          salt,
+          sodium.crypto_pwhash_OPSLIMIT_MODERATE,
+          sodium.crypto_pwhash_MEMLIMIT_MODERATE,
+          sodium.crypto_pwhash_ALG_ARGON2ID13,
+          'hex'
+        );
+        if (!keyHex) {
+          throw new Error('ONSresolve: key invalid argon2');
+        }
+        key = fromHexToArray(keyHex);
+      } catch (e) {
+        throw new Error('ONSresolve: Hashing failed');
+      }
+
+      sessionIDAsData = sodium.crypto_secretbox_open_easy(ciphertext, nonce, key);
+      if (!sessionIDAsData) {
+        throw new Error('ONSresolve: Decryption failed');
+      }
+
+      return toHex(sessionIDAsData);
+    }
+
+    // not argon2Based
+    const hexEncodedNonce = intermediate.nonce as string;
+    if (!hexEncodedNonce) {
+      throw new Error('ONSresolve: No hexEncodedNonce');
+    }
+    nonce = fromHexToArray(hexEncodedNonce);
+
+    try {
+      key = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData, nameHash);
+      if (!key) {
+        throw new Error('ONSresolve: Hashing failed');
+      }
+    } catch (e) {
+      window?.log?.warn('ONSresolve: hashing failed', e);
+      throw new Error('ONSresolve: Hashing failed');
+    }
+
+    sessionIDAsData = sodium.crypto_aead_xchacha20poly1305_ietf_decrypt(
+      null,
+      ciphertext,
+      null,
+      nonce,
+      key
+    );
+
+    if (!sessionIDAsData) {
+      throw new Error('ONSresolve: Decryption failed');
+    }
+
+    return toHex(sessionIDAsData);
+  });
+
+  try {
+    // if one promise throws, we end un the catch case
+    const allResolvedSessionIds = await Promise.all(promises);
+    if (allResolvedSessionIds?.length !== validationCount) {
+      throw new Error('ONSresolve: Validation failed');
+    }
+
+    // assert all the returned session ids are the same
+    if (_.uniq(allResolvedSessionIds).length !== 1) {
+      throw new Error('ONSresolve: Validation failed');
+    }
+    return allResolvedSessionIds[0];
+  } catch (e) {
+    window.log.warn('ONSresolve: error', e);
+    throw e;
+  }
+}
+
+export const ONSResolve = { onsNameRegex, getSessionIDForOnsName };
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
new file mode 100644
index 000000000..cc36e95fd
--- /dev/null
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -0,0 +1,141 @@
+import { isEmpty } from 'lodash';
+import { Snode } from '../../../data/data';
+import { updateIsOnline } from '../../../state/ducks/onion';
+import { getSodiumRenderer } from '../../crypto';
+import { UserUtils, StringUtils } from '../../utils';
+import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { RetrievePubkeySubRequestType, RetrieveSubRequestType } from './SnodeRequestTypes';
+
+async function getRetrieveSignatureParams(params: {
+  pubkey: string;
+  lastHash: string;
+  namespace: number;
+}): Promise<{
+  timestamp: number;
+  signature: string;
+  pubkey_ed25519: string;
+  namespace: number;
+} | null> {
+  const ourPubkey = UserUtils.getOurPubKeyFromCache();
+  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
+
+  if (isEmpty(params?.pubkey) || ourPubkey.key !== params.pubkey || !ourEd25519Key) {
+    return null;
+  }
+  const namespace = params.namespace || 0;
+  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
+
+  const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset();
+
+  const verificationData = StringUtils.encode(`retrieve${namespace}${signatureTimestamp}`, 'utf8');
+  const message = new Uint8Array(verificationData);
+
+  const sodium = await getSodiumRenderer();
+  try {
+    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
+    const signatureBase64 = fromUInt8ArrayToBase64(signature);
+
+    return {
+      timestamp: signatureTimestamp,
+      signature: signatureBase64,
+      pubkey_ed25519: ourEd25519Key.pubKey,
+      namespace,
+    };
+  } catch (e) {
+    window.log.warn('getSignatureParams failed with: ', e.message);
+    return null;
+  }
+}
+
+async function buildRetrieveRequest(
+  lastHashes: Array<string>,
+  pubkey: string,
+  namespaces: Array<number>
+): Promise<Array<RetrieveSubRequestType>> {
+  const retrieveRequestsParams = await Promise.all(
+    namespaces.map(async (namespace, index) => {
+      const retrieveParam = {
+        pubkey,
+        lastHash: lastHashes.at(index) || '',
+        namespace,
+      };
+      const signatureBuilt = await getRetrieveSignatureParams(retrieveParam);
+      const signatureParams = signatureBuilt || {};
+      const retrieve: RetrievePubkeySubRequestType = {
+        method: 'retrieve',
+        params: { ...signatureParams, ...retrieveParam },
+      };
+      return retrieve;
+    })
+  );
+
+  return retrieveRequestsParams;
+}
+
+/** */
+async function retrieveNextMessages(
+  targetNode: Snode,
+  lastHashes: Array<string>,
+  associatedWith: string,
+  namespaces: Array<number>
+): Promise<Array<any>> {
+  if (namespaces.length !== lastHashes.length) {
+    throw new Error('namespaces and lasthashes does not match');
+  }
+
+  const retrieveRequestsParams = await buildRetrieveRequest(lastHashes, associatedWith, namespaces);
+  // let exceptions bubble up
+  // no retry for this one as this a call we do every few seconds while polling for messages
+
+  const results = await doSnodeBatchRequest(retrieveRequestsParams, targetNode, 4000);
+
+  if (!results || !results.length) {
+    window?.log?.warn(
+      `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
+    );
+    throw new Error(
+      `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}`
+    );
+  }
+
+  if (results.length !== namespaces.length) {
+    throw new Error(
+      `We asked for updates about ${namespaces.length} messages but got results of length ${results.length}`
+    );
+  }
+
+  if (namespaces.length > 1) {
+    throw new Error('multiple namespace polling todo');
+  }
+  const firstResult = results[0];
+
+  if (firstResult.code !== 200) {
+    window?.log?.warn(`retrieveNextMessages result is not 200 but ${firstResult.code}`);
+    throw new Error(
+      `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port} but ${firstResult.code}`
+    );
+  }
+
+  try {
+    const json = firstResult.body;
+    if (!window.inboxStore?.getState().onionPaths.isOnline) {
+      window.inboxStore?.dispatch(updateIsOnline(true));
+    }
+
+    GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', json.t);
+
+    return json.messages || [];
+  } catch (e) {
+    window?.log?.warn('exception while parsing json of nextMessage:', e);
+    if (!window.inboxStore?.getState().onionPaths.isOnline) {
+      window.inboxStore?.dispatch(updateIsOnline(true));
+    }
+    throw new Error(
+      `_retrieveNextMessages - exception while parsing json of nextMessage ${targetNode.ip}:${targetNode.port}: ${e?.message}`
+    );
+  }
+}
+
+export const SnodeAPIRetrieve = { retrieveNextMessages };
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 2c6d62ff1..089b71121 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -2,11 +2,11 @@ import { default as insecureNodeFetch } from 'node-fetch';
 import pRetry from 'p-retry';
 import { HTTPError, NotFoundError } from '../../utils/errors';
 import { Snode } from '../../../data/data';
-import { getStoragePubKey } from '../../types';
 
 import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions';
 import { APPLICATION_JSON } from '../../../types/MIME';
 import https from 'https';
+import { clone } from 'lodash';
 
 export interface LokiFetchOptions {
   method: 'GET' | 'POST';
@@ -115,7 +115,7 @@ export async function snodeRpc(
     timeout = 10000,
   }: {
     method: string;
-    params: Record<string, any>;
+    params: Record<string, any> | Array<Record<string, any>>;
     targetNode: Snode;
     associatedWith?: string;
     timeout?: number;
@@ -123,20 +123,12 @@ export async function snodeRpc(
 ): Promise<undefined | SnodeResponse> {
   const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`;
 
-  // TODO: The jsonrpc and body field will be ignored on storage server
-  if (params.pubKey) {
-    // Ensure we always take a copy
-    // tslint:disable-next-line no-parameter-reassignment
-    params = {
-      ...params,
-      pubKey: getStoragePubKey(params.pubKey),
-    };
-  }
+
 
   const body = {
     jsonrpc: '2.0',
     method,
-    params,
+    params: clone(params),
   };
 
   const fetchOptions: LokiFetchOptions = {
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index 6c13c4d21..8adcbff1d 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -1,7 +1,5 @@
 import _ from 'lodash';
 
-import { getSnodePoolFromSnodes, requestSnodesForPubkey } from './SNodeAPI';
-
 import { Data, Snode } from '../../../data/data';
 
 import pRetry from 'p-retry';
@@ -9,6 +7,8 @@ import { ed25519Str } from '../../onions/onionPath';
 import { OnionPaths } from '../../onions';
 import { Onions, SnodePool } from '.';
 import { SeedNodeAPI } from '../seed_node_api';
+import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor';
+import { ServiceNodesList } from './getServiceNodesList';
 
 /**
  * If we get less than this snode in a swarm, we fetch new snodes for this pubkey
@@ -214,7 +214,7 @@ async function tryToGetConsensusWithSnodesWithRetries() {
   // fetch the snode pool from one of the seed nodes (see the catch).
   return pRetry(
     async () => {
-      const commonNodes = await getSnodePoolFromSnodes();
+      const commonNodes = await ServiceNodesList.getSnodePoolFromSnodes();
 
       if (!commonNodes || commonNodes.length < requiredSnodesForAgreement) {
         // throwing makes trigger a retry if we have some left.
@@ -312,7 +312,7 @@ export async function getSwarmFor(pubkey: string): Promise<Array<Snode>> {
   }
 
   // Request new node list from the network
-  const freshNodes = _.shuffle(await requestSnodesForPubkey(pubkey));
+  const freshNodes = _.shuffle(await requestSnodesForPubkeyFromNetwork(pubkey));
 
   const edkeys = freshNodes.map((n: Snode) => n.pubkey_ed25519);
   await internalUpdateSwarmFor(pubkey, edkeys);
diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts
new file mode 100644
index 000000000..51034e27c
--- /dev/null
+++ b/ts/session/apis/snode_api/storeMessage.ts
@@ -0,0 +1,56 @@
+import { Snode } from '../../../data/data';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { StoreOnNodeParams, StoreOnNodeSubRequest } from './SnodeRequestTypes';
+
+function buildStoreRequests(params: StoreOnNodeParams): Array<StoreOnNodeSubRequest> {
+  const request: StoreOnNodeSubRequest = {
+    method: 'store',
+    params,
+  };
+  return [request];
+}
+
+async function storeOnNode(
+  targetNode: Snode,
+  params: StoreOnNodeParams
+): Promise<string | null | boolean> {
+  try {
+    const subRequests = buildStoreRequests(params);
+
+    const result = await doSnodeBatchRequest(subRequests, targetNode, 4000, params.pubkey);
+
+    if (!result || !result.length) {
+      window?.log?.warn(
+        `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value`,
+        result
+      );
+      throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid result');
+    }
+
+    const firstResult = result[0];
+
+    if (firstResult.code !== 200) {
+      window?.log?.warn('Status is not 200 for storeOnNode but: ', firstResult.code);
+      throw new Error('storeOnNode: Invalid status code');
+    }
+
+    // no retry here. If an issue is with the path this is handled in lokiOnionFetch
+    // if there is an issue with the targetNode, we still send a few times this request to a few snodes in // already so it's handled
+
+    const parsed = firstResult.body;
+    GetNetworkTime.handleTimestampOffsetFromNetwork('store', parsed.t);
+
+    const messageHash = parsed.hash;
+    if (messageHash) {
+      return messageHash;
+    }
+
+    return true;
+  } catch (e) {
+    window?.log?.warn('store - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`);
+    throw e;
+  }
+}
+
+export const SnodeAPIStore = { storeOnNode };
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 4d4c8230e..115d7e49f 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -1,6 +1,6 @@
 import { PubKey } from '../../types';
 import * as snodePool from './snodePool';
-import { ERROR_CODE_NO_CONNECT, retrieveNextMessages } from './SNodeAPI';
+import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { SignalService } from '../../../protobuf';
 import * as Receiver from '../../../receiver/receiver';
 import _, { concat } from 'lodash';
@@ -14,7 +14,7 @@ import { perfEnd, perfStart } from '../../utils/Performance';
 import { ed25519Str } from '../../onions/onionPath';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import pRetry from 'p-retry';
-import { getHasSeenHF190, getHasSeenHF191 } from './hfHandling';
+import { SnodeAPIRetrieve } from './retrieveRequest';
 
 interface Message {
   hash: string;
@@ -142,10 +142,9 @@ export class SwarmPolling {
     }
     // we always poll as often as possible for our pubkey
     const ourPubkey = UserUtils.getOurPubKeyFromCache();
-    const directPromises = Promise.all([
-      this.pollOnceForKey(ourPubkey, false, 0),
-      // this.pollOnceForKey(ourPubkey, false, 5), // uncomment, and test me once we store the config messages to the namespace 5
-    ]).then(() => undefined);
+    const directPromises = Promise.all([this.pollOnceForKey(ourPubkey, false, [0])]).then(
+      () => undefined
+    );
 
     const now = Date.now();
     const groupPromises = this.groupPolling.map(async group => {
@@ -159,27 +158,11 @@ export class SwarmPolling {
           ?.idForLogging() || group.pubkey.key;
 
       if (diff >= convoPollingTimeout) {
-        const hardfork190Happened = await getHasSeenHF190();
-        const hardfork191Happened = await getHasSeenHF191();
         window?.log?.info(
-          `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ; hardfork190Happened: ${hardfork190Happened}; hardfork191Happened: ${hardfork191Happened} `
+          `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} `
         );
 
-        if (hardfork190Happened && !hardfork191Happened) {
-          // during the transition period, we poll from both namespaces (0 and -10) for groups
-          return Promise.all([
-            this.pollOnceForKey(group.pubkey, true, undefined),
-            this.pollOnceForKey(group.pubkey, true, -10),
-          ]).then(() => undefined);
-        }
-
-        if (hardfork190Happened && hardfork191Happened) {
-          // after the transition period, we poll from the namespace -10 only for groups
-          return this.pollOnceForKey(group.pubkey, true, -10);
-        }
-
-        // before any of those hardforks, we just poll from the default namespace being 0
-        return this.pollOnceForKey(group.pubkey, true, 0);
+        return this.pollOnceForKey(group.pubkey, true, [-10]);
       }
       window?.log?.info(
         `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}`
@@ -200,7 +183,7 @@ export class SwarmPolling {
   /**
    * Only exposed as public for testing
    */
-  public async pollOnceForKey(pubkey: PubKey, isGroup: boolean, namespace?: number) {
+  public async pollOnceForKey(pubkey: PubKey, isGroup: boolean, namespaces: Array<number>) {
     const pkStr = pubkey.key;
 
     const swarmSnodes = await snodePool.getSwarmFor(pkStr);
@@ -223,7 +206,7 @@ export class SwarmPolling {
     // this actually doesn't make much sense as we are at only polling from a single one
     const promisesSettled = await Promise.allSettled(
       nodesToPoll.map(async n => {
-        return this.pollNodeForKey(n, pubkey, namespace);
+        return this.pollNodeForKey(n, pubkey, namespaces);
       })
     );
 
@@ -284,7 +267,7 @@ export class SwarmPolling {
   private async pollNodeForKey(
     node: Snode,
     pubkey: PubKey,
-    namespace?: number
+    namespaces: Array<number>
   ): Promise<Array<any> | null> {
     const edkey = node.pubkey_ed25519;
 
@@ -293,21 +276,29 @@ export class SwarmPolling {
     try {
       return await pRetry(
         async () => {
-          const prevHash = await this.getLastHash(edkey, pkStr, namespace || 0);
-          const messages = await retrieveNextMessages(node, prevHash, pkStr, namespace);
+          const prevHashes = await Promise.all(
+            namespaces.map(namespace => this.getLastHash(edkey, pkStr, namespace))
+          );
+          const messages = await SnodeAPIRetrieve.retrieveNextMessages(
+            node,
+            prevHashes,
+            pkStr,
+            namespaces
+          );
           if (!messages.length) {
             return [];
           }
 
-          const lastMessage = _.last(messages);
+          // const lastMessage = _.last(messages);
+          // const newHashes = // TODO
 
-          await this.updateLastHash({
-            edkey: edkey,
-            pubkey,
-            namespace: namespace || 0,
-            hash: lastMessage.hash,
-            expiration: lastMessage.expiration,
-          });
+          // await this.updateLastHashes({
+          //   edkey: edkey,
+          //   pubkey,
+          //   namespaces,
+          //   hash: lastMessage.hash,
+          //   expiration: lastMessage.expiration,
+          // });
           return messages;
         },
         {
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
new file mode 100644
index 000000000..7554e33f3
--- /dev/null
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -0,0 +1,235 @@
+import _ from 'lodash';
+import { ClosedGroup, getMessageQueue } from '..';
+import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { MessageModel } from '../../models/message';
+import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups';
+import { ECKeyPair } from '../../receiver/keypairs';
+import { openConversationWithMessages } from '../../state/ducks/conversations';
+import { updateConfirmModal } from '../../state/ducks/modalDialog';
+import { getSwarmPollingInstance } from '../apis/snode_api';
+import {
+  generateClosedGroupPublicKey,
+  generateCurve25519KeyPairWithoutPrefix,
+  generateGroupV3Keypair,
+} from '../crypto';
+import {
+  ClosedGroupNewMessageParams,
+  ClosedGroupNewMessage,
+} from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
+import { PubKey } from '../types';
+import { UserUtils } from '../utils';
+import { forceSyncConfigurationNowIfNeeded } from '../utils/syncUtils';
+import { getConversationController } from './ConversationController';
+
+export async function createClosedGroup(groupName: string, members: Array<string>, isV3: boolean) {
+  const setOfMembers = new Set(members);
+
+  const us = UserUtils.getOurPubKeyStrFromCache();
+
+  const identityKeyPair = await generateGroupV3Keypair();
+  if (!identityKeyPair) {
+    throw new Error('Could not create identity keypair for new closed group v3');
+  }
+
+  // a v3 pubkey starts with 03 and an old one starts with 05
+  const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey();
+
+  // the first encryption keypair is generated the same for all versions of closed group
+  const encryptionKeyPair = await generateCurve25519KeyPairWithoutPrefix();
+  if (!encryptionKeyPair) {
+    throw new Error('Could not create encryption keypair for new closed group');
+  }
+
+  // Create the group
+  const convo = await getConversationController().getOrCreateAndWait(
+    groupPublicKey,
+    ConversationTypeEnum.GROUP
+  );
+  await convo.setIsApproved(true, false);
+
+  // Ensure the current user is a member
+  setOfMembers.add(us);
+  const listOfMembers = [...setOfMembers];
+  const admins = [us];
+  const existingExpireTimer = 0;
+
+  const groupDetails: ClosedGroup.GroupInfo = {
+    id: groupPublicKey,
+    name: groupName,
+    members: listOfMembers,
+    admins,
+    activeAt: Date.now(),
+    expireTimer: existingExpireTimer,
+  };
+
+  const groupDetailsV3: ClosedGroup.GroupInfoV3 = {
+    id: groupPublicKey,
+    identityPrivateKey: isV3 ? identityKeyPair.privateKey : undefined,
+    isV3: true,
+    name: groupName,
+    members: listOfMembers,
+    admins,
+    activeAt: Date.now(),
+    expireTimer: existingExpireTimer,
+  };
+
+  // used for UI only, adding of a message to remind who is in the group and the name of the group
+  const groupDiff: ClosedGroup.GroupDiff = {
+    newName: groupName,
+    joiningMembers: listOfMembers,
+  };
+
+  const dbMessage = await ClosedGroup.addUpdateMessage(convo, groupDiff, us, Date.now());
+  // be sure to call this before sending the message.
+  // the sending pipeline needs to know from GroupUtils when a message is for a medium group
+  await ClosedGroup.updateOrCreateClosedGroup(isV3 ? groupDetailsV3 : groupDetails);
+  await convo.commit();
+  convo.updateLastMessage();
+
+  if (isV3) {
+    // we need to send a group info and encryption keys message to the batch endpoint with both seqno being 0
+    throw new Error('fixme');
+  }
+
+  // Send a closed group update message to all members individually
+  const allInvitesSent = await sendToGroupMembers(
+    listOfMembers,
+    groupPublicKey,
+    groupName,
+    admins,
+    encryptionKeyPair,
+    dbMessage,
+    existingExpireTimer
+  );
+
+  if (allInvitesSent) {
+    const newHexKeypair = encryptionKeyPair.toHexKeyPair();
+
+    const isHexKeyPairSaved = await addKeyPairToCacheAndDBIfNeeded(groupPublicKey, newHexKeypair);
+
+    if (isHexKeyPairSaved) {
+      window?.log?.info('Dropping already saved keypair for group', groupPublicKey);
+    }
+
+    // Subscribe to this group id
+    getSwarmPollingInstance().addGroupId(new PubKey(groupPublicKey));
+  }
+
+  await forceSyncConfigurationNowIfNeeded();
+
+  await openConversationWithMessages({ conversationKey: groupPublicKey, messageId: null });
+}
+
+/**
+ * Sends a group invite message to each member of the group.
+ * @returns Array of promises for group invite messages sent to group members.
+ * This function takes care of the groupv3 specificities
+ */
+async function sendToGroupMembers(
+  listOfMembers: Array<string>,
+  groupPublicKey: string,
+  groupName: string,
+  admins: Array<string>,
+  encryptionKeyPair: ECKeyPair,
+  dbMessage: MessageModel,
+  existingExpireTimer: number,
+  isRetry: boolean = false
+): Promise<any> {
+  const promises = createInvitePromises(
+    listOfMembers,
+    groupPublicKey,
+    groupName,
+    admins,
+    encryptionKeyPair,
+    dbMessage,
+    existingExpireTimer
+  );
+  window?.log?.info(`Sending invites for group ${groupPublicKey} to ${listOfMembers}`);
+  // evaluating if all invites sent, if failed give the option to retry failed invites via modal dialog
+  const inviteResults = await Promise.all(promises);
+  const allInvitesSent = _.every(inviteResults, inviteResult => inviteResult !== false);
+
+  if (allInvitesSent) {
+    // if (true) {
+    if (isRetry) {
+      const invitesTitle =
+        inviteResults.length > 1
+          ? window.i18n('closedGroupInviteSuccessTitlePlural')
+          : window.i18n('closedGroupInviteSuccessTitle');
+
+      window.inboxStore?.dispatch(
+        updateConfirmModal({
+          title: invitesTitle,
+          message: window.i18n('closedGroupInviteSuccessMessage'),
+          hideCancel: true,
+        })
+      );
+    }
+    return allInvitesSent;
+  } else {
+    // Confirmation dialog that recursively calls sendToGroupMembers on resolve
+
+    window.inboxStore?.dispatch(
+      updateConfirmModal({
+        title:
+          inviteResults.length > 1
+            ? window.i18n('closedGroupInviteFailTitlePlural')
+            : window.i18n('closedGroupInviteFailTitle'),
+        message:
+          inviteResults.length > 1
+            ? window.i18n('closedGroupInviteFailMessagePlural')
+            : window.i18n('closedGroupInviteFailMessage'),
+        okText: window.i18n('closedGroupInviteOkText'),
+        onClickOk: async () => {
+          const membersToResend: Array<string> = new Array<string>();
+          inviteResults.forEach((result, index) => {
+            const member = listOfMembers[index];
+            // group invite must always contain the admin member.
+            if (result !== true || admins.includes(member)) {
+              membersToResend.push(member);
+            }
+          });
+          if (membersToResend.length > 0) {
+            const isRetrySend = true;
+            await sendToGroupMembers(
+              membersToResend,
+              groupPublicKey,
+              groupName,
+              admins,
+              encryptionKeyPair,
+              dbMessage,
+              existingExpireTimer,
+              isRetrySend
+            );
+          }
+        },
+      })
+    );
+  }
+  return allInvitesSent;
+}
+
+function createInvitePromises(
+  listOfMembers: Array<string>,
+  groupPublicKey: string,
+  groupName: string,
+  admins: Array<string>,
+  encryptionKeyPair: ECKeyPair,
+  dbMessage: MessageModel,
+  existingExpireTimer: number
+) {
+  return listOfMembers.map(async m => {
+    const messageParams: ClosedGroupNewMessageParams = {
+      groupId: groupPublicKey,
+      name: groupName,
+      members: listOfMembers,
+      admins,
+      keypair: encryptionKeyPair,
+      timestamp: Date.now(),
+      identifier: dbMessage.id,
+      expireTimer: existingExpireTimer,
+    };
+    const message = new ClosedGroupNewMessage(messageParams);
+    return getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(m), message);
+  });
+}
diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts
index 7c8767eef..1c8640b59 100644
--- a/ts/session/crypto/index.ts
+++ b/ts/session/crypto/index.ts
@@ -56,8 +56,26 @@ export async function generateClosedGroupPublicKey() {
   return toHex(prependedX25519PublicKey);
 }
 
+/**
+ * Returns a generated ed25519 hex with a public key being of length 66 and starting with 03.
+ */
+export async function generateGroupV3Keypair() {
+  const sodium = await getSodiumRenderer();
+  const ed25519KeyPair = sodium.crypto_sign_keypair();
+
+  const publicKey = new Uint8Array(ed25519KeyPair.publicKey);
+  const preprendedPubkey = new Uint8Array(33);
+  preprendedPubkey.set(publicKey, 1);
+  preprendedPubkey[0] = 3;
+
+  console.warn(`generateGroupV3Keypair: pubkey${toHex(preprendedPubkey)}`);
+
+  return { pubkey: toHex(preprendedPubkey), privateKey: toHex(ed25519KeyPair.privateKey) };
+}
+
 /**
  * Returns a generated curve25519 keypair without the prefix on the public key.
+ * This should be used for the generation of encryption keypairs for a closed group
  */
 export async function generateCurve25519KeyPairWithoutPrefix(): Promise<ECKeyPair | null> {
   const sodium = await getSodiumRenderer();
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 0d6b9ff89..71be70041 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -27,8 +27,8 @@ import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessag
 import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { getSwarmPollingInstance } from '../apis/snode_api';
-import { getNowWithNetworkOffset } from '../apis/snode_api/SNodeAPI';
 import { ConversationAttributes, ConversationTypeEnum } from '../../models/conversationAttributes';
+import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 
 export type GroupInfo = {
   id: string;
@@ -39,7 +39,19 @@ export type GroupInfo = {
   expireTimer?: number | null;
   blocked?: boolean;
   admins?: Array<string>;
-  secretKey?: Uint8Array;
+  weWereJustAdded?: boolean;
+};
+
+export type GroupInfoV3 = {
+  id: string;
+  identityPrivateKey?: string; // only set if we created the closed group v3 or got promoted to admin (and received the identity private key)
+  isV3: true;
+  name: string;
+  members: Array<string>;
+  activeAt?: number;
+  expireTimer?: number | null;
+  blocked?: boolean;
+  admins?: Array<string>;
   weWereJustAdded?: boolean;
 };
 
@@ -216,7 +228,11 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff
   return groupDiff;
 }
 
-export async function updateOrCreateClosedGroup(details: GroupInfo) {
+function isV3(details: GroupInfo | GroupInfoV3): details is GroupInfoV3 {
+  return (details as GroupInfoV3).isV3 === true;
+}
+
+export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3) {
   const { id, weWereJustAdded } = details;
 
   const conversation = await getConversationController().getOrCreateAndWait(
@@ -227,23 +243,24 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
   const updates: Pick<
     ConversationAttributes,
     | 'type'
+    | 'identityPrivateKey'
     | 'members'
     | 'displayNameInProfile'
     | 'is_medium_group'
     | 'active_at'
     | 'left'
     | 'lastJoinedTimestamp'
-    | 'zombies'
   > = {
     displayNameInProfile: details.name,
     members: details.members,
     type: 'group',
     is_medium_group: true,
-    zombies: details.zombies?.length ? details.zombies : [],
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
+    identityPrivateKey: isV3(details) ? details.identityPrivateKey : undefined,
   };
+  console.warn('updates', updates);
 
   conversation.set(updates);
 
@@ -303,7 +320,7 @@ export async function leaveClosedGroup(groupId: string) {
   await convo.commit();
 
   const source = UserUtils.getOurPubKeyStrFromCache();
-  const networkTimestamp = getNowWithNetworkOffset();
+  const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
   const dbMessage = await convo.addSingleOutgoingMessage({
     group_update: { left: [source] },
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage.ts
deleted file mode 100644
index 5a1c0df96..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { SignalService } from '../../../../../protobuf';
-import { ClosedGroupMessage } from './ClosedGroupMessage';
-
-export class ClosedGroupEncryptionPairRequestMessage extends ClosedGroupMessage {
-  public dataProto(): SignalService.DataMessage {
-    throw new Error('ClosedGroupEncryptionPairRequestMessage: This is unused for now ');
-    const dataMessage = super.dataProto();
-
-    // tslint:disable: no-non-null-assertion
-    dataMessage.closedGroupControlMessage!.type =
-      SignalService.DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR_REQUEST;
-
-    return dataMessage;
-  }
-}
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
new file mode 100644
index 000000000..684a403c7
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
@@ -0,0 +1,55 @@
+import { SignalService } from '../../../../../../protobuf';
+import { isArray } from 'lodash';
+import { GroupMessage, GroupMessageParams } from './GroupMessage';
+// import { PubKey } from '../../../../../types';
+// import { from_hex } from 'libsodium-wrappers-sumo';
+
+interface GroupAdminMessageParams extends GroupMessageParams {
+  /*
+   * A proof that we are an admin (a proof that we have access to the private key of the closed group).
+   * this field is needed  for all types of admin messages so that every member can make
+   */
+  groupSignature: Uint8Array;
+}
+
+interface GroupAdminMessageParams extends GroupMessageParams {
+  /**
+   * hex string of the members to delete the group from.
+   * a single '*' is allowed too and means 'every members'
+   *
+   */
+  members: Array<string>;
+}
+
+export class GroupAdminGroupMessage extends GroupMessage {
+  // private readonly members: Array<string>;
+
+  constructor(params: GroupAdminMessageParams) {
+    super(params);
+
+    if (!params.members || !isArray(params.members) || !params.members.length) {
+      throw new Error('members parameter must be set');
+    }
+
+    // if (params.members.length === 1 && params.members[0] === '*') {
+    //   this.members = params.members;
+    // } else {
+    //   const allAreValid = params.members.every(PubKey.isValidGroupPubkey);
+    //   if (!allAreValid) {
+    //     throw new Error('One of the members is not a `isValidGroupPubkey`');
+    //   }
+
+    //   this.members = params.members;
+    // }
+    throw new Error('TODO and add tests');
+  }
+
+  public dataProto(): SignalService.DataMessage {
+    const dataMessage = new SignalService.DataMessage();
+    dataMessage.groupMessage = super.groupMessage();
+    dataMessage.groupMessage.adminMessage = new SignalService.GroupAdminMessage();
+    // dataMessage.groupMessage.members = this.members.map(from_hex);
+
+    return dataMessage;
+  }
+}
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
new file mode 100644
index 000000000..4c6b526ab
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
@@ -0,0 +1,48 @@
+import { SignalService } from '../../../../../../protobuf';
+import { isEmpty, isString } from 'lodash';
+import { GroupMessage, GroupMessageParams } from './GroupMessage';
+import { PubKey } from '../../../../../types';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
+export interface GroupInviteMessageParams extends GroupMessageParams {
+  name: string;
+  /**
+   * hex string of that member private key
+   */
+  memberPrivateKey: string;
+}
+
+export class GroupInviteMessage extends GroupMessage {
+  private readonly name: string;
+  private readonly memberPrivateKey: string;
+
+  constructor(params: GroupInviteMessageParams) {
+    super(params);
+
+    if (!params.name || isEmpty(params.name) || !isString(params.name)) {
+      throw new Error('name parameter must be valid');
+    }
+
+    if (
+      !params.memberPrivateKey ||
+      isEmpty(params.memberPrivateKey) ||
+      !isString(params.memberPrivateKey) ||
+      !PubKey.isHexOnly(params.memberPrivateKey)
+    ) {
+      throw new Error('memberPrivateKey parameter must be valid');
+    }
+
+    this.name = params.name;
+    this.memberPrivateKey = params.memberPrivateKey;
+  }
+
+  public dataProto(): SignalService.DataMessage {
+    const dataMessage = new SignalService.DataMessage();
+    dataMessage.groupMessage = super.groupMessage();
+    dataMessage.groupMessage.inviteMessage = new SignalService.GroupInviteMessage();
+    dataMessage.groupMessage.inviteMessage.name = this.name;
+    dataMessage.groupMessage.inviteMessage.memberPrivateKey = from_hex(this.memberPrivateKey);
+
+    return dataMessage;
+  }
+}
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
new file mode 100644
index 000000000..22e90f4ed
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
@@ -0,0 +1,18 @@
+import { SignalService } from '../../../../../../protobuf';
+import { GroupMessage, GroupMessageParams } from './GroupMessage';
+
+interface GroupMemberLeftMessageParams extends GroupMessageParams {}
+
+export class GroupMemberLeftMessage extends GroupMessage {
+  constructor(params: GroupMemberLeftMessageParams) {
+    super(params);
+  }
+
+  public dataProto(): SignalService.DataMessage {
+    const dataMessage = new SignalService.DataMessage();
+    dataMessage.groupMessage = super.groupMessage();
+    dataMessage.groupMessage.memberLeftMessage = new SignalService.GroupMemberLeftMessage();
+
+    return dataMessage;
+  }
+}
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
new file mode 100644
index 000000000..57540712e
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
@@ -0,0 +1,18 @@
+import { SignalService } from '../../../../../../protobuf';
+import { DataMessage } from '../../../DataMessage';
+import { MessageParams } from '../../../Message';
+
+export interface GroupMessageParams extends MessageParams {}
+
+export abstract class GroupMessage extends DataMessage {
+  constructor(params: GroupMessageParams) {
+    super({
+      timestamp: params.timestamp,
+      identifier: params.identifier,
+    });
+  }
+
+  protected groupMessage() {
+    return new SignalService.GroupMessage();
+  }
+}
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
new file mode 100644
index 000000000..5e992a90d
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
@@ -0,0 +1,34 @@
+import { SignalService } from '../../../../../../protobuf';
+import { isEmpty } from 'lodash';
+import { GroupMessage, GroupMessageParams } from './GroupMessage';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
+export interface GroupPromoteMessageParams extends GroupMessageParams {
+  /**
+   * hex string of the group private key
+   */
+  privateKey: string;
+}
+
+export class GroupPromoteMessage extends GroupMessage {
+  private readonly privateKey: string;
+
+  constructor(params: GroupPromoteMessageParams) {
+    super(params);
+
+    if (!params.privateKey || isEmpty(params.privateKey)) {
+      throw new Error('privateKey parameter must be set');
+    }
+
+    this.privateKey = params.privateKey;
+  }
+
+  public dataProto(): SignalService.DataMessage {
+    const dataMessage = new SignalService.DataMessage();
+    dataMessage.groupMessage = super.groupMessage();
+    dataMessage.groupMessage.promoteMessage = new SignalService.GroupPromoteMessage();
+    dataMessage.groupMessage.promoteMessage.privateKey = from_hex(this.privateKey);
+
+    return dataMessage;
+  }
+}
diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
index 180bd31f8..89a6dfa84 100644
--- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
+++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
@@ -23,12 +23,17 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage {
     if (!params.groupId) {
       throw new Error('ClosedGroupVisibleMessage: groupId must be set');
     }
+
+    if (PubKey.isClosedGroupV3(PubKey.cast(params.groupId).key)) {
+      throw new Error('GroupContext should not be used anymore with closed group v3');
+    }
   }
   public dataProto(): SignalService.DataMessage {
     //expireTimer is set in the dataProto in this call directly
     const dataProto = this.chatMessage.dataProto();
 
     const groupMessage = new SignalService.GroupContext();
+
     const groupIdWithPrefix = PubKey.addTextSecurePrefixIfNeeded(this.groupId.key);
     const encoded = StringUtils.encode(groupIdWithPrefix, 'utf8');
     const id = new Uint8Array(encoded);
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index aeeeccf18..9d9b98a96 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -12,7 +12,6 @@ const minimumGuardCount = 2;
 
 import { updateOnionPaths } from '../../state/ducks/onion';
 import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI';
-import { getStoragePubKey } from '../types/PubKey';
 
 import { OnionPaths } from './';
 import { APPLICATION_JSON } from '../../types/MIME';
@@ -282,10 +281,9 @@ export async function testGuardNode(snode: Snode) {
   const url = `https://${snode.ip}:${snode.port}${endpoint}`;
 
   const ourPK = UserUtils.getOurPubKeyStrFromCache();
-  const pubKey = getStoragePubKey(ourPK); // truncate if testnet
 
-  const method = 'get_snodes_for_pubkey';
-  const params = { pubKey };
+  const method = 'get_swarm';
+  const params = { pubkey: ourPK };
   const body = {
     jsonrpc: '2.0',
     method,
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 273c87220..0d323b8e5 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -12,7 +12,6 @@ import { ContentMessage } from '../messages/outgoing';
 import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
 import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage';
 import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage';
-import { ClosedGroupEncryptionPairRequestMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage';
 import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
@@ -34,8 +33,7 @@ type ClosedGroupMessageType =
   | ClosedGroupMemberLeftMessage
   | ExpirationTimerUpdateMessage
   | ClosedGroupEncryptionPairMessage
-  | UnsendMessage
-  | ClosedGroupEncryptionPairRequestMessage;
+  | UnsendMessage;
 
 // ClosedGroupEncryptionPairReplyMessage must be sent to a user pubkey. Not a group.
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 62742812e..530a7a8df 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -11,7 +11,6 @@ import { fromUInt8ArrayToBase64 } from '../utils/String';
 import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
 import { addMessagePadding } from '../crypto/BufferPadding';
 import _ from 'lodash';
-import { getNowWithNetworkOffset, storeOnNode } from '../apis/snode_api/SNodeAPI';
 import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { firstTrue } from '../utils/Promise';
 import { MessageSender } from '.';
@@ -25,13 +24,16 @@ import {
   sendSogsMessageOnionV4,
 } from '../apis/open_group_api/sogsv3/sogsV3SendMessage';
 import { AbortController } from 'abort-controller';
+import { SnodeAPIStore } from '../apis/snode_api/storeMessage';
+import { StoreOnNodeParams } from '../apis/snode_api/SnodeRequestTypes';
+import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 
 const DEFAULT_CONNECTIONS = 1;
 
 // ================ SNODE STORE ================
 
 function overwriteOutgoingTimestampWithNetworkTimestamp(message: RawMessage) {
-  const networkTimestamp = getNowWithNetworkOffset();
+  const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
   const { plainTextBuffer } = message;
   const contentDecoded = SignalService.Content.decode(plainTextBuffer);
@@ -144,27 +146,14 @@ export async function sendMessageToSnode(
   const conversation = getConversationController().get(pubKey);
   const isClosedGroup = conversation?.isClosedGroup();
 
-  // const hardfork190Happened = await getHasSeenHF190();
-  // const hardfork191Happened = await getHasSeenHF191();
   const namespace = isClosedGroup ? -10 : 0;
 
-  // we could get rid of those now, but lets keep it in case we ever need to use the HF value again
-  // window?.log?.debug(
-  //   `Sending envelope with timestamp: ${timestamp} to ${ed25519Str(pubKey)} size base64: ${
-  //     data64.length
-  //   }; hardfork190Happened:${hardfork190Happened}; hardfork191Happened:${hardfork191Happened} to namespace:${namespace}`
-  // );
-
-  const isBetweenBothHF = false; //hardfork190Happened && !hardfork191Happened;
-
   // send parameters
-  const params = {
-    pubKey,
+  const params: StoreOnNodeParams = {
+    pubkey: pubKey,
     ttl: `${ttl}`,
     timestamp: `${timestamp}`,
     data: data64,
-    isSyncMessage, // I don't think that's of any use
-    messageId, // I don't think that's of any use
     namespace,
   };
 
@@ -178,17 +167,8 @@ export async function sendMessageToSnode(
     // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch.
     // the only case we could care about a retry would be when the usedNode is not correct,
     // but considering we trigger this request with a few snode in //, this should be fine.
-    const successfulSend = await storeOnNode(usedNode, params);
+    const successfulSend = await SnodeAPIStore.storeOnNode(usedNode, params);
 
-    if (isBetweenBothHF && isClosedGroup) {
-      window.log.warn(
-        'closedGroup and betweenHF case. Forcing duplicating to 0 and -10 inboxes...'
-      );
-      await storeOnNode(usedNode, { ...params, namespace: 0 });
-      window.log.warn(
-        'closedGroup and betweenHF case. Forcing duplicating to 0 and -10 inboxes done'
-      );
-    }
     if (successfulSend) {
       if (_.isString(successfulSend)) {
         successfulSendHash = successfulSend;
@@ -283,7 +263,7 @@ export async function sendToOpenGroupV2(
   // we agreed to pad message for opengroupv2
   const paddedBody = addMessagePadding(rawMessage.plainTextBuffer());
   const v2Message = new OpenGroupMessageV2({
-    sentTimestamp: getNowWithNetworkOffset(),
+    sentTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
     base64EncodedData: fromUInt8ArrayToBase64(paddedBody),
     filesToLink,
   });
@@ -308,7 +288,7 @@ export async function sendToOpenGroupV2BlindedRequest(
   recipientBlindedId: string
 ): Promise<{ serverId: number; serverTimestamp: number }> {
   const v2Message = new OpenGroupMessageV2({
-    sentTimestamp: getNowWithNetworkOffset(),
+    sentTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
     base64EncodedData: fromUInt8ArrayToBase64(encryptedContent),
   });
 
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index b4b1641aa..86939d53b 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -1,6 +1,5 @@
 import { fromHexToArray } from '../utils/String';
 
-export const getStoragePubKey = (key: string) => key;
 
 export enum KeyPrefixType {
   /**
@@ -15,6 +14,10 @@ export enum KeyPrefixType {
    * used for participants in open groups
    */
   blinded = '15',
+  /**
+   * used for participants in open groups
+   */
+  groupV3 = '03',
 }
 
 export class PubKey {
@@ -30,7 +33,7 @@ export class PubKey {
   public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!';
   // prettier-ignore
   private static readonly regex: RegExp = new RegExp(
-    `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded}|${KeyPrefixType.unblinded})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$`
+    `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$`
   );
   /**
    * If you want to update this regex. Be sure that those are matches ;
@@ -39,9 +42,11 @@ export class PubKey {
    *  __textsecure_group__!05010203040506070809a0b0c0d0e0f0ff
    *  __textsecure_group__!010203040506070809a0b0c0d0e0f0ff
    *  05010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff
+   *  03010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff
    *  010203040506070809a0b0c0d0e0f0ff010203040506070809a0B0c0d0e0f0FF
    *  05010203040506070809a0b0c0d0e0f0ff
    *  010203040506070809a0b0c0d0e0f0ff
+   *  030203040506070809a0b0c0d0e0f0ff
    */
 
   public readonly key: string;
@@ -229,4 +234,24 @@ export class PubKey {
   public static hasBlindedPrefix(key: string) {
     return key.startsWith(KeyPrefixType.blinded);
   }
+
+  public static isClosedGroupV3(key: string) {
+    const regex = new RegExp(`^${KeyPrefixType.groupV3}${PubKey.HEX}{64}$`);
+    return regex.test(key);
+  }
+
+  public static isHexOnly(str: string) {
+    return new RegExp(`^${PubKey.HEX}*$`).test(str);
+  }
+
+  /**
+   *
+   * @returns true if that string is a valid group (as in closed group) pubkey.
+   * i.e. returns true if length is 66, prefix is 05 only, and it's hex characters only
+   */
+  public static isValidGroupPubkey(pubkey: string): boolean {
+    return (
+      pubkey.length === 66 && pubkey.startsWith(KeyPrefixType.standard) && this.isHexOnly(pubkey)
+    );
+  }
 }
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 4d0d2e8dd..dddeef8f2 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -26,8 +26,8 @@ import { DURATION } from '../../constants';
 import { Data } from '../../../data/data';
 import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings';
 import { PnServer } from '../../apis/push_notification_api';
-import { getNowWithNetworkOffset } from '../../apis/snode_api/SNodeAPI';
 import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions';
+import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 
 // tslint:disable: function-name
 
@@ -838,7 +838,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
       await peerConnection.addIceCandidate(candicate);
     }
   }
-  const networkTimestamp = getNowWithNetworkOffset();
+  const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
   const callerConvo = getConversationController().get(fromSender);
   callerConvo.set('active_at', networkTimestamp);
   await callerConvo?.addSingleIncomingMessage({
@@ -1164,13 +1164,13 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
   const incomingCallConversation = getConversationController().get(callerPubkey);
 
   if (incomingCallConversation.isActive()) {
-    incomingCallConversation.set('active_at', getNowWithNetworkOffset());
+    incomingCallConversation.set('active_at', GetNetworkTime.getNowWithNetworkOffset());
   }
 
   await incomingCallConversation?.addSingleIncomingMessage({
     source: callerPubkey,
     sent_at: sentAt,
-    received_at: getNowWithNetworkOffset(),
+    received_at: GetNetworkTime.getNowWithNetworkOffset(),
     expireTimer: 0,
     callNotificationType: 'missed-call',
     unread: 1,
diff --git a/ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts
similarity index 84%
rename from ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts
rename to ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts
index a244c6674..98dac9505 100644
--- a/ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
 
-import { SignalService } from '../../../../protobuf';
-import { TestUtils } from '../../../test-utils';
-import { StringUtils } from '../../../../session/utils';
-import { PubKey } from '../../../../session/types';
-import { Constants } from '../../../../session';
-import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
-import { VisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/VisibleMessage';
+import { SignalService } from '../../../../../protobuf';
+import { TestUtils } from '../../../../test-utils';
+import { StringUtils } from '../../../../../session/utils';
+import { PubKey } from '../../../../../session/types';
+import { Constants } from '../../../../../session';
+import { ClosedGroupVisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
+import { VisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/VisibleMessage';
 
 describe('ClosedGroupVisibleMessage', () => {
   let groupId: PubKey;
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
new file mode 100644
index 000000000..0010e4741
--- /dev/null
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
@@ -0,0 +1,123 @@
+// import { expect } from 'chai';
+
+// import { SignalService } from '../../../../../../protobuf';
+// import { TestUtils } from '../../../../../test-utils';
+// import { GroupAdminGroupMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage';
+// import { v4 } from 'uuid';
+// import { Constants } from '../../../../../../session';
+// import { from_hex } from 'libsodium-wrappers-sumo';
+
+describe('GroupAdminGroupMessage', () => {
+  // let groupPk: string;
+  // beforeEach(async () => {
+  //   groupPk = TestUtils.generateFakeClosedGroupV3PkStr();
+  // });
+  // it('can create valid message with array of members', async () => {
+  //   const member = TestUtils.generateFakePubKeyStr();
+  //   const message = new GroupAdminGroupMessage({
+  //     timestamp: 12345,
+  //     identifier: v4(),
+  //     members: [member],
+  //   });
+  //   const plainText = message.plainTextBuffer();
+  //   const decoded = SignalService.Content.decode(plainText);
+  //   expect(decoded.dataMessage)
+  //     .to.have.property('groupMessage')
+  //     .to.have.deep.property('publicKey', from_hex(groupPk));
+  //   expect(decoded.dataMessage)
+  //     .to.have.property('closedGroupControlMessage')
+  //     .to.have.deep.property('members', [member].map(from_hex));
+  //   expect(message)
+  //     .to.have.property('timestamp')
+  //     .to.be.equal(12345);
+  // });
+  // it('correct ttl', () => {
+  //   const message = new GroupAdminGroupMessage({
+  //     timestamp: 12345,
+  //     identifier: v4(),
+  //     members: [TestUtils.generateFakePubKeyStr()],
+  //   });
+  //   expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+  // });
+  // it('has an identifier even if none are provided', () => {
+  //   const message = new GroupAdminGroupMessage({
+  //     timestamp: 12345,
+  //     members: [TestUtils.generateFakePubKeyStr()],
+  //   });
+  //   expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+  //   expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+  // });
+  // it('has the right type', () => {
+  //   const message = new GroupAdminGroupMessage({
+  //     timestamp: 12345,
+  //     identifier: v4(),
+  //     members: [TestUtils.generateFakePubKeyStr()],
+  //   });
+  //   const plainText = message.plainTextBuffer();
+  //   const decoded = SignalService.Content.decode(plainText);
+  //   expect(decoded.dataMessage)
+  //     .to.have.property('closedGroupControlMessage')
+  //     .to.have.deep.property(
+  //       'type',
+  //       SignalService.DataMessage.ClosedGroupControlMessage.Type.PROMOTE
+  //     );
+  // });
+  // describe('constructor throws on invalid ', () => {
+  //   it('groupPk empty', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: [TestUtils.generateFakePubKeyStr()],
+  //       });
+  //     }).throws();
+  //   });
+  //   it('groupPk does not have group v3 prefix', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: [TestUtils.generateFakePubKeyStr()],
+  //       });
+  //     }).throws();
+  //   });
+  //   it('groupPk does not have group v3 length', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: [TestUtils.generateFakePubKeyStr()],
+  //       });
+  //     }).throws();
+  //   });
+  //   it('members is empty', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: undefined as any,
+  //       });
+  //     }).throws();
+  //   });
+  //   it('members is not an Array', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: '05123456' as any,
+  //       });
+  //     }).throws();
+  //   });
+  //   it('members array has one not a hex string', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: [TestUtils.generateFakePubKeyStr(), '05ggggggggggg'],
+  //       });
+  //     }).throws();
+  //   });
+  //   it('members array has one item not a valid pubkey and not a `*`', () => {
+  //     expect(() => {
+  //       new GroupAdminGroupMessage({
+  //         timestamp: 12345,
+  //         members: ['03opoerpero'],
+  //       });
+  //     }).throws();
+  //   });
+  // });
+});
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
new file mode 100644
index 000000000..724068248
--- /dev/null
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
@@ -0,0 +1,89 @@
+import { expect } from 'chai';
+
+import { SignalService } from '../../../../../../protobuf';
+import { GroupInviteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage';
+import { v4 } from 'uuid';
+import { Constants } from '../../../../../../session';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
+describe('GroupInviteMessage', () => {
+  beforeEach(async () => {});
+
+  it('can create valid message', async () => {
+    const message = new GroupInviteMessage({
+      timestamp: 12345,
+      memberPrivateKey: '654321',
+      name: 'groupName',
+      identifier: v4(),
+    });
+
+    const plainText = message.plainTextBuffer();
+    const decoded = SignalService.Content.decode(plainText);
+    expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('inviteMessage')
+      .to.have.deep.property('name', 'groupName');
+    expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('inviteMessage')
+      .to.have.deep.property('memberPrivateKey', from_hex('654321'));
+
+    expect(message)
+      .to.have.property('timestamp')
+      .to.be.equal(12345);
+  });
+
+  it('correct ttl', () => {
+    const message = new GroupInviteMessage({
+      timestamp: 12345,
+      memberPrivateKey: '654321',
+      name: 'groupName',
+      identifier: v4(),
+    });
+
+    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+  });
+
+  it('has an identifier even if none are provided', () => {
+    const message = new GroupInviteMessage({
+      timestamp: 12345,
+      memberPrivateKey: '654321',
+      name: 'groupName',
+    });
+
+    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+  });
+
+  describe('constructor throws on invalid ', () => {
+    it('memberPk is empty', () => {
+      expect(() => {
+        new GroupInviteMessage({
+          timestamp: 12345,
+          memberPrivateKey: undefined as any,
+          name: 'groupName',
+        });
+      }).throws();
+    });
+
+    it('memberPk is not a string', () => {
+      expect(() => {
+        new GroupInviteMessage({
+          timestamp: 12345,
+          memberPrivateKey: 1234 as any,
+          name: 'groupName',
+        });
+      }).throws();
+    });
+
+    it('memberPk is not a hex string', () => {
+      expect(() => {
+        new GroupInviteMessage({
+          timestamp: 12345,
+          memberPrivateKey: '03ghklmnopqrstuvxyz' as any,
+          name: 'groupName',
+        });
+      }).throws();
+    });
+  });
+});
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
new file mode 100644
index 000000000..42690f3c8
--- /dev/null
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
@@ -0,0 +1,52 @@
+import { expect } from 'chai';
+
+import { SignalService } from '../../../../../../protobuf';
+import { v4 } from 'uuid';
+import { Constants } from '../../../../../../session';
+import { GroupMemberLeftMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage';
+
+describe('GroupMemberLeftMessage', () => {
+  beforeEach(async () => {});
+
+  it('can create valid message', async () => {
+    const message = new GroupMemberLeftMessage({
+      timestamp: 12345,
+      identifier: v4(),
+    });
+
+    const plainText = message.plainTextBuffer();
+    const decoded = SignalService.Content.decode(plainText);
+    expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('memberLeftMessage').to.be.not.undefined;
+    expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('memberLeftMessage').to.be.not.null;
+
+      expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('memberLeftMessage').to.be.empty;
+    expect(message)
+      .to.have.property('timestamp')
+      .to.be.equal(12345);
+  });
+
+  it('correct ttl', () => {
+    const message = new GroupMemberLeftMessage({
+      timestamp: 12345,
+      identifier: v4(),
+    });
+
+    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+  });
+
+  it('has an identifier even if none are provided', () => {
+    const message = new GroupMemberLeftMessage({
+      timestamp: 12345,
+    });
+
+    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+  });
+
+});
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
new file mode 100644
index 000000000..287a49603
--- /dev/null
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
@@ -0,0 +1,60 @@
+import { expect } from 'chai';
+
+import { SignalService } from '../../../../../../protobuf';
+import { GroupPromoteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage';
+import { v4 } from 'uuid';
+import { Constants } from '../../../../../../session';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
+describe('GroupPromoteMessage', () => {
+  beforeEach(async () => {});
+
+  it('can create valid message', async () => {
+    const message = new GroupPromoteMessage({
+      timestamp: 12345,
+      identifier: v4(),
+      privateKey: '1234',
+    });
+
+    const plainText = message.plainTextBuffer();
+    const decoded = SignalService.Content.decode(plainText);
+    expect(decoded.dataMessage)
+      .to.have.property('groupMessage')
+      .to.have.property('promoteMessage')
+      .to.have.deep.property('privateKey', from_hex('1234'));
+    expect(message)
+      .to.have.property('timestamp')
+      .to.be.equal(12345);
+  });
+
+  it('correct ttl', () => {
+    const message = new GroupPromoteMessage({
+      timestamp: 12345,
+      identifier: v4(),
+      privateKey: '1234',
+    });
+
+    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+  });
+
+  it('has an identifier even if none are provided', () => {
+    const message = new GroupPromoteMessage({
+      timestamp: 12345,
+      privateKey: '1234',
+    });
+
+    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+  });
+
+  describe('constructor throws on invalid ', () => {
+    it('privateKey empty', () => {
+      expect(() => {
+        new GroupPromoteMessage({
+          timestamp: 12345,
+          privateKey: null as any,
+        });
+      }).throws();
+    });
+  });
+});
diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts
index db3c21f13..576581b10 100644
--- a/ts/test/session/unit/onion/OnionErrors_test.ts
+++ b/ts/test/session/unit/onion/OnionErrors_test.ts
@@ -5,7 +5,7 @@ import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
 
 import { TestUtils } from '../../../test-utils';
-import * as SNodeAPI from '../../../../session/apis/snode_api';
+import * as SnodeAPI from '../../../../session/apis/snode_api';
 
 import chaiAsPromised from 'chai-as-promised';
 import { OnionPaths } from '../../../../session/onions/';
@@ -19,6 +19,7 @@ import { Snode, SNODE_POOL_ITEM_ID } from '../../../../../ts/data/data';
 import { pathFailureCount } from '../../../../session/onions/onionPath';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils';
+import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList';
 
 chai.use(chaiAsPromised as any);
 chai.should();
@@ -70,7 +71,7 @@ describe('OnionPathsErrors', () => {
     guardPubkeys = TestUtils.generateFakePubKeys(3).map(n => n.key);
     otherNodesPubkeys = TestUtils.generateFakePubKeys(20).map(n => n.key);
 
-    SNodeAPI.Onions.resetSnodeFailureCount();
+    SnodeAPI.Onions.resetSnodeFailureCount();
 
     guardNodesArray = guardPubkeys.map(generateFakeSnodeWithEdKey);
     guardSnode1 = guardNodesArray[0];
@@ -83,7 +84,7 @@ describe('OnionPathsErrors', () => {
     fakeSwarmForAssociatedWith = otherNodesPubkeys.slice(0, 6);
     // Stubs
     Sinon.stub(OnionPaths, 'selectGuardNodes').resolves(guardNodesArray);
-    Sinon.stub(SNodeAPI.SNodeAPI, 'TEST_getSnodePoolFromSnode').resolves(guardNodesArray);
+    Sinon.stub(ServiceNodesList, 'getSnodePoolFromSnode').resolves(guardNodesArray);
     TestUtils.stubData('getGuardNodes').resolves([
       guardPubkeys[0],
       guardPubkeys[1],
@@ -98,8 +99,8 @@ describe('OnionPathsErrors', () => {
     updateSwarmSpy = stubData('updateSwarmNodesForPubkey').resolves();
     stubData('getItemById').resolves({ id: SNODE_POOL_ITEM_ID, value: '' });
     stubData('createOrUpdateItem').resolves();
-    dropSnodeFromSnodePool = Sinon.spy(SNodeAPI.SnodePool, 'dropSnodeFromSnodePool');
-    dropSnodeFromSwarmIfNeededSpy = Sinon.spy(SNodeAPI.SnodePool, 'dropSnodeFromSwarmIfNeeded');
+    dropSnodeFromSnodePool = Sinon.spy(SnodeAPI.SnodePool, 'dropSnodeFromSnodePool');
+    dropSnodeFromSwarmIfNeededSpy = Sinon.spy(SnodeAPI.SnodePool, 'dropSnodeFromSwarmIfNeeded');
     dropSnodeFromPathSpy = Sinon.spy(OnionPaths, 'dropSnodeFromPath');
     incrementBadPathCountOrDropSpy = Sinon.spy(OnionPaths, 'incrementBadPathCountOrDrop');
     incrementBadSnodeCountOrDropSpy = Sinon.spy(Onions, 'incrementBadSnodeCountOrDrop');
diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts
index c03965636..bd62a2ed1 100644
--- a/ts/test/session/unit/onion/OnionPaths_test.ts
+++ b/ts/test/session/unit/onion/OnionPaths_test.ts
@@ -17,6 +17,7 @@ import {
   stubData,
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
+import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList';
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -53,7 +54,7 @@ describe('OnionPaths', () => {
       OnionPaths.clearTestOnionPath();
 
       Sinon.stub(OnionPaths, 'selectGuardNodes').resolves(fakeGuardNodes);
-      Sinon.stub(SNodeAPI.SNodeAPI, 'TEST_getSnodePoolFromSnode').resolves(fakeGuardNodes);
+      Sinon.stub(ServiceNodesList, 'getSnodePoolFromSnode').resolves(fakeGuardNodes);
       stubData('getSnodePoolFromDb').resolves(fakeSnodePool);
 
       TestUtils.stubData('getGuardNodes').resolves(fakeGuardNodesFromDB);
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 6146f4b17..7839abf6c 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -7,7 +7,6 @@ import { MessageEncrypter } from '../../../../session/crypto';
 import { SignalService } from '../../../../protobuf';
 import { PubKey, RawMessage } from '../../../../session/types';
 import { MessageUtils, UserUtils } from '../../../../session/utils';
-import { SNodeAPI } from '../../../../session/apis/snode_api';
 import _ from 'lodash';
 import { OpenGroupPollingUtils } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils';
 import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test';
@@ -17,6 +16,7 @@ import { Onions } from '../../../../session/apis/snode_api/onions';
 import { OnionV4 } from '../../../../session/onions/onionv4';
 import { OnionSending } from '../../../../session/onions/onionSend';
 import { OpenGroupMessageV2 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2';
+import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
 
 describe('MessageSender', () => {
   afterEach(() => {
@@ -119,7 +119,7 @@ describe('MessageSender', () => {
         const visibleMessage = TestUtils.generateVisibleMessage();
         const rawMessage = await MessageUtils.toRawMessage(device, visibleMessage);
         const offset = 200000;
-        Sinon.stub(SNodeAPI, 'getLatestTimestampOffset').returns(offset);
+        Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset);
         await MessageSender.send(rawMessage, 3, 10);
 
         const data = sessionMessageAPISendStub.getCall(0).args[1];
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 4f17c1b66..b6d6c3003 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -8,7 +8,7 @@ import chaiAsPromised from 'chai-as-promised';
 import { TestUtils } from '../../../test-utils';
 import { UserUtils } from '../../../../session/utils';
 import { getConversationController } from '../../../../session/conversations';
-import { getSwarmPollingInstance, SNodeAPI, SnodePool } from '../../../../session/apis/snode_api';
+import { getSwarmPollingInstance, SnodePool } from '../../../../session/apis/snode_api';
 import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling';
 import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants';
 import { ConversationCollection, ConversationModel } from '../../../../models/conversation';
@@ -17,6 +17,7 @@ import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling';
 import { sleepFor } from '../../../../session/utils/Promise';
+import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest';
 // tslint:disable: chai-vague-errors
 
 chai.use(chaiAsPromised as any);
@@ -50,7 +51,7 @@ describe('SwarmPolling', () => {
     stubData('getLastHashBySnode').resolves();
 
     Sinon.stub(SnodePool, 'getSwarmFor').resolves(generateFakeSnodes(5));
-    Sinon.stub(SNodeAPI, 'retrieveNextMessages').resolves([]);
+    Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessages').resolves([]);
     TestUtils.stubWindow('inboxStore', undefined);
     TestUtils.stubWindow('getGlobalOnlineStatus', () => true);
     TestUtils.stubWindowLog();
@@ -146,7 +147,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -158,7 +159,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -170,7 +171,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
@@ -185,55 +186,8 @@ describe('SwarmPolling', () => {
 
       // our pubkey will be polled for, hence the 2
       expect(pollOnceForKeySpy.callCount).to.eq(2);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-    });
-
-    it('does run for group pubkey on start no matter the old timestamp if HF < 19', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-
-      convo.set('active_at', 1);
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-      await swarmPolling.start(true);
-
-      // our pubkey will be polled for, hence the 2
-      expect(pollOnceForKeySpy.callCount).to.eq(2);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-    });
-
-    it('does run for group pubkey on start no matter the old timestamp if HF >= 19.0 & < 19.1  ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      getItemByIdStub.restore();
-      getItemByIdStub = TestUtils.stubData('getItemById');
-      getItemByIdStub
-        .withArgs('hasSeenHardfork190')
-        .resolves({ id: 'hasSeenHardfork190', value: true })
-        .withArgs('hasSeenHardfork191')
-        .resolves({ id: 'hasSeenHardfork191', value: false });
-
-      convo.set('active_at', 1);
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-
-      await swarmPolling.start(true);
-
-      // our pubkey will be polled for, hence the 2
-      expect(pollOnceForKeySpy.callCount).to.eq(3);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, undefined]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true, -10]);
-      getItemByIdStub.restore();
-      getItemByIdStub = TestUtils.stubData('getItemById');
-
-      getItemByIdStub.resolves();
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
     });
 
     it('does only poll from -10 for closed groups if HF >= 19.1  ', async () => {
@@ -257,8 +211,8 @@ describe('SwarmPolling', () => {
 
       // our pubkey will be polled for, hence the 2
       expect(pollOnceForKeySpy.callCount).to.eq(2);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, -10]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       getItemByIdStub.restore();
       getItemByIdStub = TestUtils.stubData('getItemById');
 
@@ -282,9 +236,9 @@ describe('SwarmPolling', () => {
       await swarmPolling.pollForAllKeys();
 
       expect(pollOnceForKeySpy.callCount).to.eq(3);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     it('does run twice if activeAt less than one hour ', async () => {
@@ -308,10 +262,10 @@ describe('SwarmPolling', () => {
       await sleepFor(10);
 
       expect(pollOnceForKeySpy.callCount).to.eq(4);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
     });
 
     it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
@@ -340,10 +294,10 @@ describe('SwarmPolling', () => {
       await sleepFor(10);
       // we should have two more calls here, so 4 total.
       expect(pollOnceForKeySpy.callCount).to.eq(4);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, 0]);
-      expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, 0]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
     });
 
     it('does run once only if group is inactive and we tick less than 2 minutes ', async () => {
@@ -365,8 +319,8 @@ describe('SwarmPolling', () => {
 
       // we should have only one more call here, the one for our direct pubkey fetch
       expect(pollOnceForKeySpy.callCount).to.eq(3);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]); // this one comes from the swarmPolling.start
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, 0]);
+      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
+      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     describe('multiple runs', () => {
@@ -400,11 +354,11 @@ describe('SwarmPolling', () => {
         // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
         expect(pollOnceForKeySpy.callCount).to.eq(4);
         // first two calls are our pubkey
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
 
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([ourPubkey, false, 0]);
-        expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, 0]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
       it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
@@ -420,12 +374,10 @@ describe('SwarmPolling', () => {
         expect(pollOnceForKeySpy.callCount).to.eq(4);
 
         // first two calls are our pubkey
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
-
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([ourPubkey, false, 0]);
-
-        expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, 0]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
     });
   });
diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts
index 62c3c7cf1..9c9cefb26 100644
--- a/ts/test/test-utils/utils/pubkey.ts
+++ b/ts/test/test-utils/utils/pubkey.ts
@@ -22,6 +22,15 @@ export function generateFakePubKeyStr(): string {
   return pubkeyString;
 }
 
+export function generateFakeClosedGroupV3PkStr(): string {
+  // Generates a mock pubkey for testing
+  const numBytes = PubKey.PUBKEY_LEN / 2 - 1;
+  const hexBuffer = crypto.randomBytes(numBytes).toString('hex');
+  const pubkeyString = `03${hexBuffer}`;
+
+  return pubkeyString;
+}
+
 export function generateFakeECKeyPair(): ECKeyPair {
   const pubkey = generateFakePubKey().toArray();
   const privKey = new Uint8Array(crypto.randomBytes(64));
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 20662cb04..384d52cf0 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -36,7 +36,7 @@ declare global {
     sessionFeatureFlags: {
       useOnionRequests: boolean;
       useTestNet: boolean;
-      useSettingsThemeSwitcher: boolean;
+      useClosedGroupV3: boolean;
       debug: {
         debugFileServerRequests: boolean;
         debugNonSnodeRequests: boolean;

From 4b97f14edf0fcc4d3ad931a079f0d69769c1bcf3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 7 Nov 2022 17:48:12 +1100
Subject: [PATCH 003/178] fix: added batch requests for snode but signature
 fails

---
 ts/node/database_utility.ts                   |  1 +
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |  1 -
 .../apis/snode_api/SnodeRequestTypes.ts       | 26 +++++-
 ts/session/apis/snode_api/batchRequest.ts     |  7 +-
 ts/session/apis/snode_api/onsResolve.ts       |  4 +-
 ts/session/apis/snode_api/retrieveRequest.ts  | 89 ++++++++++++++-----
 ts/session/apis/snode_api/sessionRpc.ts       |  4 +-
 ts/session/apis/snode_api/storeMessage.ts     |  1 -
 ts/session/apis/snode_api/swarmPolling.ts     | 72 ++++++++++-----
 ts/session/conversations/createClosedGroup.ts |  2 +-
 ts/session/types/PubKey.ts                    |  1 -
 ts/session/utils/Bencoding.ts                 |  5 +-
 .../v3/GroupInviteMessage_test.ts             |  4 +-
 .../v3/GroupMemberLeftMessage_test.ts         |  7 +-
 .../v3/GroupPromoteMessage_test.ts            |  4 +-
 ts/types/Util.ts                              |  2 +
 tslint.json                                   |  1 +
 17 files changed, 160 insertions(+), 71 deletions(-)

diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 3b8dca00f..cbab12e81 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -79,6 +79,7 @@ const allowedKeysFormatRowOfConversation = [
   'identityPrivateKey',
 ];
 
+//tslint-disable cyclomatic-complexity
 export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
   if (!row) {
     return null;
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index b51047417..731fb6f34 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -38,7 +38,6 @@ import { processMessagesUsingCache } from './sogsV3MutationCache';
 import { destroyMessagesAndUpdateRedux } from '../../../../util/expiringMessages';
 import { sogsRollingDeletions } from './sogsRollingDeletions';
 
-
 /**
  * Get the convo matching those criteria and make sure it is an opengroup convo, or return null.
  * If you get null, you most likely need to cancel the processing of whatever you are doing
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 4716d05bd..b040b8da1 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -1,3 +1,4 @@
+
 export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } };
 
 type RetrieveMaxCountSize = { max_count?: number; max_size?: number };
@@ -18,6 +19,22 @@ export type RetrievePubkeySubRequestType = {
     RetrieveMaxCountSize;
 };
 
+/** Those namespaces do not require to be authenticated for storing messages.
+ *  -> 0 is used for our swarm, and anyone needs to be able to send message to us.
+ *  -> -10 is used for legacy closed group and we do not have authentication for them yet (but we will with the new closed groups)
+ *  -> others are currently unused
+ *
+ */
+// type UnauthenticatedStoreNamespaces = -30 | -20 | -10 | 0 | 10 | 20 | 30;
+
+export type RetrieveLegacyClosedGroupSubRequestType = {
+  method: 'retrieve';
+  params: {
+    namespace: -10; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key
+  } & RetrieveAlwaysNeeded &
+    RetrieveMaxCountSize;
+};
+
 export type RetrieveSubKeySubRequestType = {
   method: 'retrieve';
   params: {
@@ -28,7 +45,10 @@ export type RetrieveSubKeySubRequestType = {
     RetrieveMaxCountSize;
 };
 
-export type RetrieveSubRequestType = RetrievePubkeySubRequestType | RetrieveSubKeySubRequestType;
+export type RetrieveSubRequestType =
+  | RetrieveLegacyClosedGroupSubRequestType
+  | RetrievePubkeySubRequestType
+  | RetrieveSubKeySubRequestType;
 
 // FIXME those store types are not right
 // type StoreAlwaysNeeded = { pubkey: string; timestamp: number; data: string };
@@ -38,7 +58,7 @@ export type RetrieveSubRequestType = RetrievePubkeySubRequestType | RetrieveSubK
 //   params: {
 //     ttl?: string; // required, unless expiry is given
 //     expiry?: number; // required, unless ttl is given
-//     namespace: -60 | -50 | -40 | -30 | -20 | -10 | 0 | 10 | 20 | 30 | 40 | 50 | 60; // we can only store without authentication on namespaces divisible by 10 (...-60...0...60...)
+//     namespace: UnauthenticatedNamespaces; // we can only store without authentication on namespaces divisible by 10 (...-60...0...60...)
 //   } & StoreAlwaysNeeded;
 // };
 
@@ -104,9 +124,11 @@ export type SnodeApiSubRequests =
   | StoreOnNodeSubRequest
   | NetworkTimeSubRequest;
 
+//tslint-disable: array-type
 export type NonEmptyArray<T> = [T, ...T[]];
 
 export type NotEmptyArrayOfBatchResults = NonEmptyArray<{
   code: number;
   body: Record<string, any>;
 }>;
+
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 0aa5ba6cd..eef3aff04 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -10,8 +10,8 @@ import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequest
  * The body is already parsed from json and is enforced to be an Array of at least one element
  * @param subRequests the list of requests to do
  * @param targetNode the node to do the request to, once all the onion routing is done
- * @param timeout
- * @param associatedWith
+ * @param timeout the timeout at which we should cancel this request.
+ * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to
  * @returns
  */
 export async function doSnodeBatchRequest(
@@ -45,13 +45,14 @@ export async function doSnodeBatchRequest(
  */
 function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchResults {
   try {
+    console.warn('decodeBatch: ', snodeResponse);
     if (snodeResponse.status !== 200) {
       throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`);
     }
     const parsed = JSON.parse(snodeResponse.body);
 
     if (!isArray(parsed.results)) {
-      throw new Error(`decodeBatchRequest results is not an array`);
+      throw new Error('decodeBatchRequest results is not an array');
     }
 
     if (!parsed.results.length) {
diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts
index 13b66a083..4cfc7724e 100644
--- a/ts/session/apis/snode_api/onsResolve.ts
+++ b/ts/session/apis/snode_api/onsResolve.ts
@@ -1,9 +1,9 @@
 import _, { range } from 'lodash';
 import { getSodiumRenderer } from '../../crypto';
 import {
-  stringToUint8Array,
-  fromUInt8ArrayToBase64,
   fromHexToArray,
+  fromUInt8ArrayToBase64,
+  stringToUint8Array,
   toHex,
 } from '../../utils/String';
 import { doSnodeBatchRequest } from './batchRequest';
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index cc36e95fd..399f0edd3 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -1,35 +1,41 @@
-import { isEmpty } from 'lodash';
 import { Snode } from '../../../data/data';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import { getSodiumRenderer } from '../../crypto';
-import { UserUtils, StringUtils } from '../../utils';
+import { StringUtils, UserUtils } from '../../utils';
 import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
-import { RetrievePubkeySubRequestType, RetrieveSubRequestType } from './SnodeRequestTypes';
+import {
+  RetrieveLegacyClosedGroupSubRequestType,
+  RetrieveSubRequestType,
+} from './SnodeRequestTypes';
 
 async function getRetrieveSignatureParams(params: {
   pubkey: string;
-  lastHash: string;
   namespace: number;
+  ourPubkey: string;
 }): Promise<{
   timestamp: number;
   signature: string;
   pubkey_ed25519: string;
   namespace: number;
-} | null> {
-  const ourPubkey = UserUtils.getOurPubKeyFromCache();
+}> {
   const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
 
-  if (isEmpty(params?.pubkey) || ourPubkey.key !== params.pubkey || !ourEd25519Key) {
-    return null;
+  if (!ourEd25519Key) {
+    window.log.warn('getRetrieveSignatureParams: User has no getUserED25519KeyPair()');
+    throw new Error('getRetrieveSignatureParams: User has no getUserED25519KeyPair()');
   }
   const namespace = params.namespace || 0;
   const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
 
   const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
-  const verificationData = StringUtils.encode(`retrieve${namespace}${signatureTimestamp}`, 'utf8');
+  const verificationData =
+    namespace === 0
+      ? StringUtils.encode(`retrieve${signatureTimestamp}`, 'utf8')
+      : StringUtils.encode(`retrieve${namespace}${signatureTimestamp}`, 'utf8');
+
   const message = new Uint8Array(verificationData);
 
   const sodium = await getSodiumRenderer();
@@ -45,27 +51,56 @@ async function getRetrieveSignatureParams(params: {
     };
   } catch (e) {
     window.log.warn('getSignatureParams failed with: ', e.message);
-    return null;
+    throw e;
   }
 }
 
 async function buildRetrieveRequest(
   lastHashes: Array<string>,
   pubkey: string,
-  namespaces: Array<number>
+  namespaces: Array<number>,
+  ourPubkey: string
 ): Promise<Array<RetrieveSubRequestType>> {
   const retrieveRequestsParams = await Promise.all(
     namespaces.map(async (namespace, index) => {
       const retrieveParam = {
         pubkey,
-        lastHash: lastHashes.at(index) || '',
+        last_hash: lastHashes.at(index) || '',
         namespace,
+        timestamp: GetNetworkTime.getNowWithNetworkOffset(),
       };
-      const signatureBuilt = await getRetrieveSignatureParams(retrieveParam);
-      const signatureParams = signatureBuilt || {};
-      const retrieve: RetrievePubkeySubRequestType = {
+
+      if (namespace === -10) {
+        if (pubkey === ourPubkey || !pubkey.startsWith('05')) {
+          throw new Error(
+            'namespace -10 can only be used to retrieve messages from a legacy closed group'
+          );
+        }
+        const retrieveLegacyClosedGroup = {
+          ...retrieveParam,
+          namespace: namespace as -10,
+        };
+        const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = {
+          method: 'retrieve',
+          params: { ...retrieveLegacyClosedGroup },
+        };
+
+        return retrieveParamsLegacy;
+      }
+
+      // all legacy closed group retrieves are unauthenticated and run above.
+      // if we get here, this can only be a retrieve for our own swarm, which needs to be authenticated
+      if (namespace !== 0) {
+        throw new Error('not a legacy closed group. namespace can only be 0');
+      }
+      if (pubkey !== ourPubkey) {
+        throw new Error('not a legacy closed group. pubkey can only be our number');
+      }
+      const signatureArgs = { ...retrieveParam, ourPubkey };
+      const signatureBuilt = await getRetrieveSignatureParams(signatureArgs);
+      const retrieve: RetrieveSubRequestType = {
         method: 'retrieve',
-        params: { ...signatureParams, ...retrieveParam },
+        params: { ...retrieveParam, ...signatureBuilt },
       };
       return retrieve;
     })
@@ -79,16 +114,23 @@ async function retrieveNextMessages(
   targetNode: Snode,
   lastHashes: Array<string>,
   associatedWith: string,
-  namespaces: Array<number>
-): Promise<Array<any>> {
+  namespaces: Array<number>,
+  ourPubkey: string
+): Promise<Array<{ code: number; messages: Array<Record<string, any>> }>> {
   if (namespaces.length !== lastHashes.length) {
     throw new Error('namespaces and lasthashes does not match');
   }
 
-  const retrieveRequestsParams = await buildRetrieveRequest(lastHashes, associatedWith, namespaces);
+  const retrieveRequestsParams = await buildRetrieveRequest(
+    lastHashes,
+    associatedWith,
+    namespaces,
+    ourPubkey
+  );
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
 
+  console.warn('retrieveRequestsParams', retrieveRequestsParams);
   const results = await doSnodeBatchRequest(retrieveRequestsParams, targetNode, 4000);
 
   if (!results || !results.length) {
@@ -118,15 +160,18 @@ async function retrieveNextMessages(
     );
   }
 
+  console.warn('what should we do if we dont get a 200 on any of those fetches?');
+
   try {
-    const json = firstResult.body;
+    // we rely on the code of the
+    const bodyFirstResult = firstResult.body;
     if (!window.inboxStore?.getState().onionPaths.isOnline) {
       window.inboxStore?.dispatch(updateIsOnline(true));
     }
 
-    GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', json.t);
+    GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', bodyFirstResult.t);
 
-    return json.messages || [];
+    return results.map(result => ({ code: result.code, messages: result.body as Array<any> }));
   } catch (e) {
     window?.log?.warn('exception while parsing json of nextMessage:', e);
     if (!window.inboxStore?.getState().onionPaths.isOnline) {
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 089b71121..db6597167 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -123,14 +123,14 @@ export async function snodeRpc(
 ): Promise<undefined | SnodeResponse> {
   const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`;
 
-
-
   const body = {
     jsonrpc: '2.0',
     method,
     params: clone(params),
   };
 
+  console.warn('snodeRPC', body);
+
   const fetchOptions: LokiFetchOptions = {
     method: 'POST',
     body: JSON.stringify(body),
diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts
index 51034e27c..98bd5f8dd 100644
--- a/ts/session/apis/snode_api/storeMessage.ts
+++ b/ts/session/apis/snode_api/storeMessage.ts
@@ -17,7 +17,6 @@ async function storeOnNode(
 ): Promise<string | null | boolean> {
   try {
     const subRequests = buildStoreRequests(params);
-
     const result = await doSnodeBatchRequest(subRequests, targetNode, 4000, params.pubkey);
 
     if (!result || !result.length) {
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 115d7e49f..db00e9113 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -3,7 +3,7 @@ import * as snodePool from './snodePool';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { SignalService } from '../../../protobuf';
 import * as Receiver from '../../../receiver/receiver';
-import _, { concat } from 'lodash';
+import _, { concat, last } from 'lodash';
 import { Data, Snode } from '../../../data/data';
 
 import { StringUtils, UserUtils } from '../../utils';
@@ -142,6 +142,7 @@ export class SwarmPolling {
     }
     // we always poll as often as possible for our pubkey
     const ourPubkey = UserUtils.getOurPubKeyFromCache();
+    // const directPromises = Promise.resolve();
     const directPromises = Promise.all([this.pollOnceForKey(ourPubkey, false, [0])]).then(
       () => undefined
     );
@@ -243,6 +244,7 @@ export class SwarmPolling {
         return group;
       });
     } else if (isGroup) {
+      debugger;
       window?.log?.info(
         `Polled for group(${ed25519Str(
           pubkey.key
@@ -269,8 +271,11 @@ export class SwarmPolling {
     pubkey: PubKey,
     namespaces: Array<number>
   ): Promise<Array<any> | null> {
+    const namespaceLength = namespaces.length;
+    if (namespaceLength > 2 || namespaceLength <= 0) {
+      throw new Error('pollNodeForKey needs  1 or 2 namespaces to be given at all times');
+    }
     const edkey = node.pubkey_ed25519;
-
     const pkStr = pubkey.key;
 
     try {
@@ -279,27 +284,47 @@ export class SwarmPolling {
           const prevHashes = await Promise.all(
             namespaces.map(namespace => this.getLastHash(edkey, pkStr, namespace))
           );
-          const messages = await SnodeAPIRetrieve.retrieveNextMessages(
+          const results = await SnodeAPIRetrieve.retrieveNextMessages(
             node,
             prevHashes,
             pkStr,
-            namespaces
+            namespaces,
+            UserUtils.getOurPubKeyStrFromCache()
           );
-          if (!messages.length) {
+          debugger;
+          if (!results.length) {
             return [];
           }
 
-          // const lastMessage = _.last(messages);
-          // const newHashes = // TODO
+          if (results.length !== namespaceLength) {
+            window.log.error(
+              `pollNodeForKey asked for ${namespaceLength} namespaces but received only messages about ${results.length} namespaces`
+            );
+            throw new Error(
+              `pollNodeForKey asked for ${namespaceLength} namespaces but received only messages about ${results.length} namespaces`
+            );
+          }
 
-          // await this.updateLastHashes({
-          //   edkey: edkey,
-          //   pubkey,
-          //   namespaces,
-          //   hash: lastMessage.hash,
-          //   expiration: lastMessage.expiration,
-          // });
-          return messages;
+          const lastMessages = results.map(r => {
+            return last(r.messages);
+          });
+
+          await Promise.all(
+            lastMessages.map(async (lastMessage, index) => {
+              if (!lastMessage) {
+                return Promise.resolve();
+              }
+              return this.updateLastHash({
+                edkey: edkey,
+                pubkey,
+                namespace: namespaces[index],
+                hash: lastMessage.hash,
+                expiration: lastMessage.expiration,
+              });
+            })
+          );
+
+          return results;
         },
         {
           minTimeout: 100,
@@ -374,14 +399,17 @@ export class SwarmPolling {
     expiration: number;
   }): Promise<void> {
     const pkStr = pubkey.key;
+    const cached = await this.getLastHash(edkey, pubkey.key, namespace);
 
-    await Data.updateLastHash({
-      convoId: pkStr,
-      snode: edkey,
-      hash,
-      expiresAt: expiration,
-      namespace,
-    });
+    if (!cached || cached !== hash) {
+      await Data.updateLastHash({
+        convoId: pkStr,
+        snode: edkey,
+        hash,
+        expiresAt: expiration,
+        namespace,
+      });
+    }
 
     if (!this.lastHashes[edkey]) {
       this.lastHashes[edkey] = {};
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 7554e33f3..7851c3dbb 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -13,8 +13,8 @@ import {
   generateGroupV3Keypair,
 } from '../crypto';
 import {
-  ClosedGroupNewMessageParams,
   ClosedGroupNewMessage,
+  ClosedGroupNewMessageParams,
 } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { PubKey } from '../types';
 import { UserUtils } from '../utils';
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index 86939d53b..44654ebfb 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -1,6 +1,5 @@
 import { fromHexToArray } from '../utils/String';
 
-
 export enum KeyPrefixType {
   /**
    * Used for keys which have the blinding update and aren't using blinding
diff --git a/ts/session/utils/Bencoding.ts b/ts/session/utils/Bencoding.ts
index 6bdf56c8f..fef98289d 100644
--- a/ts/session/utils/Bencoding.ts
+++ b/ts/session/utils/Bencoding.ts
@@ -66,7 +66,7 @@ export class BDecode {
     return parsed;
   }
 
-  parseList(): BencodeArrayType {
+  private parseList(): BencodeArrayType {
     const parsed: BencodeArrayType = [];
 
     if (this.currentParsingIndex >= this.content.length) {
@@ -134,7 +134,6 @@ export class BDecode {
       throw new Error('parseString: cannot parse string without length');
     }
 
-
     if (strLength === 0) {
       return '';
     }
@@ -193,7 +192,6 @@ export class BEncode {
   }
 
   private encodeItem(item: BencodeElementType): Uint8Array {
-
     if (isNumber(item) && isFinite(item)) {
       return from_string(`i${item}e`);
     }
@@ -216,6 +214,7 @@ export class BEncode {
 
     if (isArray(item)) {
       let content = new Uint8Array();
+      //tslint disable prefer-for-of
       for (let index = 0; index < item.length; index++) {
         const encodedItem = this.encodeItem(item[index]);
         const encodedItemLength = encodedItem.length;
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
index 724068248..3d1b7e3c9 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
@@ -7,9 +7,7 @@ import { Constants } from '../../../../../../session';
 import { from_hex } from 'libsodium-wrappers-sumo';
 
 describe('GroupInviteMessage', () => {
-  beforeEach(async () => {});
-
-  it('can create valid message', async () => {
+  it('can create valid message', () => {
     const message = new GroupInviteMessage({
       timestamp: 12345,
       memberPrivateKey: '654321',
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
index 42690f3c8..4e7ee82e1 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
@@ -6,9 +6,7 @@ import { Constants } from '../../../../../../session';
 import { GroupMemberLeftMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage';
 
 describe('GroupMemberLeftMessage', () => {
-  beforeEach(async () => {});
-
-  it('can create valid message', async () => {
+  it('can create valid message', () => {
     const message = new GroupMemberLeftMessage({
       timestamp: 12345,
       identifier: v4(),
@@ -23,7 +21,7 @@ describe('GroupMemberLeftMessage', () => {
       .to.have.property('groupMessage')
       .to.have.property('memberLeftMessage').to.be.not.null;
 
-      expect(decoded.dataMessage)
+    expect(decoded.dataMessage)
       .to.have.property('groupMessage')
       .to.have.property('memberLeftMessage').to.be.empty;
     expect(message)
@@ -48,5 +46,4 @@ describe('GroupMemberLeftMessage', () => {
     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
   });
-
 });
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
index 287a49603..16299d138 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
@@ -7,9 +7,7 @@ import { Constants } from '../../../../../../session';
 import { from_hex } from 'libsodium-wrappers-sumo';
 
 describe('GroupPromoteMessage', () => {
-  beforeEach(async () => {});
-
-  it('can create valid message', async () => {
+  it('can create valid message', () => {
     const message = new GroupPromoteMessage({
       timestamp: 12345,
       identifier: v4(),
diff --git a/ts/types/Util.ts b/ts/types/Util.ts
index ccea6b792..5e494da0d 100644
--- a/ts/types/Util.ts
+++ b/ts/types/Util.ts
@@ -7,3 +7,5 @@ export type RenderTextCallbackType = (options: {
 }) => JSX.Element;
 
 export type LocalizerType = (key: LocalizerKeys, values?: Array<string>) => string;
+
+export type FixedLengthArray<T, Length extends number> = Array<T> & { length: Length };
diff --git a/tslint.json b/tslint.json
index 2d46bc9b5..4e6e28901 100644
--- a/tslint.json
+++ b/tslint.json
@@ -25,6 +25,7 @@
     "object-literal-key-quotes": [true, "as-needed"],
     "object-literal-sort-keys": false,
     "no-async-without-await": true,
+    "no-empty-interface": false,
     "ordered-imports": [
       true,
       {

From 456d52ab1a30193103f8d13920cbe17b41afbe6a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 8 Nov 2022 11:39:22 +1100
Subject: [PATCH 004/178] fix: make sure we do not use "group" or "private"
 without the enum

---
 .../message/message-content/MessageAvatar.tsx |  4 ++-
 .../message/message-content/MessageText.tsx   |  3 ++-
 .../message-item/GenericReadableMessage.tsx   |  3 ++-
 ts/models/conversationAttributes.ts           | 25 +++++++++++++++++--
 ts/node/sql.ts                                |  4 +--
 .../conversations/ConversationController.ts   |  8 ++++--
 ts/session/group/closed-group.ts              |  2 +-
 ts/state/selectors/conversations.ts           | 17 ++++++++-----
 .../models/formatRowOfConversation_test.ts    |  3 ++-
 9 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index a2b1a878d..50dea668e 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { OpenGroupData } from '../../../../data/opengroups';
+import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { findCachedBlindedMatchOrLookItUp } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getConversationController } from '../../../../session/conversations';
@@ -55,7 +56,8 @@ export const MessageAvatar = (props: Props) => {
     isPublic,
   } = avatarProps;
 
-  if (conversationType !== 'group' || direction === 'outgoing') {
+  // no avatar when this is not a private conversation
+  if (conversationType === ConversationTypeEnum.PRIVATE || direction === 'outgoing') {
     return null;
   }
   const userName = authorName || authorProfileName || sender;
diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx
index 5a697cc28..d84d1bfac 100644
--- a/ts/components/conversation/message/message-content/MessageText.tsx
+++ b/ts/components/conversation/message/message-content/MessageText.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import {
   getMessageTextProps,
@@ -44,7 +45,7 @@ export const MessageText = (props: Props) => {
         text={contents || ''}
         disableLinks={multiSelectMode}
         disableJumbomoji={false}
-        isGroup={conversationType === 'group'}
+        isGroup={isOpenOrClosedGroup(conversationType)}
       />
     </div>
   );
diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index 1f49a35ae..92ef3a2db 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -20,6 +20,7 @@ import { MessageAvatar } from '../message-content/MessageAvatar';
 import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus';
 import { ReadableMessage } from './ReadableMessage';
 import styled, { keyframes } from 'styled-components';
+import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
 
 export type GenericReadableMessageSelectorProps = Pick<
   MessageRenderingProps,
@@ -221,7 +222,7 @@ export const GenericReadableMessage = (props: Props) => {
   }
 
   const selected = isMessageSelected || false;
-  const isGroup = conversationType === 'group';
+  const isGroup = isOpenOrClosedGroup(conversationType);
   const isIncoming = direction === 'incoming';
 
   return (
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index c701180db..83938d2a0 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -1,12 +1,33 @@
 import { defaults } from 'lodash';
 import { LastMessageStatusType } from '../state/ducks/conversations';
 
+/**
+ * Private chats have always the type `Private`
+ * Open groups have always the type `Group`
+ * Closed group have the type `Group` when they are not v3 and the type `CLOSED_GROUP` when they v3.
+ * To identity between an open or closed group before v3, we need to rely on the prefix (05 is closed groups, publicChat is opengroup)
+ *
+ *
+ * We will need to support existing closed groups foir now, but we will be able to get rid of existing closed groups at some point.
+ * When we do get rid of them, we will be able to remove any GROUP conversation with prefix 05 (as they are old closed groups) and update the remaining GROUP to be opengroups instead
+ */
 export enum ConversationTypeEnum {
   GROUP = 'group',
-  CLOSED_GROUP = 'groupv3',
+  GROUPV3 = 'groupv3',
   PRIVATE = 'private',
 }
 
+export function isOpenOrClosedGroup(conversationType: ConversationTypeEnum) {
+  return (
+    conversationType === ConversationTypeEnum.GROUP ||
+    conversationType === ConversationTypeEnum.GROUPV3
+  );
+}
+
+export function isDirectConversation(conversationType: ConversationTypeEnum) {
+  return conversationType === ConversationTypeEnum.PRIVATE;
+}
+
 /**
  * all: all  notifications enabled, the default
  * disabled: no notifications at all
@@ -17,7 +38,7 @@ export type ConversationNotificationSettingType = typeof ConversationNotificatio
 
 export interface ConversationAttributes {
   id: string;
-  type: string;
+  type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV3 | ConversationTypeEnum.GROUP;
 
   // 0 means inactive (undefined and null too but we try to get rid of them and only have 0 = inactive)
   active_at: number;
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index c4ca98047..ed8bb3d0a 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -22,7 +22,7 @@ import { redactAll } from '../util/privacy'; // checked - only node
 import { LocaleMessagesType } from './locale'; // checked - only node
 import { PubKey } from '../session/types/PubKey'; // checked - only node
 import { StorageItem } from './storage_item'; // checked - only node
-import { ConversationAttributes } from '../models/conversationAttributes';
+import { ConversationAttributes, ConversationTypeEnum } from '../models/conversationAttributes';
 import {
   arrayStrToJson,
   assertValidConversationAttributes,
@@ -2333,7 +2333,7 @@ function fillWithTestData(numConvosToAdd: number, numMsgsToAdd: number) {
       members: [],
       displayNameInProfile: `${activeAt}`,
       id: `05${id}`,
-      type: 'group',
+      type: ConversationTypeEnum.GROUPV3,
       didApproveMe: false,
       expireTimer: 0,
       groupAdmins: [],
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 4b2a15533..96354418d 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -65,8 +65,12 @@ export class ConversationController {
       throw new TypeError("'id' must be a string");
     }
 
-    if (type !== ConversationTypeEnum.PRIVATE && type !== ConversationTypeEnum.GROUP) {
-      throw new TypeError(`'type' must be 'private' or 'group' got: '${type}'`);
+    if (
+      type !== ConversationTypeEnum.PRIVATE &&
+      type !== ConversationTypeEnum.GROUP &&
+      type !== ConversationTypeEnum.GROUPV3
+    ) {
+      throw new TypeError(`'type' must be 'private' or 'group' or 'groupv3' but got: '${type}'`);
     }
 
     if (!this._initialFetchComplete) {
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 71be70041..242ceb064 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -253,7 +253,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
   > = {
     displayNameInProfile: details.name,
     members: details.members,
-    type: 'group',
+    type: isV3(details) ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP,
     is_medium_group: true,
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 563db45f8..2b8930474 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -33,7 +33,7 @@ import { LightBoxOptions } from '../../components/conversation/SessionConversati
 import { getConversationController } from '../../session/conversations';
 import { UserUtils } from '../../session/utils';
 import { Storage } from '../../util/storage';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
 
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { filter, isEmpty, pick, sortBy } from 'lodash';
@@ -97,7 +97,8 @@ export const getIsTypingEnabled = createSelector(
 export const getSelectedConversationIsGroup = createSelector(
   getSelectedConversation,
   (state: ReduxConversationType | undefined): boolean => {
-    return state?.type === 'group' || false;
+    const type = state?.type;
+    return type ? isOpenOrClosedGroup(type) : false;
   }
 );
 
@@ -107,7 +108,11 @@ export const getSelectedConversationIsGroup = createSelector(
 export const isClosedGroupConversation = createSelector(
   getSelectedConversation,
   (state: ReduxConversationType | undefined): boolean => {
-    return (state?.type === 'group' && !state.isPublic) || false;
+    return (
+      (state?.type === ConversationTypeEnum.GROUP && !state.isPublic) ||
+      state?.type === ConversationTypeEnum.GROUPV3 ||
+      false
+    );
   }
 );
 
@@ -117,7 +122,7 @@ export const isClosedGroupConversation = createSelector(
 export const isPublicGroupConversation = createSelector(
   getSelectedConversation,
   (state: ReduxConversationType | undefined): boolean => {
-    return (state?.type === 'group' && state.isPublic) || false;
+    return (state?.type === ConversationTypeEnum.GROUP && state.isPublic) || false;
   }
 );
 
@@ -293,7 +298,7 @@ function getConversationTitle(
     return conversation.displayNameInProfile;
   }
 
-  if (conversation.type === 'group') {
+  if (isOpenOrClosedGroup(conversation.type)) {
     return (testingi18n || window.i18n)('unknown');
   }
   return conversation.id;
@@ -560,7 +565,7 @@ export const getConversationHeaderTitleProps = createSelector(getSelectedConvers
     members: state.members || [],
     isPublic: !!state.isPublic,
     subscriberCount: state.subscriberCount,
-    isGroup: state.type === 'group',
+    isGroup: isOpenOrClosedGroup(state.type),
     currentNotificationSetting: state.currentNotificationSetting,
   };
 });
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 137c7249d..73162688b 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -4,6 +4,7 @@ import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
   ConversationAttributes,
+  ConversationTypeEnum,
   fillConvoAttributesWithDefaults,
 } from '../../../../models/conversationAttributes';
 import { formatRowOfConversation } from '../../../../node/database_utility';
@@ -283,7 +284,7 @@ describe('formatRowOfConversation', () => {
       formatRowOfConversation(
         fillConvoAttributesWithDefaults({
           id: '123456',
-          type: 'group',
+          type: ConversationTypeEnum.GROUP,
           nickname: 'nickname',
           displayNameInProfile: 'displayNameInProfile',
           profileKey: '',

From fddfc8c50161aa63878dc28d1acf5a9f543a803c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 30 Nov 2022 11:39:44 +1100
Subject: [PATCH 005/178] fix: hide v3 closed group protobuf messages for now

---
 protos/SignalService.proto                    |  58 +++----
 .../apis/snode_api/SnodeRequestTypes.ts       |   2 +-
 .../group/v3/GroupAdminGroupMessage.ts        |  92 +++++------
 .../group/v3/GroupInviteMessage.ts            |  80 ++++-----
 .../group/v3/GroupMemberLeftMessage.ts        |  28 ++--
 .../controlMessage/group/v3/GroupMessage.ts   |  30 ++--
 .../group/v3/GroupPromoteMessage.ts           |  54 +++---
 .../v3/GroupInviteMessage_test.ts             | 154 +++++++++---------
 .../v3/GroupMemberLeftMessage_test.ts         |  85 +++++-----
 .../v3/GroupPromoteMessage_test.ts            | 102 ++++++------
 10 files changed, 346 insertions(+), 339 deletions(-)

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index bc4c3baa9..105041ced 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -73,41 +73,41 @@ message DataExtractionNotification {
   optional uint64 timestamp = 2;
 }
 
-message GroupInviteMessage {
-  required string         name              = 1;
-  required bytes          memberPrivateKey  = 2;
-}
+// message GroupInviteMessage {
+//   required string         name              = 1;
+//   required bytes          memberPrivateKey  = 2;
+// }
 
 // this will replace our closedGroupControlMessage but we will need to keep both for some time
-message GroupMessage {
-  optional GroupAdminMessage           adminMessage         = 31;
-  optional GroupMemberLeftMessage      memberLeftMessage    = 32;
-  optional GroupInviteMessage          inviteMessage        = 33;
-  optional GroupPromoteMessage         promoteMessage       = 34;
-}
+// message GroupMessage {
+  // optional GroupAdminMessage           adminMessage         = 31;
+  // optional GroupMemberLeftMessage      memberLeftMessage    = 32;
+  // optional GroupInviteMessage          inviteMessage        = 33;
+  // optional GroupPromoteMessage         promoteMessage       = 34;
+// }
 
-message GroupPromoteMessage {
-  required bytes          privateKey        = 1; // this is the group admins key
-}
-
-message GroupAdminMessage {
-  enum Type {
-    DELETE_GROUP                   = 1; // members, groupSignature
-    DELETE_GROUP_ALL_MEMBERS       = 2;  // groupSignature
-    DELETE_MESSAGES_ALL_MEMBERS    = 3;  // groupSignature
-    DELETE_ATTACHMENTS_ALL_MEMBERS = 4;  // groupSignature
-  }
+// message GroupPromoteMessage {
+  // required bytes          privateKey        = 1; // this is the group admins key
+// }
 
+// message GroupAdminMessage {
+  // enum Type {
+  //   DELETE_GROUP                   = 1; // members, groupSignature
+  //   DELETE_GROUP_ALL_MEMBERS       = 2;  // groupSignature
+  //   DELETE_MESSAGES_ALL_MEMBERS    = 3;  // groupSignature
+  //   DELETE_ATTACHMENTS_ALL_MEMBERS = 4;  // groupSignature
+  // }
+//
+  // // @required
+ //  required Type           type              = 1;
+  // repeated bytes          members           = 2;
   // @required
-  required Type           type              = 1;
-  repeated bytes          members           = 2;
-  // @required
-  required bytes          groupSignature    = 3; // used by every members to make sure incoming admin action can be trusted
-}
+ //  required bytes          groupSignature    = 3; // used by every members to make sure incoming admin action can be trusted
+// }
 
-message GroupMemberLeftMessage {
+// message GroupMemberLeftMessage {
  // the pubkey of the member who left is already in the senderIdentity
-}
+// }
 
 
 message DataMessage {
@@ -212,7 +212,7 @@ message DataMessage {
   optional OpenGroupInvitation       openGroupInvitation       = 102;
   optional ClosedGroupControlMessage closedGroupControlMessage = 104;
   optional string                    syncTarget                = 105;
-  optional GroupMessage              groupMessage              = 120;
+  // optional GroupMessage              groupMessage              = 120;
 }
 
 message CallMessage {
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index b040b8da1..ac11da8d9 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -6,7 +6,7 @@ type RetrieveAlwaysNeeded = {
   pubkey: string;
   namespace: number;
   last_hash: string;
-  timestamp: number;
+  timestamp?: number;
 };
 
 export type RetrievePubkeySubRequestType = {
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
index 684a403c7..4688b1229 100644
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
@@ -1,55 +1,55 @@
-import { SignalService } from '../../../../../../protobuf';
-import { isArray } from 'lodash';
-import { GroupMessage, GroupMessageParams } from './GroupMessage';
-// import { PubKey } from '../../../../../types';
-// import { from_hex } from 'libsodium-wrappers-sumo';
+// import { SignalService } from '../../../../../../protobuf';
+// import { isArray } from 'lodash';
+// import { GroupMessage, GroupMessageParams } from './GroupMessage';
+// // import { PubKey } from '../../../../../types';
+// // import { from_hex } from 'libsodium-wrappers-sumo';
 
-interface GroupAdminMessageParams extends GroupMessageParams {
-  /*
-   * A proof that we are an admin (a proof that we have access to the private key of the closed group).
-   * this field is needed  for all types of admin messages so that every member can make
-   */
-  groupSignature: Uint8Array;
-}
+// interface GroupAdminMessageParams extends GroupMessageParams {
+//   /*
+//    * A proof that we are an admin (a proof that we have access to the private key of the closed group).
+//    * this field is needed  for all types of admin messages so that every member can make
+//    */
+//   groupSignature: Uint8Array;
+// }
 
-interface GroupAdminMessageParams extends GroupMessageParams {
-  /**
-   * hex string of the members to delete the group from.
-   * a single '*' is allowed too and means 'every members'
-   *
-   */
-  members: Array<string>;
-}
+// interface GroupAdminMessageParams extends GroupMessageParams {
+//   /**
+//    * hex string of the members to delete the group from.
+//    * a single '*' is allowed too and means 'every members'
+//    *
+//    */
+//   members: Array<string>;
+// }
 
-export class GroupAdminGroupMessage extends GroupMessage {
-  // private readonly members: Array<string>;
+// export class GroupAdminGroupMessage extends GroupMessage {
+//   // private readonly members: Array<string>;
 
-  constructor(params: GroupAdminMessageParams) {
-    super(params);
+//   constructor(params: GroupAdminMessageParams) {
+//     super(params);
 
-    if (!params.members || !isArray(params.members) || !params.members.length) {
-      throw new Error('members parameter must be set');
-    }
+//     if (!params.members || !isArray(params.members) || !params.members.length) {
+//       throw new Error('members parameter must be set');
+//     }
 
-    // if (params.members.length === 1 && params.members[0] === '*') {
-    //   this.members = params.members;
-    // } else {
-    //   const allAreValid = params.members.every(PubKey.isValidGroupPubkey);
-    //   if (!allAreValid) {
-    //     throw new Error('One of the members is not a `isValidGroupPubkey`');
-    //   }
+//     // if (params.members.length === 1 && params.members[0] === '*') {
+//     //   this.members = params.members;
+//     // } else {
+//     //   const allAreValid = params.members.every(PubKey.isValidGroupPubkey);
+//     //   if (!allAreValid) {
+//     //     throw new Error('One of the members is not a `isValidGroupPubkey`');
+//     //   }
 
-    //   this.members = params.members;
-    // }
-    throw new Error('TODO and add tests');
-  }
+//     //   this.members = params.members;
+//     // }
+//     throw new Error('TODO and add tests');
+//   }
 
-  public dataProto(): SignalService.DataMessage {
-    const dataMessage = new SignalService.DataMessage();
-    dataMessage.groupMessage = super.groupMessage();
-    dataMessage.groupMessage.adminMessage = new SignalService.GroupAdminMessage();
-    // dataMessage.groupMessage.members = this.members.map(from_hex);
+//   public dataProto(): SignalService.DataMessage {
+//     const dataMessage = new SignalService.DataMessage();
+//     dataMessage.groupMessage = super.groupMessage();
+//     dataMessage.groupMessage.adminMessage = new SignalService.GroupAdminMessage();
+//     // dataMessage.groupMessage.members = this.members.map(from_hex);
 
-    return dataMessage;
-  }
-}
+//     return dataMessage;
+//   }
+// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
index 4c6b526ab..d922745b8 100644
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
@@ -1,48 +1,48 @@
-import { SignalService } from '../../../../../../protobuf';
-import { isEmpty, isString } from 'lodash';
-import { GroupMessage, GroupMessageParams } from './GroupMessage';
-import { PubKey } from '../../../../../types';
-import { from_hex } from 'libsodium-wrappers-sumo';
+// import { SignalService } from '../../../../../../protobuf';
+// import { isEmpty, isString } from 'lodash';
+// import { GroupMessage, GroupMessageParams } from './GroupMessage';
+// import { PubKey } from '../../../../../types';
+// import { from_hex } from 'libsodium-wrappers-sumo';
 
-export interface GroupInviteMessageParams extends GroupMessageParams {
-  name: string;
-  /**
-   * hex string of that member private key
-   */
-  memberPrivateKey: string;
-}
+// export interface GroupInviteMessageParams extends GroupMessageParams {
+//   name: string;
+//   /**
+//    * hex string of that member private key
+//    */
+//   memberPrivateKey: string;
+// }
 
-export class GroupInviteMessage extends GroupMessage {
-  private readonly name: string;
-  private readonly memberPrivateKey: string;
+// export class GroupInviteMessage extends GroupMessage {
+//   private readonly name: string;
+//   private readonly memberPrivateKey: string;
 
-  constructor(params: GroupInviteMessageParams) {
-    super(params);
+//   constructor(params: GroupInviteMessageParams) {
+//     super(params);
 
-    if (!params.name || isEmpty(params.name) || !isString(params.name)) {
-      throw new Error('name parameter must be valid');
-    }
+//     if (!params.name || isEmpty(params.name) || !isString(params.name)) {
+//       throw new Error('name parameter must be valid');
+//     }
 
-    if (
-      !params.memberPrivateKey ||
-      isEmpty(params.memberPrivateKey) ||
-      !isString(params.memberPrivateKey) ||
-      !PubKey.isHexOnly(params.memberPrivateKey)
-    ) {
-      throw new Error('memberPrivateKey parameter must be valid');
-    }
+//     if (
+//       !params.memberPrivateKey ||
+//       isEmpty(params.memberPrivateKey) ||
+//       !isString(params.memberPrivateKey) ||
+//       !PubKey.isHexOnly(params.memberPrivateKey)
+//     ) {
+//       throw new Error('memberPrivateKey parameter must be valid');
+//     }
 
-    this.name = params.name;
-    this.memberPrivateKey = params.memberPrivateKey;
-  }
+//     this.name = params.name;
+//     this.memberPrivateKey = params.memberPrivateKey;
+//   }
 
-  public dataProto(): SignalService.DataMessage {
-    const dataMessage = new SignalService.DataMessage();
-    dataMessage.groupMessage = super.groupMessage();
-    dataMessage.groupMessage.inviteMessage = new SignalService.GroupInviteMessage();
-    dataMessage.groupMessage.inviteMessage.name = this.name;
-    dataMessage.groupMessage.inviteMessage.memberPrivateKey = from_hex(this.memberPrivateKey);
+//   public dataProto(): SignalService.DataMessage {
+//     const dataMessage = new SignalService.DataMessage();
+//     dataMessage.groupMessage = super.groupMessage();
+//     dataMessage.groupMessage.inviteMessage = new SignalService.GroupInviteMessage();
+//     dataMessage.groupMessage.inviteMessage.name = this.name;
+//     dataMessage.groupMessage.inviteMessage.memberPrivateKey = from_hex(this.memberPrivateKey);
 
-    return dataMessage;
-  }
-}
+//     return dataMessage;
+//   }
+// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
index 22e90f4ed..a85fd659d 100644
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
@@ -1,18 +1,18 @@
-import { SignalService } from '../../../../../../protobuf';
-import { GroupMessage, GroupMessageParams } from './GroupMessage';
+// import { SignalService } from '../../../../../../protobuf';
+// import { GroupMessage, GroupMessageParams } from './GroupMessage';
 
-interface GroupMemberLeftMessageParams extends GroupMessageParams {}
+// interface GroupMemberLeftMessageParams extends GroupMessageParams {}
 
-export class GroupMemberLeftMessage extends GroupMessage {
-  constructor(params: GroupMemberLeftMessageParams) {
-    super(params);
-  }
+// export class GroupMemberLeftMessage extends GroupMessage {
+//   constructor(params: GroupMemberLeftMessageParams) {
+//     super(params);
+//   }
 
-  public dataProto(): SignalService.DataMessage {
-    const dataMessage = new SignalService.DataMessage();
-    dataMessage.groupMessage = super.groupMessage();
-    dataMessage.groupMessage.memberLeftMessage = new SignalService.GroupMemberLeftMessage();
+//   public dataProto(): SignalService.DataMessage {
+//     const dataMessage = new SignalService.DataMessage();
+//     dataMessage.groupMessage = super.groupMessage();
+//     dataMessage.groupMessage.memberLeftMessage = new SignalService.GroupMemberLeftMessage();
 
-    return dataMessage;
-  }
-}
+//     return dataMessage;
+//   }
+// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
index 57540712e..b2fc845c4 100644
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
@@ -1,18 +1,18 @@
-import { SignalService } from '../../../../../../protobuf';
-import { DataMessage } from '../../../DataMessage';
-import { MessageParams } from '../../../Message';
+// import { SignalService } from '../../../../../../protobuf';
+// import { DataMessage } from '../../../DataMessage';
+// import { MessageParams } from '../../../Message';
 
-export interface GroupMessageParams extends MessageParams {}
+// export interface GroupMessageParams extends MessageParams {}
 
-export abstract class GroupMessage extends DataMessage {
-  constructor(params: GroupMessageParams) {
-    super({
-      timestamp: params.timestamp,
-      identifier: params.identifier,
-    });
-  }
+// export abstract class GroupMessage extends DataMessage {
+//   constructor(params: GroupMessageParams) {
+//     super({
+//       timestamp: params.timestamp,
+//       identifier: params.identifier,
+//     });
+//   }
 
-  protected groupMessage() {
-    return new SignalService.GroupMessage();
-  }
-}
+//   protected groupMessage() {
+//     return new SignalService.GroupMessage();
+//   }
+// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
index 5e992a90d..292ff1312 100644
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
@@ -1,34 +1,34 @@
-import { SignalService } from '../../../../../../protobuf';
-import { isEmpty } from 'lodash';
-import { GroupMessage, GroupMessageParams } from './GroupMessage';
-import { from_hex } from 'libsodium-wrappers-sumo';
+// import { SignalService } from '../../../../../../protobuf';
+// import { isEmpty } from 'lodash';
+// import { GroupMessage, GroupMessageParams } from './GroupMessage';
+// import { from_hex } from 'libsodium-wrappers-sumo';
 
-export interface GroupPromoteMessageParams extends GroupMessageParams {
-  /**
-   * hex string of the group private key
-   */
-  privateKey: string;
-}
+// export interface GroupPromoteMessageParams extends GroupMessageParams {
+//   /**
+//    * hex string of the group private key
+//    */
+//   privateKey: string;
+// }
 
-export class GroupPromoteMessage extends GroupMessage {
-  private readonly privateKey: string;
+// export class GroupPromoteMessage extends GroupMessage {
+//   private readonly privateKey: string;
 
-  constructor(params: GroupPromoteMessageParams) {
-    super(params);
+//   constructor(params: GroupPromoteMessageParams) {
+//     super(params);
 
-    if (!params.privateKey || isEmpty(params.privateKey)) {
-      throw new Error('privateKey parameter must be set');
-    }
+//     if (!params.privateKey || isEmpty(params.privateKey)) {
+//       throw new Error('privateKey parameter must be set');
+//     }
 
-    this.privateKey = params.privateKey;
-  }
+//     this.privateKey = params.privateKey;
+//   }
 
-  public dataProto(): SignalService.DataMessage {
-    const dataMessage = new SignalService.DataMessage();
-    dataMessage.groupMessage = super.groupMessage();
-    dataMessage.groupMessage.promoteMessage = new SignalService.GroupPromoteMessage();
-    dataMessage.groupMessage.promoteMessage.privateKey = from_hex(this.privateKey);
+//   public dataProto(): SignalService.DataMessage {
+//     const dataMessage = new SignalService.DataMessage();
+//     dataMessage.groupMessage = super.groupMessage();
+//     dataMessage.groupMessage.promoteMessage = new SignalService.GroupPromoteMessage();
+//     dataMessage.groupMessage.promoteMessage.privateKey = from_hex(this.privateKey);
 
-    return dataMessage;
-  }
-}
+//     return dataMessage;
+//   }
+// }
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
index 3d1b7e3c9..c5f39d889 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
@@ -1,87 +1,89 @@
-import { expect } from 'chai';
+// import { expect } from 'chai';
 
-import { SignalService } from '../../../../../../protobuf';
-import { GroupInviteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage';
-import { v4 } from 'uuid';
-import { Constants } from '../../../../../../session';
-import { from_hex } from 'libsodium-wrappers-sumo';
+// import { SignalService } from '../../../../../../protobuf';
+// import { GroupInviteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage';
+// import { v4 } from 'uuid';
+// import { Constants } from '../../../../../../session';
+// import { from_hex } from 'libsodium-wrappers-sumo';
 
-describe('GroupInviteMessage', () => {
-  it('can create valid message', () => {
-    const message = new GroupInviteMessage({
-      timestamp: 12345,
-      memberPrivateKey: '654321',
-      name: 'groupName',
-      identifier: v4(),
-    });
+// describe('GroupInviteMessage', () => {
+//   beforeEach(async () => {});
 
-    const plainText = message.plainTextBuffer();
-    const decoded = SignalService.Content.decode(plainText);
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('inviteMessage')
-      .to.have.deep.property('name', 'groupName');
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('inviteMessage')
-      .to.have.deep.property('memberPrivateKey', from_hex('654321'));
+//   it('can create valid message', async () => {
+//     const message = new GroupInviteMessage({
+//       timestamp: 12345,
+//       memberPrivateKey: '654321',
+//       name: 'groupName',
+//       identifier: v4(),
+//     });
 
-    expect(message)
-      .to.have.property('timestamp')
-      .to.be.equal(12345);
-  });
+//     const plainText = message.plainTextBuffer();
+//     const decoded = SignalService.Content.decode(plainText);
+//     expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('inviteMessage')
+//       .to.have.deep.property('name', 'groupName');
+//     expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('inviteMessage')
+//       .to.have.deep.property('memberPrivateKey', from_hex('654321'));
 
-  it('correct ttl', () => {
-    const message = new GroupInviteMessage({
-      timestamp: 12345,
-      memberPrivateKey: '654321',
-      name: 'groupName',
-      identifier: v4(),
-    });
+//     expect(message)
+//       .to.have.property('timestamp')
+//       .to.be.equal(12345);
+//   });
 
-    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-  });
+//   it('correct ttl', () => {
+//     const message = new GroupInviteMessage({
+//       timestamp: 12345,
+//       memberPrivateKey: '654321',
+//       name: 'groupName',
+//       identifier: v4(),
+//     });
 
-  it('has an identifier even if none are provided', () => {
-    const message = new GroupInviteMessage({
-      timestamp: 12345,
-      memberPrivateKey: '654321',
-      name: 'groupName',
-    });
+//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+//   });
 
-    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-  });
+//   it('has an identifier even if none are provided', () => {
+//     const message = new GroupInviteMessage({
+//       timestamp: 12345,
+//       memberPrivateKey: '654321',
+//       name: 'groupName',
+//     });
 
-  describe('constructor throws on invalid ', () => {
-    it('memberPk is empty', () => {
-      expect(() => {
-        new GroupInviteMessage({
-          timestamp: 12345,
-          memberPrivateKey: undefined as any,
-          name: 'groupName',
-        });
-      }).throws();
-    });
+//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+//   });
 
-    it('memberPk is not a string', () => {
-      expect(() => {
-        new GroupInviteMessage({
-          timestamp: 12345,
-          memberPrivateKey: 1234 as any,
-          name: 'groupName',
-        });
-      }).throws();
-    });
+//   describe('constructor throws on invalid ', () => {
+//     it('memberPk is empty', () => {
+//       expect(() => {
+//         new GroupInviteMessage({
+//           timestamp: 12345,
+//           memberPrivateKey: undefined as any,
+//           name: 'groupName',
+//         });
+//       }).throws();
+//     });
 
-    it('memberPk is not a hex string', () => {
-      expect(() => {
-        new GroupInviteMessage({
-          timestamp: 12345,
-          memberPrivateKey: '03ghklmnopqrstuvxyz' as any,
-          name: 'groupName',
-        });
-      }).throws();
-    });
-  });
-});
+//     it('memberPk is not a string', () => {
+//       expect(() => {
+//         new GroupInviteMessage({
+//           timestamp: 12345,
+//           memberPrivateKey: 1234 as any,
+//           name: 'groupName',
+//         });
+//       }).throws();
+//     });
+
+//     it('memberPk is not a hex string', () => {
+//       expect(() => {
+//         new GroupInviteMessage({
+//           timestamp: 12345,
+//           memberPrivateKey: '03ghklmnopqrstuvxyz' as any,
+//           name: 'groupName',
+//         });
+//       }).throws();
+//     });
+//   });
+// });
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
index 4e7ee82e1..e3e50c3f8 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
@@ -1,49 +1,52 @@
-import { expect } from 'chai';
+// import { expect } from 'chai';
 
-import { SignalService } from '../../../../../../protobuf';
-import { v4 } from 'uuid';
-import { Constants } from '../../../../../../session';
-import { GroupMemberLeftMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage';
+// import { SignalService } from '../../../../../../protobuf';
+// import { v4 } from 'uuid';
+// import { Constants } from '../../../../../../session';
+// import { GroupMemberLeftMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage';
 
-describe('GroupMemberLeftMessage', () => {
-  it('can create valid message', () => {
-    const message = new GroupMemberLeftMessage({
-      timestamp: 12345,
-      identifier: v4(),
-    });
+// describe('GroupMemberLeftMessage', () => {
+//   beforeEach(async () => {});
 
-    const plainText = message.plainTextBuffer();
-    const decoded = SignalService.Content.decode(plainText);
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('memberLeftMessage').to.be.not.undefined;
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('memberLeftMessage').to.be.not.null;
+//   it('can create valid message', async () => {
+//     const message = new GroupMemberLeftMessage({
+//       timestamp: 12345,
+//       identifier: v4(),
+//     });
 
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('memberLeftMessage').to.be.empty;
-    expect(message)
-      .to.have.property('timestamp')
-      .to.be.equal(12345);
-  });
+//     const plainText = message.plainTextBuffer();
+//     const decoded = SignalService.Content.decode(plainText);
+//     expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('memberLeftMessage').to.be.not.undefined;
+//     expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('memberLeftMessage').to.be.not.null;
 
-  it('correct ttl', () => {
-    const message = new GroupMemberLeftMessage({
-      timestamp: 12345,
-      identifier: v4(),
-    });
+//       expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('memberLeftMessage').to.be.empty;
+//     expect(message)
+//       .to.have.property('timestamp')
+//       .to.be.equal(12345);
+//   });
 
-    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-  });
+//   it('correct ttl', () => {
+//     const message = new GroupMemberLeftMessage({
+//       timestamp: 12345,
+//       identifier: v4(),
+//     });
 
-  it('has an identifier even if none are provided', () => {
-    const message = new GroupMemberLeftMessage({
-      timestamp: 12345,
-    });
+//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+//   });
 
-    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-  });
-});
+//   it('has an identifier even if none are provided', () => {
+//     const message = new GroupMemberLeftMessage({
+//       timestamp: 12345,
+//     });
+
+//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+//   });
+
+// });
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
index 16299d138..c50503382 100644
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
+++ b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
@@ -1,58 +1,60 @@
-import { expect } from 'chai';
+// import { expect } from 'chai';
 
-import { SignalService } from '../../../../../../protobuf';
-import { GroupPromoteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage';
-import { v4 } from 'uuid';
-import { Constants } from '../../../../../../session';
-import { from_hex } from 'libsodium-wrappers-sumo';
+// import { SignalService } from '../../../../../../protobuf';
+// import { GroupPromoteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage';
+// import { v4 } from 'uuid';
+// import { Constants } from '../../../../../../session';
+// import { from_hex } from 'libsodium-wrappers-sumo';
 
-describe('GroupPromoteMessage', () => {
-  it('can create valid message', () => {
-    const message = new GroupPromoteMessage({
-      timestamp: 12345,
-      identifier: v4(),
-      privateKey: '1234',
-    });
+// describe('GroupPromoteMessage', () => {
+//   beforeEach(async () => {});
 
-    const plainText = message.plainTextBuffer();
-    const decoded = SignalService.Content.decode(plainText);
-    expect(decoded.dataMessage)
-      .to.have.property('groupMessage')
-      .to.have.property('promoteMessage')
-      .to.have.deep.property('privateKey', from_hex('1234'));
-    expect(message)
-      .to.have.property('timestamp')
-      .to.be.equal(12345);
-  });
+//   it('can create valid message', async () => {
+//     const message = new GroupPromoteMessage({
+//       timestamp: 12345,
+//       identifier: v4(),
+//       privateKey: '1234',
+//     });
 
-  it('correct ttl', () => {
-    const message = new GroupPromoteMessage({
-      timestamp: 12345,
-      identifier: v4(),
-      privateKey: '1234',
-    });
+//     const plainText = message.plainTextBuffer();
+//     const decoded = SignalService.Content.decode(plainText);
+//     expect(decoded.dataMessage)
+//       .to.have.property('groupMessage')
+//       .to.have.property('promoteMessage')
+//       .to.have.deep.property('privateKey', from_hex('1234'));
+//     expect(message)
+//       .to.have.property('timestamp')
+//       .to.be.equal(12345);
+//   });
 
-    expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-  });
+//   it('correct ttl', () => {
+//     const message = new GroupPromoteMessage({
+//       timestamp: 12345,
+//       identifier: v4(),
+//       privateKey: '1234',
+//     });
 
-  it('has an identifier even if none are provided', () => {
-    const message = new GroupPromoteMessage({
-      timestamp: 12345,
-      privateKey: '1234',
-    });
+//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
+//   });
 
-    expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-    expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-  });
+//   it('has an identifier even if none are provided', () => {
+//     const message = new GroupPromoteMessage({
+//       timestamp: 12345,
+//       privateKey: '1234',
+//     });
 
-  describe('constructor throws on invalid ', () => {
-    it('privateKey empty', () => {
-      expect(() => {
-        new GroupPromoteMessage({
-          timestamp: 12345,
-          privateKey: null as any,
-        });
-      }).throws();
-    });
-  });
-});
+//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
+//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
+//   });
+
+//   describe('constructor throws on invalid ', () => {
+//     it('privateKey empty', () => {
+//       expect(() => {
+//         new GroupPromoteMessage({
+//           timestamp: 12345,
+//           privateKey: null as any,
+//         });
+//       }).throws();
+//     });
+//   });
+// });

From 2a8d764bfbbca070a9515666d893e12aeea05a4c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 8 Nov 2022 13:57:12 +1100
Subject: [PATCH 006/178] fix tests

---
 ts/components/conversation/TypingBubble.tsx   |   4 +-
 .../message/message-content/MessageAvatar.tsx |   8 +-
 ts/models/conversation.ts                     |  30 +-
 ts/receiver/closedGroups.ts                   |  21 +
 ts/receiver/dataMessage.ts                    |  11 +-
 ts/session/apis/snode_api/swarmPolling.ts     |   9 +-
 .../conversations/ConversationController.ts   |   6 +
 ts/session/conversations/createClosedGroup.ts |   2 +-
 ts/session/group/closed-group.ts              |   3 +-
 ts/state/ducks/search.ts                      |   2 -
 .../models/formatRowOfConversation_test.ts    |  15 +
 .../unit/sogsv3/knownBlindedKeys_test.ts      |   5 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   | 704 +++++++++++++-----
 13 files changed, 588 insertions(+), 232 deletions(-)

diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index 9f9dbe999..18e2e2059 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { TypingAnimation } from './TypingAnimation';
 import styled from 'styled-components';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
 
 interface TypingBubbleProps {
   conversationType: ConversationTypeEnum;
@@ -22,7 +22,7 @@ const TypingBubbleContainer = styled.div<TypingBubbleProps>`
 `;
 
 export const TypingBubble = (props: TypingBubbleProps) => {
-  if (props.conversationType === ConversationTypeEnum.GROUP) {
+  if (isOpenOrClosedGroup(props.conversationType)) {
     return null;
   }
 
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 50dea668e..501e8b5e9 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { OpenGroupData } from '../../../../data/opengroups';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { findCachedBlindedMatchOrLookItUp } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getConversationController } from '../../../../session/conversations';
@@ -12,6 +11,7 @@ import { updateUserDetailsModal } from '../../../../state/ducks/modalDialog';
 import {
   getIsTypingEnabled,
   getMessageAvatarProps,
+  getSelectedConversationIsGroup,
   getSelectedConversationKey,
 } from '../../../../state/selectors/conversations';
 import { Avatar, AvatarSize, CrownIcon } from '../../../avatar/Avatar';
@@ -38,6 +38,7 @@ export const MessageAvatar = (props: Props) => {
   const dispatch = useDispatch();
   const avatarProps = useSelector(state => getMessageAvatarProps(state as any, messageId));
   const selectedConvoKey = useSelector(getSelectedConversationKey);
+  const isSelectedGroup = useSelector(getSelectedConversationIsGroup);
 
   const isTypingEnabled = useSelector(getIsTypingEnabled);
 
@@ -49,15 +50,14 @@ export const MessageAvatar = (props: Props) => {
     authorName,
     sender,
     authorProfileName,
-    conversationType,
     direction,
     isSenderAdmin,
     lastMessageOfSeries,
     isPublic,
   } = avatarProps;
 
-  // no avatar when this is not a private conversation
-  if (conversationType === ConversationTypeEnum.PRIVATE || direction === 'outgoing') {
+  // no avatar when this if this is a private conversation
+  if (!isSelectedGroup || direction === 'outgoing') {
     return null;
   }
   const userName = authorName || authorProfileName || sender;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 9b41bca29..ca16d6c73 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -78,6 +78,8 @@ import {
   ConversationNotificationSetting,
   ConversationTypeEnum,
   fillConvoAttributesWithDefaults,
+  isDirectConversation,
+  isOpenOrClosedGroup,
 } from './conversationAttributes';
 import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding';
 import { from_hex } from 'libsodium-wrappers-sumo';
@@ -212,7 +214,18 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return OpenGroupUtils.isOpenGroupV2(this.id);
   }
   public isClosedGroup() {
-    return this.get('type') === ConversationTypeEnum.GROUP && !this.isPublic();
+    return (
+      (this.get('type') === ConversationTypeEnum.GROUP && !this.isPublic()) ||
+      this.get('type') === ConversationTypeEnum.GROUPV3
+    );
+  }
+  public isPrivate() {
+    return isDirectConversation(this.get('type'));
+  }
+
+  // returns true if this is a closed/medium or open group
+  public isGroup() {
+    return isOpenOrClosedGroup(this.get('type'));
   }
 
   public isBlocked() {
@@ -274,8 +287,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     // tslint:disable-next-line: cyclomatic-complexity
     const isPublic = this.isPublic();
 
-    const members = this.isGroup() && !isPublic ? this.get('members') : [];
-    const zombies = this.isGroup() && !isPublic ? this.get('zombies') : [];
+    const members = this.isClosedGroup() ? this.get('members') : [];
+    const zombies = this.isClosedGroup() ? this.get('zombies') : [];
     const ourNumber = UserUtils.getOurPubKeyStrFromCache();
     const avatarPath = this.getAvatarPath();
     const isPrivate = this.isPrivate();
@@ -304,7 +317,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const toRet: ReduxConversationType = {
       id: this.id as string,
       activeAt: this.get('active_at'),
-      type: isPrivate ? ConversationTypeEnum.PRIVATE : ConversationTypeEnum.GROUP,
+      type: this.get('type'),
     };
 
     if (isPrivate) {
@@ -1662,11 +1675,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
-  // returns true if this is a closed/medium or open group
-  public isGroup() {
-    return this.get('type') === ConversationTypeEnum.GROUP;
-  }
-
   public async removeMessage(messageId: string) {
     await Data.removeMessage(messageId);
     this.updateLastMessage();
@@ -1720,10 +1728,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return profileName || PubKey.shorten(pubkey);
   }
 
-  public isPrivate() {
-    return this.get('type') === ConversationTypeEnum.PRIVATE;
-  }
-
   public getAvatarPath(): string | null {
     const avatar = this.get('avatarInProfile');
     if (isString(avatar)) {
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 754d60092..a1c7d9c1a 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -80,6 +80,14 @@ export async function handleClosedGroupControlMessage(
     }`
   );
 
+  if (PubKey.isClosedGroupV3(envelope.source)) {
+    window?.log?.warn(
+      'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage '
+    );
+    await removeFromCache(envelope);
+    return;
+  }
+
   if (BlockedNumberController.isGroupBlocked(PubKey.cast(envelope.source))) {
     window?.log?.warn('Message ignored; destined for blocked group');
     await removeFromCache(envelope);
@@ -153,6 +161,11 @@ function sanityCheckNewGroup(
     return false;
   }
 
+  if (PubKey.isClosedGroupV3(hexGroupPublicKey)) {
+    window?.log?.warn('sanityCheckNewGroup: got a v3 new group as a ClosedGroupControlMessage. ');
+    return false;
+  }
+
   if (!members?.length) {
     window?.log?.warn('groupUpdate: members is empty');
     return false;
@@ -475,6 +488,14 @@ async function performIfValid(
   const groupPublicKey = envelope.source;
   const sender = envelope.senderIdentity;
 
+  if (PubKey.isClosedGroupV3(groupPublicKey)) {
+    window?.log?.warn(
+      'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage '
+    );
+    await removeFromCache(envelope);
+    return;
+  }
+
   const convo = getConversationController().get(groupPublicKey);
   if (!convo) {
     window?.log?.warn('dropping message for nonexistent group');
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 2d4e725eb..402a9b6b0 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -190,9 +190,18 @@ export async function handleSwarmDataMessage(
     isSyncedMessage ? cleanDataMessage.syncTarget : envelope.source
   );
 
+  const isGroupMessage = !!envelope.senderIdentity;
+  const isGroupV3Message = isGroupMessage && PubKey.isClosedGroupV3(envelope.source);
+  let typeOfConvo = ConversationTypeEnum.PRIVATE;
+  if (isGroupV3Message) {
+    typeOfConvo = ConversationTypeEnum.GROUPV3;
+  } else if (isGroupMessage) {
+    typeOfConvo = ConversationTypeEnum.GROUP;
+  }
+
   const convoToAddMessageTo = await getConversationController().getOrCreateAndWait(
     convoIdToAddTheMessageTo,
-    envelope.senderIdentity ? ConversationTypeEnum.GROUP : ConversationTypeEnum.PRIVATE
+    typeOfConvo
   );
 
   window?.log?.info(
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index db00e9113..19c8d1957 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -355,12 +355,15 @@ export class SwarmPolling {
   private loadGroupIds() {
     const convos = getConversationController().getConversations();
 
-    const mediumGroupsOnly = convos.filter(
+    const closedGroupsOnly = convos.filter(
       (c: ConversationModel) =>
-        c.isMediumGroup() && !c.isBlocked() && !c.get('isKickedFromGroup') && !c.get('left')
+        (c.isMediumGroup() || PubKey.isClosedGroupV3(c.id)) &&
+        !c.isBlocked() &&
+        !c.get('isKickedFromGroup') &&
+        !c.get('left')
     );
 
-    mediumGroupsOnly.forEach((c: any) => {
+    closedGroupsOnly.forEach((c: any) => {
       this.addGroupId(new PubKey(c.id));
     });
   }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 96354418d..279922655 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -73,6 +73,12 @@ export class ConversationController {
       throw new TypeError(`'type' must be 'private' or 'group' or 'groupv3' but got: '${type}'`);
     }
 
+    if (type === ConversationTypeEnum.GROUPV3 && !PubKey.isClosedGroupV3(id)) {
+      throw new Error(
+        'required v3 closed group` ` but the pubkey does not match the 03 prefix for them'
+      );
+    }
+
     if (!this._initialFetchComplete) {
       throw new Error('getConversationController().get() needs complete initial fetch');
     }
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 7851c3dbb..8973cd24a 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -43,7 +43,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
   // Create the group
   const convo = await getConversationController().getOrCreateAndWait(
     groupPublicKey,
-    ConversationTypeEnum.GROUP
+    isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP
   );
   await convo.setIsApproved(true, false);
 
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 242ceb064..317bf039a 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -79,9 +79,10 @@ export async function initiateClosedGroupUpdate(
   groupName: string,
   members: Array<string>
 ) {
+  const isV3 = PubKey.isClosedGroupV3(groupId);
   const convo = await getConversationController().getOrCreateAndWait(
     groupId,
-    ConversationTypeEnum.GROUP
+    isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP
   );
 
   if (!convo.isMediumGroup()) {
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index 89dfe08c1..9b85b8389 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -230,8 +230,6 @@ async function queryConversationsAndContacts(providedQuery: string, options: Sea
       }
     } else if (conversation.type === ConversationTypeEnum.PRIVATE) {
       contacts.push(conversation.id);
-    } else if (conversation.type !== ConversationTypeEnum.GROUP) {
-      contacts.push(conversation.id);
     } else {
       conversations.push(conversation.id);
     }
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 73162688b..5468b1a81 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -294,5 +294,20 @@ describe('formatRowOfConversation', () => {
         } as ConversationAttributes)
       )
     ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
+
+    expect(
+      formatRowOfConversation(
+        fillConvoAttributesWithDefaults({
+          id: '1234565',
+          type: ConversationTypeEnum.GROUPV3,
+          nickname: 'nickname',
+          displayNameInProfile: 'displayNameInProfile',
+          profileKey: '',
+          avatarPointer: 'avatarPointer',
+          avatarInProfile: 'avatarInProfile',
+          avatarImageId: 1234,
+        } as ConversationAttributes)
+      )
+    ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
   });
 });
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 925591553..c12782545 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -562,7 +562,7 @@ describe('knownBlindedKeys', () => {
         expect(real).to.eq(undefined);
       });
 
-      it('does iterate over all the conversations but is not private so must fail', async () => {
+      it('does iterate over all the conversations but is not private so must fail: group', async () => {
         getItemById.resolves();
         await loadKnownBlindedKeys();
         // adding a private conversation with a known match of the blinded pubkey we have
@@ -580,6 +580,9 @@ describe('knownBlindedKeys', () => {
 
         expect(real).to.eq(undefined);
       });
+      it('does iterate over all the conversations but is not private so must fail: groupv3', async () => {
+        // we actually cannot test this one as we would need to create  a conversation with groupv3 as type but 05 as prefix, and the conversation controller denies it, as expected
+      });
     });
   });
 });
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index b6d6c3003..374a477f7 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -81,53 +81,106 @@ describe('SwarmPolling', () => {
       expect(swarmPolling.getPollingTimeout(fakeConvo)).to.eq(SWARM_POLLING_TIMEOUT.INACTIVE);
     });
 
-    it('returns ACTIVE for convo with less than two days old activeAt', () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old
-      expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
-        SWARM_POLLING_TIMEOUT.ACTIVE
-      );
+    describe('legacy groups', () => {
+      it('returns ACTIVE for convo with less than two days old activeAt', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.ACTIVE
+        );
+      });
+
+      it('returns INACTIVE for convo with undefined activeAt', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', undefined);
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.INACTIVE
+        );
+      });
+
+      it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
+        );
+
+        convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
+        );
+      });
+
+      it('returns INACTIVE for convo with  activeAt of more than a week', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.INACTIVE
+        );
+      });
     });
 
-    it('returns INACTIVE for convo with undefined activeAt', () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      convo.set('active_at', undefined);
-      expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
-        SWARM_POLLING_TIMEOUT.INACTIVE
-      );
-    });
+    describe('groupv3', () => {
+      it('returns ACTIVE for convo with less than two days old activeAt', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.ACTIVE
+        );
+      });
 
-    it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old
-      expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
-        SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
-      );
+      it('returns INACTIVE for convo with undefined activeAt', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', undefined);
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.INACTIVE
+        );
+      });
 
-      convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old
-      expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
-        SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
-      );
-    });
+      it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
+        );
 
-    it('returns INACTIVE for convo with  activeAt of more than a week', () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days
-      expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
-        SWARM_POLLING_TIMEOUT.INACTIVE
-      );
+        convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
+        );
+      });
+
+      it('returns INACTIVE for convo with  activeAt of more than a week', () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days
+        expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq(
+          SWARM_POLLING_TIMEOUT.INACTIVE
+        );
+      });
     });
   });
 
@@ -174,211 +227,454 @@ describe('SwarmPolling', () => {
       expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
-    it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      convo.set('active_at', Date.now());
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-      await swarmPolling.start(true);
+    describe('legacy group', () => {
+      it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
 
-      // our pubkey will be polled for, hence the 2
-      expect(pollOnceForKeySpy.callCount).to.eq(2);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-    });
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      });
 
-    it('does only poll from -10 for closed groups if HF >= 19.1  ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      getItemByIdStub.restore();
-      getItemByIdStub = TestUtils.stubData('getItemById');
-      getItemByIdStub
-        .withArgs('hasSeenHardfork190')
-        .resolves({ id: 'hasSeenHardfork190', value: true })
-        .withArgs('hasSeenHardfork191')
-        .resolves({ id: 'hasSeenHardfork191', value: true });
+      it('does run for groupv3 pubkey on start no matter the recent timestamp  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
 
-      convo.set('active_at', 1);
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      });
 
-      await swarmPolling.start(true);
+      it('does only poll from -10 for closed groups if HF >= 19.1  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+        getItemByIdStub.restore();
+        getItemByIdStub = TestUtils.stubData('getItemById');
+        getItemByIdStub
+          .withArgs('hasSeenHardfork190')
+          .resolves({ id: 'hasSeenHardfork190', value: true })
+          .withArgs('hasSeenHardfork191')
+          .resolves({ id: 'hasSeenHardfork191', value: true });
 
-      // our pubkey will be polled for, hence the 2
-      expect(pollOnceForKeySpy.callCount).to.eq(2);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      getItemByIdStub.restore();
-      getItemByIdStub = TestUtils.stubData('getItemById');
+        convo.set('active_at', 1);
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
 
-      getItemByIdStub.resolves();
-    });
+        await swarmPolling.start(true);
 
-    it('does run for group pubkey on start but not another time if activeAt is old ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        getItemByIdStub.restore();
+        getItemByIdStub = TestUtils.stubData('getItemById');
 
-      convo.set('active_at', 1); // really old
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
+        getItemByIdStub.resolves();
+      });
 
-      // this calls the stub 2 times, one for our direct pubkey and one for the group
-      await swarmPolling.start(true);
+      it('does run for group pubkey on start but not another time if activeAt is old ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
 
-      // this should only call the stub one more time: for our direct pubkey but not for the group pubkey
-      await swarmPolling.pollForAllKeys();
+        convo.set('active_at', 1); // really old
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
 
-      expect(pollOnceForKeySpy.callCount).to.eq(3);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-    });
+        // this calls the stub 2 times, one for our direct pubkey and one for the group
+        await swarmPolling.start(true);
 
-    it('does run twice if activeAt less than one hour ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
+        // this should only call the stub one more time: for our direct pubkey but not for the group pubkey
+        await swarmPolling.pollForAllKeys();
 
-      convo.set('active_at', Date.now());
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-      await swarmPolling.start(true);
-      clock.tick(9000);
-      // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
-      /** this is not easy to explain, but
-       * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
-       * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
-       * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
-       */
-      clock.restore();
-      await sleepFor(10);
+        expect(pollOnceForKeySpy.callCount).to.eq(3);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      });
 
-      expect(pollOnceForKeySpy.callCount).to.eq(4);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-    });
-
-    it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-
-      pollOnceForKeySpy.resetHistory();
-      convo.set('active_at', Date.now());
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-      // this call the stub two times already, one for our direct pubkey and one for the group
-      await swarmPolling.start(true);
-      const timeToTick = 3 * 60 * 1000;
-      swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick);
-      // more than week old, so inactive group but we have to tick after more than 2 min
-      convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000);
-      clock.tick(timeToTick);
-      /** this is not easy to explain, but
-       * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
-       * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
-       * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
-       */
-      clock.restore();
-      await sleepFor(10);
-      // we should have two more calls here, so 4 total.
-      expect(pollOnceForKeySpy.callCount).to.eq(4);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-    });
-
-    it('does run once only if group is inactive and we tick less than 2 minutes ', async () => {
-      const convo = getConversationController().getOrCreate(
-        TestUtils.generateFakePubKeyStr(),
-        ConversationTypeEnum.GROUP
-      );
-      pollOnceForKeySpy.resetHistory();
-
-      convo.set('active_at', Date.now());
-      const groupConvoPubkey = PubKey.cast(convo.id as string);
-      swarmPolling.addGroupId(groupConvoPubkey);
-      await swarmPolling.start(true);
-
-      // more than a week old, we should not tick after just 5 seconds
-      convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000);
-
-      clock.tick(1 * 60 * 1000);
-
-      // we should have only one more call here, the one for our direct pubkey fetch
-      expect(pollOnceForKeySpy.callCount).to.eq(3);
-      expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-      expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-    });
-
-    describe('multiple runs', () => {
-      let convo: ConversationModel;
-      let groupConvoPubkey: PubKey;
-
-      beforeEach(async () => {
-        convo = getConversationController().getOrCreate(
+      it('does run twice if activeAt less than one hour ', async () => {
+        const convo = getConversationController().getOrCreate(
           TestUtils.generateFakePubKeyStr(),
           ConversationTypeEnum.GROUP
         );
 
         convo.set('active_at', Date.now());
-        groupConvoPubkey = PubKey.cast(convo.id as string);
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
+        clock.tick(9000);
+        // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
+        /** this is not easy to explain, but
+         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
+         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
+         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
+         */
+        clock.restore();
+        await sleepFor(10);
+
+        expect(pollOnceForKeySpy.callCount).to.eq(4);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
-      it('does run twice if activeAt is less than 2 days', async () => {
+      it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
+
         pollOnceForKeySpy.resetHistory();
-        // less than 2 days old, this is an active group
-        convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000);
-
-        const timeToTick = 6 * 1000;
-
-        swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
-        // we tick more than 5 sec
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        // this call the stub two times already, one for our direct pubkey and one for the group
+        await swarmPolling.start(true);
+        const timeToTick = 3 * 60 * 1000;
+        swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick);
+        // more than week old, so inactive group but we have to tick after more than 2 min
+        convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000);
         clock.tick(timeToTick);
-
-        await swarmPolling.pollForAllKeys();
-        // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
+        /** this is not easy to explain, but
+         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
+         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
+         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
+         */
+        clock.restore();
+        await sleepFor(10);
+        // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
-        // first two calls are our pubkey
         expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-
         expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
-      it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
+      it('does run once only if group is inactive and we tick less than 2 minutes ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakePubKeyStr(),
+          ConversationTypeEnum.GROUP
+        );
         pollOnceForKeySpy.resetHistory();
-        convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active
 
-        const timeToTick = 65 * 1000;
-        swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
 
-        clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group)
+        // more than a week old, we should not tick after just 5 seconds
+        convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000);
 
+        clock.tick(1 * 60 * 1000);
+
+        // we should have only one more call here, the one for our direct pubkey fetch
+        expect(pollOnceForKeySpy.callCount).to.eq(3);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      });
+
+      describe('multiple runs', () => {
+        let convo: ConversationModel;
+        let groupConvoPubkey: PubKey;
+
+        beforeEach(async () => {
+          convo = getConversationController().getOrCreate(
+            TestUtils.generateFakePubKeyStr(),
+            ConversationTypeEnum.GROUP
+          );
+
+          convo.set('active_at', Date.now());
+          groupConvoPubkey = PubKey.cast(convo.id as string);
+          swarmPolling.addGroupId(groupConvoPubkey);
+          await swarmPolling.start(true);
+        });
+
+        it('does run twice if activeAt is less than 2 days', async () => {
+          pollOnceForKeySpy.resetHistory();
+          // less than 2 days old, this is an active group
+          convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000);
+
+          const timeToTick = 6 * 1000;
+
+          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
+          // we tick more than 5 sec
+          clock.tick(timeToTick);
+
+          await swarmPolling.pollForAllKeys();
+          // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
+          expect(pollOnceForKeySpy.callCount).to.eq(4);
+          // first two calls are our pubkey
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        });
+
+        it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
+          pollOnceForKeySpy.resetHistory();
+          convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active
+
+          const timeToTick = 65 * 1000;
+          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
+
+          clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group)
+
+          await swarmPolling.pollForAllKeys();
+          expect(pollOnceForKeySpy.callCount).to.eq(4);
+
+          // first two calls are our pubkey
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        });
+      });
+    });
+
+    describe('group v3', () => {
+      it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
+
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      });
+
+      it('does run for groupv3 pubkey on start no matter the recent timestamp  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
+
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      });
+
+      it('does only poll from -10 for closed groups if HF >= 19.1  ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        getItemByIdStub.restore();
+        getItemByIdStub = TestUtils.stubData('getItemById');
+        getItemByIdStub
+          .withArgs('hasSeenHardfork190')
+          .resolves({ id: 'hasSeenHardfork190', value: true })
+          .withArgs('hasSeenHardfork191')
+          .resolves({ id: 'hasSeenHardfork191', value: true });
+
+        convo.set('active_at', 1);
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+
+        await swarmPolling.start(true);
+
+        // our pubkey will be polled for, hence the 2
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        getItemByIdStub.restore();
+        getItemByIdStub = TestUtils.stubData('getItemById');
+
+        getItemByIdStub.resolves();
+      });
+
+      it('does run for group pubkey on start but not another time if activeAt is old ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+
+        convo.set('active_at', 1); // really old
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+
+        // this calls the stub 2 times, one for our direct pubkey and one for the group
+        await swarmPolling.start(true);
+
+        // this should only call the stub one more time: for our direct pubkey but not for the group pubkey
         await swarmPolling.pollForAllKeys();
-        expect(pollOnceForKeySpy.callCount).to.eq(4);
 
-        // first two calls are our pubkey
+        expect(pollOnceForKeySpy.callCount).to.eq(3);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      });
+
+      it('does run twice if activeAt less than one hour ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
+        clock.tick(9000);
+        // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
+        /** this is not easy to explain, but
+         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
+         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
+         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
+         */
+        clock.restore();
+        await sleepFor(10);
+
+        expect(pollOnceForKeySpy.callCount).to.eq(4);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+      });
+
+      it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+
+        pollOnceForKeySpy.resetHistory();
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        // this call the stub two times already, one for our direct pubkey and one for the group
+        await swarmPolling.start(true);
+        const timeToTick = 3 * 60 * 1000;
+        swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick);
+        // more than week old, so inactive group but we have to tick after more than 2 min
+        convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000);
+        clock.tick(timeToTick);
+        /** this is not easy to explain, but
+         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
+         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
+         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
+         */
+        clock.restore();
+        await sleepFor(10);
+        // we should have two more calls here, so 4 total.
+        expect(pollOnceForKeySpy.callCount).to.eq(4);
         expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
+
+      it('does run once only if group is inactive and we tick less than 2 minutes ', async () => {
+        const convo = getConversationController().getOrCreate(
+          TestUtils.generateFakeClosedGroupV3PkStr(),
+          ConversationTypeEnum.GROUPV3
+        );
+        pollOnceForKeySpy.resetHistory();
+
+        convo.set('active_at', Date.now());
+        const groupConvoPubkey = PubKey.cast(convo.id as string);
+        swarmPolling.addGroupId(groupConvoPubkey);
+        await swarmPolling.start(true);
+
+        // more than a week old, we should not tick after just 5 seconds
+        convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000);
+
+        clock.tick(1 * 60 * 1000);
+
+        // we should have only one more call here, the one for our direct pubkey fetch
+        expect(pollOnceForKeySpy.callCount).to.eq(3);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      });
+
+      describe('multiple runs', () => {
+        let convo: ConversationModel;
+        let groupConvoPubkey: PubKey;
+
+        beforeEach(async () => {
+          convo = getConversationController().getOrCreate(
+            TestUtils.generateFakeClosedGroupV3PkStr(),
+            ConversationTypeEnum.GROUPV3
+          );
+
+          convo.set('active_at', Date.now());
+          groupConvoPubkey = PubKey.cast(convo.id as string);
+          swarmPolling.addGroupId(groupConvoPubkey);
+          await swarmPolling.start(true);
+        });
+
+        it('does run twice if activeAt is less than 2 days', async () => {
+          pollOnceForKeySpy.resetHistory();
+          // less than 2 days old, this is an active group
+          convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000);
+
+          const timeToTick = 6 * 1000;
+
+          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
+          // we tick more than 5 sec
+          clock.tick(timeToTick);
+
+          await swarmPolling.pollForAllKeys();
+          // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
+          expect(pollOnceForKeySpy.callCount).to.eq(4);
+          // first two calls are our pubkey
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        });
+
+        it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
+          pollOnceForKeySpy.resetHistory();
+          convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active
+
+          const timeToTick = 65 * 1000;
+          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
+
+          clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group)
+
+          await swarmPolling.pollForAllKeys();
+          expect(pollOnceForKeySpy.callCount).to.eq(4);
+
+          // first two calls are our pubkey
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        });
+      });
     });
   });
 });

From 9749529e25707e23726ccbcb4d81d1faf9960317 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 7 Dec 2022 15:27:24 +1100
Subject: [PATCH 007/178] feat: add dependency to our libsession wrapper for
 nodejs

also add a basic test to make sure it works
---
 package.json                                  |   1 +
 .../libsession_wrapper_test.ts                | 222 ++++++++++++++++++
 yarn.lock                                     |  38 ++-
 3 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts

diff --git a/package.json b/package.json
index cccad15f6..d059e0940 100644
--- a/package.json
+++ b/package.json
@@ -150,6 +150,7 @@
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
+    "session_util_wrapper": "https://github.com/oxen-io/libsession-util-nodejs",
     "styled-components": "5.1.1",
     "uuid": "8.3.2"
   },
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
new file mode 100644
index 000000000..a8d115ec2
--- /dev/null
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -0,0 +1,222 @@
+import { expect } from 'chai';
+
+import * as SessionUtilWrapper from 'session_util_wrapper';
+import { stringToUint8Array } from '../../../../session/utils/String';
+import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
+import { concatUInt8Array } from '../../../../session/crypto';
+
+describe('libsession_wrapper', () => {
+  it.skip('[config][user_profile][c]', () => {
+    // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
+    // To do this, you can cd to the node_module/libsession_wrapper folder and do
+    // yarn configure && yarn build
+
+    const edSecretKey = from_hex(
+      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
+    );
+
+    // Initialize a brand new, empty config because we have no dump data to deal with.
+    const conf = new SessionUtilWrapper.UserConfigWrapper(edSecretKey, null);
+
+    // We don't need to push anything, since this is an empty config
+    expect(conf.needsPush()).to.be.eql(false);
+    expect(conf.needsDump()).to.be.eql(false);
+
+    // Since it's empty there shouldn't be a name.
+    expect(conf.getName()).to.be.null;
+
+    let pushResult = conf.push();
+
+    expect(pushResult.seqno).to.be.eq(0);
+    expect(pushResult.data.length).to.be.eq(256);
+
+    expect(conf.encryptionDomain()).to.be.eq('UserProfile');
+    expect(conf.storageNamespace()).to.be.eq(2);
+    expect(to_hex(pushResult.data)).to.be.deep.eq(
+      '9ffb5347e061ac40d937ae4f1a890031475bdc11653f94c8ae1d516ffda71d9ee9cdaf9fbaeb15d835cdc7b3b6ecc120361f004ff172dd5e757c80ede10e88945536e6841255a7bca73664ab8a0607fcfe2579c05bb3d9d4b34ac1de2921e703783ce39e317a512cb9d4e3b59176cbde47b5ba24a03065bf8fefe3e8ca2609e0ad10c7c9c3f81dc6d3a399bda0c190e8a228d0acb22863ab84c2d0c411be74dac4de1f8bc18539635db01ea1ef7f28e505703d67786cb419690edd4bd8c92926fc1d6449eaccc31d7d9639e1b36222e5672b87d1e34b7860308c3f40b3997f39fecf6ceb889323826fa69e001816307799fc9fed302a90faa1e43f7cd7367c3c'
+    );
+
+    // This should also be unset:
+    const picResult = conf.getProfilePic();
+    expect(picResult.url).to.be.null;
+    expect(picResult.key).to.be.null;
+
+    // Now let's go set a profile name and picture:
+    conf.setProfilePic('http://example.org/omg-pic-123.bmp', stringToUint8Array('secret'));
+    conf.setName('Kallie');
+
+    // Retrieve them just to make sure they set properly:
+    const name = conf.getName();
+
+    expect(name).to.be.not.null;
+    expect(name).to.be.eq('Kallie');
+
+    const picture = conf.getProfilePic();
+
+    expect(picture.url).to.be.eq('http://example.org/omg-pic-123.bmp');
+    expect(picture.key).to.be.deep.eq(stringToUint8Array('secret'));
+
+    // Since we've made changes, we should need to push new config to the swarm, *and* should need
+    // to dump the updated state:
+
+    expect(conf.needsDump()).to.be.true;
+    expect(conf.needsPush()).to.be.true;
+
+    // incremented since we made changes (this only increments once between
+    // dumps; even though we changed two fields here).
+    pushResult = conf.push();
+    expect(pushResult.seqno).to.be.eq(1);
+
+    const exp_hash0 = from_hex('ea173b57beca8af18c3519a7bbf69c3e7a05d1c049fa9558341d8ebb48b0c965');
+
+    // prettier-ignore
+    const exp_push1_start = "d" +
+            "1:#" +"i1e"+
+            "1:&" +"d"+
+                "1:n" +"6:Kallie"+
+                "1:p" +"34:http://example.org/omg-pic-123.bmp"+
+                "1:q" +"6:secret"+
+            "e"+
+            "1:<"+ "l"+
+            "l" +"i0e" +"32:" ;
+    // prettier-ignore
+    const exp_push1_end = "de"+ "e"+
+            "e"+
+            "1:="+ "d"+
+                "1:n" +"0:"+
+                "1:p" +"0:"+
+                "1:q" +"0:"+
+            "e"+
+            "e";
+
+    // The data to be actually pushed, expanded like this to make it somewhat human-readable:
+    const exp_push1_decrypted = concatUInt8Array(
+      stringToUint8Array(exp_push1_start),
+      exp_hash0,
+      stringToUint8Array(exp_push1_end)
+    );
+    const exp_push1_encrypted = from_hex(
+      'a2952190dcb9797bc48e48f6dc7b3254d004bde9091cfc9ec3433cbc5939a3726deb04f58a546d7d79e6f80ea185d43bf93278398556304998ae882304075c77f15c67f9914c4d10005a661f29ff7a79e0a9de7f21725ba3b5a6c19eaa3797671b8fa4008d62e9af2744629cbb46664c4d8048e2867f66ed9254120371bdb24e95b2d92341fa3b1f695046113a768ceb7522269f937ead5591bfa8a5eeee3010474002f2db9de043f0f0d1cfb1066a03e7b5d6cfb70a8f84a20cd2df5a510cd3d175708015a52dd4a105886d916db0005dbea5706e5a5dc37ffd0a0ca2824b524da2e2ad181a48bb38e21ed9abe136014a4ee1e472cb2f53102db2a46afa9d68'
+    );
+
+    expect(to_hex(pushResult.data)).to.be.deep.eq(to_hex(exp_push1_encrypted));
+
+    // We haven't dumped, so still need to dump:
+    expect(conf.needsDump()).to.be.true;
+    // We did call push, but we haven't confirmed it as stored yet, so this will still return true:
+    expect(conf.needsPush()).to.be.true;
+
+    let dumped = conf.dump();
+    // (in a real client we'd now store this to disk)
+    expect(conf.needsDump()).to.be.false;
+
+    // prettier-ignore
+    const expected_dump = concatUInt8Array(stringToUint8Array("d" +
+        "1:!" +"i2e"+
+          "1:$" + `${exp_push1_decrypted.length}` + ':'), exp_push1_decrypted, stringToUint8Array("e"));
+    expect(to_hex(dumped)).to.be.deep.eq(to_hex(expected_dump));
+
+    // So now imagine we got back confirmation from the swarm that the push has been stored:
+    conf.confirmPushed(pushResult.seqno);
+    expect(conf.needsPush()).to.be.false;
+    expect(conf.needsDump()).to.be.true;
+
+    conf.dump();
+    expect(conf.needsDump()).to.be.false;
+
+    // Now we're going to set up a second, competing config object (in the real world this would be
+    // another Session client somewhere).
+
+    // Start with an empty config, as above:
+
+    const conf2 = new SessionUtilWrapper.UserConfigWrapper(edSecretKey, null);
+
+    expect(conf2.needsDump()).to.be.false;
+
+    // Now imagine we just pulled down the encrypted string from the swarm; we merge it into conf2:
+    const accepted = conf2.merge([exp_push1_encrypted]);
+    expect(accepted).to.be.eq(1);
+
+    // Our state has changed, so we need to dump:
+    expect(conf2.needsDump()).to.be.true;
+    conf2.dump();
+    // (store in db)
+    expect(conf2.needsDump()).to.be.false;
+
+    // We *don't* need to push: even though we updated, all we did is update to the merged data (and
+    // didn't have any sort of merge conflict needed):
+    expect(conf2.needsPush()).to.be.false;
+
+    // Now let's create a conflicting update:
+    // Change the name on both clients:
+    conf.setName('Nibbler');
+    conf2.setName('Raz');
+
+    // And, on conf2, we're also going to change the profile pic:
+    conf2.setProfilePic('http://new.example.com/pic', stringToUint8Array('qwert\0yuio'));
+
+    // Both have changes, so push need a push
+    expect(conf.needsPush()).to.be.true;
+    expect(conf2.needsPush()).to.be.true;
+    pushResult = conf.push();
+    expect(pushResult.seqno).to.be.eq(2); // incremented, since we made a field change
+
+    let pushResult2 = conf2.push();
+    expect(pushResult2.seqno).to.be.eq(2); // incremented, since we made a field change
+
+    // (store in db)
+    conf.dump();
+    conf2.dump();
+
+    // Since we set different things, we're going to get back different serialized data to be
+    // pushed:
+    expect(to_hex(pushResult.data)).to.not.be.deep.eq(to_hex(pushResult2.data));
+
+    // Now imagine that each client pushed its `seqno=2` config to the swarm, but then each client
+    // also fetches new messages and pulls down the other client's `seqno=2` value.
+
+    // Feed the new config into each other.  (This array could hold multiple configs if we pulled
+    // down more than one).
+    conf2.merge([pushResult.data]);
+    conf.merge([pushResult2.data]);
+
+    // Now after the merge we *will* want to push from both client, since both will have generated a
+    // merge conflict update (with seqno = 3).
+    expect(conf.needsPush()).to.be.true;
+    expect(conf2.needsPush()).to.be.true;
+
+    pushResult = conf.push();
+    pushResult2 = conf2.push();
+    expect(pushResult.seqno).to.be.eq(3);
+    expect(pushResult2.seqno).to.be.eq(3);
+
+    // They should have resolved the conflict to the same thing:
+    expect(conf.getName()).to.be.eq('Nibbler');
+    expect(conf2.getName()).to.be.eq('Nibbler');
+
+    // (Note that they could have also both resolved to "Raz" here, but the hash of the serialized
+    // message just happens to have a higher hash -- and thus gets priority -- for this particular
+    // test).
+
+    // Since only one of them set a profile pic there should be no conflict there:
+    const pic = conf.getProfilePic();
+    const pic2 = conf2.getProfilePic();
+    expect(pic.url).to.be.eq('http://new.example.com/pic');
+    expect(pic2.url).to.be.eq('http://new.example.com/pic');
+
+    expect(pic.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio'));
+    expect(pic2.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio'));
+
+    conf.confirmPushed(pushResult.seqno);
+    conf2.confirmPushed(pushResult2.seqno);
+
+    conf.dump();
+    conf2.dump();
+    // (store in db)
+
+    expect(conf.needsPush()).to.be.false;
+    expect(conf.needsDump()).to.be.false;
+    expect(conf2.needsPush()).to.be.false;
+    expect(conf2.needsDump()).to.be.false;
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 250d89e1a..24c053925 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,7 +2180,7 @@ abab@^2.0.5, abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1:
+abbrev@1, abbrev@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -6569,6 +6569,11 @@ nan@^2.14.0, nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nan@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
+  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+
 nano-css@^5.3.1:
   version "5.3.5"
   resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.3.5.tgz#3075ea29ffdeb0c7cb6d25edb21d8f7fa8e8fe8e"
@@ -6657,6 +6662,22 @@ node-gyp@9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
+node-gyp@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319"
+  integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -6683,6 +6704,13 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 nopt@~3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -8175,6 +8203,14 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+"session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs":
+  version "0.1.0"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#08bebd19042dee4d53f617bf93d51ab8fe9d8282"
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.17.0"
+    node-gyp "^9.3.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"

From 65df3157bd8cb28ebd75b6484716e25368d58cdb Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 8 Dec 2022 10:09:59 +1100
Subject: [PATCH 008/178] chore: lint

---
 .editorconfig                                 |  1 +
 package.json                                  | 16 ++---
 ts/node/database_utility.ts                   |  3 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |  4 +-
 ts/session/apis/snode_api/batchRequest.ts     |  1 -
 ts/session/apis/snode_api/swarmPolling.ts     |  2 -
 ts/session/group/closed-group.ts              |  4 +-
 ts/session/utils/Bencoding.ts                 |  1 -
 ...est.ts => libsession_wrapper_test_skip.ts} | 60 ++++++++-----------
 .../unit/sogsv3/knownBlindedKeys_test.ts      |  2 +-
 tslint.json                                   |  3 +
 yarn.lock                                     |  2 +-
 12 files changed, 44 insertions(+), 55 deletions(-)
 rename ts/test/session/unit/libsession_wrapper/{libsession_wrapper_test.ts => libsession_wrapper_test_skip.ts} (85%)

diff --git a/.editorconfig b/.editorconfig
index d4f444678..f4d3f0f2e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,4 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_size = 2
+quote_type = double
\ No newline at end of file
diff --git a/package.json b/package.json
index d059e0940..fb3b7f4bc 100644
--- a/package.json
+++ b/package.json
@@ -46,25 +46,20 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
-
     "build-everything": "yarn clean && yarn protobuf && grunt && yarn sass && tsc && yarn parcel-util-worker",
     "build-everything:watch": "yarn clean && yarn protobuf && grunt && yarn sass && yarn parcel-util-worker && tsc -w",
     "watch": "yarn clean && yarn protobuf && grunt && concurrently 'yarn build-everything:watch' 'yarn sass:watch'",
-
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && parcel build --target sass --no-autoinstall --no-cache",
     "sass:watch": "rimraf 'stylesheets/dist/' && parcel watch --target sass --no-autoinstall --no-cache",
     "parcel-util-worker": "rimraf ts/webworker/workers/util.worker.js && parcel build --target util-worker --no-autoinstall --no-cache",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
-
     "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
-
     "integration-test": "npx playwright test",
     "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots",
     "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "coverage": "nyc --reporter=html mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
-
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
     "build-release:win32": "yarn build-release-non-linux",
@@ -259,7 +254,10 @@
     "mac": {
       "category": "public.app-category.social-networking",
       "icon": "build/icon-mac.icns",
-      "target": ["dmg", "zip"],
+      "target": [
+        "dmg",
+        "zip"
+      ],
       "bundleVersion": "1",
       "hardenedRuntime": true,
       "gatekeeperAssess": false,
@@ -293,7 +291,11 @@
         "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
-      "target": ["deb", "rpm", "freebsd"],
+      "target": [
+        "deb",
+        "rpm",
+        "freebsd"
+      ],
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index cbab12e81..1a8087342 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -78,8 +78,7 @@ const allowedKeysFormatRowOfConversation = [
   'conversationIdOrigin',
   'identityPrivateKey',
 ];
-
-//tslint-disable cyclomatic-complexity
+// tslint:disable: cyclomatic-complexity
 export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
   if (!row) {
     return null;
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index ac11da8d9..80aa52689 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -1,4 +1,3 @@
-
 export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } };
 
 type RetrieveMaxCountSize = { max_count?: number; max_size?: number };
@@ -124,11 +123,10 @@ export type SnodeApiSubRequests =
   | StoreOnNodeSubRequest
   | NetworkTimeSubRequest;
 
-//tslint-disable: array-type
+// tslint:disable: array-type
 export type NonEmptyArray<T> = [T, ...T[]];
 
 export type NotEmptyArrayOfBatchResults = NonEmptyArray<{
   code: number;
   body: Record<string, any>;
 }>;
-
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index eef3aff04..7946ece0b 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -12,7 +12,6 @@ import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequest
  * @param targetNode the node to do the request to, once all the onion routing is done
  * @param timeout the timeout at which we should cancel this request.
  * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to
- * @returns
  */
 export async function doSnodeBatchRequest(
   subRequests: Array<SnodeApiSubRequests>,
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 19c8d1957..63b6a1b56 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -244,7 +244,6 @@ export class SwarmPolling {
         return group;
       });
     } else if (isGroup) {
-      debugger;
       window?.log?.info(
         `Polled for group(${ed25519Str(
           pubkey.key
@@ -291,7 +290,6 @@ export class SwarmPolling {
             namespaces,
             UserUtils.getOurPubKeyStrFromCache()
           );
-          debugger;
           if (!results.length) {
             return [];
           }
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 317bf039a..abd9379f5 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -79,10 +79,10 @@ export async function initiateClosedGroupUpdate(
   groupName: string,
   members: Array<string>
 ) {
-  const isV3 = PubKey.isClosedGroupV3(groupId);
+  const isGroupV3 = PubKey.isClosedGroupV3(groupId);
   const convo = await getConversationController().getOrCreateAndWait(
     groupId,
-    isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP
+    isGroupV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP
   );
 
   if (!convo.isMediumGroup()) {
diff --git a/ts/session/utils/Bencoding.ts b/ts/session/utils/Bencoding.ts
index fef98289d..ea8b73bd2 100644
--- a/ts/session/utils/Bencoding.ts
+++ b/ts/session/utils/Bencoding.ts
@@ -214,7 +214,6 @@ export class BEncode {
 
     if (isArray(item)) {
       let content = new Uint8Array();
-      //tslint disable prefer-for-of
       for (let index = 0; index < item.length; index++) {
         const encodedItem = this.encodeItem(item[index]);
         const encodedItemLength = encodedItem.length;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
similarity index 85%
rename from ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
rename to ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
index a8d115ec2..6e27d4730 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
@@ -1,15 +1,20 @@
 import { expect } from 'chai';
 
-import * as SessionUtilWrapper from 'session_util_wrapper';
 import { stringToUint8Array } from '../../../../session/utils/String';
 import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
 import { concatUInt8Array } from '../../../../session/crypto';
+import * as SessionUtilWrapper from 'session_util_wrapper';
+
+// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
 
 describe('libsession_wrapper', () => {
-  it.skip('[config][user_profile][c]', () => {
+  it('[config][user_profile][c]', () => {
     // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
     // To do this, you can cd to the node_module/libsession_wrapper folder and do
     // yarn configure && yarn build
+    // once that is done, you can rename this file and remove the _skip suffix so that test is run.
+
+    // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
 
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
@@ -67,54 +72,39 @@ describe('libsession_wrapper', () => {
     pushResult = conf.push();
     expect(pushResult.seqno).to.be.eq(1);
 
-    const exp_hash0 = from_hex('ea173b57beca8af18c3519a7bbf69c3e7a05d1c049fa9558341d8ebb48b0c965');
+    const expHash0 = from_hex('ea173b57beca8af18c3519a7bbf69c3e7a05d1c049fa9558341d8ebb48b0c965');
 
-    // prettier-ignore
-    const exp_push1_start = "d" +
-            "1:#" +"i1e"+
-            "1:&" +"d"+
-                "1:n" +"6:Kallie"+
-                "1:p" +"34:http://example.org/omg-pic-123.bmp"+
-                "1:q" +"6:secret"+
-            "e"+
-            "1:<"+ "l"+
-            "l" +"i0e" +"32:" ;
-    // prettier-ignore
-    const exp_push1_end = "de"+ "e"+
-            "e"+
-            "1:="+ "d"+
-                "1:n" +"0:"+
-                "1:p" +"0:"+
-                "1:q" +"0:"+
-            "e"+
-            "e";
+    const expPush1Start =
+      'd1:#i1e1:&d1:n6:Kallie1:p34:http://example.org/omg-pic-123.bmp1:q6:secrete1:<lli0e32:';
+    const expPush1End = 'deee1:=d1:n0:1:p0:1:q0:ee';
 
     // The data to be actually pushed, expanded like this to make it somewhat human-readable:
-    const exp_push1_decrypted = concatUInt8Array(
-      stringToUint8Array(exp_push1_start),
-      exp_hash0,
-      stringToUint8Array(exp_push1_end)
+    const expPush1Decrypted = concatUInt8Array(
+      stringToUint8Array(expPush1Start),
+      expHash0,
+      stringToUint8Array(expPush1End)
     );
-    const exp_push1_encrypted = from_hex(
+    const expPush1Encrypted = from_hex(
       'a2952190dcb9797bc48e48f6dc7b3254d004bde9091cfc9ec3433cbc5939a3726deb04f58a546d7d79e6f80ea185d43bf93278398556304998ae882304075c77f15c67f9914c4d10005a661f29ff7a79e0a9de7f21725ba3b5a6c19eaa3797671b8fa4008d62e9af2744629cbb46664c4d8048e2867f66ed9254120371bdb24e95b2d92341fa3b1f695046113a768ceb7522269f937ead5591bfa8a5eeee3010474002f2db9de043f0f0d1cfb1066a03e7b5d6cfb70a8f84a20cd2df5a510cd3d175708015a52dd4a105886d916db0005dbea5706e5a5dc37ffd0a0ca2824b524da2e2ad181a48bb38e21ed9abe136014a4ee1e472cb2f53102db2a46afa9d68'
     );
 
-    expect(to_hex(pushResult.data)).to.be.deep.eq(to_hex(exp_push1_encrypted));
+    expect(to_hex(pushResult.data)).to.be.deep.eq(to_hex(expPush1Encrypted));
 
     // We haven't dumped, so still need to dump:
     expect(conf.needsDump()).to.be.true;
     // We did call push, but we haven't confirmed it as stored yet, so this will still return true:
     expect(conf.needsPush()).to.be.true;
 
-    let dumped = conf.dump();
+    const dumped = conf.dump();
     // (in a real client we'd now store this to disk)
     expect(conf.needsDump()).to.be.false;
 
-    // prettier-ignore
-    const expected_dump = concatUInt8Array(stringToUint8Array("d" +
-        "1:!" +"i2e"+
-          "1:$" + `${exp_push1_decrypted.length}` + ':'), exp_push1_decrypted, stringToUint8Array("e"));
-    expect(to_hex(dumped)).to.be.deep.eq(to_hex(expected_dump));
+    const expectedDump = concatUInt8Array(
+      stringToUint8Array('d' + '1:!' + 'i2e' + '1:$' + `${expPush1Decrypted.length}` + ':'),
+      expPush1Decrypted,
+      stringToUint8Array('e')
+    );
+    expect(to_hex(dumped)).to.be.deep.eq(to_hex(expectedDump));
 
     // So now imagine we got back confirmation from the swarm that the push has been stored:
     conf.confirmPushed(pushResult.seqno);
@@ -134,7 +124,7 @@ describe('libsession_wrapper', () => {
     expect(conf2.needsDump()).to.be.false;
 
     // Now imagine we just pulled down the encrypted string from the swarm; we merge it into conf2:
-    const accepted = conf2.merge([exp_push1_encrypted]);
+    const accepted = conf2.merge([expPush1Encrypted]);
     expect(accepted).to.be.eq(1);
 
     // Our state has changed, so we need to dump:
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index c12782545..9b09f9c4b 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -580,7 +580,7 @@ describe('knownBlindedKeys', () => {
 
         expect(real).to.eq(undefined);
       });
-      it('does iterate over all the conversations but is not private so must fail: groupv3', async () => {
+      it('does iterate over all the conversations but is not private so must fail: groupv3', () => {
         // we actually cannot test this one as we would need to create  a conversation with groupv3 as type but 05 as prefix, and the conversation controller denies it, as expected
       });
     });
diff --git a/tslint.json b/tslint.json
index 4e6e28901..357cccdee 100644
--- a/tslint.json
+++ b/tslint.json
@@ -26,6 +26,9 @@
     "object-literal-sort-keys": false,
     "no-async-without-await": true,
     "no-empty-interface": false,
+    "prefer-for-of": false,
+    "chai-vague-errors": false,
+    "no-useless-files": false,
     "ordered-imports": [
       true,
       {
diff --git a/yarn.lock b/yarn.lock
index 24c053925..e1bed7451 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8205,7 +8205,7 @@ serialize-javascript@6.0.0:
 
 "session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs":
   version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#08bebd19042dee4d53f617bf93d51ab8fe9d8282"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#d1519f038c738cb446b23714913db5fd33ef1d9c"
   dependencies:
     bindings "^1.5.0"
     nan "^2.17.0"

From bace70c6bcea30118992020608870724dd1584cd Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 8 Dec 2022 10:49:09 +1100
Subject: [PATCH 009/178] chore: move util worker to its own folder

---
 package.json                                                | 2 +-
 ts/receiver/attachments.ts                                  | 2 +-
 .../apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts   | 2 +-
 ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts          | 2 +-
 ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts    | 2 +-
 ts/session/apis/push_notification_api/PnServer.ts           | 2 +-
 ts/session/apis/snode_api/onions.ts                         | 2 +-
 ts/test/test-utils/utils/stubbing.ts                        | 2 +-
 ts/util/local_attachments_encrypter.ts                      | 2 +-
 ts/webworker/workers/index.ts                               | 2 +-
 ts/webworker/workers/{ => util}/util.worker.ts              | 2 +-
 ts/webworker/workers/{ => util}/util_worker_interface.ts    | 6 +++---
 12 files changed, 14 insertions(+), 14 deletions(-)
 rename ts/webworker/workers/{ => util}/util.worker.ts (99%)
 rename ts/webworker/workers/{ => util}/util_worker_interface.ts (85%)

diff --git a/package.json b/package.json
index fb3b7f4bc..9578a2022 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
       "sourceMap": true
     },
     "util-worker": {
-      "source": "ts/webworker/workers/util.worker.ts",
+      "source": "ts/webworker/workers/util/util.worker.ts",
       "distDir": "./ts/webworker/workers/",
       "optimize": true,
       "sourceMap": false,
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index b5a5ad18a..c2a6caa58 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -7,7 +7,7 @@ import { ConversationModel } from '../models/conversation';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getUnpaddedAttachment } from '../session/crypto/BufferPadding';
 import { decryptAttachment } from '../util/crypto/attachmentsEncrypter';
-import { callUtilsWorker } from '../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../webworker/workers/util/util_worker_interface';
 import { sogsV3FetchFileByFileID } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
 import { OpenGroupData } from '../data/opengroups';
 import {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
index 9cd00578e..c576fed63 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
@@ -1,6 +1,6 @@
 import { sign } from 'curve25519-js';
 import { SessionKeyPair } from '../../../../receiver/keypairs';
-import { callUtilsWorker } from '../../../../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
 import { getSodiumRenderer } from '../../../crypto';
 import { UserUtils } from '../../../utils';
 import { fromBase64ToArray, fromHexToArray } from '../../../utils/String';
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 731fb6f34..6add3f88f 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -12,7 +12,7 @@ import { handleCapabilities } from './sogsCapabilities';
 import { getConversationController } from '../../../conversations';
 import { ConversationModel } from '../../../../models/conversation';
 import { filterDuplicatesFromDbAndIncomingV4 } from '../opengroupV2/SogsFilterDuplicate';
-import { callUtilsWorker } from '../../../../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
 import { PubKey } from '../../../types';
 import {
   addCachedBlindedKey,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index 488ad5d61..e1af09f98 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../data/opengroups';
 import { MIME } from '../../../../types';
 import { processNewAttachment } from '../../../../types/MessageAttachment';
-import { callUtilsWorker } from '../../../../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
 import { getConversationController } from '../../../conversations';
 import { OnionSending } from '../../../onions/onionSend';
 import { allowOnlyOneAtATime } from '../../../utils/Promise';
diff --git a/ts/session/apis/push_notification_api/PnServer.ts b/ts/session/apis/push_notification_api/PnServer.ts
index 46f36ce83..9534156b0 100644
--- a/ts/session/apis/push_notification_api/PnServer.ts
+++ b/ts/session/apis/push_notification_api/PnServer.ts
@@ -1,5 +1,5 @@
 import AbortController from 'abort-controller';
-import { callUtilsWorker } from '../../../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../../../webworker/workers/util/util_worker_interface';
 import { OnionSending } from '../../onions/onionSend';
 
 export const pnServerPubkeyHex = '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049';
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index 824d53d5b..a937e0184 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -14,7 +14,7 @@ let snodeFailureCount: Record<string, number> = {};
 import { Snode } from '../../../data/data';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { hrefPnServerProd } from '../push_notification_api/PnServer';
-import { callUtilsWorker } from '../../../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../../../webworker/workers/util/util_worker_interface';
 import { encodeV4Request } from '../../onions/onionv4';
 import { AbortSignal } from 'abort-controller';
 import { to_string } from 'libsodium-wrappers-sumo';
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 7ec27485f..044c70133 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -3,7 +3,7 @@ import Sinon from 'sinon';
 import { Data } from '../../../../ts/data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 
-import * as utilWorker from '../../../webworker/workers/util_worker_interface';
+import * as utilWorker from '../../../webworker/workers/util/util_worker_interface';
 
 const globalAny: any = global;
 
diff --git a/ts/util/local_attachments_encrypter.ts b/ts/util/local_attachments_encrypter.ts
index 90b2a5d9e..914ff17f1 100644
--- a/ts/util/local_attachments_encrypter.ts
+++ b/ts/util/local_attachments_encrypter.ts
@@ -1,6 +1,6 @@
 import { isArrayBuffer } from 'lodash';
 import { fromHexToArray } from '../session/utils/String';
-import { callUtilsWorker } from '../webworker/workers/util_worker_interface';
+import { callUtilsWorker } from '../webworker/workers/util/util_worker_interface';
 import { Data } from '../data/data';
 
 export const encryptAttachmentBufferRenderer = async (bufferIn: ArrayBuffer) => {
diff --git a/ts/webworker/workers/index.ts b/ts/webworker/workers/index.ts
index e5c972ea7..693d96037 100644
--- a/ts/webworker/workers/index.ts
+++ b/ts/webworker/workers/index.ts
@@ -1,2 +1,2 @@
-import * as utilWorkerInterface from './util_worker_interface';
+import * as utilWorkerInterface from './util/util_worker_interface';
 export { utilWorkerInterface };
diff --git a/ts/webworker/workers/util.worker.ts b/ts/webworker/workers/util/util.worker.ts
similarity index 99%
rename from ts/webworker/workers/util.worker.ts
rename to ts/webworker/workers/util/util.worker.ts
index 46600edc0..f997e531f 100644
--- a/ts/webworker/workers/util.worker.ts
+++ b/ts/webworker/workers/util/util.worker.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
 import {
   decryptAttachmentBufferNode as realDecryptAttachmentBufferNode,
   encryptAttachmentBufferNode as realEncryptAttachmentBufferNode,
-} from '../../node/encrypt_attachment_buffer';
+} from '../../../node/encrypt_attachment_buffer';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
diff --git a/ts/webworker/workers/util_worker_interface.ts b/ts/webworker/workers/util/util_worker_interface.ts
similarity index 85%
rename from ts/webworker/workers/util_worker_interface.ts
rename to ts/webworker/workers/util/util_worker_interface.ts
index 6a818b250..a54b4e2d2 100644
--- a/ts/webworker/workers/util_worker_interface.ts
+++ b/ts/webworker/workers/util/util_worker_interface.ts
@@ -1,6 +1,6 @@
-import { WorkerInterface } from '../worker_interface';
+import { WorkerInterface } from '../../worker_interface';
 import { join } from 'path';
-import { getAppRootPath } from '../../node/getRootPath';
+import { getAppRootPath } from '../../../node/getRootPath';
 
 let utilWorkerInterface: WorkerInterface | undefined;
 
@@ -19,7 +19,7 @@ export const internalCallUtilsWorker = async (
 ): Promise<any> => {
   if (!utilWorkerInterface) {
     const utilWorkerPath = join(getAppRootPath(), 'ts', 'webworker', 'workers', 'util.worker.js');
-    utilWorkerInterface = new WorkerInterface(utilWorkerPath, 3 * 60 * 1000); //{ type: 'module' }
+    utilWorkerInterface = new WorkerInterface(utilWorkerPath, 3 * 60 * 1000);
   }
   return utilWorkerInterface?.callWorker(fnName, ...args);
 };

From 1a65b7a7f270eef479a9333d20ed19256b74376d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 9 Dec 2022 09:47:49 +1100
Subject: [PATCH 010/178] feat: working calls to node module from renderer
 through worker

---
 libsession.worker.config.js                   |  35 ++
 package.json                                  |  10 +-
 ts/components/leftpane/ActionsPanel.tsx       |   9 +
 ts/receiver/attachments.ts                    |   2 +-
 .../opengroupV2/OpenGroupMessageV2.ts         |   2 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |   2 +-
 .../open_group_api/sogsv3/sogsV3FetchFile.ts  |   2 +-
 .../apis/push_notification_api/PnServer.ts    |   2 +-
 ts/session/apis/snode_api/onions.ts           |   2 +-
 ts/test/test-utils/utils/stubbing.ts          |   2 +-
 ts/util/local_attachments_encrypter.ts        |   2 +-
 ts/webworker/worker_interface.ts              |  12 +-
 .../browser/libsession_worker_functions.d.ts  |  22 +
 .../browser/libsession_worker_interface.ts    |  32 ++
 .../util_worker_interface.ts                  |  12 +-
 ts/webworker/workers/index.ts                 |   5 +-
 .../291fe70add0aed9152dd65b009ea805d.node     | Bin 0 -> 667336 bytes
 .../4bd3aa7e66b8715da772e40d870b54a4.node     | Bin 0 -> 671576 bytes
 .../libsession.worker.js.LICENSE.txt          |  10 +
 .../node/libsession/libsession.worker.ts      |  66 +++
 ts/webworker/workers/node/tsconfig.json       |  10 +
 .../node/util/util.worker.js.LICENSE.txt      |  32 ++
 .../workers/{ => node}/util/util.worker.ts    |   2 +-
 utils.worker.config.js                        |  28 +
 yarn.lock                                     | 493 +++++++++++++++++-
 25 files changed, 758 insertions(+), 36 deletions(-)
 create mode 100644 libsession.worker.config.js
 create mode 100644 ts/webworker/workers/browser/libsession_worker_functions.d.ts
 create mode 100644 ts/webworker/workers/browser/libsession_worker_interface.ts
 rename ts/webworker/workers/{util => browser}/util_worker_interface.ts (80%)
 create mode 100644 ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node
 create mode 100644 ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node
 create mode 100644 ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
 create mode 100644 ts/webworker/workers/node/libsession/libsession.worker.ts
 create mode 100644 ts/webworker/workers/node/tsconfig.json
 create mode 100644 ts/webworker/workers/node/util/util.worker.js.LICENSE.txt
 rename ts/webworker/workers/{ => node}/util/util.worker.ts (99%)
 create mode 100644 utils.worker.config.js

diff --git a/libsession.worker.config.js b/libsession.worker.config.js
new file mode 100644
index 000000000..1cb89929b
--- /dev/null
+++ b/libsession.worker.config.js
@@ -0,0 +1,35 @@
+const path = require('path');
+
+module.exports = {
+  entry: './ts/webworker/workers/node/libsession/libsession.worker.ts',
+  node: {
+    __dirname: false,
+  },
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.node$/,
+        loader: 'node-loader',
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+    fallback: {
+      crypto: require.resolve('crypto-browserify'),
+      path: require.resolve('path-browserify'),
+      fs: false,
+      stream: require.resolve('stream-browserify'),
+    },
+  },
+  output: {
+    filename: 'libsession.worker.js',
+    path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'libsession'),
+  },
+  target: 'node',
+};
diff --git a/package.json b/package.json
index 9578a2022..b2d80c6c6 100644
--- a/package.json
+++ b/package.json
@@ -21,10 +21,10 @@
       "sourceMap": true
     },
     "util-worker": {
-      "source": "ts/webworker/workers/util/util.worker.ts",
+      "source": "ts/webworker/workers/node/util/util.worker.ts",
       "distDir": "./ts/webworker/workers/",
       "optimize": true,
-      "sourceMap": false,
+      "sourceMap": true,
       "context": "web-worker"
     }
   },
@@ -232,12 +232,14 @@
     "run-script-os": "^1.1.6",
     "sinon": "9.0.2",
     "stream-browserify": "^3.0.0",
-    "ts-loader": "^9.2.8",
+    "ts-loader": "^9.4.2",
     "ts-mock-imports": "^1.3.0",
     "tslint": "5.19.0",
     "tslint-microsoft-contrib": "6.0.0",
     "tslint-react": "3.6.0",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   },
   "engines": {
     "node": "16.13.0"
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 75301958c..539630a66 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -47,6 +47,7 @@ import { switchThemeTo } from '../../themes/switchTheme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
+import { callLibSessionWorker } from '../../webworker/workers/browser/libsession_worker_interface';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -211,6 +212,14 @@ const doAppStartUp = () => {
   void loadDefaultRooms();
 
   debounce(triggerAvatarReUploadIfNeeded, 200);
+
+  setTimeout(async () => {
+    // callLibSessionWorker(['ClosedGroupConfig-123', 'dump']);
+    console.warn(`getName result:"${await callLibSessionWorker(['UserConfig', 'getName'])}"`);
+    console.warn('setName');
+    await callLibSessionWorker(['UserConfig', 'setName', 'MyName']);
+    console.warn(`getName result:"${await callLibSessionWorker(['UserConfig', 'getName'])}"`);
+  }, 3000);
 };
 
 async function fetchReleaseFromFSAndUpdateMain() {
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index c2a6caa58..0221e26a2 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -7,7 +7,7 @@ import { ConversationModel } from '../models/conversation';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getUnpaddedAttachment } from '../session/crypto/BufferPadding';
 import { decryptAttachment } from '../util/crypto/attachmentsEncrypter';
-import { callUtilsWorker } from '../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../webworker/workers/browser/util_worker_interface';
 import { sogsV3FetchFileByFileID } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
 import { OpenGroupData } from '../data/opengroups';
 import {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
index c576fed63..8023c1338 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts
@@ -1,6 +1,6 @@
 import { sign } from 'curve25519-js';
 import { SessionKeyPair } from '../../../../receiver/keypairs';
-import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface';
 import { getSodiumRenderer } from '../../../crypto';
 import { UserUtils } from '../../../utils';
 import { fromBase64ToArray, fromHexToArray } from '../../../utils/String';
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 6add3f88f..65339b3f5 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -12,7 +12,7 @@ import { handleCapabilities } from './sogsCapabilities';
 import { getConversationController } from '../../../conversations';
 import { ConversationModel } from '../../../../models/conversation';
 import { filterDuplicatesFromDbAndIncomingV4 } from '../opengroupV2/SogsFilterDuplicate';
-import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface';
 import { PubKey } from '../../../types';
 import {
   addCachedBlindedKey,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index e1af09f98..132570efc 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../data/opengroups';
 import { MIME } from '../../../../types';
 import { processNewAttachment } from '../../../../types/MessageAttachment';
-import { callUtilsWorker } from '../../../../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface';
 import { getConversationController } from '../../../conversations';
 import { OnionSending } from '../../../onions/onionSend';
 import { allowOnlyOneAtATime } from '../../../utils/Promise';
diff --git a/ts/session/apis/push_notification_api/PnServer.ts b/ts/session/apis/push_notification_api/PnServer.ts
index 9534156b0..9413d2310 100644
--- a/ts/session/apis/push_notification_api/PnServer.ts
+++ b/ts/session/apis/push_notification_api/PnServer.ts
@@ -1,5 +1,5 @@
 import AbortController from 'abort-controller';
-import { callUtilsWorker } from '../../../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface';
 import { OnionSending } from '../../onions/onionSend';
 
 export const pnServerPubkeyHex = '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049';
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index a937e0184..20f929240 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -14,7 +14,7 @@ let snodeFailureCount: Record<string, number> = {};
 import { Snode } from '../../../data/data';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { hrefPnServerProd } from '../push_notification_api/PnServer';
-import { callUtilsWorker } from '../../../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface';
 import { encodeV4Request } from '../../onions/onionv4';
 import { AbortSignal } from 'abort-controller';
 import { to_string } from 'libsodium-wrappers-sumo';
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 044c70133..70b71b8a7 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -3,7 +3,7 @@ import Sinon from 'sinon';
 import { Data } from '../../../../ts/data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 
-import * as utilWorker from '../../../webworker/workers/util/util_worker_interface';
+import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface';
 
 const globalAny: any = global;
 
diff --git a/ts/util/local_attachments_encrypter.ts b/ts/util/local_attachments_encrypter.ts
index 914ff17f1..a1d69648e 100644
--- a/ts/util/local_attachments_encrypter.ts
+++ b/ts/util/local_attachments_encrypter.ts
@@ -1,6 +1,6 @@
 import { isArrayBuffer } from 'lodash';
 import { fromHexToArray } from '../session/utils/String';
-import { callUtilsWorker } from '../webworker/workers/util/util_worker_interface';
+import { callUtilsWorker } from '../webworker/workers/browser/util_worker_interface';
 import { Data } from '../data/data';
 
 export const encryptAttachmentBufferRenderer = async (bufferIn: ArrayBuffer) => {
diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts
index a3d904040..c5989ef1b 100644
--- a/ts/webworker/worker_interface.ts
+++ b/ts/webworker/worker_interface.ts
@@ -17,16 +17,20 @@ export class WorkerInterface {
   private readonly _DEBUG: boolean;
   private _jobCounter: number;
   private readonly _jobs: Record<number, any>;
-  private readonly _utilWorker: Worker;
+  private readonly _worker: Worker;
 
   constructor(path: string, timeout = WORKER_TIMEOUT) {
-    this._utilWorker = new Worker(path);
+    (process as any).dlopen = () => {
+      throw new Error('Load native module is not safe');
+    };
+
+    this._worker = new Worker(path);
     this.timeout = timeout;
     this._jobs = Object.create(null);
     this._DEBUG = false;
     this._jobCounter = 0;
 
-    this._utilWorker.onmessage = e => {
+    this._worker.onmessage = e => {
       const [jobId, errorForDisplay, result] = e.data;
 
       const job = this._getJob(jobId);
@@ -52,7 +56,7 @@ export class WorkerInterface {
     const jobId = this._makeJob(fnName);
 
     return new Promise((resolve, reject) => {
-      this._utilWorker.postMessage([jobId, fnName, ...args]);
+      this._worker.postMessage([jobId, fnName, ...args]);
 
       this._updateJob(jobId, {
         resolve,
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
new file mode 100644
index 000000000..ef086a5d7
--- /dev/null
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -0,0 +1,22 @@
+import { BaseConfigWrapper } from 'session_util_wrapper';
+
+type UserConfig = 'UserConfig'; // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
+type ClosedGroupConfigPrefix = 'ClosedGroupConfig-'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
+type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
+
+export type ConfigWrapperObjectTypes = UserConfig | ClosedGroupConfig;
+
+type BaseConfigActions = ['needsDump'] | ['needsPush'] | ['push', Uint8Array, number] | ['dump']
+
+/**Those are the actions inherited from BaseConfigWrapper to UserConfigWrapper */
+type UserConfigInheritedActions = [UserConfig, ...BaseConfigActions];
+type UserConfigActions = [UserConfig, 'getName'] | [UserConfig, 'setName', string|null];
+
+/**Those are the actions inherited from BaseConfigWrapper to ClosedGroupConfigWrapper */
+type ClosedGroupConfigFromBase = [ClosedGroupConfig, ...BaseConfigActions];
+
+
+type UserConfigFunctions = UserConfigInheritedActions | UserConfigActions;
+type ClosedGroupConfigFunctions = ClosedGroupConfigFromBase;
+
+export type LibSessionWorkerFunctions = UserConfigFunctions | ClosedGroupConfigFunctions;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
new file mode 100644
index 000000000..83756f2d1
--- /dev/null
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -0,0 +1,32 @@
+import { WorkerInterface } from '../../worker_interface';
+import { join } from 'path';
+import { getAppRootPath } from '../../../node/getRootPath';
+import { LibSessionWorkerFunctions } from './libsession_worker_functions';
+
+let libsessionWorkerInterface: WorkerInterface | undefined;
+
+const internalCallLibSessionWorker = async ([
+  config,
+  fnName,
+  ...args
+]: LibSessionWorkerFunctions): Promise<any> => {
+  if (!libsessionWorkerInterface) {
+    const libsessionWorkerPath = join(
+      getAppRootPath(),
+      'ts',
+      'webworker',
+      'workers',
+      'node',
+      'libsession',
+      'libsession.worker.js'
+    );
+
+    console.warn('libsessionWorkerPath', libsessionWorkerPath);
+    libsessionWorkerInterface = new WorkerInterface(libsessionWorkerPath, 1 * 60 * 1000);
+  }
+  return libsessionWorkerInterface?.callWorker(config, fnName, ...args);
+};
+
+export const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<any> => {
+  return internalCallLibSessionWorker(callToMake);
+};
diff --git a/ts/webworker/workers/util/util_worker_interface.ts b/ts/webworker/workers/browser/util_worker_interface.ts
similarity index 80%
rename from ts/webworker/workers/util/util_worker_interface.ts
rename to ts/webworker/workers/browser/util_worker_interface.ts
index a54b4e2d2..4a995ebe9 100644
--- a/ts/webworker/workers/util/util_worker_interface.ts
+++ b/ts/webworker/workers/browser/util_worker_interface.ts
@@ -13,12 +13,20 @@ type WorkerAllowedFunctionName =
   | 'verifyAllSignatures'
   | 'encryptForPubkey';
 
-export const internalCallUtilsWorker = async (
+const internalCallUtilsWorker = async (
   fnName: WorkerAllowedFunctionName,
   ...args: any
 ): Promise<any> => {
   if (!utilWorkerInterface) {
-    const utilWorkerPath = join(getAppRootPath(), 'ts', 'webworker', 'workers', 'util.worker.js');
+    const utilWorkerPath = join(
+      getAppRootPath(),
+      'ts',
+      'webworker',
+      'workers',
+      'node',
+      'util',
+      'util.worker.js'
+    );
     utilWorkerInterface = new WorkerInterface(utilWorkerPath, 3 * 60 * 1000);
   }
   return utilWorkerInterface?.callWorker(fnName, ...args);
diff --git a/ts/webworker/workers/index.ts b/ts/webworker/workers/index.ts
index 693d96037..58bea990d 100644
--- a/ts/webworker/workers/index.ts
+++ b/ts/webworker/workers/index.ts
@@ -1,2 +1,3 @@
-import * as utilWorkerInterface from './util/util_worker_interface';
-export { utilWorkerInterface };
+import * as utilWorkerInterface from './browser/util_worker_interface';
+import * as libSessionWorkerInterface from './browser/libsession_worker_interface';
+export { utilWorkerInterface, libSessionWorkerInterface };
diff --git a/ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node b/ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node
new file mode 100644
index 0000000000000000000000000000000000000000..b9caaace83c258ccd9b7c638477c6c49a7bf4ef3
GIT binary patch
literal 667336
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%0DOQOZ%2r=RuJeInm2drq!l8Tj7o!DbZ
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%0DwVCeju{8kr
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%0D984|$wz
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

literal 0
HcmV?d00001

diff --git a/ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node b/ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node
new file mode 100644
index 0000000000000000000000000000000000000000..9fb8f3fac26c9adadbd89895cbed50fed60a3bcf
GIT binary patch
literal 671576
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

literal 0
HcmV?d00001

diff --git a/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt b/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
new file mode 100644
index 000000000..9805d779c
--- /dev/null
+++ b/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
@@ -0,0 +1,10 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
new file mode 100644
index 000000000..3190f9ac1
--- /dev/null
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -0,0 +1,66 @@
+import _ from 'lodash';
+import { UserConfigWrapper } from 'session_util_wrapper';
+import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
+import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
+
+/* eslint-disable no-console */
+/* eslint-disable strict */
+
+let userConfig: UserConfigWrapper;
+
+/* eslint-disable strict */
+
+async function getSodiumWorker() {
+  await sodiumWrappers.ready;
+
+  return sodiumWrappers;
+}
+
+async function getCorrespondingWrapper(config: ConfigWrapperObjectTypes) {
+  if (config !== 'UserConfig') {
+    throw new Error(`Invalid config: ${config}`);
+  }
+  const sodium = await getSodiumWorker();
+  if (!userConfig) {
+    const edSecretKey = sodium.from_hex(
+      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
+    );
+
+    userConfig = new UserConfigWrapper(edSecretKey, null);
+  }
+  return userConfig;
+}
+
+// tslint:disable: function-name
+//tslint-disable no-console
+onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
+  const [jobId, config, action, ...args] = e.data;
+
+  try {
+    const wrapper = await getCorrespondingWrapper(config);
+
+    const fn = (wrapper as any)[action];
+    if (!fn) {
+      throw new Error(
+        `Worker: job "${jobId}" did not find function "${action}" on config "${config}"`
+      );
+    }
+    const result = await (wrapper as any)[action](...args);
+    postMessage([jobId, null, result]);
+  } catch (error) {
+    const errorForDisplay = prepareErrorForPostMessage(error);
+    postMessage([jobId, errorForDisplay]);
+  }
+};
+
+function prepareErrorForPostMessage(error: any) {
+  if (!error) {
+    return null;
+  }
+
+  if (error.stack) {
+    return error.stack;
+  }
+
+  return error.message;
+}
diff --git a/ts/webworker/workers/node/tsconfig.json b/ts/webworker/workers/node/tsconfig.json
new file mode 100644
index 000000000..89b85c980
--- /dev/null
+++ b/ts/webworker/workers/node/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "module": "es2020",
+    "lib": ["esnext", "webworker"],
+    "target": "es6",
+    "esModuleInterop": true,
+    "moduleResolution": "node"
+  }
+}
diff --git a/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt b/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt
new file mode 100644
index 000000000..b5677a878
--- /dev/null
+++ b/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt
@@ -0,0 +1,32 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
+/**
+ * @license bytebuffer.js (c) 2015 Daniel Wirtz <dcode@dcode.io>
+ * Backing buffer: ArrayBuffer, Accessor: Uint8Array
+ * Released under the Apache License, Version 2.0
+ * see: https://github.com/dcodeIO/bytebuffer.js for details
+ */
+
+/**
+ * @license long.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
+ * Released under the Apache License, Version 2.0
+ * see: https://github.com/dcodeIO/long.js for details
+ */
diff --git a/ts/webworker/workers/util/util.worker.ts b/ts/webworker/workers/node/util/util.worker.ts
similarity index 99%
rename from ts/webworker/workers/util/util.worker.ts
rename to ts/webworker/workers/node/util/util.worker.ts
index f997e531f..54e4daf54 100644
--- a/ts/webworker/workers/util/util.worker.ts
+++ b/ts/webworker/workers/node/util/util.worker.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
 import {
   decryptAttachmentBufferNode as realDecryptAttachmentBufferNode,
   encryptAttachmentBufferNode as realEncryptAttachmentBufferNode,
-} from '../../../node/encrypt_attachment_buffer';
+} from '../../../../node/encrypt_attachment_buffer';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
diff --git a/utils.worker.config.js b/utils.worker.config.js
new file mode 100644
index 000000000..528b1e488
--- /dev/null
+++ b/utils.worker.config.js
@@ -0,0 +1,28 @@
+const path = require('path');
+
+module.exports = {
+  entry: './ts/webworker/workers/node/util/util.worker.ts',
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+    fallback: {
+      crypto: require.resolve('crypto-browserify'),
+      path: require.resolve('path-browserify'),
+      fs: false,
+      stream: require.resolve('stream-browserify'),
+    },
+  },
+  output: {
+    filename: 'util.worker.js',
+    path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'util'),
+  },
+  target: 'webworker',
+};
diff --git a/yarn.lock b/yarn.lock
index e1bed7451..ffd71aaf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -636,6 +636,11 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
+"@discoveryjs/json-ext@^0.5.0":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+
 "@electron/get@^1.13.0":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
@@ -781,6 +786,11 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
@@ -796,11 +806,32 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
+"@jridgewell/trace-mapping@^0.3.14":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
@@ -1788,6 +1819,32 @@
   dependencies:
     "@types/react" "*"
 
+"@types/eslint-scope@^3.7.3":
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "8.4.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
+  integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
+"@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+
 "@types/filesize@3.6.0":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/@types/filesize/-/filesize-3.6.0.tgz#5f1a25c7b4e3d5ee2bc63133d374d096b7008c8d"
@@ -1871,6 +1928,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
   integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
 
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -2165,11 +2227,157 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webpack-cli/configtest@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
+  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
+
+"@webpack-cli/info@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
+  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
+
+"@webpack-cli/serve@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
+  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
   integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==
 
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -2205,6 +2413,11 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
+acorn-import-assertions@^1.7.6:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -2256,12 +2469,12 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv-keywords@^3.4.1:
+ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4:
+ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2731,6 +2944,16 @@ browserify-sign@^4.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
+browserslist@^4.14.5:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+  dependencies:
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
+
 browserslist@^4.20.2, browserslist@^4.6.6:
   version "4.20.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
@@ -2913,6 +3136,11 @@ caniuse-lite@^1.0.30001332:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
   integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001436"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz#22d7cbdbbbb60cdc4ca1030ccd6dea9f5de4848b"
+  integrity sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==
+
 chai-as-promised@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
@@ -3069,6 +3297,15 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -3131,6 +3368,11 @@ color@^3.1.2:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+colorette@^2.0.14:
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
+  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+
 colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -3168,6 +3410,11 @@ commander@^8.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -3833,6 +4080,11 @@ electron-to-chromium@^1.4.118:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f"
   integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==
 
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+
 electron-updater@^4.2.2:
   version "4.6.5"
   resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d"
@@ -3918,6 +4170,14 @@ enhanced-resolve@^5.0.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enhanced-resolve@^5.10.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -3933,6 +4193,11 @@ env-paths@^2.2.0:
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
+envinfo@^7.7.3:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+
 err-code@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
@@ -3988,6 +4253,11 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-module-lexer@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
@@ -4235,6 +4505,14 @@ eslint-plugin-more@^1.0.5:
   resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f"
   integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w==
 
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-scope@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
@@ -4329,6 +4607,11 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -4349,7 +4632,7 @@ eventemitter2@~0.4.13:
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
   integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=
 
-events@^3.3.0:
+events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -4447,6 +4730,11 @@ fast-shallow-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
   integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==
 
+fastest-levenshtein@^1.0.12:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastest-stable-stringify@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
@@ -4824,6 +5112,11 @@ glob-parent@^6.0.1, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.3"
 
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -5377,6 +5670,14 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -5426,6 +5727,11 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
+
 interpret@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -5842,6 +6148,15 @@ jest-regex-util@^27.0.6:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
   integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
 
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jpeg-js@^0.4.2, jpeg-js@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
@@ -5925,7 +6240,7 @@ json-buffer@3.0.1, json-buffer@~3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -6109,6 +6424,11 @@ lmdb@2.2.4:
     ordered-binary "^1.2.4"
     weak-lru-cache "^1.2.2"
 
+loader-runner@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+
 loader-utils@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
@@ -6340,7 +6660,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@^2.1.27:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -6608,6 +6928,11 @@ negotiator@^0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -6697,6 +7022,11 @@ node-releases@^2.0.3:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
   integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
 
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -7283,7 +7613,7 @@ pixelmatch@^5.2.1:
   dependencies:
     pngjs "^6.0.0"
 
-pkg-dir@^4.1.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -7864,6 +8194,13 @@ rechoir@^0.7.0:
   dependencies:
     resolve "^1.9.0"
 
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
+  dependencies:
+    resolve "^1.20.0"
+
 redux-logger@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
@@ -7973,6 +8310,13 @@ resolve-alpn@^1.0.0:
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
   integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
 
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -8150,6 +8494,15 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+schema-utils@^3.1.0, schema-utils@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 screenfull@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba"
@@ -8196,7 +8549,7 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@6.0.0:
+serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
   integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
@@ -8205,9 +8558,8 @@ serialize-javascript@6.0.0:
 
 "session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs":
   version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#d1519f038c738cb446b23714913db5fd33ef1d9c"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#a56aba11e504fe743f299bab79b7c33b2772f17f"
   dependencies:
-    bindings "^1.5.0"
     nan "^2.17.0"
     node-gyp "^9.3.0"
 
@@ -8229,6 +8581,13 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
 shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
@@ -8616,7 +8975,7 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@8.1.1, supports-color@^8.1.0:
+supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -8670,7 +9029,7 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tapable@^2.2.0:
+tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
@@ -8700,6 +9059,27 @@ term-size@^2.1.0, term-size@^2.2.1:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
+terser-webpack-plugin@^5.1.3:
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.14"
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.0"
+    terser "^5.14.1"
+
+terser@^5.14.1:
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
+  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 terser@^5.2.0:
   version "5.13.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799"
@@ -8815,10 +9195,10 @@ ts-easing@^0.2.0:
   resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
   integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
 
-ts-loader@^9.2.8:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.0.tgz#980f4dbfb60e517179e15e10ed98e454b132159f"
-  integrity sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==
+ts-loader@^9.4.2:
+  version "9.4.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
+  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
@@ -9022,6 +9402,14 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 update-notifier@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
@@ -9119,6 +9507,14 @@ warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 weak-lru-cache@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz#fdbb6741f36bae9540d12f480ce8254060dccd19"
@@ -9139,6 +9535,68 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
+webpack-cli@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
+  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/configtest" "^2.0.1"
+    "@webpack-cli/info" "^2.0.1"
+    "@webpack-cli/serve" "^2.0.1"
+    colorette "^2.0.14"
+    commander "^9.4.1"
+    cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
+    fastest-levenshtein "^1.0.12"
+    import-local "^3.0.2"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
+    webpack-merge "^5.7.3"
+
+webpack-merge@^5.7.3:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+  dependencies:
+    clone-deep "^4.0.1"
+    wildcard "^2.0.0"
+
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@^5.75.0:
+  version "5.75.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
+  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^0.0.51"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.7.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.10.0"
+    es-module-lexer "^0.9.0"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.9"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.4.0"
+    webpack-sources "^3.2.3"
+
 websocket-driver@>=0.5.1:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
@@ -9242,6 +9700,11 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
+wildcard@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+
 word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"

From b4835f16363af945db95756d48c982273c53bf3e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 19 Dec 2022 18:58:55 +1100
Subject: [PATCH 011/178] fix: make libsession worker run from the renderer
 with key from settings

---
 .gitignore                                    |   2 +
 libsession.worker.config.js                   |   6 +-
 package.json                                  |  24 ++--
 ts/components/leftpane/ActionsPanel.tsx       |   7 +-
 .../browser/libsession_worker_functions.d.ts  |   7 +-
 .../browser/libsession_worker_interface.ts    |   1 -
 .../libsession.worker.js.LICENSE.txt          |  16 +--
 .../node/libsession/libsession.worker.ts      |  49 +++++--
 .../node/util/util.worker.js.LICENSE.txt      |  32 -----
 utils.worker.config.js                        |   8 +-
 yarn.lock                                     | 133 +++++++++++++++++-
 11 files changed, 202 insertions(+), 83 deletions(-)
 delete mode 100644 ts/webworker/workers/node/util/util.worker.js.LICENSE.txt

diff --git a/.gitignore b/.gitignore
index 4642403c1..ef46ea92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ test-results/
 .nyc_output
 coverage/
 stylesheets/dist/
+
+*.worker.js.LICENSE.txt
diff --git a/libsession.worker.config.js b/libsession.worker.config.js
index 1cb89929b..bf9928a6b 100644
--- a/libsession.worker.config.js
+++ b/libsession.worker.config.js
@@ -21,10 +21,10 @@ module.exports = {
   resolve: {
     extensions: ['.ts', '.js'],
     fallback: {
-      crypto: require.resolve('crypto-browserify'),
-      path: require.resolve('path-browserify'),
+      crypto: false,
+      path: false,
       fs: false,
-      stream: require.resolve('stream-browserify'),
+      stream: false,
     },
   },
   output: {
diff --git a/package.json b/package.json
index b2d80c6c6..2cd0cdf00 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,6 @@
       "distDir": "stylesheets/dist/",
       "optimize": true,
       "sourceMap": true
-    },
-    "util-worker": {
-      "source": "ts/webworker/workers/node/util/util.worker.ts",
-      "distDir": "./ts/webworker/workers/",
-      "optimize": true,
-      "sourceMap": true,
-      "context": "web-worker"
     }
   },
   "resolutions": {
@@ -46,13 +39,12 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
-    "build-everything": "yarn clean && yarn protobuf && grunt && yarn sass && tsc && yarn parcel-util-worker",
-    "build-everything:watch": "yarn clean && yarn protobuf && grunt && yarn sass && yarn parcel-util-worker && tsc -w",
+    "build-everything": "yarn clean && yarn protobuf && grunt && yarn sass && tsc && yarn worker:utils && yarn worker:libsession",
+    "build-everything:watch": "yarn clean && yarn protobuf && grunt && yarn sass && yarn worker:utils && yarn worker:libsession && tsc -w",
     "watch": "yarn clean && yarn protobuf && grunt && concurrently 'yarn build-everything:watch' 'yarn sass:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && parcel build --target sass --no-autoinstall --no-cache",
     "sass:watch": "rimraf 'stylesheets/dist/' && parcel watch --target sass --no-autoinstall --no-cache",
-    "parcel-util-worker": "rimraf ts/webworker/workers/util.worker.js && parcel build --target util-worker --no-autoinstall --no-cache",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
     "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
@@ -75,7 +67,9 @@
     "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json",
     "ready": "yarn build-everything && yarn lint-full && yarn test",
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps && yarn rebuild-curve25519-js",
-    "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../"
+    "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../",
+    "worker:utils": "webpack  --config=./utils.worker.config.js",
+    "worker:libsession": "webpack  --config=./libsession.worker.config.js"
   },
   "dependencies": {
     "@emoji-mart/data": "^1.0.6",
@@ -197,7 +191,7 @@
     "chai-bytes": "^0.1.2",
     "concurrently": "^7.4.0",
     "cross-env": "^6.0.3",
-    "crypto-browserify": "^3.12.0",
+    "css-loader": "^6.7.2",
     "electron": "^17.2.0",
     "electron-builder": "22.8.0",
     "electron-notarize": "^0.2.0",
@@ -209,6 +203,7 @@
     "eslint-plugin-mocha": "^10.0.4",
     "eslint-plugin-more": "^1.0.5",
     "events": "^3.3.0",
+    "file-loader": "^6.2.0",
     "grunt": "1.5.3",
     "grunt-cli": "1.4.3",
     "grunt-contrib-concat": "2.1.0",
@@ -224,14 +219,15 @@
     "nyc": "^15.1.0",
     "parcel": "2.5.0",
     "patch-package": "^6.4.7",
-    "path-browserify": "^1.0.1",
     "playwright": "1.16.3",
+    "postcss-loader": "^7.0.2",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
     "process": "^0.11.10",
     "run-script-os": "^1.1.6",
+    "sass-loader": "^13.2.0",
     "sinon": "9.0.2",
-    "stream-browserify": "^3.0.0",
+    "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
     "ts-mock-imports": "^1.3.0",
     "tslint": "5.19.0",
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 539630a66..22873200f 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -214,7 +214,12 @@ const doAppStartUp = () => {
   debounce(triggerAvatarReUploadIfNeeded, 200);
 
   setTimeout(async () => {
-    // callLibSessionWorker(['ClosedGroupConfig-123', 'dump']);
+    const keypair = await UserUtils.getUserED25519KeyPairBytes();
+    if (!keypair) {
+      throw new Error('edkeypair not found for current user');
+    }
+
+    await callLibSessionWorker(['UserConfig', 'init', keypair.privKeyBytes, null]);
     console.warn(`getName result:"${await callLibSessionWorker(['UserConfig', 'getName'])}"`);
     console.warn('setName');
     await callLibSessionWorker(['UserConfig', 'setName', 'MyName']);
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index ef086a5d7..837f5f6a7 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -1,16 +1,15 @@
-import { BaseConfigWrapper } from 'session_util_wrapper';
+import { BaseConfigActions, BaseConfigWrapper, UserConfigActionsType } from 'session_util_wrapper';
 
 type UserConfig = 'UserConfig'; // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
-type ClosedGroupConfigPrefix = 'ClosedGroupConfig-'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
+type ClosedGroupConfigPrefix = 'ClosedGroupConfig-03'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
 type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
 
 export type ConfigWrapperObjectTypes = UserConfig | ClosedGroupConfig;
 
-type BaseConfigActions = ['needsDump'] | ['needsPush'] | ['push', Uint8Array, number] | ['dump']
 
 /**Those are the actions inherited from BaseConfigWrapper to UserConfigWrapper */
 type UserConfigInheritedActions = [UserConfig, ...BaseConfigActions];
-type UserConfigActions = [UserConfig, 'getName'] | [UserConfig, 'setName', string|null];
+type UserConfigActions = [UserConfig,...UserConfigActionsType] | [UserConfig, 'init'];
 
 /**Those are the actions inherited from BaseConfigWrapper to ClosedGroupConfigWrapper */
 type ClosedGroupConfigFromBase = [ClosedGroupConfig, ...BaseConfigActions];
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 83756f2d1..4ddafcbb2 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -21,7 +21,6 @@ const internalCallLibSessionWorker = async ([
       'libsession.worker.js'
     );
 
-    console.warn('libsessionWorkerPath', libsessionWorkerPath);
     libsessionWorkerInterface = new WorkerInterface(libsessionWorkerPath, 1 * 60 * 1000);
   }
   return libsessionWorkerInterface?.callWorker(config, fnName, ...args);
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt b/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
index 9805d779c..b1121f519 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
+++ b/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
@@ -1,10 +1,8 @@
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
-
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 3190f9ac1..7087190c2 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,7 +1,7 @@
-import _ from 'lodash';
+import _, { isEmpty, isNull } from 'lodash';
 import { UserConfigWrapper } from 'session_util_wrapper';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
-import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
+// import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
@@ -10,33 +10,58 @@ let userConfig: UserConfigWrapper;
 
 /* eslint-disable strict */
 
-async function getSodiumWorker() {
-  await sodiumWrappers.ready;
+// async function getSodiumWorker() {
+//   await sodiumWrappers.ready;
 
-  return sodiumWrappers;
-}
+//   return sodiumWrappers;
+// }
 
 async function getCorrespondingWrapper(config: ConfigWrapperObjectTypes) {
   if (config !== 'UserConfig') {
     throw new Error(`Invalid config: ${config}`);
   }
-  const sodium = await getSodiumWorker();
   if (!userConfig) {
-    const edSecretKey = sodium.from_hex(
-      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
-    );
-
-    userConfig = new UserConfigWrapper(edSecretKey, null);
+    throw new Error('UserConfig is not init yet');
   }
   return userConfig;
 }
 
+function isUInt8Array(value: any) {
+  return value.constructor === Uint8Array;
+}
+
+function initUserConfigWrapper(options: Array<any>) {
+  if (userConfig) {
+    throw new Error('UserConfig already init');
+  }
+  if (options.length !== 2) {
+    throw new Error('UserConfig init needs two arguments');
+  }
+  const [edSecretKey, dump] = options;
+
+  if (isEmpty(edSecretKey) || !isUInt8Array(edSecretKey)) {
+    throw new Error('UserConfig init needs a valid edSecretKey');
+  }
+
+  if (!isNull(dump) && !isUInt8Array(dump)) {
+    throw new Error('UserConfig init needs a valid dump');
+  }
+
+  userConfig = new UserConfigWrapper(edSecretKey, dump);
+}
+
 // tslint:disable: function-name
 //tslint-disable no-console
 onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
   const [jobId, config, action, ...args] = e.data;
 
   try {
+    if (action === 'init') {
+      initUserConfigWrapper(args);
+      postMessage([jobId, null, null]);
+      return;
+    }
+
     const wrapper = await getCorrespondingWrapper(config);
 
     const fn = (wrapper as any)[action];
diff --git a/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt b/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt
deleted file mode 100644
index b5677a878..000000000
--- a/ts/webworker/workers/node/util/util.worker.js.LICENSE.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-
-/**
- * @license bytebuffer.js (c) 2015 Daniel Wirtz <dcode@dcode.io>
- * Backing buffer: ArrayBuffer, Accessor: Uint8Array
- * Released under the Apache License, Version 2.0
- * see: https://github.com/dcodeIO/bytebuffer.js for details
- */
-
-/**
- * @license long.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
- * Released under the Apache License, Version 2.0
- * see: https://github.com/dcodeIO/long.js for details
- */
diff --git a/utils.worker.config.js b/utils.worker.config.js
index 528b1e488..dc1a4fb25 100644
--- a/utils.worker.config.js
+++ b/utils.worker.config.js
@@ -14,15 +14,15 @@ module.exports = {
   resolve: {
     extensions: ['.ts', '.js'],
     fallback: {
-      crypto: require.resolve('crypto-browserify'),
-      path: require.resolve('path-browserify'),
+      crypto: false,
+      path: false,
       fs: false,
-      stream: require.resolve('stream-browserify'),
+      stream: false,
     },
   },
   output: {
     filename: 'util.worker.js',
     path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'util'),
   },
-  target: 'webworker',
+  target: 'node',
 };
diff --git a/yarn.lock b/yarn.lock
index ffd71aaf8..9ef4479eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3537,6 +3537,17 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cosmiconfig@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 cosmiconfig@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
@@ -3654,6 +3665,20 @@ css-in-js-utils@^2.0.0:
     hyphenate-style-name "^1.0.2"
     isobject "^3.0.1"
 
+css-loader@^6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
+  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
+  dependencies:
+    icss-utils "^5.1.0"
+    postcss "^8.4.18"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
+    postcss-value-parser "^4.2.0"
+    semver "^7.3.8"
+
 css-select@^4.1.3:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
@@ -3687,6 +3712,11 @@ css-what@^6.0.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 csso@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
@@ -4769,6 +4799,14 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 file-sync-cmp@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
@@ -5630,6 +5668,11 @@ iconv-lite@~0.4.13:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+icss-utils@^5.0.0, icss-utils@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+
 ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -6328,6 +6371,11 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
+klona@^2.0.4, klona@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
+  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
+
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -6913,6 +6961,11 @@ nanoid@3.3.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
   integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -7659,11 +7712,65 @@ pngjs@^6.0.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
   integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
 
-postcss-value-parser@^4.0.2, postcss-value-parser@^4.2.0:
+postcss-loader@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb"
+  integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==
+  dependencies:
+    cosmiconfig "^7.0.0"
+    klona "^2.0.5"
+    semver "^7.3.8"
+
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  dependencies:
+    icss-utils "^5.0.0"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  dependencies:
+    postcss-selector-parser "^6.0.4"
+
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
+  dependencies:
+    icss-utils "^5.0.0"
+
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
+postcss@^8.4.18:
+  version "8.4.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
+  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 posthtml-parser@^0.10.1:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.2.tgz#df364d7b179f2a6bf0466b56be7b98fd4e97c573"
@@ -8465,6 +8572,14 @@ sanitize.css@^12.0.1:
   resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-12.0.1.tgz#f20369357557ba2b41d7278eeb3ea691a3bee514"
   integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw==
 
+sass-loader@^13.2.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.0.tgz#80195050f58c9aac63b792fa52acb6f5e0f6bdc3"
+  integrity sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==
+  dependencies:
+    klona "^2.0.4"
+    neo-async "^2.6.2"
+
 sass@^1.38.0:
   version "1.52.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.1.tgz#554693da808543031f9423911d62c60a1acf7889"
@@ -8494,7 +8609,7 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -8542,6 +8657,13 @@ semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-error@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
@@ -8688,7 +8810,7 @@ socks@^2.6.2:
     ip "^1.1.5"
     smart-buffer "^4.2.0"
 
-"source-map-js@>=0.6.2 <2.0.0":
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -8939,6 +9061,11 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+style-loader@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
+  integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
+
 styled-components@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"

From becd494863ae8c32accc75f3f0b0d7e32fdceae8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 20 Dec 2022 00:45:32 +1100
Subject: [PATCH 012/178] fix: package.json lint

---
 package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2cd0cdf00..10614b508 100644
--- a/package.json
+++ b/package.json
@@ -289,11 +289,7 @@
         "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
-      "target": [
-        "deb",
-        "rpm",
-        "freebsd"
-      ],
+      "target": ["deb", "rpm", "freebsd"],
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [

From a77aa610f8845321695aff9a171744ba61c75b2c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 6 Jan 2023 14:51:55 +1100
Subject: [PATCH 013/178] finish contact test1, still need to fix the .set with
 a struct

---
 .gitignore                                    |   1 +
 .../libsession_wrapper_contacts_test.ts       | 183 ++++++++++++++++++
 2 files changed, 184 insertions(+)
 create mode 100644 ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts

diff --git a/.gitignore b/.gitignore
index ef46ea92a..5f5adfd1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ coverage/
 stylesheets/dist/
 
 *.worker.js.LICENSE.txt
+ts/webworker/workers/node/**/*.node
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
new file mode 100644
index 000000000..8b79cc02c
--- /dev/null
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -0,0 +1,183 @@
+import { expect } from 'chai';
+
+import { from_hex, from_string, to_hex } from 'libsodium-wrappers-sumo';
+import * as SessionUtilWrapper from 'session_util_wrapper';
+
+// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
+
+describe('libsession_wrapper_contacts  ', () => {
+  it('contacts', () => {
+    // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
+    // To do this, you can cd to the node_module/libsession_wrapper folder and do
+    // yarn configure && yarn build
+    // once that is done, you can rename this file and remove the _skip suffix so that test is run.
+
+    // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
+
+    const edSecretKey = from_hex(
+      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
+    );
+
+    // Initialize a brand new, empty config because we have no dump data to deal with.
+    const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+
+    // We don't need to push anything, since this is an empty config
+    expect(contacts.needsPush()).to.be.eql(false);
+    expect(contacts.needsDump()).to.be.eql(false);
+    const real_id = '050000000000000000000000000000000000000000000000000000000000000000';
+
+    // Since it's empty there shouldn't be a get result.
+    expect(contacts.get(real_id)).to.be.null;
+
+    const created = contacts.getOrCreate(real_id);
+
+    expect(created).to.be.not.null;
+
+    expect(created.id).to.be.eq(real_id);
+    expect(created.name).to.be.null;
+    expect(created.nickname).to.be.null;
+    expect(created.approved).to.be.eq(false);
+    expect(created.approvedMe).to.be.eq(false);
+    expect(created.blocked).to.be.eq(false);
+    expect(created.id).to.be.eq(real_id);
+
+    expect(contacts.needsPush()).to.be.eql(false);
+    expect(contacts.needsDump()).to.be.eql(false);
+
+    expect(contacts.push().seqno === 0);
+
+    created.name = 'Joe';
+    created.nickname = 'Joey';
+    created.approved = true;
+    created.approvedMe = true;
+    contacts.set(created);
+
+    contacts.setName(real_id, 'Joe');
+    contacts.setNickname(real_id, 'Joey');
+    contacts.setApproved(real_id, true);
+    contacts.setApprovedMe(real_id, true);
+
+    const updated = contacts.get(real_id);
+    expect(updated).to.not.be.null;
+    expect(updated).to.not.be.undefined;
+
+    expect(updated?.id).to.be.eq(real_id);
+    expect(updated?.name).to.be.eq('Joe');
+    expect(updated?.nickname).to.be.eq('Joey');
+    expect(updated?.approved).to.be.true;
+    expect(updated?.approvedMe).to.be.true;
+    expect(updated?.blocked).to.be.false;
+    expect(updated?.profilePicture).to.be.undefined;
+
+    expect(contacts.needsPush()).to.be.eql(true);
+    expect(contacts.needsDump()).to.be.eql(true);
+
+    let push1 = contacts.push();
+    expect(push1.seqno).to.be.eq(1);
+
+    // Pretend we uploaded it
+    contacts.confirmPushed(push1.seqno);
+    expect(contacts.needsPush()).to.be.eql(false);
+    expect(contacts.needsDump()).to.be.eql(true);
+
+    const dump = contacts.dump();
+
+    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, dump);
+
+    expect(contacts2.needsPush()).to.be.eql(false);
+    expect(contacts2.needsDump()).to.be.eql(false);
+    expect(contacts2.push().seqno).to.be.eq(1);
+    // Because we just called dump() above, to load up
+    // contacts2.
+    expect(contacts2.needsDump()).to.be.eql(false);
+
+    const x = contacts2.get(real_id);
+    expect(x?.id).to.be.eq(real_id);
+    expect(x?.name).to.be.eq('Joe');
+    expect(x?.nickname).to.be.eq('Joey');
+    expect(x?.approved).to.be.true;
+    expect(x?.approvedMe).to.be.true;
+    expect(x?.blocked).to.be.false;
+    expect(x?.profilePicture).to.be.undefined;
+
+    const another_id = '051111111111111111111111111111111111111111111111111111111111111111';
+    contacts2.getOrCreate(another_id);
+    contacts2.set({
+      id: another_id,
+    });
+    // We're not setting any fields, but we should still keep a record of the session id
+    expect(contacts2.needsPush()).to.be.true;
+
+    let push2 = contacts2.push();
+    push1.seqno = push2.seqno;
+    push1.data = push2.data;
+    expect(push1.seqno).to.be.equal(2);
+    contacts.merge([push1.data]);
+
+    contacts2.confirmPushed(push1.seqno);
+    expect(contacts.needsPush()).to.be.false;
+    expect(contacts.push().seqno).to.be.eq(push1.seqno);
+
+    // Iterate through and make sure we got everything we expected
+    const allContacts = contacts.getAll();
+    const session_ids = allContacts.map(m => m.id);
+    const nicknames = allContacts.map(m => m.nickname || '(N/A)');
+
+    expect(session_ids.length).to.be.eq(2);
+    expect(session_ids).to.be.deep.eq([real_id, another_id]);
+    expect(nicknames).to.be.deep.eq(['Joey', '(N/A)']);
+
+    // Conflict! Oh no!
+
+    // On client 1 delete a contact:
+    contacts.erase(real_id);
+    const shouldBeErased = contacts.get(real_id);
+    expect(shouldBeErased).to.be.null;
+
+    // Client 2 adds a new friend:
+    const third_id = '052222222222222222222222222222222222222222222222222222222222222222';
+    contacts2.setNickname(third_id, 'Nickname 3');
+    contacts2.setApproved(third_id, true);
+    contacts2.setBlocked(third_id, true);
+    contacts2.setProfilePicture(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
+
+    expect(contacts.needsPush()).to.be.true;
+    expect(contacts2.needsPush()).to.be.true;
+
+    push1 = contacts.push();
+    push2 = contacts2.push();
+
+    expect(push1.seqno).to.be.eq(push2.seqno);
+    expect(push1.data).to.not.be.deep.eq(push2.data);
+    contacts.confirmPushed(push1.seqno);
+    contacts2.confirmPushed(push2.seqno);
+
+    contacts.merge([push2.data]);
+    expect(contacts.needsPush()).to.be.true;
+
+    contacts2.merge([push1.data]);
+    expect(contacts2.needsPush()).to.be.true;
+
+    push1 = contacts.push();
+    expect(push1.seqno).to.be.eq(push2.seqno + 1);
+    push2 = contacts2.push();
+
+    expect(push1.seqno).to.be.deep.eq(push2.seqno);
+    expect(push1.data).to.be.deep.eq(push2.data);
+
+    contacts.confirmPushed(push1.seqno);
+    contacts2.confirmPushed(push2.seqno);
+
+    expect(contacts.needsPush()).to.be.false;
+    expect(contacts2.needsPush()).to.be.false;
+
+    const allContacts2 = contacts.getAll();
+    const session_ids2 = allContacts2.map(m => m.id);
+    const nicknames2 = allContacts2.map(m => m.nickname || '(N/A)');
+
+    expect(session_ids2.length).to.be.eq(2);
+    expect(nicknames2.length).to.be.eq(2);
+    expect(session_ids2).to.be.deep.eq([another_id, third_id]);
+    expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
+  });
+});

From ffe9e26d764b04cc51241cd87775d47a90ba4933 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 9 Jan 2023 10:35:46 +1100
Subject: [PATCH 014/178] test: finish contact test but still missing the .set
 function

---
 .../libsession_wrapper_contacts_test.ts       | 125 ++++++++++++++++--
 1 file changed, 117 insertions(+), 8 deletions(-)

diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 8b79cc02c..d4eff8842 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -1,19 +1,19 @@
 import { expect } from 'chai';
 
-import { from_hex, from_string, to_hex } from 'libsodium-wrappers-sumo';
+import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 import * as SessionUtilWrapper from 'session_util_wrapper';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
 
 describe('libsession_wrapper_contacts  ', () => {
-  it('contacts', () => {
-    // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
-    // To do this, you can cd to the node_module/libsession_wrapper folder and do
-    // yarn configure && yarn build
-    // once that is done, you can rename this file and remove the _skip suffix so that test is run.
+  // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
+  // To do this, you can cd to the node_module/libsession_wrapper folder and do
+  // yarn configure && yarn build
+  // once that is done, you can rename this file and remove the _skip suffix so that test is run.
 
-    // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
+  // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
 
+  it('[config][contacts]', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
@@ -139,7 +139,7 @@ describe('libsession_wrapper_contacts  ', () => {
     contacts2.setNickname(third_id, 'Nickname 3');
     contacts2.setApproved(third_id, true);
     contacts2.setBlocked(third_id, true);
-    contacts2.setProfilePicture(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
+    contacts2.setProfilePic(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
 
     expect(contacts.needsPush()).to.be.true;
     expect(contacts2.needsPush()).to.be.true;
@@ -180,4 +180,113 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(session_ids2).to.be.deep.eq([another_id, third_id]);
     expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
   });
+
+  it('[config][contacts][c]', () => {
+    const edSecretKey = from_hex(
+      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
+    );
+
+    // Initialize a brand new, empty config because we have no dump data to deal with.
+    const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+
+    const real_id = '050000000000000000000000000000000000000000000000000000000000000000';
+
+    expect(contacts.get(real_id)).to.be.null;
+    const c = contacts.getOrCreate(real_id);
+    expect(c.id).to.be.eq(real_id);
+    expect(c.name).to.be.null;
+    expect(c.nickname).to.be.null;
+    expect(c.approved).to.be.false;
+    expect(c.approvedMe).to.be.false;
+    expect(c.blocked).to.be.false;
+    expect(c.profilePicture?.key).to.be.undefined;
+    expect(c.profilePicture?.url).to.be.undefined;
+
+    c.name = 'Joe';
+    c.nickname = 'Joey';
+    c.approved = true;
+    c.approvedMe = true;
+    // contacts.set(c); // FIXME use .set when ready
+    contacts.setName(real_id, c.name);
+    contacts.setNickname(real_id, c.nickname);
+    contacts.setApproved(real_id, c.approved);
+    contacts.setApprovedMe(real_id, c.approvedMe);
+
+    const c2 = contacts.getOrCreate(real_id);
+    expect(c2.name).to.be.eq('Joe');
+    expect(c2.nickname).to.be.eq('Joey');
+    expect(c2.approved).to.be.true;
+    expect(c2.approvedMe).to.be.true;
+    expect(c2.blocked).to.be.false;
+    expect(c2.profilePicture?.key).to.be.undefined;
+    expect(c2.profilePicture?.url).to.be.undefined;
+
+    expect(contacts.needsDump()).to.be.true;
+    expect(contacts.needsPush()).to.be.true;
+
+    let push1 = contacts.push();
+    expect(push1.seqno).to.be.equal(1);
+
+    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+
+    let accepted = contacts2.merge([push1.data]);
+    expect(accepted).to.be.equal(1);
+
+    contacts.confirmPushed(push1.seqno);
+
+    let c3 = contacts2.getOrCreate(real_id);
+    expect(c3.name).to.be.eq('Joe');
+    expect(c3.nickname).to.be.eq('Joey');
+    expect(c3.approved).to.be.true;
+    expect(c3.approvedMe).to.be.true;
+    expect(c3.blocked).to.be.false;
+    expect(c3.profilePicture?.key).to.be.undefined;
+    expect(c3.profilePicture?.url).to.be.undefined;
+
+    const another_id = '051111111111111111111111111111111111111111111111111111111111111111';
+    c3 = contacts.getOrCreate(another_id);
+    expect(c3.name).to.be.null;
+    expect(c3.nickname).to.be.null;
+    expect(c3.approved).to.be.false;
+    expect(c3.approvedMe).to.be.false;
+    expect(c3.blocked).to.be.false;
+
+    expect(c3.profilePicture?.key).to.be.undefined;
+    expect(c3.profilePicture?.url).to.be.undefined;
+
+    contacts2.set(c3);
+
+    let push2 = contacts2.push();
+    accepted = contacts.merge([push2.data]);
+    expect(accepted).to.be.equal(1);
+
+    const allContacts2 = contacts.getAll();
+    const session_ids2 = allContacts2.map(m => m.id);
+    const nicknames2 = allContacts2.map(m => m.nickname || '(N/A)');
+
+    expect(session_ids2.length).to.be.eq(2);
+    expect(nicknames2.length).to.be.eq(2);
+    expect(session_ids2).to.be.deep.eq([real_id, another_id]);
+    expect(nicknames2).to.be.deep.eq(['Joey', '(N/A)']);
+
+    // Changing things while iterating:
+    // no need to support this in JS for now.
+
+    const allContacts3 = contacts.getAll();
+    let deletions = 0;
+    let non_deletions = 0;
+    allContacts3.forEach(c => {
+      if (c.id !== real_id) {
+        contacts.erase(c.id);
+        deletions++;
+      } else {
+        non_deletions++;
+      }
+    });
+
+    expect(deletions).to.be.eq(1);
+    expect(non_deletions).to.be.eq(1);
+    expect(contacts.get(real_id)).to.exist;
+    expect(contacts.get(another_id)).to.be.null;
+  });
 });

From 5627ab4583d2614a2f8038cf4130ad6bc0061b90 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 9 Jan 2023 14:48:46 +1100
Subject: [PATCH 015/178] finish the .set and toCppContact function

---
 .../libsession_wrapper_contacts_test.ts       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index d4eff8842..82b79c51f 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -52,12 +52,7 @@ describe('libsession_wrapper_contacts  ', () => {
     created.approvedMe = true;
     contacts.set(created);
 
-    contacts.setName(real_id, 'Joe');
-    contacts.setNickname(real_id, 'Joey');
-    contacts.setApproved(real_id, true);
-    contacts.setApprovedMe(real_id, true);
-
-    const updated = contacts.get(real_id);
+    let updated = contacts.get(real_id);
     expect(updated).to.not.be.null;
     expect(updated).to.not.be.undefined;
 
@@ -69,6 +64,13 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(updated?.blocked).to.be.false;
     expect(updated?.profilePicture).to.be.undefined;
 
+    created.profilePicture = { key: new Uint8Array([1, 2, 3]), url: 'fakeUrl' };
+    contacts.set(created);
+    updated = contacts.get(real_id);
+
+    expect(updated?.profilePicture?.url).to.be.deep.eq('fakeUrl');
+    expect(updated?.profilePicture?.key).to.be.deep.eq(new Uint8Array([1, 2, 3]));
+
     expect(contacts.needsPush()).to.be.eql(true);
     expect(contacts.needsDump()).to.be.eql(true);
 
@@ -98,7 +100,6 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(x?.approved).to.be.true;
     expect(x?.approvedMe).to.be.true;
     expect(x?.blocked).to.be.false;
-    expect(x?.profilePicture).to.be.undefined;
 
     const another_id = '051111111111111111111111111111111111111111111111111111111111111111';
     contacts2.getOrCreate(another_id);
@@ -206,11 +207,11 @@ describe('libsession_wrapper_contacts  ', () => {
     c.nickname = 'Joey';
     c.approved = true;
     c.approvedMe = true;
-    // contacts.set(c); // FIXME use .set when ready
-    contacts.setName(real_id, c.name);
-    contacts.setNickname(real_id, c.nickname);
-    contacts.setApproved(real_id, c.approved);
-    contacts.setApprovedMe(real_id, c.approvedMe);
+    contacts.set(c); // FIXME use .set when ready
+    // contacts.setName(real_id, c.name);
+    // contacts.setNickname(real_id, c.nickname);
+    // contacts.setApproved(real_id, c.approved);
+    // contacts.setApprovedMe(real_id, c.approvedMe);
 
     const c2 = contacts.getOrCreate(real_id);
     expect(c2.name).to.be.eq('Joe');

From 0f58e11a175e8d87ee2aa1dff8792fd300c80b49 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 10 Jan 2023 17:24:56 +1100
Subject: [PATCH 016/178] chore: update with latest libsession wrapper

---
 libsession.worker.config.js                   |   3 +
 preload.js                                    |   1 +
 ts/receiver/configMessage.ts                  |  29 +-
 ts/receiver/contentMessage.ts                 |   7 +-
 ts/receiver/receiver.ts                       |   4 +-
 ts/session/apis/snode_api/namespaces.ts       |  26 ++
 ts/session/apis/snode_api/retrieveRequest.ts  |  20 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  73 ++--
 .../libsession_wrapper_contacts_test.ts       |   2 +-
 .../libsession_wrapper_test_skip.ts           |  12 +-
 .../receiving/ConfigurationMessage_test.ts    |   6 +-
 .../node/libsession/libsession.worker.ts      |   2 +-
 ts/window.d.ts                                |   1 +
 utils.worker.config.js                        |   3 +
 yarn.lock                                     | 320 +-----------------
 15 files changed, 147 insertions(+), 362 deletions(-)
 create mode 100644 ts/session/apis/snode_api/namespaces.ts

diff --git a/libsession.worker.config.js b/libsession.worker.config.js
index bf9928a6b..627aef7a1 100644
--- a/libsession.worker.config.js
+++ b/libsession.worker.config.js
@@ -32,4 +32,7 @@ module.exports = {
     path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'libsession'),
   },
   target: 'node',
+  optimization: {
+    minimize: false,
+  },
 };
diff --git a/preload.js b/preload.js
index 4e1accf36..f43747571 100644
--- a/preload.js
+++ b/preload.js
@@ -30,6 +30,7 @@ window.sessionFeatureFlags = {
     process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('testnet')
   ),
   useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
+  useSharedUtilForUserConfig: true,
   debug: {
     debugFileServerRequests: false,
     debugNonSnodeRequests: false,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 1d712a5c3..45f67056f 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -19,6 +19,17 @@ import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '..
 import { appendFetchAvatarAndProfileJob, updateOurProfileSync } from './userProfileImageUpdates';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 
+export async function handleConfigMessagesViaLibSession(
+  configMessages: Array<SignalService.ConfigurationMessage>
+) {
+  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  }
+
+  window?.log?.info(
+    `Handling our profileUdpates via libsession_util. count: ${configMessages.length}`
+  );
+}
+
 async function handleOurProfileUpdate(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
@@ -195,10 +206,21 @@ const handleContactFromConfig = async (
   }
 };
 
-export async function handleConfigurationMessage(
+/**
+ * This is the legacy way of handling incoming configuration message.
+ * Should not be used at all soon.
+ */
+async function handleConfigurationMessage(
   envelope: EnvelopePlus,
   configurationMessage: SignalService.ConfigurationMessage
 ): Promise<void> {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    window?.log?.info(
+      'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessage()"'
+    );
+    return;
+  }
+
   window?.log?.info('Handling configuration message');
   const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
   if (!ourPubkey) {
@@ -216,3 +238,8 @@ export async function handleConfigurationMessage(
 
   await removeFromCache(envelope);
 }
+
+export const ConfigMessageHandler = {
+  handleConfigurationMessage,
+  handleConfigMessagesViaLibSession,
+};
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 7ea6fbf33..400ddd918 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -12,7 +12,7 @@ import { fromHexToArray, toHex } from '../session/utils/String';
 import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
 import { getConversationController } from '../session/conversations';
 import { ECKeyPair } from './keypairs';
-import { handleConfigurationMessage } from './configMessage';
+import { ConfigMessageHandler } from './configMessage';
 import { removeMessagePadding } from '../session/crypto/BufferPadding';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { getAllCachedECKeyPair } from './closedGroups';
@@ -425,8 +425,9 @@ export async function innerHandleSwarmContentMessage(
       return;
     }
     if (content.configurationMessage) {
-      // this one can be quite long (downloads profilePictures and everything, is do not block)
-      void handleConfigurationMessage(
+      // this one can be quite long (downloads profilePictures and everything),
+      // so do not await it
+      void ConfigMessageHandler.handleConfigurationMessage(
         envelope,
         content.configurationMessage as SignalService.ConfigurationMessage
       );
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 7924b859d..c2e2e7c44 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -148,8 +148,8 @@ export function handleRequest(plaintext: any, options: ReqOptions, messageHash:
  */
 export async function queueAllCached() {
   const items = await getAllFromCache();
-  items.forEach(async item => {
-    await queueCached(item);
+  items.forEach(item => {
+    void queueCached(item);
   });
 }
 
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
new file mode 100644
index 000000000..40d154492
--- /dev/null
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -0,0 +1,26 @@
+export enum SnodeNamespaces {
+  /**
+   * The messages sent to a closed group are sent and polled from this namespace
+   */
+  ClosedGroupMessages = -10,
+
+  /**
+   * This is the namespace anyone can deposit a message for us
+   */
+  UserMessages = 0,
+
+  /**
+   * This is the namespace used to sync our profile
+   */
+  UserProfile = 2,
+
+  /**
+   * This is the namespace used to sync our contacts
+   */
+  UserContacts = 3,
+
+  /**
+   * This is the namespace used to sync the closed group details for each of the closed groups we are polling
+   */
+  ClosedGroupInfo = 11,
+}
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 399f0edd3..6e5efa206 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -5,6 +5,7 @@ import { StringUtils, UserUtils } from '../../utils';
 import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
+import { SnodeNamespaces } from './namespaces';
 import {
   RetrieveLegacyClosedGroupSubRequestType,
   RetrieveSubRequestType,
@@ -58,7 +59,7 @@ async function getRetrieveSignatureParams(params: {
 async function buildRetrieveRequest(
   lastHashes: Array<string>,
   pubkey: string,
-  namespaces: Array<number>,
+  namespaces: Array<SnodeNamespaces>,
   ourPubkey: string
 ): Promise<Array<RetrieveSubRequestType>> {
   const retrieveRequestsParams = await Promise.all(
@@ -70,7 +71,7 @@ async function buildRetrieveRequest(
         timestamp: GetNetworkTime.getNowWithNetworkOffset(),
       };
 
-      if (namespace === -10) {
+      if (namespace === SnodeNamespaces.ClosedGroupMessages) {
         if (pubkey === ourPubkey || !pubkey.startsWith('05')) {
           throw new Error(
             'namespace -10 can only be used to retrieve messages from a legacy closed group'
@@ -90,7 +91,11 @@ async function buildRetrieveRequest(
 
       // all legacy closed group retrieves are unauthenticated and run above.
       // if we get here, this can only be a retrieve for our own swarm, which needs to be authenticated
-      if (namespace !== 0) {
+      if (
+        namespace !== SnodeNamespaces.UserMessages &&
+        namespace !== SnodeNamespaces.UserContacts &&
+        namespace !== SnodeNamespaces.UserProfile
+      ) {
         throw new Error('not a legacy closed group. namespace can only be 0');
       }
       if (pubkey !== ourPubkey) {
@@ -114,7 +119,7 @@ async function retrieveNextMessages(
   targetNode: Snode,
   lastHashes: Array<string>,
   associatedWith: string,
-  namespaces: Array<number>,
+  namespaces: Array<SnodeNamespaces>,
   ourPubkey: string
 ): Promise<Array<{ code: number; messages: Array<Record<string, any>> }>> {
   if (namespaces.length !== lastHashes.length) {
@@ -170,8 +175,13 @@ async function retrieveNextMessages(
     }
 
     GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', bodyFirstResult.t);
+    // merge results with their corresponding namespaces
 
-    return results.map(result => ({ code: result.code, messages: result.body as Array<any> }));
+    return results.map((result, index) => ({
+      code: result.code,
+      messages: result.body as Array<any>,
+      namespace: namespaces[index],
+    }));
   } catch (e) {
     window?.log?.warn('exception while parsing json of nextMessage:', e);
     if (!window.inboxStore?.getState().onionPaths.isOnline) {
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 63b6a1b56..2bcd641b5 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -15,6 +15,7 @@ import { ed25519Str } from '../../onions/onionPath';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import pRetry from 'p-retry';
 import { SnodeAPIRetrieve } from './retrieveRequest';
+import { SnodeNamespaces } from './namespaces';
 
 interface Message {
   hash: string;
@@ -22,6 +23,11 @@ interface Message {
   data: string;
 }
 
+export type RetrieveMessagesResults = Array<{
+  code: number;
+  messages: Record<string, any>[];
+}>;
+
 // Some websocket nonsense
 export function processMessage(message: string, options: any = {}, messageHash: string) {
   try {
@@ -142,10 +148,13 @@ export class SwarmPolling {
     }
     // we always poll as often as possible for our pubkey
     const ourPubkey = UserUtils.getOurPubKeyFromCache();
-    // const directPromises = Promise.resolve();
-    const directPromises = Promise.all([this.pollOnceForKey(ourPubkey, false, [0])]).then(
-      () => undefined
-    );
+    const directPromise = Promise.all([
+      this.pollOnceForKey(ourPubkey, false, [
+        SnodeNamespaces.UserMessages,
+        SnodeNamespaces.UserProfile,
+        SnodeNamespaces.UserContacts,
+      ]),
+    ]).then(() => undefined);
 
     const now = Date.now();
     const groupPromises = this.groupPolling.map(async group => {
@@ -163,7 +172,7 @@ export class SwarmPolling {
           `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} `
         );
 
-        return this.pollOnceForKey(group.pubkey, true, [-10]);
+        return this.pollOnceForKey(group.pubkey, true, [SnodeNamespaces.ClosedGroupMessages]);
       }
       window?.log?.info(
         `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}`
@@ -172,7 +181,7 @@ export class SwarmPolling {
       return Promise.resolve();
     });
     try {
-      await Promise.all(concat([directPromises], groupPromises));
+      await Promise.all(concat([directPromise], groupPromises));
     } catch (e) {
       window?.log?.info('pollForAllKeys exception: ', e);
       throw e;
@@ -184,40 +193,37 @@ export class SwarmPolling {
   /**
    * Only exposed as public for testing
    */
-  public async pollOnceForKey(pubkey: PubKey, isGroup: boolean, namespaces: Array<number>) {
+  public async pollOnceForKey(
+    pubkey: PubKey,
+    isGroup: boolean,
+    namespaces: Array<SnodeNamespaces>
+  ) {
     const pkStr = pubkey.key;
 
     const swarmSnodes = await snodePool.getSwarmFor(pkStr);
 
     // Select nodes for which we already have lastHashes
     const alreadyPolled = swarmSnodes.filter((n: Snode) => this.lastHashes[n.pubkey_ed25519]);
+    let toPollFrom = alreadyPolled.length ? alreadyPolled[0] : null;
 
     // If we need more nodes, select randomly from the remaining nodes:
-
-    // We only poll from a single node.
-    let nodesToPoll = _.sampleSize(alreadyPolled, 1);
-    if (nodesToPoll.length < 1) {
+    if (!toPollFrom) {
       const notPolled = _.difference(swarmSnodes, alreadyPolled);
-
-      const newNodes = _.sampleSize(notPolled, 1);
-
-      nodesToPoll = _.concat(nodesToPoll, newNodes);
+      toPollFrom = _.sample(notPolled) as Snode;
     }
 
-    // this actually doesn't make much sense as we are at only polling from a single one
-    const promisesSettled = await Promise.allSettled(
-      nodesToPoll.map(async n => {
-        return this.pollNodeForKey(n, pubkey, namespaces);
-      })
-    );
-
-    const arrayOfResultsWithNull = promisesSettled.map(entry =>
-      entry.status === 'fulfilled' ? entry.value : null
-    );
+    let resultsFromAllNamespaces: RetrieveMessagesResults | null;
+    try {
+      resultsFromAllNamespaces = await this.pollNodeForKey(toPollFrom, pubkey, namespaces);
+    } catch (e) {
+      window.log.warn('pollNodeForKey failed with: ', e.message);
+      resultsFromAllNamespaces = null;
+    }
 
     // filter out null (exception thrown)
-    const arrayOfResults = _.compact(arrayOfResultsWithNull);
-
+    const arrayOfResults = resultsFromAllNamespaces?.length
+      ? _.compact(resultsFromAllNamespaces)
+      : null;
     // Merge results into one list of unique messages
     const messages = _.uniqBy(_.flatten(arrayOfResults), (x: any) => x.hash);
 
@@ -257,6 +263,9 @@ export class SwarmPolling {
 
     perfEnd(`handleSeenMessages-${pkStr}`, 'handleSeenMessages');
 
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    }
+
     newMessages.forEach((m: Message) => {
       const options = isGroup ? { conversationId: pkStr } : {};
       processMessage(m.data, options, m.hash);
@@ -268,10 +277,10 @@ export class SwarmPolling {
   private async pollNodeForKey(
     node: Snode,
     pubkey: PubKey,
-    namespaces: Array<number>
-  ): Promise<Array<any> | null> {
+    namespaces: Array<SnodeNamespaces>
+  ): Promise<RetrieveMessagesResults | null> {
     const namespaceLength = namespaces.length;
-    if (namespaceLength > 2 || namespaceLength <= 0) {
+    if (namespaceLength > 3 || namespaceLength <= 0) {
       throw new Error('pollNodeForKey needs  1 or 2 namespaces to be given at all times');
     }
     const edkey = node.pubkey_ed25519;
@@ -310,7 +319,7 @@ export class SwarmPolling {
           await Promise.all(
             lastMessages.map(async (lastMessage, index) => {
               if (!lastMessage) {
-                return Promise.resolve();
+                return;
               }
               return this.updateLastHash({
                 edkey: edkey,
@@ -345,7 +354,7 @@ export class SwarmPolling {
           window.inboxStore?.dispatch(updateIsOnline(true));
         }
       }
-      window?.log?.info('pollNodeForKey failed with', e.message);
+      window?.log?.info('pollNodeForKey failed with:', e.message);
       return null;
     }
   }
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 82b79c51f..516cc1b7f 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -140,7 +140,7 @@ describe('libsession_wrapper_contacts  ', () => {
     contacts2.setNickname(third_id, 'Nickname 3');
     contacts2.setApproved(third_id, true);
     contacts2.setBlocked(third_id, true);
-    contacts2.setProfilePic(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
+    contacts2.setProfilePicture(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
 
     expect(contacts.needsPush()).to.be.true;
     expect(contacts2.needsPush()).to.be.true;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
index 6e27d4730..3aafb3d6f 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
@@ -42,12 +42,12 @@ describe('libsession_wrapper', () => {
     );
 
     // This should also be unset:
-    const picResult = conf.getProfilePic();
+    const picResult = conf.getProfilePicture();
     expect(picResult.url).to.be.null;
     expect(picResult.key).to.be.null;
 
     // Now let's go set a profile name and picture:
-    conf.setProfilePic('http://example.org/omg-pic-123.bmp', stringToUint8Array('secret'));
+    conf.setProfilePicture('http://example.org/omg-pic-123.bmp', stringToUint8Array('secret'));
     conf.setName('Kallie');
 
     // Retrieve them just to make sure they set properly:
@@ -56,7 +56,7 @@ describe('libsession_wrapper', () => {
     expect(name).to.be.not.null;
     expect(name).to.be.eq('Kallie');
 
-    const picture = conf.getProfilePic();
+    const picture = conf.getProfilePicture();
 
     expect(picture.url).to.be.eq('http://example.org/omg-pic-123.bmp');
     expect(picture.key).to.be.deep.eq(stringToUint8Array('secret'));
@@ -143,7 +143,7 @@ describe('libsession_wrapper', () => {
     conf2.setName('Raz');
 
     // And, on conf2, we're also going to change the profile pic:
-    conf2.setProfilePic('http://new.example.com/pic', stringToUint8Array('qwert\0yuio'));
+    conf2.setProfilePicture('http://new.example.com/pic', stringToUint8Array('qwert\0yuio'));
 
     // Both have changes, so push need a push
     expect(conf.needsPush()).to.be.true;
@@ -189,8 +189,8 @@ describe('libsession_wrapper', () => {
     // test).
 
     // Since only one of them set a profile pic there should be no conflict there:
-    const pic = conf.getProfilePic();
-    const pic2 = conf2.getProfilePic();
+    const pic = conf.getProfilePicture();
+    const pic2 = conf2.getProfilePicture();
     expect(pic.url).to.be.eq('http://new.example.com/pic');
     expect(pic2.url).to.be.eq('http://new.example.com/pic');
 
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index c4e291170..ee4669f34 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -12,7 +12,7 @@ import * as cache from '../../../../receiver/cache';
 import { EnvelopePlus } from '../../../../receiver/types';
 
 import chaiAsPromised from 'chai-as-promised';
-import { handleConfigurationMessage } from '../../../../receiver/configMessage';
+import { ConfigMessageHandler } from '../../../../receiver/configMessage';
 import { stubData } from '../../../test-utils/utils';
 chai.use(chaiAsPromised as any);
 chai.should();
@@ -51,7 +51,7 @@ describe('ConfigurationMessage_receiving', () => {
     const proto = config.contentProto();
     createOrUpdateStub = stubData('createOrUpdateItem').resolves();
     getItemByIdStub = stubData('getItemById').resolves();
-    await handleConfigurationMessage(
+    await ConfigMessageHandler.handleConfigurationMessage(
       envelope,
       proto.configurationMessage as SignalService.ConfigurationMessage
     );
@@ -73,7 +73,7 @@ describe('ConfigurationMessage_receiving', () => {
 
       createOrUpdateStub = stubData('createOrUpdateItem').resolves();
       getItemByIdStub = stubData('getItemById').resolves();
-      await handleConfigurationMessage(
+      await ConfigMessageHandler.handleConfigurationMessage(
         envelope,
         proto.configurationMessage as SignalService.ConfigurationMessage
       );
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 7087190c2..9b1eb0cbe 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -46,7 +46,7 @@ function initUserConfigWrapper(options: Array<any>) {
   if (!isNull(dump) && !isUInt8Array(dump)) {
     throw new Error('UserConfig init needs a valid dump');
   }
-
+  console.warn('UserConfigWrapper', UserConfigWrapper);
   userConfig = new UserConfigWrapper(edSecretKey, dump);
 }
 
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 384d52cf0..664e85c5f 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -37,6 +37,7 @@ declare global {
       useOnionRequests: boolean;
       useTestNet: boolean;
       useClosedGroupV3: boolean;
+      useSharedUtilForUserConfig: boolean;
       debug: {
         debugFileServerRequests: boolean;
         debugNonSnodeRequests: boolean;
diff --git a/utils.worker.config.js b/utils.worker.config.js
index dc1a4fb25..79bf25ee5 100644
--- a/utils.worker.config.js
+++ b/utils.worker.config.js
@@ -25,4 +25,7 @@ module.exports = {
     path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'util'),
   },
   target: 'node',
+  optimization: {
+    minimize: false,
+  },
 };
diff --git a/yarn.lock b/yarn.lock
index 9ef4479eb..de65cf2e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2654,16 +2654,6 @@ asbycountry@^1.4.2:
     chalk "^1.1.3"
     fetch "^1.1.0"
 
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -2809,16 +2799,6 @@ blueimp-load-image@5.14.0:
   resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6"
   integrity sha512-g5l+4dCOESBG8HkPLdGnBx8dhEwpQHaOZ0en623sl54o3bGhGMLYGc54L5cWfGmPvfKUjbsY7LOAmcW/xlkBSA==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -2875,11 +2855,6 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
-
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
@@ -2890,60 +2865,6 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
-  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
 browserslist@^4.14.5:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
@@ -2975,11 +2896,6 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
-
 buffer@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
@@ -3242,14 +3158,6 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
 classnames@2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
@@ -3564,37 +3472,6 @@ country-code-lookup@^0.0.19:
   resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6"
   integrity sha512-lpvgdPyj8RuP0CSZhACNf5ueKlLbv/IQUAQfg7yr/qJbFrdcWV7Y+aDN9K/u/bx3MXRfcsjuW+TdIc0AEj7kDw==
 
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 cross-env@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
@@ -3622,23 +3499,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-browserify@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -3874,14 +3734,6 @@ depd@^1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
@@ -3917,15 +3769,6 @@ diff@^4.0.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
 dmg-builder@22.8.0:
   version "22.8.0"
   resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.8.0.tgz#2b17127837ed444db3086317eda5cf8912f6e6a9"
@@ -4138,19 +3981,6 @@ electron@*, electron@^17.2.0:
     "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
 emoji-mart@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.2.2.tgz#1c093ffc19554dd6edfcfeec9aca43ff38bcc16e"
@@ -4667,14 +4497,6 @@ events@^3.2.0, events@^3.3.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
 execa@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
@@ -5501,23 +5323,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
 hasha@^5.0.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
@@ -5531,15 +5336,6 @@ he@1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
 hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -5744,7 +5540,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6652,15 +6448,6 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -6695,14 +6482,6 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -6735,16 +6514,6 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
 "minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -7495,17 +7264,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
-  dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
 parse-filepath@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
@@ -7554,11 +7312,6 @@ patch-package@^6.4.7:
     slash "^2.0.0"
     tmp "^0.0.33"
 
-path-browserify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -7618,17 +7371,6 @@ pathval@^1.1.1:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
   integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
-pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -7916,18 +7658,6 @@ psl@^1.1.33, psl@^1.1.7:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -7982,21 +7712,13 @@ ramda@^0.28.0:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
   integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
@@ -8278,7 +8000,7 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.5.0, readable-stream@^3.6.0:
+readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -8496,14 +8218,6 @@ rimraf@~2.4.0:
   dependencies:
     glob "^6.0.1"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
 roarr@^2.15.3:
   version "2.15.4"
   resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
@@ -8535,7 +8249,7 @@ rxjs@^7.0.0:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8555,7 +8269,7 @@ safe-json-stringify@~1:
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
   integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -8678,9 +8392,15 @@ serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+"session_util_wrapper@file:../libsession-util-nodejs":
+  version "0.1.0"
+  dependencies:
+    nan "^2.17.0"
+    node-gyp "^9.3.0"
+
 "session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs":
   version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#a56aba11e504fe743f299bab79b7c33b2772f17f"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#0951d0138a289795257198d556409b2e73068fc1"
   dependencies:
     nan "^2.17.0"
     node-gyp "^9.3.0"
@@ -8695,14 +8415,6 @@ set-harmonic-interval@^1.0.1:
   resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249"
   integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -8963,14 +8675,6 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
-stream-browserify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
-  integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==
-  dependencies:
-    inherits "~2.0.4"
-    readable-stream "^3.5.0"
-
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"

From 6d1b406c85f1a90ae55ba696b3f998a5e9a8e839 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 17 Jan 2023 12:44:02 +1100
Subject: [PATCH 017/178] fix: add namespace to all sending message calls

---
 .../conversations/unsendingInteractions.ts    | 13 ++-
 ts/models/conversation.ts                     | 85 ++++++++++++-----
 ts/models/message.ts                          | 27 ++++--
 ts/receiver/closedGroups.ts                   |  7 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |  4 +-
 ts/session/apis/snode_api/batchRequest.ts     |  2 +-
 ts/session/apis/snode_api/namespaces.ts       | 46 +++++++--
 ts/session/apis/snode_api/retrieveRequest.ts  | 28 +++---
 ts/session/apis/snode_api/sessionRpc.ts       |  2 -
 ts/session/apis/snode_api/swarmPolling.ts     | 85 ++++++++++-------
 ts/session/apis/snode_api/types.ts            | 23 +++++
 ts/session/conversations/createClosedGroup.ts |  7 +-
 ts/session/group/closed-group.ts              | 57 ++++++++----
 .../DataExtractionNotificationMessage.ts      |  3 +-
 ts/session/sending/MessageQueue.ts            | 93 +++++++++++++------
 ts/session/sending/MessageSender.ts           | 84 ++++++++++-------
 ts/session/sending/PendingMessageCache.ts     |  9 +-
 ts/session/types/RawMessage.ts                |  2 +
 ts/session/utils/Messages.ts                  |  3 +
 ts/session/utils/calling/CallManager.ts       | 40 ++++++--
 ts/session/utils/syncUtils.ts                 | 12 ++-
 .../session/unit/sending/MessageQueue_test.ts | 48 +++++++---
 .../unit/sending/MessageSender_test.ts        | 28 +++++-
 .../unit/sending/PendingMessageCache_test.ts  | 77 +++++++++++----
 ts/test/session/unit/utils/Messages_test.ts   | 46 ++++++---
 25 files changed, 592 insertions(+), 239 deletions(-)
 create mode 100644 ts/session/apis/snode_api/types.ts

diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 4a713613e..97997fe00 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -13,6 +13,7 @@ import { resetSelectedMessageIds } from '../../state/ducks/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { SessionButtonColor } from '../../components/basic/SessionButton';
 import { deleteSogsMessageByServerIds } from '../../session/apis/open_group_api/sogsv3/sogsV3DeleteMessages';
+import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
 
 /**
  * Deletes messages for everyone in a 1-1 or everyone in a closed group conversation.
@@ -38,14 +39,14 @@ async function unsendMessagesForEveryone(
     await Promise.all(
       unsendMsgObjects.map(unsendObject =>
         getMessageQueue()
-          .sendToPubKey(new PubKey(destinationId), unsendObject)
+          .sendToPubKey(new PubKey(destinationId), unsendObject, SnodeNamespaces.UserMessages)
           .catch(window?.log?.error)
       )
     );
     await Promise.all(
       unsendMsgObjects.map(unsendObject =>
         getMessageQueue()
-          .sendSyncMessage(unsendObject)
+          .sendSyncMessage({ namespace: SnodeNamespaces.UserMessages, message: unsendObject })
           .catch(window?.log?.error)
       )
     );
@@ -54,7 +55,11 @@ async function unsendMessagesForEveryone(
     await Promise.all(
       unsendMsgObjects.map(unsendObject => {
         getMessageQueue()
-          .sendToGroup(unsendObject, undefined, new PubKey(destinationId))
+          .sendToGroup({
+            message: unsendObject,
+            namespace: SnodeNamespaces.ClosedGroupMessage,
+            groupPubKey: new PubKey(destinationId),
+          })
           .catch(window?.log?.error);
       })
     );
@@ -222,7 +227,7 @@ async function unsendMessageJustForThisUser(
   await Promise.all(
     unsendMsgObjects.map(unsendObject =>
       getMessageQueue()
-        .sendSyncMessage(unsendObject)
+        .sendSyncMessage({ namespace: SnodeNamespaces.UserMessages, message: unsendObject })
         .catch(window?.log?.error)
     )
   );
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index ca16d6c73..748a155c7 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -98,6 +98,7 @@ import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogs
 import { Reaction } from '../types/Reaction';
 import { Reactions } from '../util/reactions';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -609,12 +610,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         }
         const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id);
         // send with blinding if we need to
-        await getMessageQueue().sendToOpenGroupV2(
-          chatMessageOpenGroupV2,
+        await getMessageQueue().sendToOpenGroupV2({
+          message: chatMessageOpenGroupV2,
           roomInfos,
-          Boolean(roomHasBlindEnabled(openGroup)),
-          fileIdsToLink
-        );
+          blinded: Boolean(roomHasBlindEnabled(openGroup)),
+          filesToLink: fileIdsToLink,
+        });
         return;
       }
 
@@ -625,7 +626,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
           chatMessageParams.syncTarget = this.id;
           const chatMessageMe = new VisibleMessage(chatMessageParams);
 
-          await getMessageQueue().sendSyncMessage(chatMessageMe);
+          await getMessageQueue().sendSyncMessage({
+            namespace: SnodeNamespaces.UserMessages,
+            message: chatMessageMe,
+          });
           return;
         }
 
@@ -639,12 +643,20 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
             expireTimer: this.get('expireTimer'),
           });
           // we need the return await so that errors are caught in the catch {}
-          await getMessageQueue().sendToPubKey(destinationPubkey, groupInvitMessage);
+          await getMessageQueue().sendToPubKey(
+            destinationPubkey,
+            groupInvitMessage,
+            SnodeNamespaces.UserMessages
+          );
           return;
         }
         const chatMessagePrivate = new VisibleMessage(chatMessageParams);
 
-        await getMessageQueue().sendToPubKey(destinationPubkey, chatMessagePrivate);
+        await getMessageQueue().sendToPubKey(
+          destinationPubkey,
+          chatMessagePrivate,
+          SnodeNamespaces.UserMessages
+        );
         return;
       }
 
@@ -656,7 +668,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         });
 
         // we need the return await so that errors are caught in the catch {}
-        await getMessageQueue().sendToGroup(closedGroupVisibleMessage);
+        await getMessageQueue().sendToGroup({
+          message: closedGroupVisibleMessage,
+          namespace: SnodeNamespaces.ClosedGroupMessage,
+        });
         return;
       }
 
@@ -729,7 +744,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         const blinded = Boolean(roomHasBlindEnabled(openGroup));
 
         // send with blinding if we need to
-        await getMessageQueue().sendToOpenGroupV2(chatMessageOpenGroupV2, roomInfos, blinded, []);
+        await getMessageQueue().sendToOpenGroupV2({
+          message: chatMessageOpenGroupV2,
+          roomInfos,
+          blinded,
+          filesToLink: [],
+        });
         return;
       }
 
@@ -740,10 +760,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
           ...chatMessageParams,
           syncTarget: this.id,
         });
-        await getMessageQueue().sendSyncMessage(chatMessageMe);
+        await getMessageQueue().sendSyncMessage({
+          namespace: SnodeNamespaces.UserMessages,
+          message: chatMessageMe,
+        });
 
         const chatMessagePrivate = new VisibleMessage(chatMessageParams);
-        await getMessageQueue().sendToPubKey(destinationPubkey, chatMessagePrivate);
+        await getMessageQueue().sendToPubKey(
+          destinationPubkey,
+          chatMessagePrivate,
+          SnodeNamespaces.UserMessages
+        );
         await Reactions.handleMessageReaction({
           reaction,
           sender: UserUtils.getOurPubKeyStrFromCache(),
@@ -760,7 +787,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
           groupId: destination,
         });
         // we need the return await so that errors are caught in the catch {}
-        await getMessageQueue().sendToGroup(closedGroupVisibleMessage);
+        await getMessageQueue().sendToGroup({
+          message: closedGroupVisibleMessage,
+          namespace: SnodeNamespaces.ClosedGroupMessage,
+        });
         await Reactions.handleMessageReaction({
           reaction,
           sender: UserUtils.getOurPubKeyStrFromCache(),
@@ -893,12 +923,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     this.set({ active_at: Date.now(), isApproved: true });
 
-    await getMessageQueue().sendToOpenGroupV2BlindedRequest(
-      encryptedMsg,
-      roomInfo,
-      sogsVisibleMessage,
-      this.id
-    );
+    await getMessageQueue().sendToOpenGroupV2BlindedRequest({
+      encryptedContent: encryptedMsg,
+      roomInfos: roomInfo,
+      message: sogsVisibleMessage,
+      recipientBlindedId: this.id,
+    });
   }
 
   /**
@@ -920,7 +950,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams);
     const pubkeyForSending = new PubKey(this.id);
     await getMessageQueue()
-      .sendToPubKey(pubkeyForSending, messageRequestResponse)
+      .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.UserMessages)
       .catch(window?.log?.error);
   }
 
@@ -1118,7 +1148,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.isPrivate()) {
       const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate);
       const pubkey = new PubKey(this.get('id'));
-      await getMessageQueue().sendToPubKey(pubkey, expirationTimerMessage);
+      await getMessageQueue().sendToPubKey(
+        pubkey,
+        expirationTimerMessage,
+        SnodeNamespaces.UserMessages
+      );
     } else {
       window?.log?.warn('TODO: Expiration update for closed groups are to be updated');
       const expireUpdateForGroup = {
@@ -1128,7 +1162,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
       const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdateForGroup);
 
-      await getMessageQueue().sendToGroup(expirationTimerMessage);
+      await getMessageQueue().sendToGroup({
+        message: expirationTimerMessage,
+        namespace: SnodeNamespaces.ClosedGroupMessage,
+      });
     }
     return;
   }
@@ -1365,7 +1402,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       });
 
       const device = new PubKey(this.id);
-      await getMessageQueue().sendToPubKey(device, receiptMessage);
+      await getMessageQueue().sendToPubKey(device, receiptMessage, SnodeNamespaces.UserMessages);
     }
   }
 
@@ -2045,7 +2082,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     // send the message to a single recipient if this is a session chat
     const device = new PubKey(recipientId);
     getMessageQueue()
-      .sendToPubKey(device, typingMessage)
+      .sendToPubKey(device, typingMessage, SnodeNamespaces.UserMessages)
       .catch(window?.log?.error);
   }
 
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 0b66676d4..3bc5b709a 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -95,6 +95,7 @@ import { QUOTED_TEXT_MAX_LENGTH } from '../session/constants';
 import { ReactionList } from '../types/Reaction';
 import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
 // tslint:disable: cyclomatic-complexity
 
 /**
@@ -905,12 +906,12 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         const openGroupMessage = new OpenGroupVisibleMessage(openGroupParams);
         const openGroup = OpenGroupData.getV2OpenGroupRoom(conversation.id);
 
-        return getMessageQueue().sendToOpenGroupV2(
-          openGroupMessage,
+        return getMessageQueue().sendToOpenGroupV2({
+          message: openGroupMessage,
           roomInfos,
-          roomHasBlindEnabled(openGroup),
-          fileIdsToLink
-        );
+          blinded: roomHasBlindEnabled(openGroup),
+          filesToLink: fileIdsToLink,
+        });
       }
 
       const chatParams = {
@@ -936,7 +937,11 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       }
 
       if (conversation.isPrivate()) {
-        return getMessageQueue().sendToPubKey(PubKey.cast(conversation.id), chatMessage);
+        return getMessageQueue().sendToPubKey(
+          PubKey.cast(conversation.id),
+          chatMessage,
+          SnodeNamespaces.UserMessages
+        );
       }
 
       // Here, the convo is neither an open group, a private convo or ourself. It can only be a medium group.
@@ -954,7 +959,10 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         groupId: this.get('conversationId'),
       });
 
-      return getMessageQueue().sendToGroup(closedGroupVisibleMessage);
+      return getMessageQueue().sendToGroup({
+        message: closedGroupVisibleMessage,
+        namespace: SnodeNamespaces.ClosedGroupMessage,
+      });
     } catch (e) {
       await this.saveErrors(e);
       return null;
@@ -1060,7 +1068,10 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         throw new Error('Cannot trigger syncMessage with unknown convo.');
       }
       const syncMessage = buildSyncMessage(this.id, dataMessage, conversation.id, sentTimestamp);
-      await getMessageQueue().sendSyncMessage(syncMessage);
+      await getMessageQueue().sendSyncMessage({
+        namespace: SnodeNamespaces.UserMessages,
+        message: syncMessage,
+      });
     }
     this.set({ sentSync: true });
     await this.commit();
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index a1c7d9c1a..64695f86b 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -19,6 +19,7 @@ import { queueAllCachedFromSource } from './receiver';
 import { getSwarmPollingInstance } from '../session/apis/snode_api';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
 
 export const distributingClosedGroupEncryptionKeyPairs = new Map<string, ECKeyPair>();
 
@@ -906,7 +907,11 @@ async function sendLatestKeyPairToUsers(
       });
 
       // the encryption keypair is sent using established channels
-      await getMessageQueue().sendToPubKey(PubKey.cast(member), keypairsMessage);
+      await getMessageQueue().sendToPubKey(
+        PubKey.cast(member),
+        keypairsMessage,
+        SnodeNamespaces.UserMessages
+      );
     })
   );
 }
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 80aa52689..7b8665d35 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -1,3 +1,5 @@
+import { SnodeNamespaces } from './namespaces';
+
 export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } };
 
 type RetrieveMaxCountSize = { max_count?: number; max_size?: number };
@@ -29,7 +31,7 @@ export type RetrievePubkeySubRequestType = {
 export type RetrieveLegacyClosedGroupSubRequestType = {
   method: 'retrieve';
   params: {
-    namespace: -10; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key
+    namespace: SnodeNamespaces.ClosedGroupMessage; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key
   } & RetrieveAlwaysNeeded &
     RetrieveMaxCountSize;
 };
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 7946ece0b..01f239bff 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -44,7 +44,7 @@ export async function doSnodeBatchRequest(
  */
 function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchResults {
   try {
-    console.warn('decodeBatch: ', snodeResponse);
+    // console.warn('decodeBatch: ', snodeResponse);
     if (snodeResponse.status !== 200) {
       throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`);
     }
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 40d154492..4b5234ed1 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -1,9 +1,4 @@
 export enum SnodeNamespaces {
-  /**
-   * The messages sent to a closed group are sent and polled from this namespace
-   */
-  ClosedGroupMessages = -10,
-
   /**
    * This is the namespace anyone can deposit a message for us
    */
@@ -13,14 +8,51 @@ export enum SnodeNamespaces {
    * This is the namespace used to sync our profile
    */
   UserProfile = 2,
-
   /**
    * This is the namespace used to sync our contacts
    */
   UserContacts = 3,
 
+  /**
+   * The messages sent to a closed group are sent and polled from this namespace
+   */
+  ClosedGroupMessage = -10,
+
   /**
    * This is the namespace used to sync the closed group details for each of the closed groups we are polling
    */
-  ClosedGroupInfo = 11,
+  ClosedGroupInfo = 1,
 }
+
+type PickEnum<T, K extends T> = {
+  [P in keyof K]: P extends K ? P : never;
+};
+
+export type SnodeNamespacesGroup = PickEnum<
+  SnodeNamespaces,
+  SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMessage
+>;
+
+export type SnodeNamespacesUser = PickEnum<
+  SnodeNamespaces,
+  SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.UserMessages
+>;
+
+/**
+ * Returns true if that namespace is associated with the config of a user (not his messages, only configs)
+ */
+function isUserConfigNamespace(namespace: SnodeNamespaces) {
+  return namespace === SnodeNamespaces.UserContacts || namespace === SnodeNamespaces.UserProfile;
+}
+
+/**
+ * Returns true if that namespace is associated with the config of a closed group (not its messages, only configs)
+ */
+function isGroupConfigNamespace(namespace: SnodeNamespaces) {
+  return namespace === SnodeNamespaces.ClosedGroupInfo;
+}
+
+export const SnodeNamespace = {
+  isUserConfigNamespace,
+  isGroupConfigNamespace,
+};
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 6e5efa206..47c6361a0 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -6,10 +6,12 @@ import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
 import { SnodeNamespaces } from './namespaces';
+
 import {
   RetrieveLegacyClosedGroupSubRequestType,
   RetrieveSubRequestType,
 } from './SnodeRequestTypes';
+import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types';
 
 async function getRetrieveSignatureParams(params: {
   pubkey: string;
@@ -71,15 +73,15 @@ async function buildRetrieveRequest(
         timestamp: GetNetworkTime.getNowWithNetworkOffset(),
       };
 
-      if (namespace === SnodeNamespaces.ClosedGroupMessages) {
+      if (namespace === SnodeNamespaces.ClosedGroupMessage) {
         if (pubkey === ourPubkey || !pubkey.startsWith('05')) {
           throw new Error(
-            'namespace -10 can only be used to retrieve messages from a legacy closed group'
+            'namespace -10 can only be used to retrieve messages from a legacy closed group (prefix 05)'
           );
         }
         const retrieveLegacyClosedGroup = {
           ...retrieveParam,
-          namespace: namespace as -10,
+          namespace,
         };
         const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = {
           method: 'retrieve',
@@ -99,7 +101,7 @@ async function buildRetrieveRequest(
         throw new Error('not a legacy closed group. namespace can only be 0');
       }
       if (pubkey !== ourPubkey) {
-        throw new Error('not a legacy closed group. pubkey can only be our number');
+        throw new Error('not a legacy closed group. pubkey can only be ours');
       }
       const signatureArgs = { ...retrieveParam, ourPubkey };
       const signatureBuilt = await getRetrieveSignatureParams(signatureArgs);
@@ -121,7 +123,7 @@ async function retrieveNextMessages(
   associatedWith: string,
   namespaces: Array<SnodeNamespaces>,
   ourPubkey: string
-): Promise<Array<{ code: number; messages: Array<Record<string, any>> }>> {
+): Promise<RetrieveMessagesResultsBatched> {
   if (namespaces.length !== lastHashes.length) {
     throw new Error('namespaces and lasthashes does not match');
   }
@@ -135,7 +137,7 @@ async function retrieveNextMessages(
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
 
-  console.warn('retrieveRequestsParams', retrieveRequestsParams);
+  console.warn(`fetching messages associatedWith:${associatedWith} namespaces:${namespaces}`);
   const results = await doSnodeBatchRequest(retrieveRequestsParams, targetNode, 4000);
 
   if (!results || !results.length) {
@@ -153,11 +155,11 @@ async function retrieveNextMessages(
     );
   }
 
-  if (namespaces.length > 1) {
-    throw new Error('multiple namespace polling todo');
-  }
   const firstResult = results[0];
 
+  // TODO we should probably check for status code of all the results (when polling for a few namespaces at a time)
+  console.warn('what should we do if we dont get a 200 on any of those fetches?');
+
   if (firstResult.code !== 200) {
     window?.log?.warn(`retrieveNextMessages result is not 200 but ${firstResult.code}`);
     throw new Error(
@@ -165,21 +167,19 @@ async function retrieveNextMessages(
     );
   }
 
-  console.warn('what should we do if we dont get a 200 on any of those fetches?');
-
   try {
-    // we rely on the code of the
+    // we rely on the code of the first one to check for online status
     const bodyFirstResult = firstResult.body;
     if (!window.inboxStore?.getState().onionPaths.isOnline) {
       window.inboxStore?.dispatch(updateIsOnline(true));
     }
 
     GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', bodyFirstResult.t);
-    // merge results with their corresponding namespaces
 
+    // merge results with their corresponding namespaces
     return results.map((result, index) => ({
       code: result.code,
-      messages: result.body as Array<any>,
+      messages: result.body as RetrieveMessagesResultsContent,
       namespace: namespaces[index],
     }));
   } catch (e) {
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index db6597167..197de119a 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -129,8 +129,6 @@ export async function snodeRpc(
     params: clone(params),
   };
 
-  console.warn('snodeRPC', body);
-
   const fetchOptions: LokiFetchOptions = {
     method: 'POST',
     body: JSON.stringify(body),
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 2bcd641b5..e4ac9b8da 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -3,7 +3,7 @@ import * as snodePool from './snodePool';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { SignalService } from '../../../protobuf';
 import * as Receiver from '../../../receiver/receiver';
-import _, { concat, last } from 'lodash';
+import _, { compact, concat, difference, flatten, last, sample, uniqBy } from 'lodash';
 import { Data, Snode } from '../../../data/data';
 
 import { StringUtils, UserUtils } from '../../utils';
@@ -15,18 +15,8 @@ import { ed25519Str } from '../../onions/onionPath';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import pRetry from 'p-retry';
 import { SnodeAPIRetrieve } from './retrieveRequest';
-import { SnodeNamespaces } from './namespaces';
-
-interface Message {
-  hash: string;
-  expiration: number;
-  data: string;
-}
-
-export type RetrieveMessagesResults = Array<{
-  code: number;
-  messages: Record<string, any>[];
-}>;
+import { SnodeNamespace, SnodeNamespaces } from './namespaces';
+import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
 
 // Some websocket nonsense
 export function processMessage(message: string, options: any = {}, messageHash: string) {
@@ -172,7 +162,7 @@ export class SwarmPolling {
           `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} `
         );
 
-        return this.pollOnceForKey(group.pubkey, true, [SnodeNamespaces.ClosedGroupMessages]);
+        return this.pollOnceForKey(group.pubkey, true, [SnodeNamespaces.ClosedGroupMessage]);
       }
       window?.log?.info(
         `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}`
@@ -208,27 +198,54 @@ export class SwarmPolling {
 
     // If we need more nodes, select randomly from the remaining nodes:
     if (!toPollFrom) {
-      const notPolled = _.difference(swarmSnodes, alreadyPolled);
-      toPollFrom = _.sample(notPolled) as Snode;
+      const notPolled = difference(swarmSnodes, alreadyPolled);
+      toPollFrom = sample(notPolled) as Snode;
     }
 
-    let resultsFromAllNamespaces: RetrieveMessagesResults | null;
+    let resultsFromAllNamespaces: RetrieveMessagesResultsBatched | null;
     try {
       resultsFromAllNamespaces = await this.pollNodeForKey(toPollFrom, pubkey, namespaces);
     } catch (e) {
-      window.log.warn('pollNodeForKey failed with: ', e.message);
+      window.log.warn(
+        `pollNodeForKey of ${pubkey} namespaces: ${namespaces} failed with: ${e.message}`
+      );
       resultsFromAllNamespaces = null;
     }
 
-    // filter out null (exception thrown)
-    const arrayOfResults = resultsFromAllNamespaces?.length
-      ? _.compact(resultsFromAllNamespaces)
-      : null;
+    let userConfigMessagesMerged: Array<RetrieveMessageItem> = [];
+    let allNamespacesWithoutUserConfigIfNeeded: Array<RetrieveMessageItem> = [];
+
+    // check if we just fetched the details from the config namespaces.
+    // If yes, merge them together and exclude them from the rest of the messages.
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig && resultsFromAllNamespaces) {
+      const userConfigMessages = resultsFromAllNamespaces
+        .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace))
+        .map(r => r.messages.messages);
+
+      allNamespacesWithoutUserConfigIfNeeded = flatten(
+        compact(
+          resultsFromAllNamespaces
+            .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace))
+            .map(r => r.messages.messages)
+        )
+      );
+      userConfigMessagesMerged = flatten(compact(userConfigMessages));
+    } else {
+      allNamespacesWithoutUserConfigIfNeeded = flatten(
+        compact(resultsFromAllNamespaces?.map(m => m.messages.messages))
+      );
+    }
+
+    console.warn(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
+    console.warn(
+      `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
+    );
+
     // Merge results into one list of unique messages
-    const messages = _.uniqBy(_.flatten(arrayOfResults), (x: any) => x.hash);
+    const messages = uniqBy(allNamespacesWithoutUserConfigIfNeeded, x => x.hash);
 
     // if all snodes returned an error (null), no need to update the lastPolledTimestamp
-    if (isGroup && arrayOfResults?.length) {
+    if (isGroup && allNamespacesWithoutUserConfigIfNeeded?.length) {
       window?.log?.info(
         `Polled for group(${ed25519Str(pubkey.key)}):, got ${messages.length} messages back.`
       );
@@ -263,10 +280,7 @@ export class SwarmPolling {
 
     perfEnd(`handleSeenMessages-${pkStr}`, 'handleSeenMessages');
 
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    }
-
-    newMessages.forEach((m: Message) => {
+    newMessages.forEach((m: RetrieveMessageItem) => {
       const options = isGroup ? { conversationId: pkStr } : {};
       processMessage(m.data, options, m.hash);
     });
@@ -278,7 +292,7 @@ export class SwarmPolling {
     node: Snode,
     pubkey: PubKey,
     namespaces: Array<SnodeNamespaces>
-  ): Promise<RetrieveMessagesResults | null> {
+  ): Promise<RetrieveMessagesResultsBatched | null> {
     const namespaceLength = namespaces.length;
     if (namespaceLength > 3 || namespaceLength <= 0) {
       throw new Error('pollNodeForKey needs  1 or 2 namespaces to be given at all times');
@@ -313,7 +327,7 @@ export class SwarmPolling {
           }
 
           const lastMessages = results.map(r => {
-            return last(r.messages);
+            return last(r.messages.messages);
           });
 
           await Promise.all(
@@ -336,7 +350,6 @@ export class SwarmPolling {
         {
           minTimeout: 100,
           retries: 1,
-
           onFailedAttempt: e => {
             window?.log?.warn(
               `retrieveNextMessages attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.name}`
@@ -375,18 +388,20 @@ export class SwarmPolling {
     });
   }
 
-  private async handleSeenMessages(messages: Array<Message>): Promise<Array<Message>> {
+  private async handleSeenMessages(
+    messages: Array<RetrieveMessageItem>
+  ): Promise<Array<RetrieveMessageItem>> {
     if (!messages.length) {
       return [];
     }
 
-    const incomingHashes = messages.map((m: Message) => m.hash);
+    const incomingHashes = messages.map((m: RetrieveMessageItem) => m.hash);
 
     const dupHashes = await Data.getSeenMessagesByHashList(incomingHashes);
-    const newMessages = messages.filter((m: Message) => !dupHashes.includes(m.hash));
+    const newMessages = messages.filter((m: RetrieveMessageItem) => !dupHashes.includes(m.hash));
 
     if (newMessages.length) {
-      const newHashes = newMessages.map((m: Message) => ({
+      const newHashes = newMessages.map((m: RetrieveMessageItem) => ({
         expiresAt: m.expiration,
         hash: m.hash,
       }));
diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts
new file mode 100644
index 000000000..705c7b5fe
--- /dev/null
+++ b/ts/session/apis/snode_api/types.ts
@@ -0,0 +1,23 @@
+import { SnodeNamespaces } from './namespaces';
+
+export type RetrieveMessageItem = {
+  hash: string;
+  expiration: number;
+  data: string; // base64 encrypted content of the emssage
+  timestamp: number;
+};
+
+export type RetrieveMessagesResultsContent = {
+  hf?: Array<number>;
+  messages?: Array<RetrieveMessageItem>;
+  more: boolean;
+  t: number;
+};
+
+export type RetrieveRequestResult = {
+  code: number;
+  messages: RetrieveMessagesResultsContent;
+  namespace: SnodeNamespaces;
+};
+
+export type RetrieveMessagesResultsBatched = Array<RetrieveRequestResult>;
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 8973cd24a..51424e481 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -7,6 +7,7 @@ import { ECKeyPair } from '../../receiver/keypairs';
 import { openConversationWithMessages } from '../../state/ducks/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { getSwarmPollingInstance } from '../apis/snode_api';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import {
   generateClosedGroupPublicKey,
   generateCurve25519KeyPairWithoutPrefix,
@@ -230,6 +231,10 @@ function createInvitePromises(
       expireTimer: existingExpireTimer,
     };
     const message = new ClosedGroupNewMessage(messageParams);
-    return getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(m), message);
+    return getMessageQueue().sendToPubKeyNonDurably({
+      pubkey: PubKey.cast(m),
+      message,
+      namespace: SnodeNamespaces.UserMessages,
+    });
   });
 }
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index abd9379f5..d16c33a31 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -29,6 +29,7 @@ import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMe
 import { getSwarmPollingInstance } from '../apis/snode_api';
 import { ConversationAttributes, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 export type GroupInfo = {
   id: string;
@@ -338,11 +339,15 @@ export async function leaveClosedGroup(groupId: string) {
   window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
   // sent the message to the group and once done, remove everything related to this group
   getSwarmPollingInstance().removePubkey(groupId);
-  await getMessageQueue().sendToGroup(ourLeavingMessage, async () => {
-    window?.log?.info(
-      `Leaving message sent ${groupId}. Removing everything related to this group.`
-    );
-    await markGroupAsLeftOrKicked(groupId, convo, false);
+  await getMessageQueue().sendToGroup({
+    message: ourLeavingMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+    sentCb: async () => {
+      window?.log?.info(
+        `Leaving message sent ${groupId}. Removing everything related to this group.`
+      );
+      await markGroupAsLeftOrKicked(groupId, convo, false);
+    },
   });
 }
 
@@ -361,7 +366,10 @@ async function sendNewName(convo: ConversationModel, name: string, messageId: st
     identifier: messageId,
     name,
   });
-  await getMessageQueue().sendToGroup(nameChangeMessage);
+  await getMessageQueue().sendToGroup({
+    message: nameChangeMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+  });
 }
 
 async function sendAddedMembers(
@@ -393,7 +401,10 @@ async function sendAddedMembers(
     addedMembers,
     identifier: messageId,
   });
-  await getMessageQueue().sendToGroup(closedGroupControlMessage);
+  await getMessageQueue().sendToGroup({
+    message: closedGroupControlMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+  });
 
   // Send closed group update messages to any new members individually
   const newClosedGroupUpdate = new ClosedGroupNewMessage({
@@ -410,7 +421,11 @@ async function sendAddedMembers(
   const promises = addedMembers.map(async m => {
     await getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE);
     const memberPubKey = PubKey.cast(m);
-    await getMessageQueue().sendToPubKey(memberPubKey, newClosedGroupUpdate);
+    await getMessageQueue().sendToPubKey(
+      memberPubKey,
+      newClosedGroupUpdate,
+      SnodeNamespaces.ClosedGroupMessage
+    );
   });
   await Promise.all(promises);
 }
@@ -445,15 +460,19 @@ export async function sendRemovedMembers(
     identifier: messageId,
   });
   // Send the group update, and only once sent, generate and distribute a new encryption key pair if needed
-  await getMessageQueue().sendToGroup(mainClosedGroupControlMessage, async () => {
-    if (isCurrentUserAdmin) {
-      // we send the new encryption key only to members already here before the update
-      window?.log?.info(
-        `Sending group update: A user was removed from ${groupId} and we are the admin. Generating and sending a new EncryptionKeyPair`
-      );
+  await getMessageQueue().sendToGroup({
+    message: mainClosedGroupControlMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+    sentCb: async () => {
+      if (isCurrentUserAdmin) {
+        // we send the new encryption key only to members already here before the update
+        window?.log?.info(
+          `Sending group update: A user was removed from ${groupId} and we are the admin. Generating and sending a new EncryptionKeyPair`
+        );
 
-      await generateAndSendNewEncryptionKeyPair(groupId, stillMembers);
-    }
+        await generateAndSendNewEncryptionKeyPair(groupId, stillMembers);
+      }
+    },
   });
 }
 
@@ -513,7 +532,11 @@ async function generateAndSendNewEncryptionKeyPair(
     await addKeyPairToCacheAndDBIfNeeded(toHex(groupId), newKeyPair.toHexKeyPair());
   };
   // this is to be sent to the group pubkey adress
-  await getMessageQueue().sendToGroup(keypairsMessage, messageSentCallback);
+  await getMessageQueue().sendToGroup({
+    message: keypairsMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+    sentCb: messageSentCallback,
+  });
 }
 
 export async function buildEncryptionKeyPairWrappers(
diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
index 04ab63910..1a9b8e955 100644
--- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
@@ -8,6 +8,7 @@ import { getConversationController } from '../../../conversations';
 import { UserUtils } from '../../../utils';
 import { SettingsKey } from '../../../../data/settings-key';
 import { Storage } from '../../../../util/storage';
+import { SnodeNamespaces } from '../../../apis/snode_api/namespaces';
 interface DataExtractionNotificationMessageParams extends MessageParams {
   referencedAttachmentTimestamp: number;
 }
@@ -73,7 +74,7 @@ export const sendDataExtractionNotification = async (
   );
 
   try {
-    await getMessageQueue().sendToPubKey(pubkey, dataExtractionNotificationMessage);
+    await getMessageQueue().sendToPubKey(pubkey, dataExtractionNotificationMessage, SnodeNamespaces.UserMessages);
   } catch (e) {
     window.log.warn('failed to send data extraction notification', e);
   }
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 0d323b8e5..ab4050991 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -24,6 +24,11 @@ import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
 import { AbortController } from 'abort-controller';
 import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction';
+import {
+  SnodeNamespaces,
+  SnodeNamespacesGroup,
+  SnodeNamespacesUser,
+} from '../apis/snode_api/namespaces';
 
 type ClosedGroupMessageType =
   | ClosedGroupVisibleMessage
@@ -49,13 +54,14 @@ export class MessageQueue {
   public async sendToPubKey(
     destinationPubKey: PubKey,
     message: ContentMessage,
+    namespace: SnodeNamespaces,
     sentCb?: (message: RawMessage) => Promise<void>,
     isGroup = false
   ): Promise<void> {
     if (message instanceof ConfigurationMessage || !!(message as any).syncTarget) {
       throw new Error('SyncMessage needs to be sent with sendSyncMessage');
     }
-    await this.process(destinationPubKey, message, sentCb, isGroup);
+    await this.process(destinationPubKey, message, namespace, sentCb, isGroup);
   }
 
   /**
@@ -66,12 +72,17 @@ export class MessageQueue {
    *
    * fileIds is the array of ids this message is linked to. If we upload files as part of a message but do not link them with this, the files will be deleted much sooner
    */
-  public async sendToOpenGroupV2(
-    message: OpenGroupVisibleMessage,
-    roomInfos: OpenGroupRequestCommonType,
-    blinded: boolean,
-    filesToLink: Array<number>
-  ) {
+  public async sendToOpenGroupV2({
+    blinded,
+    filesToLink,
+    message,
+    roomInfos,
+  }: {
+    message: OpenGroupVisibleMessage;
+    roomInfos: OpenGroupRequestCommonType;
+    blinded: boolean;
+    filesToLink: Array<number>;
+  }) {
     // Skipping the queue for Open Groups v2; the message is sent directly
 
     try {
@@ -115,12 +126,17 @@ export class MessageQueue {
     }
   }
 
-  public async sendToOpenGroupV2BlindedRequest(
-    encryptedContent: Uint8Array,
-    roomInfos: OpenGroupRequestCommonType,
-    message: OpenGroupVisibleMessage,
-    recipientBlindedId: string
-  ) {
+  public async sendToOpenGroupV2BlindedRequest({
+    encryptedContent,
+    message,
+    recipientBlindedId,
+    roomInfos,
+  }: {
+    encryptedContent: Uint8Array;
+    roomInfos: OpenGroupRequestCommonType;
+    message: OpenGroupVisibleMessage;
+    recipientBlindedId: string;
+  }) {
     try {
       if (!PubKey.hasBlindedPrefix(recipientBlindedId)) {
         throw new Error('sendToOpenGroupV2BlindedRequest needs a blindedId');
@@ -153,11 +169,17 @@ export class MessageQueue {
    *
    * @param sentCb currently only called for medium groups sent message
    */
-  public async sendToGroup(
-    message: ClosedGroupMessageType,
-    sentCb?: (message: RawMessage) => Promise<void>,
-    groupPubKey?: PubKey
-  ): Promise<void> {
+  public async sendToGroup({
+    message,
+    namespace,
+    groupPubKey,
+    sentCb,
+  }: {
+    message: ClosedGroupMessageType;
+    namespace: SnodeNamespacesGroup;
+    sentCb?: (message: RawMessage) => Promise<void>;
+    groupPubKey?: PubKey;
+  }): Promise<void> {
     let destinationPubKey: PubKey | undefined = groupPubKey;
     if (message instanceof ExpirationTimerUpdateMessage || message instanceof ClosedGroupMessage) {
       destinationPubKey = groupPubKey ? groupPubKey : message.groupId;
@@ -168,13 +190,18 @@ export class MessageQueue {
     }
 
     // if groupId is set here, it means it's for a medium group. So send it as it
-    return this.sendToPubKey(PubKey.cast(destinationPubKey), message, sentCb, true);
+    return this.sendToPubKey(PubKey.cast(destinationPubKey), message, namespace, sentCb, true);
   }
 
-  public async sendSyncMessage(
-    message?: SyncMessageType,
-    sentCb?: (message: RawMessage) => Promise<void>
-  ): Promise<void> {
+  public async sendSyncMessage({
+    namespace,
+    message,
+    sentCb,
+  }: {
+    namespace: SnodeNamespacesUser;
+    message?: SyncMessageType;
+    sentCb?: (message: RawMessage) => Promise<void>;
+  }): Promise<void> {
     if (!message) {
       return;
     }
@@ -188,7 +215,7 @@ export class MessageQueue {
 
     const ourPubKey = UserUtils.getOurPubKeyStrFromCache();
 
-    await this.process(PubKey.cast(ourPubKey), message, sentCb);
+    await this.process(PubKey.cast(ourPubKey), message, namespace, sentCb);
   }
 
   /**
@@ -196,13 +223,18 @@ export class MessageQueue {
    * @param user user pub key to send to
    * @param message Message to be sent
    */
-  public async sendToPubKeyNonDurably(
-    user: PubKey,
-    message: ClosedGroupNewMessage | CallMessage
-  ): Promise<boolean | number> {
+  public async sendToPubKeyNonDurably({
+    message,
+    namespace,
+    pubkey,
+  }: {
+    pubkey: PubKey;
+    message: ClosedGroupNewMessage | CallMessage;
+    namespace: SnodeNamespaces;
+  }): Promise<boolean | number> {
     let rawMessage;
     try {
-      rawMessage = await MessageUtils.toRawMessage(user, message);
+      rawMessage = await MessageUtils.toRawMessage(pubkey, message, namespace);
       const { wrappedEnvelope, effectiveTimestamp } = await MessageSender.send(rawMessage);
       await MessageSentHandler.handleMessageSentSuccess(
         rawMessage,
@@ -281,6 +313,7 @@ export class MessageQueue {
   private async process(
     destinationPk: PubKey,
     message: ContentMessage,
+    namespace: SnodeNamespaces,
     sentCb?: (message: RawMessage) => Promise<void>,
     isGroup = false
   ): Promise<void> {
@@ -305,7 +338,7 @@ export class MessageQueue {
       }
     }
 
-    await this.pendingMessageCache.add(destinationPk, message, sentCb, isGroup);
+    await this.pendingMessageCache.add(destinationPk, message, namespace, sentCb, isGroup);
     void this.processPending(destinationPk, isSyncMessage);
   }
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 530a7a8df..78e944817 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -12,7 +12,6 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope
 import { addMessagePadding } from '../crypto/BufferPadding';
 import _ from 'lodash';
 import { getSwarmFor } from '../apis/snode_api/snodePool';
-import { firstTrue } from '../utils/Promise';
 import { MessageSender } from '.';
 import { Data, Snode } from '../../../ts/data/data';
 import { getConversationController } from '../conversations';
@@ -27,8 +26,7 @@ import { AbortController } from 'abort-controller';
 import { SnodeAPIStore } from '../apis/snode_api/storeMessage';
 import { StoreOnNodeParams } from '../apis/snode_api/SnodeRequestTypes';
 import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
-
-const DEFAULT_CONNECTIONS = 1;
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 // ================ SNODE STORE ================
 
@@ -83,6 +81,7 @@ export async function send(
     async () => {
       const recipient = PubKey.cast(message.device);
       const { encryption, ttl } = message;
+      let namespace = message.namespace;
 
       const {
         overRiddenTimestampBuffer,
@@ -113,14 +112,25 @@ export async function send(
         found.set({ sent_at: networkTimestamp });
         await found.commit();
       }
-      await MessageSender.sendMessageToSnode(
-        recipient.key,
+
+      // right when we upgrade from not having namespaces stored in the outgoing cached messages our messages won't have a namespace associated.
+      // So we need to keep doing the lookup of where they should go if the namespace is not set.
+      if (namespace === null || namespace === undefined) {
+        namespace = getConversationController()
+          .get(recipient.key)
+          ?.isClosedGroup()
+          ? SnodeNamespaces.ClosedGroupMessage
+          : SnodeNamespaces.UserMessages;
+      }
+      await MessageSender.sendMessageToSnode({
+        pubKey: recipient.key,
         data,
         ttl,
-        networkTimestamp,
+        timestamp: networkTimestamp,
         isSyncMessage,
-        message.identifier
-      );
+        messageId: message.identifier,
+        namespace,
+      });
       return { wrappedEnvelope: data, effectiveTimestamp: networkTimestamp };
     },
     {
@@ -132,22 +142,29 @@ export async function send(
 }
 
 // tslint:disable-next-line: function-name
-export async function sendMessageToSnode(
-  pubKey: string,
-  data: Uint8Array,
-  ttl: number,
-  timestamp: number,
-  isSyncMessage?: boolean,
-  messageId?: string
-): Promise<void> {
+export async function sendMessageToSnode({
+  data,
+  namespace,
+  pubKey,
+  timestamp,
+  ttl,
+  isSyncMessage,
+  messageId,
+}: {
+  pubKey: string;
+  data: Uint8Array;
+  ttl: number;
+  timestamp: number;
+  namespace: SnodeNamespaces;
+  isSyncMessage?: boolean;
+  messageId?: string;
+}): Promise<void> {
   const data64 = ByteBuffer.wrap(data).toString('base64');
   const swarm = await getSwarmFor(pubKey);
 
   const conversation = getConversationController().get(pubKey);
   const isClosedGroup = conversation?.isClosedGroup();
 
-  const namespace = isClosedGroup ? -10 : 0;
-
   // send parameters
   const params: StoreOnNodeParams = {
     pubkey: pubKey,
@@ -157,32 +174,27 @@ export async function sendMessageToSnode(
     namespace,
   };
 
-  const usedNodes = _.slice(swarm, 0, DEFAULT_CONNECTIONS);
+  const usedNodes = _.slice(swarm, 0, 1);
   if (!usedNodes || usedNodes.length === 0) {
     throw new EmptySwarmError(pubKey, 'Ran out of swarm nodes to query');
   }
 
   let successfulSendHash: string | undefined;
-  const promises = usedNodes.map(async usedNode => {
+
+  let snode: Snode | undefined;
+  try {
+    const snodeTried = usedNodes[0];
     // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch.
     // the only case we could care about a retry would be when the usedNode is not correct,
     // but considering we trigger this request with a few snode in //, this should be fine.
-    const successfulSend = await SnodeAPIStore.storeOnNode(usedNode, params);
+    const successfulSend = await SnodeAPIStore.storeOnNode(snodeTried, params);
 
     if (successfulSend) {
       if (_.isString(successfulSend)) {
         successfulSendHash = successfulSend;
       }
-      return usedNode;
+      snode = snodeTried;
     }
-    // should we mark snode as bad if it can't store our message?
-    return undefined;
-  });
-
-  let snode: Snode | undefined;
-  try {
-    const firstSuccessSnode = await firstTrue(promises);
-    snode = firstSuccessSnode;
   } catch (e) {
     const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
     window?.log?.warn(
@@ -203,11 +215,13 @@ export async function sendMessageToSnode(
     }
   }
 
-  window?.log?.info(
-    `loki_message:::sendMessage - Successfully stored message to ${ed25519Str(pubKey)} via ${
-      snode.ip
-    }:${snode.port}`
-  );
+  if (snode) {
+    window?.log?.info(
+      `loki_message:::sendMessage - Successfully stored message to ${ed25519Str(pubKey)} via ${
+        snode.ip
+      }:${snode.port}`
+    );
+  }
 }
 
 async function buildEnvelope(
diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts
index f3affb3b2..5ded9c477 100644
--- a/ts/session/sending/PendingMessageCache.ts
+++ b/ts/session/sending/PendingMessageCache.ts
@@ -4,6 +4,7 @@ import { PartialRawMessage, RawMessage } from '../types/RawMessage';
 import { ContentMessage } from '../messages/outgoing';
 import { PubKey } from '../types';
 import { MessageUtils } from '../utils';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 // This is an abstraction for storing pending messages.
 // Ideally we want to store pending messages in the database so that
@@ -41,11 +42,17 @@ export class PendingMessageCache {
   public async add(
     destinationPubKey: PubKey,
     message: ContentMessage,
+    namespace: SnodeNamespaces,
     sentCb?: (message: any) => Promise<void>,
     isGroup = false
   ): Promise<RawMessage> {
     await this.loadFromDBIfNeeded();
-    const rawMessage = await MessageUtils.toRawMessage(destinationPubKey, message, isGroup);
+    const rawMessage = await MessageUtils.toRawMessage(
+      destinationPubKey,
+      message,
+      namespace,
+      isGroup
+    );
 
     // Does it exist in cache already?
     if (this.find(rawMessage)) {
diff --git a/ts/session/types/RawMessage.ts b/ts/session/types/RawMessage.ts
index 07a933b67..bebabc47c 100644
--- a/ts/session/types/RawMessage.ts
+++ b/ts/session/types/RawMessage.ts
@@ -1,4 +1,5 @@
 import { SignalService } from '../../protobuf';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 export type RawMessage = {
   identifier: string;
@@ -6,6 +7,7 @@ export type RawMessage = {
   device: string;
   ttl: number;
   encryption: SignalService.Envelope.Type;
+  namespace: SnodeNamespaces | null; // allowing null as when we upgrade, we might have messages awaiting sending which won't have a namespace
 };
 
 // For building RawMessages from JSON
diff --git a/ts/session/utils/Messages.ts b/ts/session/utils/Messages.ts
index 7a42ca5c0..fe94a9b05 100644
--- a/ts/session/utils/Messages.ts
+++ b/ts/session/utils/Messages.ts
@@ -7,6 +7,7 @@ import { ClosedGroupEncryptionPairReplyMessage } from '../messages/outgoing/cont
 import { ContentMessage } from '../messages/outgoing';
 import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
 import { SignalService } from '../../protobuf';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 function getEncryptionTypeFromMessageType(
   message: ContentMessage,
@@ -36,6 +37,7 @@ function getEncryptionTypeFromMessageType(
 export async function toRawMessage(
   destinationPubKey: PubKey,
   message: ContentMessage,
+  namespace: SnodeNamespaces,
   isGroup = false
 ): Promise<RawMessage> {
   const ttl = message.ttl();
@@ -50,6 +52,7 @@ export async function toRawMessage(
     device: destinationPubKey.key,
     ttl,
     encryption,
+    namespace,
   };
 
   return rawMessage;
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index dddeef8f2..be04987af 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -28,6 +28,7 @@ import { getCallMediaPermissionsSettings } from '../../../components/settings/Se
 import { PnServer } from '../../apis/push_notification_api';
 import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 
 // tslint:disable: function-name
 
@@ -414,10 +415,11 @@ async function createOfferAndSendIt(recipient: string) {
       });
 
       window.log.info(`sending '${offer.type}'' with callUUID: ${currentCallUUID}`);
-      const negotiationOfferSendResult = await getMessageQueue().sendToPubKeyNonDurably(
-        PubKey.cast(recipient),
-        offerMessage
-      );
+      const negotiationOfferSendResult = await getMessageQueue().sendToPubKeyNonDurably({
+        pubkey: PubKey.cast(recipient),
+        message: offerMessage,
+        namespace: SnodeNamespaces.UserMessages,
+      });
       if (typeof negotiationOfferSendResult === 'number') {
         // window.log?.warn('setting last sent timestamp');
         lastOutgoingOfferTimestamp = negotiationOfferSendResult;
@@ -514,7 +516,11 @@ export async function USER_callRecipient(recipient: string) {
 
   // we do it manually as the sendToPubkeyNonDurably rely on having a message saved to the db for MessageSentSuccess
   // which is not the case for a pre offer message (the message only exists in memory)
-  const rawMessage = await MessageUtils.toRawMessage(PubKey.cast(recipient), preOfferMsg);
+  const rawMessage = await MessageUtils.toRawMessage(
+    PubKey.cast(recipient),
+    preOfferMsg,
+    SnodeNamespaces.UserMessages
+  );
   const { wrappedEnvelope } = await MessageSender.send(rawMessage);
   void PnServer.notifyPnServer(wrappedEnvelope, recipient);
 
@@ -572,7 +578,11 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => {
     `sending ICE CANDIDATES MESSAGE to ${ed25519Str(recipient)} about call ${currentCallUUID}`
   );
 
-  await getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(recipient), callIceCandicates);
+  await getMessageQueue().sendToPubKeyNonDurably({
+    pubkey: PubKey.cast(recipient),
+    message: callIceCandicates,
+    namespace: SnodeNamespaces.UserMessages,
+  });
 }, 2000);
 
 const findLastMessageTypeFromSender = (sender: string, msgType: SignalService.CallMessage.Type) => {
@@ -903,8 +913,16 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) {
 
 async function sendCallMessageAndSync(callmessage: CallMessage, user: string) {
   await Promise.all([
-    getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(user), callmessage),
-    getMessageQueue().sendToPubKeyNonDurably(UserUtils.getOurPubKeyFromCache(), callmessage),
+    getMessageQueue().sendToPubKeyNonDurably({
+      pubkey: PubKey.cast(user),
+      message: callmessage,
+      namespace: SnodeNamespaces.UserMessages,
+    }),
+    getMessageQueue().sendToPubKeyNonDurably({
+      pubkey: UserUtils.getOurPubKeyFromCache(),
+      message: callmessage,
+      namespace: SnodeNamespaces.UserMessages,
+    }),
   ]);
 }
 
@@ -921,7 +939,11 @@ export async function USER_hangup(fromSender: string) {
       timestamp: Date.now(),
       uuid: currentCallUUID,
     });
-    void getMessageQueue().sendToPubKeyNonDurably(PubKey.cast(fromSender), endCallMessage);
+    void getMessageQueue().sendToPubKeyNonDurably({
+      pubkey: PubKey.cast(fromSender),
+      message: endCallMessage,
+      namespace: SnodeNamespaces.UserMessages,
+    });
   }
 
   window.inboxStore?.dispatch(endCall());
diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/syncUtils.ts
index cb41ff728..62b18628b 100644
--- a/ts/session/utils/syncUtils.ts
+++ b/ts/session/utils/syncUtils.ts
@@ -26,6 +26,7 @@ import { DURATION } from '../constants';
 import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage';
 import { MessageRequestResponse } from '../messages/outgoing/controlMessage/MessageRequestResponse';
 import { PubKey } from '../types';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -53,7 +54,10 @@ export const syncConfigurationIfNeeded = async () => {
   try {
     // window?.log?.info('syncConfigurationIfNeeded with', configMessage);
 
-    await getMessageQueue().sendSyncMessage(configMessage);
+    await getMessageQueue().sendSyncMessage({
+      namespace: SnodeNamespaces.UserMessages,
+      message: configMessage,
+    });
   } catch (e) {
     window?.log?.warn('Caught an error while sending our ConfigurationMessage:', e);
     // we do return early so that next time we use the old timestamp again
@@ -81,7 +85,11 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
               resolve(true);
             }
           : undefined;
-        void getMessageQueue().sendSyncMessage(configMessage, callback as any);
+        void getMessageQueue().sendSyncMessage({
+          namespace: SnodeNamespaces.UserMessages,
+          message: configMessage,
+          sentCb: callback as any,
+        });
         // either we resolve from the callback if we need to wait for it,
         // or we don't want to wait, we resolve it here.
         if (!waitForMessageSent) {
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index 51892a99b..e07421342 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -17,6 +17,7 @@ import { ClosedGroupMessage } from '../../../../session/messages/outgoing/contro
 import chaiAsPromised from 'chai-as-promised';
 import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler';
 import { stubData } from '../../../test-utils/utils';
+import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
 chai.use(chaiAsPromised as any);
 chai.should();
@@ -102,7 +103,11 @@ describe('MessageQueue', () => {
         }
 
         const device = TestUtils.generateFakePubKey();
-        await pendingMessageCache.add(device, TestUtils.generateVisibleMessage());
+        await pendingMessageCache.add(
+          device,
+          TestUtils.generateVisibleMessage(),
+          SnodeNamespaces.UserMessages
+        );
 
         const initialMessages = await pendingMessageCache.getForDevice(device);
         expect(initialMessages).to.have.length(1);
@@ -139,7 +144,7 @@ describe('MessageQueue', () => {
           });
 
         void pendingMessageCache
-          .add(device, message, waitForMessageSentEvent)
+          .add(device, message, SnodeNamespaces.UserMessages, waitForMessageSentEvent)
           .then(() => messageQueueStub.processPending(device));
       });
 
@@ -149,7 +154,7 @@ describe('MessageQueue', () => {
         const device = TestUtils.generateFakePubKey();
         const message = TestUtils.generateVisibleMessage();
         void pendingMessageCache
-          .add(device, message)
+          .add(device, message, SnodeNamespaces.UserMessages)
           .then(() => messageQueueStub.processPending(device));
         // The cb is only invoke is all reties fails. Here we poll until the messageSentHandlerFailed was invoked as this is what we want to do
 
@@ -177,7 +182,7 @@ describe('MessageQueue', () => {
       const stub = Sinon.stub(messageQueueStub as any, 'process').resolves();
 
       const message = TestUtils.generateVisibleMessage();
-      await messageQueueStub.sendToPubKey(device, message);
+      await messageQueueStub.sendToPubKey(device, message, SnodeNamespaces.UserMessages);
 
       const args = stub.lastCall.args as [Array<PubKey>, ContentMessage];
       expect(args[0]).to.be.equal(device);
@@ -188,9 +193,12 @@ describe('MessageQueue', () => {
   describe('sendToGroup', () => {
     it('should throw an error if invalid non-group message was passed', async () => {
       const chatMessage = TestUtils.generateVisibleMessage();
-      return expect(messageQueueStub.sendToGroup(chatMessage as any)).to.be.rejectedWith(
-        'Invalid group message passed in sendToGroup.'
-      );
+      return expect(
+        messageQueueStub.sendToGroup({
+          message: chatMessage as any,
+          namespace: SnodeNamespaces.ClosedGroupMessage,
+        })
+      ).to.be.rejectedWith('Invalid group message passed in sendToGroup.');
     });
 
     describe('closed groups', () => {
@@ -201,7 +209,10 @@ describe('MessageQueue', () => {
         const send = Sinon.stub(messageQueueStub, 'sendToPubKey').resolves();
 
         const message = TestUtils.generateClosedGroupMessage();
-        await messageQueueStub.sendToGroup(message);
+        await messageQueueStub.sendToGroup({
+          message,
+          namespace: SnodeNamespaces.ClosedGroupMessage,
+        });
         expect(send.callCount).to.equal(1);
 
         const arg = send.getCall(0).args;
@@ -223,7 +234,12 @@ describe('MessageQueue', () => {
           const message = TestUtils.generateOpenGroupVisibleMessage();
           const roomInfos = TestUtils.generateOpenGroupV2RoomInfos();
 
-          await messageQueueStub.sendToOpenGroupV2(message, roomInfos, false, []);
+          await messageQueueStub.sendToOpenGroupV2({
+            message,
+            roomInfos,
+            blinded: false,
+            filesToLink: [],
+          });
           expect(sendToOpenGroupV2Stub.callCount).to.equal(1);
         });
 
@@ -235,7 +251,12 @@ describe('MessageQueue', () => {
 
           const message = TestUtils.generateOpenGroupVisibleMessage();
           const roomInfos = TestUtils.generateOpenGroupV2RoomInfos();
-          await messageQueueStub.sendToOpenGroupV2(message, roomInfos, false, []);
+          await messageQueueStub.sendToOpenGroupV2({
+            message,
+            roomInfos,
+            blinded: false,
+            filesToLink: [],
+          });
 
           expect(messageSentPublicHandlerSuccessStub.callCount).to.equal(1);
           expect(messageSentPublicHandlerSuccessStub.lastCall.args[0]).to.equal(message.identifier);
@@ -250,7 +271,12 @@ describe('MessageQueue', () => {
           const message = TestUtils.generateOpenGroupVisibleMessage();
           const roomInfos = TestUtils.generateOpenGroupV2RoomInfos();
 
-          await messageQueueStub.sendToOpenGroupV2(message, roomInfos, false, []);
+          await messageQueueStub.sendToOpenGroupV2({
+            message,
+            roomInfos,
+            blinded: false,
+            filesToLink: [],
+          });
           expect(messageSentHandlerFailedStub.callCount).to.equal(1);
           expect(messageSentHandlerFailedStub.lastCall.args[0].identifier).to.equal(
             message.identifier
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 7839abf6c..9db043876 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -17,6 +17,7 @@ import { OnionV4 } from '../../../../session/onions/onionv4';
 import { OnionSending } from '../../../../session/onions/onionSend';
 import { OpenGroupMessageV2 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2';
 import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
 describe('MessageSender', () => {
   afterEach(() => {
@@ -52,7 +53,8 @@ describe('MessageSender', () => {
       beforeEach(async () => {
         rawMessage = await MessageUtils.toRawMessage(
           TestUtils.generateFakePubKey(),
-          TestUtils.generateVisibleMessage()
+          TestUtils.generateVisibleMessage(),
+          SnodeNamespaces.UserMessages
         );
       });
 
@@ -100,7 +102,11 @@ describe('MessageSender', () => {
         const device = TestUtils.generateFakePubKey();
         const visibleMessage = TestUtils.generateVisibleMessage();
 
-        const rawMessage = await MessageUtils.toRawMessage(device, visibleMessage);
+        const rawMessage = await MessageUtils.toRawMessage(
+          device,
+          visibleMessage,
+          SnodeNamespaces.UserMessages
+        );
 
         await MessageSender.send(rawMessage, 3, 10);
 
@@ -117,7 +123,11 @@ describe('MessageSender', () => {
         const device = TestUtils.generateFakePubKey();
 
         const visibleMessage = TestUtils.generateVisibleMessage();
-        const rawMessage = await MessageUtils.toRawMessage(device, visibleMessage);
+        const rawMessage = await MessageUtils.toRawMessage(
+          device,
+          visibleMessage,
+          SnodeNamespaces.UserMessages
+        );
         const offset = 200000;
         Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset);
         await MessageSender.send(rawMessage, 3, 10);
@@ -149,7 +159,11 @@ describe('MessageSender', () => {
         const visibleMessageExpected = TestUtils.generateVisibleMessage({
           timestamp: decodedTimestampFromSending,
         });
-        const rawMessageExpected = await MessageUtils.toRawMessage(device, visibleMessageExpected);
+        const rawMessageExpected = await MessageUtils.toRawMessage(
+          device,
+          visibleMessageExpected,
+          0
+        );
 
         expect(envelope.content).to.deep.equal(rawMessageExpected.plainTextBuffer);
       });
@@ -162,7 +176,11 @@ describe('MessageSender', () => {
           const device = TestUtils.generateFakePubKey();
 
           const visibleMessage = TestUtils.generateVisibleMessage();
-          const rawMessage = await MessageUtils.toRawMessage(device, visibleMessage);
+          const rawMessage = await MessageUtils.toRawMessage(
+            device,
+            visibleMessage,
+            SnodeNamespaces.UserMessages
+          );
           await MessageSender.send(rawMessage, 3, 10);
 
           const data = sessionMessageAPISendStub.getCall(0).args[1];
diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts
index eb52b5210..4da6d7d28 100644
--- a/ts/test/session/unit/sending/PendingMessageCache_test.ts
+++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts
@@ -5,6 +5,7 @@ import * as _ from 'lodash';
 import { MessageUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../../test/test-utils';
 import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache';
+import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
 // Equivalent to Data.StorageItem
 interface StorageItem {
@@ -55,9 +56,13 @@ describe('PendingMessageCache', () => {
   it('can add to cache', async () => {
     const device = TestUtils.generateFakePubKey();
     const message = TestUtils.generateVisibleMessage();
-    const rawMessage = await MessageUtils.toRawMessage(device, message);
+    const rawMessage = await MessageUtils.toRawMessage(
+      device,
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
-    await pendingMessageCacheStub.add(device, message);
+    await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages);
 
     // Verify that the message is in the cache
     const finalCache = await pendingMessageCacheStub.getAllPending();
@@ -71,12 +76,24 @@ describe('PendingMessageCache', () => {
   it('can add multiple messages belonging to the same user', async () => {
     const device = TestUtils.generateFakePubKey();
 
-    await pendingMessageCacheStub.add(device, TestUtils.generateVisibleMessage());
+    await pendingMessageCacheStub.add(
+      device,
+      TestUtils.generateVisibleMessage(),
+      SnodeNamespaces.UserMessages
+    );
     // We have to timeout here otherwise it's processed too fast and messages start having the same timestamp
     await TestUtils.timeout(5);
-    await pendingMessageCacheStub.add(device, TestUtils.generateVisibleMessage());
+    await pendingMessageCacheStub.add(
+      device,
+      TestUtils.generateVisibleMessage(),
+      SnodeNamespaces.UserMessages
+    );
     await TestUtils.timeout(5);
-    await pendingMessageCacheStub.add(device, TestUtils.generateVisibleMessage());
+    await pendingMessageCacheStub.add(
+      device,
+      TestUtils.generateVisibleMessage(),
+      SnodeNamespaces.UserMessages
+    );
 
     // Verify that the message is in the cache
     const finalCache = await pendingMessageCacheStub.getAllPending();
@@ -87,9 +104,13 @@ describe('PendingMessageCache', () => {
   it('can remove from cache', async () => {
     const device = TestUtils.generateFakePubKey();
     const message = TestUtils.generateVisibleMessage();
-    const rawMessage = await MessageUtils.toRawMessage(device, message);
+    const rawMessage = await MessageUtils.toRawMessage(
+      device,
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
-    await pendingMessageCacheStub.add(device, message);
+    await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages);
 
     const initialCache = await pendingMessageCacheStub.getAllPending();
     expect(initialCache).to.have.length(1);
@@ -106,12 +127,24 @@ describe('PendingMessageCache', () => {
   it('should only remove messages with different identifier and device', async () => {
     const device = TestUtils.generateFakePubKey();
     const message = TestUtils.generateVisibleMessage();
-    const rawMessage = await MessageUtils.toRawMessage(device, message);
+    const rawMessage = await MessageUtils.toRawMessage(
+      device,
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
-    await pendingMessageCacheStub.add(device, message);
+    await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages);
     await TestUtils.timeout(5);
-    const one = await pendingMessageCacheStub.add(device, TestUtils.generateVisibleMessage());
-    const two = await pendingMessageCacheStub.add(TestUtils.generateFakePubKey(), message);
+    const one = await pendingMessageCacheStub.add(
+      device,
+      TestUtils.generateVisibleMessage(),
+      SnodeNamespaces.UserMessages
+    );
+    const two = await pendingMessageCacheStub.add(
+      TestUtils.generateFakePubKey(),
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
     const initialCache = await pendingMessageCacheStub.getAllPending();
     expect(initialCache).to.have.length(3);
@@ -143,7 +176,7 @@ describe('PendingMessageCache', () => {
     ];
 
     for (const item of cacheItems) {
-      await pendingMessageCacheStub.add(item.device, item.message);
+      await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages);
     }
 
     const cache = await pendingMessageCacheStub.getAllPending();
@@ -171,7 +204,7 @@ describe('PendingMessageCache', () => {
     ];
 
     for (const item of cacheItems) {
-      await pendingMessageCacheStub.add(item.device, item.message);
+      await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages);
     }
 
     const initialCache = await pendingMessageCacheStub.getAllPending();
@@ -188,7 +221,11 @@ describe('PendingMessageCache', () => {
   it('can find nothing when empty', async () => {
     const device = TestUtils.generateFakePubKey();
     const message = TestUtils.generateVisibleMessage();
-    const rawMessage = await MessageUtils.toRawMessage(device, message);
+    const rawMessage = await MessageUtils.toRawMessage(
+      device,
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
     const foundMessage = pendingMessageCacheStub.find(rawMessage);
     expect(foundMessage, 'a message was found in empty cache').to.be.undefined;
@@ -197,9 +234,13 @@ describe('PendingMessageCache', () => {
   it('can find message in cache', async () => {
     const device = TestUtils.generateFakePubKey();
     const message = TestUtils.generateVisibleMessage();
-    const rawMessage = await MessageUtils.toRawMessage(device, message);
+    const rawMessage = await MessageUtils.toRawMessage(
+      device,
+      message,
+      SnodeNamespaces.UserMessages
+    );
 
-    await pendingMessageCacheStub.add(device, message);
+    await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages);
 
     const finalCache = await pendingMessageCacheStub.getAllPending();
     expect(finalCache).to.have.length(1);
@@ -226,7 +267,7 @@ describe('PendingMessageCache', () => {
     ];
 
     for (const item of cacheItems) {
-      await pendingMessageCacheStub.add(item.device, item.message);
+      await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages);
     }
 
     const initialCache = await pendingMessageCacheStub.getAllPending();
@@ -256,7 +297,7 @@ describe('PendingMessageCache', () => {
     ];
 
     for (const item of cacheItems) {
-      await pendingMessageCacheStub.add(item.device, item.message);
+      await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages);
     }
 
     const addedMessages = await pendingMessageCacheStub.getAllPending();
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index 1362158a5..b6835285e 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -25,6 +25,7 @@ import { ConversationTypeEnum } from '../../../../models/conversationAttributes'
 import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
 import { beforeEach } from 'mocha';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
+import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
 const { expect } = chai;
 
@@ -39,7 +40,11 @@ describe('Message Utils', () => {
       const device = TestUtils.generateFakePubKey();
       const message = TestUtils.generateVisibleMessage();
 
-      const rawMessage = await MessageUtils.toRawMessage(device, message);
+      const rawMessage = await MessageUtils.toRawMessage(
+        device,
+        message,
+        SnodeNamespaces.UserContacts
+      );
 
       expect(Object.keys(rawMessage)).to.have.length(5);
 
@@ -56,13 +61,18 @@ describe('Message Utils', () => {
       expect(rawMessage.device).to.equal(device.key);
       expect(rawMessage.plainTextBuffer).to.deep.equal(message.plainTextBuffer());
       expect(rawMessage.ttl).to.equal(message.ttl());
+      expect(rawMessage.namespace).to.equal(3);
     });
 
     it('should generate valid plainTextBuffer', async () => {
       const device = TestUtils.generateFakePubKey();
       const message = TestUtils.generateVisibleMessage();
 
-      const rawMessage = await MessageUtils.toRawMessage(device, message);
+      const rawMessage = await MessageUtils.toRawMessage(
+        device,
+        message,
+        SnodeNamespaces.UserMessages
+      );
 
       const rawBuffer = rawMessage.plainTextBuffer;
       const rawBufferJSON = JSON.stringify(rawBuffer);
@@ -82,7 +92,11 @@ describe('Message Utils', () => {
       const device = TestUtils.generateFakePubKey();
       const message = TestUtils.generateVisibleMessage();
 
-      const rawMessage = await MessageUtils.toRawMessage(device, message);
+      const rawMessage = await MessageUtils.toRawMessage(
+        device,
+        message,
+        SnodeNamespaces.UserMessages
+      );
       const derivedPubKey = PubKey.from(rawMessage.device);
 
       expect(derivedPubKey).to.not.be.eq(undefined, 'should maintain pubkey');
@@ -98,14 +112,22 @@ describe('Message Utils', () => {
       const chatMessage = TestUtils.generateVisibleMessage();
       const message = new ClosedGroupVisibleMessage({ chatMessage, groupId });
 
-      const rawMessage = await MessageUtils.toRawMessage(device, message);
+      const rawMessage = await MessageUtils.toRawMessage(
+        device,
+        message,
+        SnodeNamespaces.UserMessages
+      );
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE);
     });
 
     it('should set encryption to Fallback on other messages', async () => {
       const device = TestUtils.generateFakePubKey();
       const message = TestUtils.generateVisibleMessage();
-      const rawMessage = await MessageUtils.toRawMessage(device, message);
+      const rawMessage = await MessageUtils.toRawMessage(
+        device,
+        message,
+        SnodeNamespaces.UserMessages
+      );
 
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE);
     });
@@ -123,7 +145,7 @@ describe('Message Utils', () => {
         keypair: TestUtils.generateFakeECKeyPair(),
         expireTimer: 0,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE);
     });
 
@@ -135,7 +157,7 @@ describe('Message Utils', () => {
         name: 'df',
         groupId: TestUtils.generateFakePubKey().key,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE);
     });
 
@@ -147,7 +169,7 @@ describe('Message Utils', () => {
         addedMembers: [TestUtils.generateFakePubKey().key],
         groupId: TestUtils.generateFakePubKey().key,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE);
     });
 
@@ -159,7 +181,7 @@ describe('Message Utils', () => {
         removedMembers: [TestUtils.generateFakePubKey().key],
         groupId: TestUtils.generateFakePubKey().key,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE);
     });
 
@@ -180,7 +202,7 @@ describe('Message Utils', () => {
         groupId: TestUtils.generateFakePubKey().key,
         encryptedKeyPairs: fakeWrappers,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE);
     });
 
@@ -201,7 +223,7 @@ describe('Message Utils', () => {
         groupId: TestUtils.generateFakePubKey().key,
         encryptedKeyPairs: fakeWrappers,
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE);
     });
 
@@ -215,7 +237,7 @@ describe('Message Utils', () => {
         displayName: 'displayName',
         contacts: [],
       });
-      const rawMessage = await MessageUtils.toRawMessage(device, msg);
+      const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages);
       expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE);
     });
   });

From 58edbf44eeffa23095a675c3db21abef81af8eea Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 18 Jan 2023 11:25:19 +1100
Subject: [PATCH 018/178] add SharedConfig message and signing it when sending
 them

---
 protos/SignalService.proto                    | 22 +++++--
 ts/components/leftpane/ActionsPanel.tsx       |  5 ++
 .../apis/snode_api/SnodeRequestTypes.ts       |  2 +
 ts/session/apis/snode_api/batchRequest.ts     | 14 ++++-
 ts/session/apis/snode_api/onions.ts           |  5 +-
 ts/session/apis/snode_api/retrieveRequest.ts  | 53 +----------------
 ts/session/apis/snode_api/snodeSignatures.ts  | 59 +++++++++++++++++++
 ts/session/apis/snode_api/storeMessage.ts     |  2 +-
 .../controlMessage/SharedConfigMessage.ts     | 39 ++++++++++++
 ts/session/sending/MessageQueue.ts            |  3 +
 ts/session/sending/MessageSender.ts           | 42 ++++++++++---
 ts/session/utils/syncUtils.ts                 |  4 +-
 12 files changed, 182 insertions(+), 68 deletions(-)
 create mode 100644 ts/session/apis/snode_api/snodeSignatures.ts
 create mode 100644 ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 105041ced..e4c36fe68 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -22,27 +22,38 @@ message TypingMessage {
         STARTED = 0;
         STOPPED = 1;
     }
-    // @required
     required uint64 timestamp = 1;
-    // @required
     required Action action    = 2;
 }
 
 
 message Unsend {
-  // @required
   required uint64 timestamp = 1;
-  // @required
   required string author    = 2;
 }
 
 message MessageRequestResponse {
-  // @required
   required bool                      isApproved                = 1;
   optional bytes                     profileKey                = 2;
   optional DataMessage.LokiProfile   profile                   = 3;
 }
 
+message SharedConfigMessage {
+  enum Kind {
+    USER_PROFILE            = 1;
+    CONTACTS                = 2;
+    CONVERSATION_INFO       = 3;
+    LEGACY_CLOSED_GROUPS    = 4;
+    CLOSED_GROUP_INFO       = 5;
+    CLOSED_GROUP_MEMBERS    = 6;
+    ENCRYPTION_KEYS         = 7;
+  }
+
+  required Kind              kind             = 1;
+  required int64             seqno            = 2;
+  required bytes             data             = 3;
+}
+
 message Content {
   optional DataMessage                dataMessage                = 1;
   optional CallMessage                callMessage                = 3;
@@ -52,6 +63,7 @@ message Content {
   optional DataExtractionNotification dataExtractionNotification = 8;
   optional Unsend                     unsendMessage              = 9;
   optional MessageRequestResponse     messageRequestResponse     = 10;
+  optional SharedConfigMessage        sharedConfigMessage        = 11;
 }
 
 message KeyPair {
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 22873200f..5950b451d 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -48,6 +48,11 @@ import { ThemeStateType } from '../../themes/constants/colors';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
 import { callLibSessionWorker } from '../../webworker/workers/browser/libsession_worker_interface';
+import { SharedConfigMessage } from '../../session/messages/outgoing/controlMessage/SharedConfigMessage';
+import { SignalService } from '../../protobuf';
+import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime';
+import Long from 'long';
+import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 7b8665d35..5388098c3 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -111,6 +111,8 @@ export type StoreOnNodeParams = {
   timestamp: string;
   data: string;
   namespace: number;
+  signature?: string;
+  pubkey_ed25519?: string;
 };
 
 export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams };
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 01f239bff..dfade5612 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -1,6 +1,6 @@
 import { isArray } from 'lodash';
 import { Snode } from '../../../data/data';
-import { SnodeResponse } from './onions';
+import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions';
 import { snodeRpc } from './sessionRpc';
 import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequestTypes';
 
@@ -36,6 +36,18 @@ export async function doSnodeBatchRequest(
   }
   const decoded = decodeBatchRequest(result);
 
+  if (decoded?.length) {
+    for (let index = 0; index < decoded.length; index++) {
+      const resultRow = decoded[index];
+      await processOnionRequestErrorAtDestination({
+        statusCode: resultRow.code,
+        body: JSON.stringify(resultRow.body),
+        associatedWith,
+        destinationSnodeEd25519: targetNode.pubkey_ed25519,
+      });
+    }
+  }
+
   return decoded;
 }
 
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index 20f929240..31e9ced62 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -282,7 +282,7 @@ async function process421Error(
  *
  * If destinationEd25519 is set, we will increment the failure count of the specified snode
  */
-async function processOnionRequestErrorAtDestination({
+export async function processOnionRequestErrorAtDestination({
   statusCode,
   body,
   destinationSnodeEd25519,
@@ -299,10 +299,9 @@ async function processOnionRequestErrorAtDestination({
   window?.log?.info(
     `processOnionRequestErrorAtDestination. statusCode nok: ${statusCode}: "${body}"`
   );
-
   process406Or425Error(statusCode);
-  await process421Error(statusCode, body, associatedWith, destinationSnodeEd25519);
   processOxenServerError(statusCode, body);
+  await process421Error(statusCode, body, associatedWith, destinationSnodeEd25519);
   if (destinationSnodeEd25519) {
     await processAnyOtherErrorAtDestination(
       statusCode,
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 47c6361a0..262a54a2d 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -1,8 +1,5 @@
 import { Snode } from '../../../data/data';
 import { updateIsOnline } from '../../../state/ducks/onion';
-import { getSodiumRenderer } from '../../crypto';
-import { StringUtils, UserUtils } from '../../utils';
-import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
 import { SnodeNamespaces } from './namespaces';
@@ -11,53 +8,9 @@ import {
   RetrieveLegacyClosedGroupSubRequestType,
   RetrieveSubRequestType,
 } from './SnodeRequestTypes';
+import { SnodeSignature } from './snodeSignatures';
 import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types';
 
-async function getRetrieveSignatureParams(params: {
-  pubkey: string;
-  namespace: number;
-  ourPubkey: string;
-}): Promise<{
-  timestamp: number;
-  signature: string;
-  pubkey_ed25519: string;
-  namespace: number;
-}> {
-  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
-
-  if (!ourEd25519Key) {
-    window.log.warn('getRetrieveSignatureParams: User has no getUserED25519KeyPair()');
-    throw new Error('getRetrieveSignatureParams: User has no getUserED25519KeyPair()');
-  }
-  const namespace = params.namespace || 0;
-  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
-
-  const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset();
-
-  const verificationData =
-    namespace === 0
-      ? StringUtils.encode(`retrieve${signatureTimestamp}`, 'utf8')
-      : StringUtils.encode(`retrieve${namespace}${signatureTimestamp}`, 'utf8');
-
-  const message = new Uint8Array(verificationData);
-
-  const sodium = await getSodiumRenderer();
-  try {
-    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
-    const signatureBase64 = fromUInt8ArrayToBase64(signature);
-
-    return {
-      timestamp: signatureTimestamp,
-      signature: signatureBase64,
-      pubkey_ed25519: ourEd25519Key.pubKey,
-      namespace,
-    };
-  } catch (e) {
-    window.log.warn('getSignatureParams failed with: ', e.message);
-    throw e;
-  }
-}
-
 async function buildRetrieveRequest(
   lastHashes: Array<string>,
   pubkey: string,
@@ -103,8 +56,8 @@ async function buildRetrieveRequest(
       if (pubkey !== ourPubkey) {
         throw new Error('not a legacy closed group. pubkey can only be ours');
       }
-      const signatureArgs = { ...retrieveParam, ourPubkey };
-      const signatureBuilt = await getRetrieveSignatureParams(signatureArgs);
+      const signatureArgs = { ...retrieveParam, method: 'retrieve' as 'retrieve', ourPubkey };
+      const signatureBuilt = await SnodeSignature.getSnodeSignatureParams(signatureArgs);
       const retrieve: RetrieveSubRequestType = {
         method: 'retrieve',
         params: { ...retrieveParam, ...signatureBuilt },
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
new file mode 100644
index 000000000..8ab5eda2e
--- /dev/null
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -0,0 +1,59 @@
+import { to_string } from 'libsodium-wrappers-sumo';
+import { getSodiumRenderer } from '../../crypto';
+import { UserUtils, StringUtils } from '../../utils';
+import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
+import { GetNetworkTime } from './getNetworkTime';
+
+export type SnodeSignatureResult = {
+  timestamp: number;
+  signature: string;
+  pubkey_ed25519: string;
+  namespace: number;
+};
+
+async function getSnodeSignatureParams(params: {
+  pubkey: string;
+  namespace: number;
+  ourPubkey: string;
+  method: 'retrieve' | 'store';
+}): Promise<SnodeSignatureResult> {
+  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
+
+  if (!ourEd25519Key) {
+    const err = `getSnodeSignatureParams "${params.method}": User has no getUserED25519KeyPair()`;
+    window.log.warn(err);
+    throw new Error(err);
+  }
+  const namespace = params.namespace || 0;
+  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
+
+  const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset();
+
+  const verificationData =
+    namespace === 0
+      ? StringUtils.encode(`${params.method}${signatureTimestamp}`, 'utf8')
+      : StringUtils.encode(`${params.method}${namespace}${signatureTimestamp}`, 'utf8');
+
+  const message = new Uint8Array(verificationData);
+
+  const sodium = await getSodiumRenderer();
+  try {
+    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
+    const signatureBase64 = fromUInt8ArrayToBase64(signature);
+    console.warn(
+      `signing: "${to_string(new Uint8Array(verificationData))}" signature:"${signatureBase64}"`
+    );
+
+    return {
+      timestamp: signatureTimestamp,
+      signature: signatureBase64,
+      pubkey_ed25519: ourEd25519Key.pubKey,
+      namespace,
+    };
+  } catch (e) {
+    window.log.warn('getSnodeSignatureParams failed with: ', e.message);
+    throw e;
+  }
+}
+
+export const SnodeSignature = { getSnodeSignatureParams };
diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts
index 98bd5f8dd..90c7eee81 100644
--- a/ts/session/apis/snode_api/storeMessage.ts
+++ b/ts/session/apis/snode_api/storeMessage.ts
@@ -30,7 +30,7 @@ async function storeOnNode(
     const firstResult = result[0];
 
     if (firstResult.code !== 200) {
-      window?.log?.warn('Status is not 200 for storeOnNode but: ', firstResult.code);
+      window?.log?.warn('first result status is not 200 for storeOnNode but: ', firstResult.code);
       throw new Error('storeOnNode: Invalid status code');
     }
 
diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
new file mode 100644
index 000000000..b7e915804
--- /dev/null
+++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
@@ -0,0 +1,39 @@
+// this is not a very good name, but a configuration message is a message sent to our other devices so sync our current public and closed groups
+
+import { SignalService } from '../../../../protobuf';
+import { MessageParams } from '../Message';
+import { ContentMessage } from '..';
+import Long from 'long';
+
+interface SharedConfigParams extends MessageParams {
+  seqno: Long;
+  kind: SignalService.SharedConfigMessage.Kind;
+  data: Uint8Array;
+}
+
+export class SharedConfigMessage extends ContentMessage {
+  public readonly seqno: Long;
+  public readonly kind: SignalService.SharedConfigMessage.Kind;
+  public readonly data: Uint8Array;
+
+  constructor(params: SharedConfigParams) {
+    super({ timestamp: params.timestamp, identifier: params.identifier });
+    this.data = params.data;
+    this.kind = params.kind;
+    this.seqno = params.seqno;
+  }
+
+  public contentProto(): SignalService.Content {
+    return new SignalService.Content({
+      sharedConfigMessage: this.sharedConfigProto(),
+    });
+  }
+
+  protected sharedConfigProto(): SignalService.SharedConfigMessage {
+    return new SignalService.SharedConfigMessage({
+      data: this.data,
+      kind: this.kind,
+      seqno: this.seqno,
+    });
+  }
+}
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index ab4050991..b063b3b99 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -29,6 +29,7 @@ import {
   SnodeNamespacesGroup,
   SnodeNamespacesUser,
 } from '../apis/snode_api/namespaces';
+import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage';
 
 type ClosedGroupMessageType =
   | ClosedGroupVisibleMessage
@@ -208,6 +209,7 @@ export class MessageQueue {
     if (
       !(message instanceof ConfigurationMessage) &&
       !(message instanceof UnsendMessage) &&
+      !(message instanceof SharedConfigMessage) &&
       !(message as any)?.syncTarget
     ) {
       throw new Error('Invalid message given to sendSyncMessage');
@@ -328,6 +330,7 @@ export class MessageQueue {
         message instanceof ConfigurationMessage ||
         message instanceof ClosedGroupNewMessage ||
         message instanceof UnsendMessage ||
+        message instanceof SharedConfigMessage ||
         (message as any).syncTarget?.length > 0
       ) {
         window?.log?.warn('Processing sync message');
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 78e944817..682bf6cd1 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -26,7 +26,9 @@ import { AbortController } from 'abort-controller';
 import { SnodeAPIStore } from '../apis/snode_api/storeMessage';
 import { StoreOnNodeParams } from '../apis/snode_api/SnodeRequestTypes';
 import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
-import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/snodeSignatures';
+import { UserUtils } from '../utils';
 
 // ================ SNODE STORE ================
 
@@ -122,14 +124,26 @@ export async function send(
           ? SnodeNamespaces.ClosedGroupMessage
           : SnodeNamespaces.UserMessages;
       }
+      let timestamp = networkTimestamp;
+      // the user config namespacesm requires a signature to be added
+      let signOpts: SnodeSignatureResult | undefined;
+      if (SnodeNamespace.isUserConfigNamespace(namespace)) {
+        signOpts = await SnodeSignature.getSnodeSignatureParams({
+          method: 'store' as 'store',
+          namespace,
+          ourPubkey: UserUtils.getOurPubKeyStrFromCache(),
+          pubkey: recipient.key,
+        });
+      }
       await MessageSender.sendMessageToSnode({
         pubKey: recipient.key,
         data,
         ttl,
-        timestamp: networkTimestamp,
+        timestamp,
         isSyncMessage,
         messageId: message.identifier,
         namespace,
+        ...signOpts,
       });
       return { wrappedEnvelope: data, effectiveTimestamp: networkTimestamp };
     },
@@ -141,6 +155,13 @@ export async function send(
   );
 }
 
+export type SendMessageSignatureOpts = {
+  signature?: string; // needed for some namespaces
+  namespace: SnodeNamespaces;
+  pubkey_ed25519?: string;
+  timestamp: number;
+};
+
 // tslint:disable-next-line: function-name
 export async function sendMessageToSnode({
   data,
@@ -149,16 +170,17 @@ export async function sendMessageToSnode({
   timestamp,
   ttl,
   isSyncMessage,
+  signature,
   messageId,
+  pubkey_ed25519,
 }: {
   pubKey: string;
   data: Uint8Array;
   ttl: number;
-  timestamp: number;
   namespace: SnodeNamespaces;
   isSyncMessage?: boolean;
   messageId?: string;
-}): Promise<void> {
+} & SendMessageSignatureOpts): Promise<void> {
   const data64 = ByteBuffer.wrap(data).toString('base64');
   const swarm = await getSwarmFor(pubKey);
 
@@ -174,6 +196,11 @@ export async function sendMessageToSnode({
     namespace,
   };
 
+  if (signature && pubkey_ed25519) {
+    params.signature = signature;
+    params.pubkey_ed25519 = pubkey_ed25519;
+  }
+
   const usedNodes = _.slice(swarm, 0, 1);
   if (!usedNodes || usedNodes.length === 0) {
     throw new EmptySwarmError(pubKey, 'Ran out of swarm nodes to query');
@@ -182,8 +209,9 @@ export async function sendMessageToSnode({
   let successfulSendHash: string | undefined;
 
   let snode: Snode | undefined;
+  const snodeTried = usedNodes[0];
+
   try {
-    const snodeTried = usedNodes[0];
     // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch.
     // the only case we could care about a retry would be when the usedNode is not correct,
     // but considering we trigger this request with a few snode in //, this should be fine.
@@ -196,9 +224,9 @@ export async function sendMessageToSnode({
       snode = snodeTried;
     }
   } catch (e) {
-    const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
+    const snodeStr = snodeTried ? `${snodeTried.ip}:${snodeTried.port}` : 'null';
     window?.log?.warn(
-      `loki_message:::sendMessage - ${e.code} ${e.message} to ${pubKey} via snode:${snodeStr}`
+      `loki_message:::sendMessage - "${e.code}:${e.message}" to ${pubKey} via snode:${snodeStr}`
     );
     throw e;
   }
diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/syncUtils.ts
index 62b18628b..cfbf99f62 100644
--- a/ts/session/utils/syncUtils.ts
+++ b/ts/session/utils/syncUtils.ts
@@ -27,6 +27,7 @@ import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage
 import { MessageRequestResponse } from '../messages/outgoing/controlMessage/MessageRequestResponse';
 import { PubKey } from '../types';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -321,7 +322,8 @@ export type SyncMessageType =
   | ExpirationTimerUpdateMessage
   | ConfigurationMessage
   | MessageRequestResponse
-  | UnsendMessage;
+  | UnsendMessage
+  | SharedConfigMessage;
 
 export const buildSyncMessage = (
   identifier: string,

From d1327fab5fc42ac8e2ba8ba1d2278d2b4eb87cad Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 18 Jan 2023 11:25:51 +1100
Subject: [PATCH 019/178] chore: format signalservice.proto

---
 protos/SignalService.proto | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index e4c36fe68..6734fa9a2 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -179,34 +179,34 @@ message DataMessage {
 
   message ClosedGroupControlMessage {
 
-	  enum Type {
-	    NEW                           = 1;  // TODO: should get rid of this once closed group redesign has been released for a while
+    enum Type {
+      NEW                           = 1;  // TODO: should get rid of this once closed group redesign has been released for a while
       ENCRYPTION_KEY_PAIR           = 3;  // TODO: should get rid of this once closed group redesign has been released for a while
       NAME_CHANGE                   = 4;  // TODO: should get rid of this once closed group redesign has been released for a while
       MEMBERS_ADDED                 = 5;  // TODO: should get rid of this once closed group redesign has been released for a while
       MEMBERS_REMOVED               = 6;  // TODO: should get rid of this once closed group redesign has been released for a while
       MEMBER_LEFT                   = 7;
       ENCRYPTION_KEY_PAIR_REQUEST   = 8;  // TODO: should get rid of this once closed group redesign has been released for a while
-	  }
+    }
 
     // TODO:  should get rid of this once closed group redesign has been released for a while
-	  message KeyPairWrapper {
-	    // @required
-	    required bytes publicKey        = 1; // The public key of the user the key pair is meant for
-	    // @required
-	    required bytes encryptedKeyPair = 2; // The encrypted key pair
-	  }
+    message KeyPairWrapper {
+      // @required
+      required bytes publicKey        = 1; // The public key of the user the key pair is meant for
+      // @required
+      required bytes encryptedKeyPair = 2; // The encrypted key pair
+    }
 
-	  // @required
-	  required Type           type              = 1;
-	  optional bytes          publicKey         = 2;
-	  optional string         name              = 3;
-	  optional KeyPair        encryptionKeyPair = 4; // TODO:  should get rid of this once closed group redesign has been released for a while
-	  repeated bytes          members           = 5;
-	  repeated bytes          admins            = 6; // TODO: should get rid of this once closed group redesign has been released for a while
-	  repeated KeyPairWrapper wrappers          = 7; // TODO: should get rid of this once closed group redesign has been released for a while
+    // @required
+    required Type           type              = 1;
+    optional bytes          publicKey         = 2;
+    optional string         name              = 3;
+    optional KeyPair        encryptionKeyPair = 4; // TODO:  should get rid of this once closed group redesign has been released for a while
+    repeated bytes          members           = 5;
+    repeated bytes          admins            = 6; // TODO: should get rid of this once closed group redesign has been released for a while
+    repeated KeyPairWrapper wrappers          = 7; // TODO: should get rid of this once closed group redesign has been released for a while
     optional uint32         expireTimer       = 8; // TODO: should get rid of this once closed group redesign has been released for a while
-	}
+  }
 
 
 

From c8e76b17de6394a748e08111b4f36f26de4839fa Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 19 Jan 2023 11:23:51 +1100
Subject: [PATCH 020/178] chore: refactor db instance to outside its sql.ts
 file

---
 ts/data/channels.ts                           |   9 --
 ts/data/configDump/configDump.ts              |  26 ++++
 ts/data/configDump/configDumpType.ts          |   0
 ts/data/dataInit.ts                           |   4 +
 ts/node/migration/sessionMigrations.ts        |  31 ++++-
 ts/node/sql.ts                                | 131 ++++++++++++------
 ts/node/sqlInstance.ts                        |  44 ++++++
 ts/session/apis/snode_api/retrieveRequest.ts  |   1 -
 ts/session/apis/snode_api/snodeSignatures.ts  |   4 -
 ts/session/apis/snode_api/swarmPolling.ts     |   4 +-
 ts/session/sending/MessageSender.ts           |   2 +-
 ts/types/sqlSharedTypes.ts                    |  35 +++++
 .../node/libsession/libsession.worker.ts      |   6 +-
 13 files changed, 233 insertions(+), 64 deletions(-)
 create mode 100644 ts/data/configDump/configDump.ts
 create mode 100644 ts/data/configDump/configDumpType.ts
 create mode 100644 ts/node/sqlInstance.ts

diff --git a/ts/data/channels.ts b/ts/data/channels.ts
index 6ba4bc00b..d2801432b 100644
--- a/ts/data/channels.ts
+++ b/ts/data/channels.ts
@@ -1,10 +1 @@
 export const channels = {} as Record<string, any>;
-
-// export const addChannel = (id: string, action: any) => {
-//   (window as any).channels = (window as any).channels || {};
-//   (window as any).channels[id] = action;
-// };
-
-// export const getChannel = (id: string): ((...args: any) => Promise<any>) => {
-//   return (window as any).channels[id];
-// };
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
new file mode 100644
index 000000000..1c9a8d1dc
--- /dev/null
+++ b/ts/data/configDump/configDump.ts
@@ -0,0 +1,26 @@
+import {
+  AsyncWrapper,
+  ConfigDumpRow,
+  GetByPubkeyConfigDump,
+  GetByVariantAndPubkeyConfigDump,
+  SaveConfigDump,
+  SharedConfigSupportedVariant,
+} from '../../types/sqlSharedTypes';
+import { channels } from '../channels';
+
+const getByVariantAndPubkey: AsyncWrapper<GetByVariantAndPubkeyConfigDump> = (
+  variant: SharedConfigSupportedVariant,
+  pubkey: string
+) => {
+  return channels.getConfigDumpByVariantAndPubkey(variant, pubkey);
+};
+
+const getByPubkey: AsyncWrapper<GetByPubkeyConfigDump> = (pubkey: string) => {
+  return channels.getConfigDumpsByPk(pubkey);
+};
+
+const saveConfigDump: AsyncWrapper<SaveConfigDump> = (dump: ConfigDumpRow) => {
+  return channels.saveConfigDump(dump);
+};
+
+export const ConfigDumpData = { getByVariantAndPubkey, getByPubkey, saveConfigDump };
diff --git a/ts/data/configDump/configDumpType.ts b/ts/data/configDump/configDumpType.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index f838adfcc..93f75f963 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 import _ from 'lodash';
 import { channels } from './channels';
+import { ConfigDumpData } from './configDump/configDump';
 
 const channelsToMakeForOpengroupV2 = [
   'getAllV2OpenGroupRooms',
@@ -10,6 +11,8 @@ const channelsToMakeForOpengroupV2 = [
   'getAllOpenGroupV2Conversations',
 ];
 
+const channelsToMakeForConfigDumps = [...Object.keys(ConfigDumpData)];
+
 const channelsToMake = new Set([
   'shutdown',
   'close',
@@ -89,6 +92,7 @@ const channelsToMake = new Set([
   'removeAllClosedGroupEncryptionKeyPairs',
   'fillWithTestData',
   ...channelsToMakeForOpengroupV2,
+  ...channelsToMakeForConfigDumps,
 ]);
 
 const SQL_CHANNEL_KEY = 'sql-channel';
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 8f3b7980f..8a45af40d 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -80,6 +80,7 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToSessionSchemaVersion28,
   updateToSessionSchemaVersion29,
   updateToSessionSchemaVersion30,
+  updateToSessionSchemaVersion31,
 ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
@@ -1223,9 +1224,33 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-// function printTableColumns(table: string, db: BetterSqlite3.Database) {
-//   console.info(db.pragma(`table_info('${table}');`));
-// }
+function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 31;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
+  /**
+   * Create a table to store our sharedConfigMessage dumps
+   **/
+  db.transaction(() => {
+    db.exec(`CREATE TABLE configDump(
+      variant TEXT NOT NULL,
+      publicKey TEXT NOT NULL,
+      data BLOB,
+      combinedMessageHashes TEXT);
+      `);
+    throw null;
+    writeSessionSchemaVersion(targetVersion, db);
+  })();
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+}
+
+export function printTableColumns(table: string, db: BetterSqlite3.Database) {
+  console.info(db.pragma(`table_info('${table}');`));
+}
 
 function writeSessionSchemaVersion(newVersion: number, db: BetterSqlite3.Database) {
   db.prepare(
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index ed8bb3d0a..590574e04 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -46,7 +46,12 @@ import {
   toSqliteBoolean,
 } from './database_utility';
 
-import { UpdateLastHashType } from '../types/sqlSharedTypes';
+import {
+  ConfigDumpDataNode,
+  ConfigDumpRow,
+  SharedConfigSupportedVariant,
+  UpdateLastHashType,
+} from '../types/sqlSharedTypes';
 import { OpenGroupV2Room } from '../data/opengroups';
 
 import {
@@ -55,6 +60,13 @@ import {
   updateSchema,
 } from './migration/signalMigrations';
 import { SettingsKey } from '../data/settings-key';
+import {
+  assertGlobalInstance,
+  assertGlobalInstanceOrInstance,
+  closeDbInstance,
+  initDbInstanceWith,
+  isInstanceInitialized,
+} from './sqlInstance';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -74,14 +86,14 @@ function openAndSetUpSQLCipher(filePath: string, { key }: { key: string }) {
 }
 
 function setSQLPassword(password: string) {
-  if (!globalInstance) {
+  if (!assertGlobalInstance()) {
     throw new Error('setSQLPassword: db is not initialized');
   }
 
   // If the password isn't hex then we need to derive a key from it
   const deriveKey = HEX_KEY.test(password);
   const value = deriveKey ? `'${password}'` : `"x'${password}'"`;
-  globalInstance.pragma(`rekey = ${value}`);
+  assertGlobalInstance().pragma(`rekey = ${value}`);
 }
 
 function vacuumDatabase(db: BetterSqlite3.Database) {
@@ -94,26 +106,6 @@ function vacuumDatabase(db: BetterSqlite3.Database) {
   console.info(`Vacuuming DB Finished in ${Date.now() - start}ms.`);
 }
 
-let globalInstance: BetterSqlite3.Database | null = null;
-
-function assertGlobalInstance(): BetterSqlite3.Database {
-  if (!globalInstance) {
-    throw new Error('globalInstance is not initialized.');
-  }
-  return globalInstance;
-}
-
-function assertGlobalInstanceOrInstance(
-  instance?: BetterSqlite3.Database | null
-): BetterSqlite3.Database {
-  // if none of them are initialized, throw
-  if (!globalInstance && !instance) {
-    throw new Error('neither globalInstance nor initialized is initialized.');
-  }
-  // otherwise, return which ever is true, priority to the global one
-  return globalInstance || (instance as BetterSqlite3.Database);
-}
-
 let databaseFilePath: string | undefined;
 
 function _initializePaths(configDir: string) {
@@ -143,7 +135,7 @@ async function initializeSql({
   passwordAttempt: boolean;
 }) {
   console.info('initializeSql sqlnode');
-  if (globalInstance) {
+  if (isInstanceInitialized()) {
     throw new Error('Cannot initialize more than once!');
   }
 
@@ -184,7 +176,7 @@ async function initializeSql({
     }
 
     // At this point we can allow general access to the database
-    globalInstance = db;
+    initDbInstanceWith(db);
 
     console.info('total message count before cleaning: ', getMessageCount());
     console.info('total conversation count before cleaning: ', getConversationCount());
@@ -215,7 +207,7 @@ async function initializeSql({
     if (button.response === 0) {
       clipboard.writeText(`Database startup error:\n\n${redactAll(error.stack)}`);
     } else {
-      close();
+      closeDbInstance();
       showFailedToStart();
     }
 
@@ -226,20 +218,8 @@ async function initializeSql({
   return true;
 }
 
-function close() {
-  if (!globalInstance) {
-    return;
-  }
-  const dbRef = globalInstance;
-  globalInstance = null;
-  // SQLLite documentation suggests that we run `PRAGMA optimize` right before
-  // closing the database connection.
-  dbRef.pragma('optimize');
-  dbRef.close();
-}
-
 function removeDB(configDir = null) {
-  if (globalInstance) {
+  if (isInstanceInitialized()) {
     throw new Error('removeDB: Cannot erase database when it is open!');
   }
 
@@ -1232,7 +1212,7 @@ function getMessagesByConversation(conversationId: string, { messageId = null }
   // If messageId is null, it means we are just opening the convo to the last unread message, or at the bottom
   const firstUnread = getFirstUnreadMessageIdInConversation(conversationId);
 
-  const numberOfMessagesInConvo = getMessagesCountByConversation(conversationId, globalInstance);
+  const numberOfMessagesInConvo = getMessagesCountByConversation(conversationId);
   const floorLoadAllMessagesInConvo = 70;
 
   if (messageId || firstUnread) {
@@ -2046,6 +2026,70 @@ function removeV2OpenGroupRoom(conversationId: string) {
     });
 }
 
+/**
+ * Config dumps sql calls
+ */
+
+const configDumpData: ConfigDumpDataNode = {
+  getConfigDumpByVariantAndPubkey: (variant: SharedConfigSupportedVariant, pubkey: string) => {
+    const rows = assertGlobalInstance()
+      .prepare(`SELECT * from configDump WHERE variant = $variant AND pubkey = $pubkey;`)
+      .get({
+        pubkey,
+        variant,
+      });
+
+    if (!rows) {
+      return [];
+    }
+    throw new Error(`getConfigDumpByVariantAndPubkey: rows: ${JSON.stringify(rows)} `);
+
+    return rows;
+  },
+
+  getConfigDumpsByPubkey: (pubkey: string) => {
+    const rows = assertGlobalInstance()
+      .prepare(`SELECT * from configDump WHERE pubkey = $pubkey;`)
+      .get({
+        pubkey,
+      });
+
+    if (!rows) {
+      return [];
+    }
+    throw new Error(`getConfigDumpsByPubkey: rows: ${JSON.stringify(rows)} `);
+
+    return rows;
+  },
+
+  saveConfigDump: ({ data, pubkey, variant, combinedMessageHashes }: ConfigDumpRow) => {
+    assertGlobalInstance()
+      .prepare(
+        `INSERT OR REPLACE INTO configDump (
+          pubkey,
+          variant,
+          combinedMessageHashes,
+          data
+      ) values (
+        $pubkey,
+        $variant,
+        $combinedMessageHashes,
+        $data,
+      );`
+      )
+      .run({
+        pubkey,
+        variant,
+        combinedMessageHashes,
+        data,
+      });
+  },
+};
+
+/**
+ * Others
+ */
+
 function getEntriesCountInTable(tbl: string) {
   try {
     const row = assertGlobalInstance()
@@ -2424,6 +2468,10 @@ function fillWithTestData(numConvosToAdd: number, numMsgsToAdd: number) {
 
 export type SqlNodeType = typeof sqlNode;
 
+export function close() {
+  closeDbInstance();
+}
+
 export const sqlNode = {
   initializeSql,
   close,
@@ -2528,4 +2576,7 @@ export const sqlNode = {
   saveV2OpenGroupRoom,
   getAllV2OpenGroupRooms,
   removeV2OpenGroupRoom,
+
+  // config dumps
+  ...configDumpData,
 };
diff --git a/ts/node/sqlInstance.ts b/ts/node/sqlInstance.ts
new file mode 100644
index 000000000..7a3ba12d4
--- /dev/null
+++ b/ts/node/sqlInstance.ts
@@ -0,0 +1,44 @@
+import * as BetterSqlite3 from 'better-sqlite3';
+
+let globalInstance: BetterSqlite3.Database | null = null;
+
+export function assertGlobalInstance(): BetterSqlite3.Database {
+  if (!globalInstance) {
+    throw new Error('globalInstance is not initialized.');
+  }
+  return globalInstance;
+}
+
+export function isInstanceInitialized(): boolean {
+  return !!globalInstance;
+}
+
+export function assertGlobalInstanceOrInstance(
+  instance?: BetterSqlite3.Database | null
+): BetterSqlite3.Database {
+  // if none of them are initialized, throw
+  if (!globalInstance && !instance) {
+    throw new Error('neither globalInstance nor initialized is initialized.');
+  }
+  // otherwise, return which ever is true, priority to the global one
+  return globalInstance || (instance as BetterSqlite3.Database);
+}
+
+export function initDbInstanceWith(instance: BetterSqlite3.Database) {
+  if (globalInstance) {
+    throw new Error('already init');
+  }
+  globalInstance = instance;
+}
+
+export function closeDbInstance() {
+  if (!globalInstance) {
+    return;
+  }
+  const dbRef = globalInstance;
+  globalInstance = null;
+  // SQLLite documentation suggests that we run `PRAGMA optimize` right before
+  // closing the database connection.
+  dbRef.pragma('optimize');
+  dbRef.close();
+}
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 262a54a2d..85d1aefa6 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -90,7 +90,6 @@ async function retrieveNextMessages(
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
 
-  console.warn(`fetching messages associatedWith:${associatedWith} namespaces:${namespaces}`);
   const results = await doSnodeBatchRequest(retrieveRequestsParams, targetNode, 4000);
 
   if (!results || !results.length) {
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index 8ab5eda2e..22d4db730 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -1,4 +1,3 @@
-import { to_string } from 'libsodium-wrappers-sumo';
 import { getSodiumRenderer } from '../../crypto';
 import { UserUtils, StringUtils } from '../../utils';
 import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
@@ -40,9 +39,6 @@ async function getSnodeSignatureParams(params: {
   try {
     const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
     const signatureBase64 = fromUInt8ArrayToBase64(signature);
-    console.warn(
-      `signing: "${to_string(new Uint8Array(verificationData))}" signature:"${signatureBase64}"`
-    );
 
     return {
       timestamp: signatureTimestamp,
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index e4ac9b8da..ec7876e9e 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -236,8 +236,8 @@ export class SwarmPolling {
       );
     }
 
-    console.warn(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
-    console.warn(
+    console.info(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
+    console.info(
       `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
     );
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 682bf6cd1..4f3fd2348 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -125,7 +125,7 @@ export async function send(
           : SnodeNamespaces.UserMessages;
       }
       let timestamp = networkTimestamp;
-      // the user config namespacesm requires a signature to be added
+      // the user config namespaces requires a signature to be added
       let signOpts: SnodeSignatureResult | undefined;
       if (SnodeNamespace.isUserConfigNamespace(namespace)) {
         signOpts = await SnodeSignature.getSnodeSignatureParams({
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index d781b3614..a64d56167 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,3 +1,11 @@
+/**
+ * This wrapper can be used to make a function type not async, asynced.
+ * We use it in the typing of the database communication, because the data calls (renderer side) have essentially the same signature of the sql calls (node side), with an added `await`
+ */
+export type AsyncWrapper<T extends (...args: any) => any> = (
+  ...args: Parameters<T>
+) => Promise<ReturnType<T>>;
+
 export type MsgDuplicateSearchOpenGroup = Array<{
   sender: string;
   serverTimestamp: number;
@@ -11,3 +19,30 @@ export type UpdateLastHashType = {
   expiresAt: number;
   namespace: number;
 };
+
+/**
+ * Shared config dump types
+ */
+
+export type SharedConfigSupportedVariant = 'user-profile' | 'contacts';
+
+export type ConfigDumpRow = {
+  variant: SharedConfigSupportedVariant; // the variant this entry is about. (user-config, contacts, ...)
+  pubkey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
+  data: Uint8Array; // the blob returned by libsession.dump() call
+  combinedMessageHashes?: string; // array of lastHashes to keep track of, stringified
+  // we might need to add a `seqno` field here.
+};
+
+export type GetByVariantAndPubkeyConfigDump = (
+  variant: SharedConfigSupportedVariant,
+  pubkey: string
+) => Array<ConfigDumpRow>;
+export type GetByPubkeyConfigDump = (pubkey: string) => Array<ConfigDumpRow>;
+export type SaveConfigDump = (dump: ConfigDumpRow) => void;
+
+export type ConfigDumpDataNode = {
+  getConfigDumpByVariantAndPubkey: GetByVariantAndPubkeyConfigDump;
+  getConfigDumpsByPubkey: GetByPubkeyConfigDump;
+  saveConfigDump: SaveConfigDump;
+};
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 9b1eb0cbe..df55da608 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -8,8 +8,6 @@ import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functi
 
 let userConfig: UserConfigWrapper;
 
-/* eslint-disable strict */
-
 // async function getSodiumWorker() {
 //   await sodiumWrappers.ready;
 
@@ -50,8 +48,8 @@ function initUserConfigWrapper(options: Array<any>) {
   userConfig = new UserConfigWrapper(edSecretKey, dump);
 }
 
-// tslint:disable: function-name
-//tslint-disable no-console
+// tslint:disable: function-name no-console
+
 onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
   const [jobId, config, action, ...args] = e.data;
 

From 68852a9e63ee9c2c5e16374e6ca84e02e6546349 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 19 Jan 2023 14:02:59 +1100
Subject: [PATCH 021/178] chore: move syncUtils to its own folder

---
 ts/components/dialog/DeleteAccountModal.tsx   |  2 +-
 ts/components/leftpane/ActionsPanel.tsx       |  2 +-
 .../overlay/OverlayMessageRequest.tsx         |  2 +-
 ts/interactions/conversationInteractions.ts   |  2 +-
 ts/models/conversation.ts                     |  2 +-
 ts/models/message.ts                          |  2 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |  2 +-
 ts/session/conversations/createClosedGroup.ts |  2 +-
 ts/session/sending/MessageQueue.ts            |  2 +-
 ts/session/utils/index.ts                     |  2 +-
 ts/session/utils/{ => sync}/syncUtils.ts      | 38 +++++++++----------
 ts/test/session/unit/utils/Messages_test.ts   |  2 +-
 12 files changed, 30 insertions(+), 30 deletions(-)
 rename ts/session/utils/{ => sync}/syncUtils.ts (89%)

diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index 35809a7d0..6a605ebc3 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { ed25519Str } from '../../session/onions/onionPath';
 import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI';
-import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/sync/syncUtils';
 import { updateConfirmModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { SpacerLG } from '../basic/Text';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 5950b451d..cd6a639df 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { getConversationController } from '../../session/conversations';
-import { syncConfigurationIfNeeded } from '../../session/utils/syncUtils';
+import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
 
 import {
   Data,
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 64f7138d4..95793b669 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
 import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../../state/ducks/section';
 import { getConversationController } from '../../../session/conversations';
-import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
 import { BlockedNumberController } from '../../../util';
 import useKey from 'react-use/lib/useKey';
 import {
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 6b4cd2898..8715fb5e7 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -29,7 +29,7 @@ import { quoteMessage, resetConversationExternal } from '../state/ducks/conversa
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { IMAGE_JPEG } from '../types/MIME';
 import { fromHexToArray, toHex } from '../session/utils/String';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import { SessionButtonColor } from '../components/basic/SessionButton';
 import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
 import { perfEnd, perfStart } from '../session/utils/Performance';
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 748a155c7..33d95689e 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -54,7 +54,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ed25519Str } from '../session/onions/onionPath';
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { IMAGE_JPEG } from '../types/MIME';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import { createLastMessageUpdate } from '../types/Conversation';
 import {
   ReplyingToMessageProps,
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 3bc5b709a..ff3c90767 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -48,7 +48,7 @@ import {
   VisibleMessage,
   VisibleMessageParams,
 } from '../session/messages/outgoing/visibleMessage/VisibleMessage';
-import { buildSyncMessage } from '../session/utils/syncUtils';
+import { buildSyncMessage } from '../session/utils/sync/syncUtils';
 import {
   uploadAttachmentsV3,
   uploadLinkPreviewsV3,
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index c4d0ad646..9432857dd 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -4,7 +4,7 @@ import { ConversationModel } from '../../../../models/conversation';
 import { getConversationController } from '../../../conversations';
 import { PromiseUtils, ToastUtils } from '../../../utils';
 
-import { forceSyncConfigurationNowIfNeeded } from '../../../utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../../../utils/sync/syncUtils';
 import {
   getOpenGroupV2ConversationId,
   openGroupV2CompleteURLRegex,
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 51424e481..affce6fb9 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -19,7 +19,7 @@ import {
 } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { PubKey } from '../types';
 import { UserUtils } from '../utils';
-import { forceSyncConfigurationNowIfNeeded } from '../utils/syncUtils';
+import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils';
 import { getConversationController } from './ConversationController';
 
 export async function createClosedGroup(groupName: string, members: Array<string>, isV3: boolean) {
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index b063b3b99..3ceff61e3 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -15,7 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe
 import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
-import { SyncMessageType } from '../utils/syncUtils';
+import { SyncMessageType } from '../utils/sync/syncUtils';
 
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
diff --git a/ts/session/utils/index.ts b/ts/session/utils/index.ts
index c3e942bca..d946162f0 100644
--- a/ts/session/utils/index.ts
+++ b/ts/session/utils/index.ts
@@ -4,7 +4,7 @@ import * as StringUtils from './String';
 import * as PromiseUtils from './Promise';
 import * as ToastUtils from './Toast';
 import * as UserUtils from './User';
-import * as SyncUtils from './syncUtils';
+import * as SyncUtils from './sync/syncUtils';
 import * as AttachmentsV2Utils from './AttachmentsV2';
 import * as AttachmentDownloads from './AttachmentsDownload';
 import * as CallManager from './calling/CallManager';
diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
similarity index 89%
rename from ts/session/utils/syncUtils.ts
rename to ts/session/utils/sync/syncUtils.ts
index cfbf99f62..db057265f 100644
--- a/ts/session/utils/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -1,33 +1,33 @@
-import { Data } from '../../../ts/data/data';
-import { getMessageQueue } from '..';
-import { getConversationController } from '../conversations';
+import { Data } from '../../../data/data';
+import { getMessageQueue } from '../..';
+import { getConversationController } from '../../conversations';
 import { v4 as uuidv4 } from 'uuid';
-import { UserUtils } from '.';
-import { ECKeyPair } from '../../receiver/keypairs';
+import { UserUtils } from '..';
+import { ECKeyPair } from '../../../receiver/keypairs';
 import {
   ConfigurationMessage,
   ConfigurationMessageClosedGroup,
   ConfigurationMessageContact,
-} from '../messages/outgoing/controlMessage/ConfigurationMessage';
-import { ConversationModel } from '../../models/conversation';
-import { fromBase64ToArray, fromHexToArray } from './String';
-import { SignalService } from '../../protobuf';
+} from '../../messages/outgoing/controlMessage/ConfigurationMessage';
+import { ConversationModel } from '../../../models/conversation';
+import { fromBase64ToArray, fromHexToArray } from '../String';
+import { SignalService } from '../../../protobuf';
 import _ from 'lodash';
 import {
   AttachmentPointerWithUrl,
   PreviewWithAttachmentUrl,
   Quote,
   VisibleMessage,
-} from '../messages/outgoing/visibleMessage/VisibleMessage';
-import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
-import { OpenGroupData } from '../../data/opengroups';
-import { getCompleteUrlFromRoom } from '../apis/open_group_api/utils/OpenGroupUtils';
-import { DURATION } from '../constants';
-import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage';
-import { MessageRequestResponse } from '../messages/outgoing/controlMessage/MessageRequestResponse';
-import { PubKey } from '../types';
-import { SnodeNamespaces } from '../apis/snode_api/namespaces';
-import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage';
+} from '../../messages/outgoing/visibleMessage/VisibleMessage';
+import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
+import { OpenGroupData } from '../../../data/opengroups';
+import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
+import { DURATION } from '../../constants';
+import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage';
+import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse';
+import { PubKey } from '../../types';
+import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
+import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index b6835285e..f33a7b26f 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -17,7 +17,7 @@ import { ClosedGroupNameChangeMessage } from '../../../../session/messages/outgo
 import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import Sinon from 'sinon';
-import { getCurrentConfigurationMessage } from '../../../../session/utils/syncUtils';
+import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils';
 import { getConversationController } from '../../../../session/conversations';
 import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
 import { ConversationCollection } from '../../../../models/conversation';

From 2da2c952725ded7b61d197919b81c654dd9a44f5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 20 Jan 2023 14:35:59 +1100
Subject: [PATCH 022/178] chore: cleanedup the stubbing logic

---
 ts/node/sql.ts                                  |  4 ++--
 ts/session/apis/snode_api/swarmPolling.ts       | 12 +++++++-----
 ...=> libsession_wrapper_contacts_test_skip.ts} | 17 +++++++++--------
 .../libsession_wrapper_test_skip.ts             |  2 +-
 ts/test/test-utils/utils/stubbing.ts            |  6 ++++++
 5 files changed, 25 insertions(+), 16 deletions(-)
 rename ts/test/session/unit/libsession_wrapper/{libsession_wrapper_contacts_test.ts => libsession_wrapper_contacts_test_skip.ts} (94%)

diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 590574e04..0c80bce7c 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -2033,7 +2033,7 @@ function removeV2OpenGroupRoom(conversationId: string) {
 const configDumpData: ConfigDumpDataNode = {
   getConfigDumpByVariantAndPubkey: (variant: SharedConfigSupportedVariant, pubkey: string) => {
     const rows = assertGlobalInstance()
-      .prepare(`SELECT * from configDump WHERE variant = $variant AND pubkey = $pubkey;`)
+      .prepare('SELECT * from configDump WHERE variant = $variant AND pubkey = $pubkey;')
       .get({
         pubkey,
         variant,
@@ -2049,7 +2049,7 @@ const configDumpData: ConfigDumpDataNode = {
 
   getConfigDumpsByPubkey: (pubkey: string) => {
     const rows = assertGlobalInstance()
-      .prepare(`SELECT * from configDump WHERE pubkey = $pubkey;`)
+      .prepare('SELECT * from configDump WHERE pubkey = $pubkey;')
       .get({
         pubkey,
       });
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index ec7876e9e..44a95217d 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -139,11 +139,7 @@ export class SwarmPolling {
     // we always poll as often as possible for our pubkey
     const ourPubkey = UserUtils.getOurPubKeyFromCache();
     const directPromise = Promise.all([
-      this.pollOnceForKey(ourPubkey, false, [
-        SnodeNamespaces.UserMessages,
-        SnodeNamespaces.UserProfile,
-        SnodeNamespaces.UserContacts,
-      ]),
+      this.pollOnceForKey(ourPubkey, false, this.getUserNamespacesPolled()),
     ]).then(() => undefined);
 
     const now = Date.now();
@@ -410,6 +406,12 @@ export class SwarmPolling {
     return newMessages;
   }
 
+  private getUserNamespacesPolled() {
+    return window.sessionFeatureFlags.useSharedUtilForUserConfig
+      ? [SnodeNamespaces.UserMessages, SnodeNamespaces.UserProfile, SnodeNamespaces.UserContacts]
+      : [SnodeNamespaces.UserMessages];
+  }
+
   private async updateLastHash({
     edkey,
     expiration,
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts
similarity index 94%
rename from ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
rename to ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts
index 516cc1b7f..09e28a1e3 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
 
 import { from_hex, from_string } from 'libsodium-wrappers-sumo';
-import * as SessionUtilWrapper from 'session_util_wrapper';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
 
@@ -17,6 +16,7 @@ describe('libsession_wrapper_contacts  ', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
+    const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
     const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
@@ -121,8 +121,8 @@ describe('libsession_wrapper_contacts  ', () => {
 
     // Iterate through and make sure we got everything we expected
     const allContacts = contacts.getAll();
-    const session_ids = allContacts.map(m => m.id);
-    const nicknames = allContacts.map(m => m.nickname || '(N/A)');
+    const session_ids = allContacts.map((m: any) => m.id);
+    const nicknames = allContacts.map((m: any) => m.nickname || '(N/A)');
 
     expect(session_ids.length).to.be.eq(2);
     expect(session_ids).to.be.deep.eq([real_id, another_id]);
@@ -173,8 +173,8 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(contacts2.needsPush()).to.be.false;
 
     const allContacts2 = contacts.getAll();
-    const session_ids2 = allContacts2.map(m => m.id);
-    const nicknames2 = allContacts2.map(m => m.nickname || '(N/A)');
+    const session_ids2 = allContacts2.map((m: any) => m.id);
+    const nicknames2 = allContacts2.map((m: any) => m.nickname || '(N/A)');
 
     expect(session_ids2.length).to.be.eq(2);
     expect(nicknames2.length).to.be.eq(2);
@@ -186,6 +186,7 @@ describe('libsession_wrapper_contacts  ', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
+    const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
     const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
@@ -262,8 +263,8 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(accepted).to.be.equal(1);
 
     const allContacts2 = contacts.getAll();
-    const session_ids2 = allContacts2.map(m => m.id);
-    const nicknames2 = allContacts2.map(m => m.nickname || '(N/A)');
+    const session_ids2 = allContacts2.map((m: any) => m.id);
+    const nicknames2 = allContacts2.map((m: any) => m.nickname || '(N/A)');
 
     expect(session_ids2.length).to.be.eq(2);
     expect(nicknames2.length).to.be.eq(2);
@@ -276,7 +277,7 @@ describe('libsession_wrapper_contacts  ', () => {
     const allContacts3 = contacts.getAll();
     let deletions = 0;
     let non_deletions = 0;
-    allContacts3.forEach(c => {
+    allContacts3.forEach((c: any) => {
       if (c.id !== real_id) {
         contacts.erase(c.id);
         deletions++;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
index 3aafb3d6f..e01e92059 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
@@ -3,7 +3,6 @@ import { expect } from 'chai';
 import { stringToUint8Array } from '../../../../session/utils/String';
 import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
 import { concatUInt8Array } from '../../../../session/crypto';
-import * as SessionUtilWrapper from 'session_util_wrapper';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
 
@@ -19,6 +18,7 @@ describe('libsession_wrapper', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
+    const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
     const conf = new SessionUtilWrapper.UserConfigWrapper(edSecretKey, null);
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 70b71b8a7..5cbd02810 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import Sinon from 'sinon';
 import { Data } from '../../../../ts/data/data';
 import { OpenGroupData } from '../../../data/opengroups';
+import { ConfigDumpData } from '../../../data/configDump/configDump';
 
 import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface';
 
@@ -12,6 +13,7 @@ const globalAny: any = global;
 // tslint:disable: no-require-imports no-var-requires
 type DataFunction = typeof Data;
 type OpenGroupDataFunction = typeof OpenGroupData;
+type ConfigDumpDataFunction = typeof ConfigDumpData;
 
 /**
  * Stub a function inside Data.
@@ -27,6 +29,10 @@ export function stubOpenGroupData<K extends keyof OpenGroupDataFunction>(fn: K):
   return Sinon.stub(OpenGroupData, fn);
 }
 
+export function stubConfigDumpData<K extends keyof ConfigDumpDataFunction>(fn: K): sinon.SinonStub {
+  return Sinon.stub(ConfigDumpData, fn);
+}
+
 export function stubUtilWorker(fnName: string, returnedValue: any): sinon.SinonStub {
   return Sinon.stub(utilWorker, 'callUtilsWorker')
     .withArgs(fnName as any)

From b3995c117b05716a919158fa239e72db5bd5da72 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 20 Jan 2023 14:36:27 +1100
Subject: [PATCH 023/178] feat: add a PersistedJobRunner which can handle
 SyncConfJobs

---
 .../utils/job_runners/JobDeserialization.ts   |  22 ++
 ts/session/utils/job_runners/JobRunner.ts     | 268 ++++++++++++++++++
 ts/session/utils/job_runners/PersistedJob.ts  | 107 +++++++
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  45 +++
 .../utils/job_runners/jobs/JobRunnerType.ts   |   1 +
 .../unit/utils/job_runner/JobRunner_test.ts   | 144 ++++++++++
 6 files changed, 587 insertions(+)
 create mode 100644 ts/session/utils/job_runners/JobDeserialization.ts
 create mode 100644 ts/session/utils/job_runners/JobRunner.ts
 create mode 100644 ts/session/utils/job_runners/PersistedJob.ts
 create mode 100644 ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
 create mode 100644 ts/session/utils/job_runners/jobs/JobRunnerType.ts
 create mode 100644 ts/test/session/unit/utils/job_runner/JobRunner_test.ts

diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
new file mode 100644
index 000000000..07fc2141d
--- /dev/null
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -0,0 +1,22 @@
+import { isEmpty, isString } from 'lodash';
+import { ConfigurationSyncJob } from './jobs/ConfigurationSyncJob';
+import { Persistedjob, PersistedJobType, SerializedPersistedJob } from './PersistedJob';
+
+export function persistedJobFromData(data: SerializedPersistedJob): Persistedjob | null {
+  if (!data || isEmpty(data.jobType) || !isString(data?.jobType)) {
+    return null;
+  }
+  const jobType: PersistedJobType = data.jobType as PersistedJobType;
+  switch (jobType) {
+    case 'ConfigurationSyncJobType':
+      return new ConfigurationSyncJob({
+        maxAttempts: data.maxAttempts,
+        identifier: data.identifier,
+        nextAttemptTimestamp: data.nextAttemptTimestamp,
+        currentRetry: data.currentRetry,
+      });
+    default:
+      console.warn('unknown persisted job type:', jobType);
+      return null;
+  }
+}
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
new file mode 100644
index 000000000..497096c0c
--- /dev/null
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -0,0 +1,268 @@
+import { cloneDeep, compact, isArray, isString } from 'lodash';
+import { Data } from '../../../data/data';
+import { persistedJobFromData } from './JobDeserialization';
+import { JobRunnerType } from './jobs/JobRunnerType';
+import { Persistedjob, SerializedPersistedJob } from './PersistedJob';
+
+/**
+ * 'not_running' when the queue is not running
+ * 'already_started' if startProcessing was called already once before
+ * 'job_in_progress' if there is already a job in progress
+ * 'job_deferred' if there is a next job, but too far in the future to start it now
+ * 'job_started' a job was pending to be started and we could start it, so we started it
+ * 'no_job' if there are no jobs to be run at all
+ */
+export type StartProcessingResult =
+  | 'not_running'
+  | 'already_started'
+  | 'job_in_progress'
+  | 'job_deferred'
+  | 'job_started'
+  | 'no_job';
+
+export class PersistedJobRunner {
+  private isInit = false;
+  private jobsScheduled: Array<Persistedjob> = [];
+  private isStarted = false;
+  private readonly jobRunnerType: JobRunnerType;
+  private nextJobStartTimer: NodeJS.Timeout | null = null;
+  private currentJob: Persistedjob | null = null;
+
+  constructor(jobRunnerType: JobRunnerType) {
+    this.jobRunnerType = jobRunnerType;
+    console.warn('new runner');
+  }
+
+  public async loadJobsFromDb() {
+    if (this.isInit) {
+      throw new Error('job runner already init');
+    }
+    let jobsArray: Array<SerializedPersistedJob> = [];
+    const found = await Data.getItemById(this.getJobRunnerItemId());
+    if (found && found.value && isString(found.value)) {
+      const asStr = found.value;
+
+      try {
+        const parsed = JSON.parse(asStr);
+        if (!isArray(parsed)) {
+          jobsArray = [];
+        } else {
+          jobsArray = parsed;
+        }
+      } catch (e) {
+        window.log.warn(`Failed to parse jobs of type ${this.jobRunnerType} from DB`);
+        jobsArray = [];
+      }
+    }
+    const jobs: Array<Persistedjob> = compact(jobsArray.map(persistedJobFromData));
+    this.jobsScheduled = cloneDeep(jobs);
+    // make sure the list is sorted
+    this.sortJobsList();
+    this.isInit = true;
+  }
+
+  public async addJob(job: Persistedjob) {
+    this.assertIsInitialized();
+
+    if (job.singleJobInQueue) {
+      // make sure there is no job with that same type already scheduled.
+      if (this.jobsScheduled.find(j => j.jobType === job.jobType)) {
+        console.info(
+          `job runner has already a job "${job.identifier}" planned so not adding another one`
+        );
+        return;
+      }
+
+      this.jobsScheduled.push(job);
+      this.sortJobsList();
+      await this.writeJobsToDB();
+
+      if (this.isStarted) {
+        // a new job was added. trigger it if we can/have to start it
+        this.planNextJob();
+      }
+
+      return;
+    }
+    throw new Error('persisted job runner does not support non single type for now.');
+  }
+
+  /**
+   * Only used for testing
+   */
+  public getJobList() {
+    return this.getSerializedJobs();
+  }
+
+  public resetForTesting() {
+    this.jobsScheduled = [];
+    this.isInit = false;
+
+    if (this.nextJobStartTimer) {
+      clearTimeout(this.nextJobStartTimer);
+      this.nextJobStartTimer = null;
+    }
+    this.currentJob = null;
+  }
+
+  /**
+   * if we are running a job, this call will await until the job is done
+   */
+  public async stopAndWaitCurrentJob() {
+    if (!this.isStarted || !this.currentJob) {
+      return;
+    }
+    this.isStarted = false;
+    if (this.currentJob) {
+      await this.currentJob.waitForCurrentTry();
+    }
+  }
+
+  public startProcessing(): StartProcessingResult {
+    if (this.isStarted) {
+      return 'already_started';
+    }
+    this.isStarted = true;
+    return this.planNextJob();
+  }
+
+  private sortJobsList() {
+    this.jobsScheduled.sort((a, b) => a.nextAttemptTimestamp - b.nextAttemptTimestamp);
+  }
+
+  private async writeJobsToDB() {
+    const serialized = this.getSerializedJobs();
+    console.warn('writing to db', serialized);
+    await Data.createOrUpdateItem({
+      id: this.getJobRunnerItemId(),
+      value: JSON.stringify(serialized),
+    });
+  }
+
+  private getSerializedJobs() {
+    return this.jobsScheduled.map(m => m.serializeJob());
+  }
+
+  private getJobRunnerItemId() {
+    return `jobRunner-${this.jobRunnerType}`;
+  }
+
+  /**
+   * Returns 'not_running' if that job runner is not started at all
+   * Returns 'in_progress' if there is already a job running
+   * Returns 'none' if there are no jobs to be started at all (or the runner is not running)
+   * Returns 'started' if there the next jobs was just started
+   * Returns 'deferred' if there is a next job but it is in the future and so wasn't started yet, but a timer is set.
+   */
+  private planNextJob(): StartProcessingResult {
+    if (!this.isStarted) {
+      return 'not_running';
+    }
+    if (this.currentJob) {
+      return 'job_in_progress';
+    }
+    if (!this.jobsScheduled.length) {
+      return 'no_job';
+    }
+
+    const nextJob = this.jobsScheduled[0];
+
+    if (!nextJob) {
+      return 'no_job';
+    }
+
+    if (nextJob.nextAttemptTimestamp <= Date.now()) {
+      if (this.nextJobStartTimer) {
+        global.clearTimeout(this.nextJobStartTimer);
+        this.nextJobStartTimer = null;
+      }
+      // nextJob should be started right away
+      void this.runNextJob();
+      return 'job_started';
+    }
+
+    // next job is not to be started right away, just plan our runner to be awakened when the time is right.
+    if (this.nextJobStartTimer) {
+      global.clearTimeout(this.nextJobStartTimer);
+    }
+    // plan a timer to wakeup when that timer is reached.
+    this.nextJobStartTimer = global.setTimeout(() => {
+      console.warn('wakeup timer');
+      if (this.nextJobStartTimer) {
+        global.clearTimeout(this.nextJobStartTimer);
+        this.nextJobStartTimer = null;
+      }
+      void this.runNextJob();
+    }, Math.max(nextJob.nextAttemptTimestamp - Date.now(), 1));
+
+    return 'job_deferred';
+  }
+
+  private deleteJobByIdentifier(identifier: string) {
+    const jobIndex = this.jobsScheduled.findIndex(f => f.identifier === identifier);
+    if (jobIndex >= 0) {
+      this.jobsScheduled.splice(jobIndex, 1);
+    }
+  }
+
+  private async runNextJob() {
+    console.warn('runNextJob called');
+    this.assertIsInitialized();
+    if (this.currentJob || !this.isStarted || !this.jobsScheduled.length) {
+      return;
+    }
+
+    const nextJob = this.jobsScheduled[0];
+
+    if (nextJob.nextAttemptTimestamp >= Date.now()) {
+      window.log.info('next job is not to be run just yet. Going idle.');
+      this.planNextJob();
+      return;
+    }
+
+    try {
+      if (this.currentJob) {
+        return;
+      }
+      this.currentJob = nextJob;
+      const success = await this.currentJob.runJob();
+      if (!success) {
+        throw new Error(`job ${nextJob.identifier} failed`);
+      }
+      // here the job did not throw and didn't return false. Consider it OK then and remove it from the list of jobs to run.
+      this.deleteJobByIdentifier(this.currentJob.identifier);
+      await this.writeJobsToDB();
+    } catch (e) {
+      // either the job throw or didn't return 'OK'
+      if (nextJob.currentRetry >= nextJob.maxAttempts) {
+        // we cannot restart this job anymore. Remove the entry completely
+        this.deleteJobByIdentifier(nextJob.identifier);
+      } else {
+        // that job can be restarted. Plan a retry later with the already defined retry
+        nextJob.nextAttemptTimestamp = Date.now() + nextJob.delayBetweenRetries;
+      }
+      // in any case, either we removed a job or changed one of the timestamp.
+      // so sort the list again, and persist it
+      this.sortJobsList();
+      await this.writeJobsToDB();
+    } finally {
+      this.currentJob = null;
+      // start the next job if there is any to be started now, or just plan the wakeup of our runner for the right time.
+      this.planNextJob();
+    }
+  }
+
+  private assertIsInitialized() {
+    if (!this.isInit) {
+      throw new Error(
+        'persisted job runner was not initlized yet. Call initWithData with what you have persisted first'
+      );
+    }
+  }
+}
+
+const configurationSyncRunner = new PersistedJobRunner('ConfigurationSyncJob');
+
+export const runners = {
+  configurationSyncRunner,
+};
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
new file mode 100644
index 000000000..c73616b0c
--- /dev/null
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -0,0 +1,107 @@
+import { isEmpty } from 'lodash';
+
+export type PersistedJobType = 'ConfigurationSyncJobType';
+
+export type SerializedPersistedJob = {
+  // we  need at least those as they are needed to do lookups of the list of jobs.
+  jobType: string;
+  identifier: string;
+  nextAttemptTimestamp: number;
+  maxAttempts: number; // to run try to run it twice, set this to 2.
+  currentRetry: number; //
+  // then we can have other details on a specific type of job case
+  [key: string]: any;
+};
+
+export abstract class Persistedjob {
+  public readonly identifier: string;
+  public readonly singleJobInQueue: boolean;
+  public readonly delayBetweenRetries: number;
+  public readonly maxAttempts: number;
+  public readonly jobType: PersistedJobType;
+  public currentRetry: number;
+  public nextAttemptTimestamp: number;
+
+  private runningPromise: Promise<boolean> | null = null;
+
+  public constructor({
+    maxAttempts,
+    delayBetweenRetries,
+    identifier,
+    singleJobInQueue,
+    jobType,
+    nextAttemptTimestamp,
+  }: {
+    identifier: string;
+    maxAttempts: number;
+    delayBetweenRetries: number;
+    singleJobInQueue: boolean;
+    jobType: PersistedJobType;
+    nextAttemptTimestamp: number;
+    currentRetry: number;
+  }) {
+    this.identifier = identifier;
+    this.jobType = jobType;
+    this.delayBetweenRetries = delayBetweenRetries;
+    this.maxAttempts = maxAttempts;
+    this.currentRetry = 0;
+    this.singleJobInQueue = singleJobInQueue;
+    this.nextAttemptTimestamp = nextAttemptTimestamp;
+
+    if (maxAttempts < 1) {
+      throw new Error('maxAttempts must be >= 1');
+    }
+
+    if (isEmpty(identifier)) {
+      throw new Error('identifier must be not empty');
+    }
+
+    if (isEmpty(jobType)) {
+      throw new Error('identifier must be not empty');
+    }
+
+    if (delayBetweenRetries <= 0) {
+      throw new Error('delayBetweenRetries must be at least > 0');
+    }
+
+    if (nextAttemptTimestamp <= 0) {
+      throw new Error('nextAttemptTimestamp must be set and > 0');
+    }
+  }
+
+  public async runJob() {
+    if (!this.runningPromise) {
+      this.runningPromise = this.run();
+    }
+    return this.runningPromise;
+  }
+
+  /**
+   * If that job is running, wait for its completion (success or failure) before returning.
+   * Can be used to wait for the task to be done before exiting the JobRunner
+   */
+  public async waitForCurrentTry() {
+    // tslint:disable-next-line: no-promise-as-boolean
+    return this.runningPromise || Promise.resolve();
+  }
+
+  /**
+   * This one must be reimplemented in the child class, and must first call `super.serializeBase()`
+   */
+  public abstract serializeJob(): SerializedPersistedJob;
+
+  protected abstract run(): Promise<boolean>; // must return true if that job is a success and doesn't need to be retried
+
+  protected serializeBase(): SerializedPersistedJob {
+    return {
+      // those are mandatory
+      jobType: this.jobType,
+      identifier: this.identifier,
+      nextAttemptTimestamp: this.nextAttemptTimestamp,
+      maxAttempts: this.maxAttempts,
+      currentRetry: this.currentRetry,
+      delayBetweenRetries: this.delayBetweenRetries,
+      singleJobInQueue: this.singleJobInQueue,
+    };
+  }
+}
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
new file mode 100644
index 000000000..0be0d07cc
--- /dev/null
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -0,0 +1,45 @@
+import { isNumber } from 'lodash';
+import { v4 } from 'uuid';
+import { sleepFor } from '../../Promise';
+import { Persistedjob, SerializedPersistedJob } from '../PersistedJob';
+
+export class ConfigurationSyncJob extends Persistedjob {
+  constructor({
+    identifier,
+    nextAttemptTimestamp,
+    maxAttempts,
+    currentRetry,
+  }: {
+    identifier: string | null;
+    nextAttemptTimestamp: number | null;
+    maxAttempts: number | null;
+    currentRetry: number;
+  }) {
+    super({
+      jobType: 'ConfigurationSyncJobType',
+      identifier: identifier || v4(),
+      delayBetweenRetries: 3000,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
+      singleJobInQueue: true,
+      currentRetry,
+    });
+  }
+
+  public async run() {
+    // blablha do everything from the notion page, and if success, return true.
+    console.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
+
+    await sleepFor(5000);
+    console.warn(
+      `running job ${this.jobType} with id:"${this.identifier}" done and returning failed `
+    );
+
+    return false;
+  }
+
+  public serializeJob(): SerializedPersistedJob {
+    const fromParent = super.serializeBase();
+    return fromParent;
+  }
+}
diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
new file mode 100644
index 000000000..fdf5c9bd4
--- /dev/null
+++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
@@ -0,0 +1 @@
+export type JobRunnerType = 'ConfigurationSyncJob';
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
new file mode 100644
index 000000000..beaff7e90
--- /dev/null
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -0,0 +1,144 @@
+import { expect } from 'chai';
+import _ from 'lodash';
+import Sinon from 'sinon';
+import { v4 } from 'uuid';
+import { persistedJobFromData } from '../../../../../session/utils/job_runners/JobDeserialization';
+import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner';
+import { SerializedPersistedJob } from '../../../../../session/utils/job_runners/PersistedJob';
+import { stubData } from '../../../../test-utils/utils';
+
+function getFakeConfigurationJobPersisted(timestamp: number): SerializedPersistedJob {
+  return {
+    jobType: 'ConfigurationSyncJobType',
+    identifier: v4(),
+    delayBetweenRetries: 3000,
+    maxAttempts: 3,
+    nextAttemptTimestamp: timestamp || Date.now() + 3000,
+    singleJobInQueue: true,
+    currentRetry: 0,
+  };
+}
+
+function getFakeConfigurationJob(timestamp: number) {
+  const job = persistedJobFromData(getFakeConfigurationJobPersisted(timestamp));
+  if (!job) {
+    throw new Error('persistedJobFromData failed');
+  }
+  return job;
+}
+
+describe('JobRunner', () => {
+  let getItemById: Sinon.SinonStub;
+  let createOrUpdateItem: Sinon.SinonStub;
+  let clock: Sinon.SinonFakeTimers;
+
+  let runner: PersistedJobRunner;
+
+  beforeEach(() => {
+    getItemById = stubData('getItemById');
+    createOrUpdateItem = stubData('createOrUpdateItem');
+    clock = Sinon.useFakeTimers();
+    runner = new PersistedJobRunner('ConfigurationSyncJob');
+  });
+
+  afterEach(() => {
+    Sinon.restore();
+    runner.resetForTesting();
+  });
+
+  describe('loadJobsFromDb', () => {
+    it('throw if already loaded', async () => {
+      await runner.loadJobsFromDb();
+      try {
+        await runner.loadJobsFromDb();
+        throw new Error('PLOP'); // the line above should throw something else
+      } catch (e) {
+        expect(e.message).to.not.eq('PLOP');
+      }
+    });
+    it('unsorted list is sorted after loading', async () => {
+      const unsorted = [
+        getFakeConfigurationJobPersisted(1),
+        getFakeConfigurationJobPersisted(5),
+        getFakeConfigurationJobPersisted(0),
+      ];
+      getItemById.resolves({
+        id: '',
+        value: JSON.stringify(unsorted),
+      });
+
+      await runner.loadJobsFromDb();
+
+      const jobList = runner.getJobList();
+      expect(jobList).to.be.deep.eq(
+        unsorted.sort((a, b) => a.nextAttemptTimestamp - b.nextAttemptTimestamp)
+      );
+    });
+
+    it('invalid stored data results in empty array of jobs', async () => {
+      const unsorted = { invalid: 'data' };
+      getItemById.resolves({
+        id: '',
+        value: JSON.stringify(unsorted),
+      });
+
+      await runner.loadJobsFromDb();
+
+      const jobList = runner.getJobList();
+      expect(jobList).to.be.deep.eq([]);
+    });
+
+    it('no stored data results in empty array of jobs', async () => {
+      getItemById.resolves(null);
+
+      await runner.loadJobsFromDb();
+
+      const jobList = runner.getJobList();
+      expect(jobList).to.be.deep.eq([]);
+    });
+  });
+
+  describe('addJob', () => {
+    it('can add configurationSyncJob ', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeConfigurationJob(123);
+      const persisted = job.serializeJob();
+      await runner.addJob(job);
+
+      expect(runner.getJobList()).to.deep.eq([persisted]);
+    });
+    it('does not add a second configurationSyncJob if one is already there', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeConfigurationJob(123);
+      const job2 = getFakeConfigurationJob(1234);
+      await runner.addJob(job);
+      await runner.addJob(job2);
+      const persisted = job.serializeJob();
+
+      expect(runner.getJobList()).to.deep.eq([persisted]);
+    });
+  });
+
+  describe('startProcessing Config Sync Jobs', () => {
+    it('does not trigger anything if no job present ', async () => {
+      await runner.loadJobsFromDb();
+      expect(runner.startProcessing()).to.be.eq('no_job');
+    });
+
+    it('triggers a job right away if there is a job which should already be running', async () => {
+      await runner.loadJobsFromDb();
+      clock.tick(100);
+      const job = getFakeConfigurationJob(50);
+      await runner.addJob(job);
+      expect(runner.startProcessing()).to.be.eq('job_started');
+    });
+
+    it('plans a deffered job if there is a job starting later', async () => {
+      await runner.loadJobsFromDb();
+      clock.tick(100);
+      const job = getFakeConfigurationJob(150);
+      await runner.addJob(job);
+      expect(runner.startProcessing()).to.be.eq('job_deferred');
+    });
+  });
+});

From 141c22ed4308e7659e9ef84e1393b638d527b1aa Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 23 Jan 2023 16:13:11 +1100
Subject: [PATCH 024/178] tesat: add tests for the JobRunner class

---
 ts/components/leftpane/ActionsPanel.tsx       |  12 +-
 .../utils/job_runners/JobDeserialization.ts   |  20 ++
 ts/session/utils/job_runners/JobRunner.ts     | 144 +++++---
 ts/session/utils/job_runners/PersistedJob.ts  |  14 +-
 .../utils/job_runners/jobs/JobRunnerType.ts   |   2 +-
 .../unit/utils/job_runner/FakeSleepForJob.ts  |  98 ++++++
 .../unit/utils/job_runner/JobRunner_test.ts   | 329 ++++++++++++++++--
 tslint.json                                   |   2 +-
 8 files changed, 531 insertions(+), 90 deletions(-)
 create mode 100644 ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index cd6a639df..2edebaa29 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -26,7 +26,7 @@ import { cleanUpOldDecryptedMedias } from '../../session/crypto/DecryptedAttachm
 
 import { DURATION } from '../../session/constants';
 
-import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
+import { onionPathModal } from '../../state/ducks/modalDialog';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { debounce, isEmpty, isString } from 'lodash';
 
@@ -67,7 +67,15 @@ const Section = (props: { type: SectionType }) => {
   const handleClick = async () => {
     /* tslint:disable:no-void-expression */
     if (type === SectionType.Profile) {
-      dispatch(editProfileModal({}));
+      const message = new SharedConfigMessage({
+        data: new Uint8Array([1, 2, 3]),
+        kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
+        seqno: Long.fromNumber(0),
+        timestamp: GetNetworkTime.getNowWithNetworkOffset(),
+      });
+      await getMessageQueue().sendSyncMessage({ message, namespace: SnodeNamespaces.UserProfile });
+      console.warn('FIXME');
+      // dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
       const currentTheme = String(window.Events.getThemeSetting());
       const newTheme = (isDarkMode
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index 07fc2141d..0e800613e 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -1,4 +1,8 @@
 import { isEmpty, isString } from 'lodash';
+import {
+  FakeSleepForJob,
+  FakeSleepForMultiJob,
+} from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
 import { ConfigurationSyncJob } from './jobs/ConfigurationSyncJob';
 import { Persistedjob, PersistedJobType, SerializedPersistedJob } from './PersistedJob';
 
@@ -15,6 +19,22 @@ export function persistedJobFromData(data: SerializedPersistedJob): Persistedjob
         nextAttemptTimestamp: data.nextAttemptTimestamp,
         currentRetry: data.currentRetry,
       });
+    case 'FakeSleepForJobType':
+      return new FakeSleepForJob({
+        maxAttempts: data.maxAttempts,
+        identifier: data.identifier,
+        nextAttemptTimestamp: data.nextAttemptTimestamp,
+        currentRetry: data.currentRetry,
+      });
+    case 'FakeSleepForJobMultiType':
+      return new FakeSleepForMultiJob({
+        maxAttempts: data.maxAttempts,
+        identifier: data.identifier,
+        nextAttemptTimestamp: data.nextAttemptTimestamp,
+        currentRetry: data.currentRetry,
+        returnResult: data.returnResult,
+        sleepDuration: data.sleepDuration,
+      });
     default:
       console.warn('unknown persisted job type:', jobType);
       return null;
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 497096c0c..b75beebe4 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -5,20 +5,21 @@ import { JobRunnerType } from './jobs/JobRunnerType';
 import { Persistedjob, SerializedPersistedJob } from './PersistedJob';
 
 /**
- * 'not_running' when the queue is not running
- * 'already_started' if startProcessing was called already once before
  * 'job_in_progress' if there is already a job in progress
  * 'job_deferred' if there is a next job, but too far in the future to start it now
  * 'job_started' a job was pending to be started and we could start it, so we started it
  * 'no_job' if there are no jobs to be run at all
  */
-export type StartProcessingResult =
-  | 'not_running'
-  | 'already_started'
-  | 'job_in_progress'
-  | 'job_deferred'
-  | 'job_started'
-  | 'no_job';
+export type StartProcessingResult = 'job_in_progress' | 'job_deferred' | 'job_started' | 'no_job';
+
+export type AddJobResult = 'job_deferred' | 'job_started';
+
+export type JobEventListener = {
+  onJobSuccess: (job: SerializedPersistedJob) => void;
+  onJobDeferred: (job: SerializedPersistedJob) => void;
+  onJobError: (job: SerializedPersistedJob) => void;
+  onJobStarted: (job: SerializedPersistedJob) => void;
+};
 
 export class PersistedJobRunner {
   private isInit = false;
@@ -27,9 +28,11 @@ export class PersistedJobRunner {
   private readonly jobRunnerType: JobRunnerType;
   private nextJobStartTimer: NodeJS.Timeout | null = null;
   private currentJob: Persistedjob | null = null;
+  private readonly jobEventsListener: JobEventListener | null;
 
-  constructor(jobRunnerType: JobRunnerType) {
+  constructor(jobRunnerType: JobRunnerType, jobEventsListener: JobEventListener | null) {
     this.jobRunnerType = jobRunnerType;
+    this.jobEventsListener = jobEventsListener;
     console.warn('new runner');
   }
 
@@ -61,30 +64,31 @@ export class PersistedJobRunner {
     this.isInit = true;
   }
 
-  public async addJob(job: Persistedjob) {
+  public async addJob(
+    job: Persistedjob
+  ): Promise<'type_exists' | 'identifier_exists' | AddJobResult> {
     this.assertIsInitialized();
 
     if (job.singleJobInQueue) {
       // make sure there is no job with that same type already scheduled.
       if (this.jobsScheduled.find(j => j.jobType === job.jobType)) {
         console.info(
-          `job runner has already a job "${job.identifier}" planned so not adding another one`
+          `job runner has already a job with type:"${job.jobType}" planned so not adding another one`
         );
-        return;
+        return 'type_exists';
       }
-
-      this.jobsScheduled.push(job);
-      this.sortJobsList();
-      await this.writeJobsToDB();
-
-      if (this.isStarted) {
-        // a new job was added. trigger it if we can/have to start it
-        this.planNextJob();
-      }
-
-      return;
+      return this.addJobUnchecked(job);
     }
-    throw new Error('persisted job runner does not support non single type for now.');
+
+    // make sure there is no job with that same identifier already .
+    if (this.jobsScheduled.find(j => j.identifier === job.identifier)) {
+      console.info(
+        `job runner has already a job with id:"${job.identifier}" planned so not adding another one`
+      );
+      return 'identifier_exists';
+    }
+    console.info(`job runner adding type :"${job.jobType}" `);
+    return this.addJobUnchecked(job);
   }
 
   /**
@@ -106,21 +110,32 @@ export class PersistedJobRunner {
   }
 
   /**
-   * if we are running a job, this call will await until the job is done
+   * if we are running a job, this call will await until the job is done and stop the queue
    */
-  public async stopAndWaitCurrentJob() {
+  public async stopAndWaitCurrentJob(): Promise<'no_await' | 'await'> {
     if (!this.isStarted || !this.currentJob) {
-      return;
+      return 'no_await';
     }
     this.isStarted = false;
-    if (this.currentJob) {
-      await this.currentJob.waitForCurrentTry();
+    await this.currentJob.waitForCurrentTry();
+    return 'await';
+  }
+
+  /**
+   * if we are running a job, this call will await until the job is done.
+   * If another job must be run right away this one, we will also add the upcoming one as the currentJob.
+   */
+  public async waitCurrentJob(): Promise<'no_await' | 'await'> {
+    if (!this.isStarted || !this.currentJob) {
+      return 'no_await';
     }
+    await this.currentJob.waitForCurrentTry();
+    return 'await';
   }
 
   public startProcessing(): StartProcessingResult {
     if (this.isStarted) {
-      return 'already_started';
+      throw new Error('startProcessing already called');
     }
     this.isStarted = true;
     return this.planNextJob();
@@ -139,6 +154,23 @@ export class PersistedJobRunner {
     });
   }
 
+  private async addJobUnchecked(job: Persistedjob) {
+    this.jobsScheduled.push(cloneDeep(job));
+    this.sortJobsList();
+    await this.writeJobsToDB();
+    // a new job was added. trigger it if we can/have to start it
+    const result = this.planNextJob();
+
+    console.warn('addJobUnchecked: ', result);
+    if (result === 'no_job') {
+      throw new Error('We just pushed a job, there cannot be no job');
+    }
+    if (result === 'job_in_progress') {
+      return 'job_deferred';
+    }
+    return result;
+  }
+
   private getSerializedJobs() {
     return this.jobsScheduled.map(m => m.serializeJob());
   }
@@ -148,24 +180,23 @@ export class PersistedJobRunner {
   }
 
   /**
-   * Returns 'not_running' if that job runner is not started at all
-   * Returns 'in_progress' if there is already a job running
+   * Returns 'job_in_progress' if there is already a job running
    * Returns 'none' if there are no jobs to be started at all (or the runner is not running)
    * Returns 'started' if there the next jobs was just started
-   * Returns 'deferred' if there is a next job but it is in the future and so wasn't started yet, but a timer is set.
+   * Returns 'job_deferred' if there is a next job but it is in the future and so wasn't started yet, but a timer is set.
    */
   private planNextJob(): StartProcessingResult {
     if (!this.isStarted) {
-      return 'not_running';
+      if (this.jobsScheduled.length) {
+        return 'job_deferred';
+      } else {
+        return 'no_job';
+      }
     }
     if (this.currentJob) {
       return 'job_in_progress';
     }
-    if (!this.jobsScheduled.length) {
-      return 'no_job';
-    }
-
-    const nextJob = this.jobsScheduled[0];
+    const nextJob = this.jobsScheduled?.[0];
 
     if (!nextJob) {
       return 'no_job';
@@ -183,11 +214,11 @@ export class PersistedJobRunner {
 
     // next job is not to be started right away, just plan our runner to be awakened when the time is right.
     if (this.nextJobStartTimer) {
+      // remove the timer as there might be a more urgent job to be run before the one we have set here.
       global.clearTimeout(this.nextJobStartTimer);
     }
     // plan a timer to wakeup when that timer is reached.
     this.nextJobStartTimer = global.setTimeout(() => {
-      console.warn('wakeup timer');
       if (this.nextJobStartTimer) {
         global.clearTimeout(this.nextJobStartTimer);
         this.nextJobStartTimer = null;
@@ -200,13 +231,14 @@ export class PersistedJobRunner {
 
   private deleteJobByIdentifier(identifier: string) {
     const jobIndex = this.jobsScheduled.findIndex(f => f.identifier === identifier);
+    console.info('deleteJobByIdentifier job', identifier, ' index', jobIndex);
+
     if (jobIndex >= 0) {
       this.jobsScheduled.splice(jobIndex, 1);
     }
   }
 
   private async runNextJob() {
-    console.warn('runNextJob called');
     this.assertIsInitialized();
     if (this.currentJob || !this.isStarted || !this.jobsScheduled.length) {
       return;
@@ -214,8 +246,12 @@ export class PersistedJobRunner {
 
     const nextJob = this.jobsScheduled[0];
 
-    if (nextJob.nextAttemptTimestamp >= Date.now()) {
-      window.log.info('next job is not to be run just yet. Going idle.');
+    // if the time is 101, and that task is to be run at t=101, we need to start it right away.
+    if (nextJob.nextAttemptTimestamp > Date.now()) {
+      console.warn(
+        'next job is not due to be run just yet. Going idle.',
+        nextJob.nextAttemptTimestamp - Date.now()
+      );
       this.planNextJob();
       return;
     }
@@ -225,28 +261,44 @@ export class PersistedJobRunner {
         return;
       }
       this.currentJob = nextJob;
+
+      this.jobEventsListener?.onJobStarted(this.currentJob.serializeJob());
+
       const success = await this.currentJob.runJob();
       if (!success) {
         throw new Error(`job ${nextJob.identifier} failed`);
       }
+
       // here the job did not throw and didn't return false. Consider it OK then and remove it from the list of jobs to run.
       this.deleteJobByIdentifier(this.currentJob.identifier);
       await this.writeJobsToDB();
     } catch (e) {
       // either the job throw or didn't return 'OK'
-      if (nextJob.currentRetry >= nextJob.maxAttempts) {
+      if (nextJob.currentRetry >= nextJob.maxAttempts - 1) {
         // we cannot restart this job anymore. Remove the entry completely
         this.deleteJobByIdentifier(nextJob.identifier);
+        if (this.jobEventsListener && this.currentJob) {
+          this.jobEventsListener.onJobError(this.currentJob.serializeJob());
+        }
       } else {
+        nextJob.currentRetry = nextJob.currentRetry + 1;
         // that job can be restarted. Plan a retry later with the already defined retry
         nextJob.nextAttemptTimestamp = Date.now() + nextJob.delayBetweenRetries;
+        if (this.jobEventsListener && this.currentJob) {
+          this.jobEventsListener.onJobDeferred(this.currentJob.serializeJob());
+        }
       }
       // in any case, either we removed a job or changed one of the timestamp.
       // so sort the list again, and persist it
       this.sortJobsList();
       await this.writeJobsToDB();
     } finally {
+      if (this.jobEventsListener && this.currentJob) {
+        this.jobEventsListener.onJobSuccess(this.currentJob.serializeJob());
+      }
+
       this.currentJob = null;
+
       // start the next job if there is any to be started now, or just plan the wakeup of our runner for the right time.
       this.planNextJob();
     }
@@ -261,7 +313,7 @@ export class PersistedJobRunner {
   }
 }
 
-const configurationSyncRunner = new PersistedJobRunner('ConfigurationSyncJob');
+const configurationSyncRunner = new PersistedJobRunner('ConfigurationSyncJob', null);
 
 export const runners = {
   configurationSyncRunner,
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index c73616b0c..632429b4f 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -1,6 +1,9 @@
 import { isEmpty } from 'lodash';
 
-export type PersistedJobType = 'ConfigurationSyncJobType';
+export type PersistedJobType =
+  | 'ConfigurationSyncJobType'
+  | 'FakeSleepForJobType'
+  | 'FakeSleepForJobMultiType';
 
 export type SerializedPersistedJob = {
   // we  need at least those as they are needed to do lookups of the list of jobs.
@@ -81,8 +84,13 @@ export abstract class Persistedjob {
    * Can be used to wait for the task to be done before exiting the JobRunner
    */
   public async waitForCurrentTry() {
-    // tslint:disable-next-line: no-promise-as-boolean
-    return this.runningPromise || Promise.resolve();
+    try {
+      // tslint:disable-next-line: no-promise-as-boolean
+      return this.runningPromise || Promise.resolve();
+    } catch (e) {
+      window.log.warn('waitForCurrentTry got an error: ', e.message);
+      return Promise.resolve();
+    }
   }
 
   /**
diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
index fdf5c9bd4..1b448416b 100644
--- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts
+++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
@@ -1 +1 @@
-export type JobRunnerType = 'ConfigurationSyncJob';
+export type JobRunnerType = 'ConfigurationSyncJob' | 'FakeSleepForJob';
diff --git a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
new file mode 100644
index 000000000..68a7340c7
--- /dev/null
+++ b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
@@ -0,0 +1,98 @@
+import { isNumber } from 'lodash';
+import { v4 } from 'uuid';
+import { sleepFor } from '../../../../../session/utils/Promise';
+import {
+  Persistedjob,
+  SerializedPersistedJob,
+} from '../../../../../session/utils/job_runners/PersistedJob';
+
+export class FakeSleepForMultiJob extends Persistedjob {
+  private readonly sleepDuration: number;
+  private readonly returnResult: boolean;
+
+  constructor({
+    identifier,
+    nextAttemptTimestamp,
+    maxAttempts,
+    currentRetry,
+    returnResult,
+    sleepDuration,
+  }: {
+    identifier: string | null;
+    nextAttemptTimestamp: number | null;
+    maxAttempts: number | null;
+    currentRetry: number;
+    sleepDuration: number;
+    returnResult: boolean;
+  }) {
+    super({
+      jobType: 'FakeSleepForJobMultiType',
+      identifier: identifier || v4(),
+      delayBetweenRetries: 10000,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
+      singleJobInQueue: false,
+      currentRetry,
+    });
+    this.returnResult = returnResult;
+    this.sleepDuration = sleepDuration;
+    if (process.env.NODE_APP_INSTANCE !== undefined) {
+      throw new Error('FakeSleepForJobMultiType are only meant for testing purposes');
+    }
+  }
+
+  public async run() {
+    console.warn(
+      `running job ${this.jobType} with id:"${this.identifier}". sleeping for ${this.sleepDuration} & returning ${this.returnResult} `
+    );
+    await sleepFor(this.sleepDuration);
+    console.warn(`${this.jobType} with id:"${this.identifier}" done. returning success `);
+    return this.returnResult;
+  }
+
+  public serializeJob(): SerializedPersistedJob {
+    const fromParent = super.serializeBase();
+    fromParent.sleepDuration = this.sleepDuration;
+    fromParent.returnResult = this.returnResult;
+    return fromParent;
+  }
+}
+
+export class FakeSleepForJob extends Persistedjob {
+  constructor({
+    identifier,
+    nextAttemptTimestamp,
+    maxAttempts,
+    currentRetry,
+  }: {
+    identifier: string | null;
+    nextAttemptTimestamp: number | null;
+    maxAttempts: number | null;
+    currentRetry: number;
+  }) {
+    super({
+      jobType: 'FakeSleepForJobType',
+      identifier: identifier || v4(),
+      delayBetweenRetries: 10000,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
+      singleJobInQueue: true,
+      currentRetry,
+    });
+    if (process.env.NODE_APP_INSTANCE !== undefined) {
+      throw new Error('FakeSleepForJob are only meant for testing purposes');
+    }
+  }
+
+  public async run() {
+    console.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
+    await sleepFor(5000);
+    console.warn(`${this.jobType} with id:"${this.identifier}" done. returning failed `);
+    return false;
+  }
+
+  public serializeJob(): SerializedPersistedJob {
+    const fromParent = super.serializeBase();
+    return fromParent;
+  }
+}
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index beaff7e90..8dc5ff062 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -1,44 +1,76 @@
 import { expect } from 'chai';
-import _ from 'lodash';
+import _, { isUndefined } from 'lodash';
 import Sinon from 'sinon';
 import { v4 } from 'uuid';
-import { persistedJobFromData } from '../../../../../session/utils/job_runners/JobDeserialization';
-import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner';
+import {
+  JobEventListener,
+  PersistedJobRunner,
+} from '../../../../../session/utils/job_runners/JobRunner';
+import { FakeSleepForJob, FakeSleepForMultiJob } from './FakeSleepForJob';
 import { SerializedPersistedJob } from '../../../../../session/utils/job_runners/PersistedJob';
+import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
 
-function getFakeConfigurationJobPersisted(timestamp: number): SerializedPersistedJob {
-  return {
-    jobType: 'ConfigurationSyncJobType',
+function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
+  const job = new FakeSleepForJob({
     identifier: v4(),
-    delayBetweenRetries: 3000,
     maxAttempts: 3,
-    nextAttemptTimestamp: timestamp || Date.now() + 3000,
-    singleJobInQueue: true,
+    nextAttemptTimestamp: timestamp || 3000,
     currentRetry: 0,
-  };
-}
-
-function getFakeConfigurationJob(timestamp: number) {
-  const job = persistedJobFromData(getFakeConfigurationJobPersisted(timestamp));
-  if (!job) {
-    throw new Error('persistedJobFromData failed');
-  }
+  });
   return job;
 }
 
+function getFakeSleepForJobPersisted(timestamp: number): SerializedPersistedJob {
+  return getFakeSleepForJob(timestamp).serializeJob();
+}
+
+function getFakeSleepForMultiJob({
+  timestamp,
+  identifier,
+  returnResult,
+}: {
+  timestamp: number;
+  identifier?: string;
+  returnResult?: boolean;
+}): FakeSleepForMultiJob {
+  const job = new FakeSleepForMultiJob({
+    identifier: identifier || v4(),
+    maxAttempts: 3,
+    nextAttemptTimestamp: timestamp || 3000,
+    currentRetry: 0,
+    returnResult: isUndefined(returnResult) ? true : returnResult,
+    sleepDuration: 5000,
+  });
+  return job;
+}
+
+// tslint:disable-next-line: max-func-body-length
 describe('JobRunner', () => {
   let getItemById: Sinon.SinonStub;
-  let createOrUpdateItem: Sinon.SinonStub;
   let clock: Sinon.SinonFakeTimers;
-
   let runner: PersistedJobRunner;
+  let jobEventsListener: JobEventListener;
 
   beforeEach(() => {
     getItemById = stubData('getItemById');
-    createOrUpdateItem = stubData('createOrUpdateItem');
-    clock = Sinon.useFakeTimers();
-    runner = new PersistedJobRunner('ConfigurationSyncJob');
+    stubData('createOrUpdateItem');
+    clock = Sinon.useFakeTimers({ shouldAdvanceTime: true });
+    jobEventsListener = {
+      onJobDeferred: (_job: SerializedPersistedJob) => {
+        // console.warn('listener got deferred for job ', job);
+      },
+      onJobSuccess: (_job: SerializedPersistedJob) => {
+        // console.warn('listener got success for job ', job);
+      },
+      onJobError: (_job: SerializedPersistedJob) => {
+        // console.warn('listener got error for job ', job);
+      },
+      onJobStarted: (_job: SerializedPersistedJob) => {
+        // console.warn('listener got started for job ', job);
+      },
+    };
+    runner = new PersistedJobRunner('FakeSleepForJob', jobEventsListener);
   });
 
   afterEach(() => {
@@ -58,9 +90,9 @@ describe('JobRunner', () => {
     });
     it('unsorted list is sorted after loading', async () => {
       const unsorted = [
-        getFakeConfigurationJobPersisted(1),
-        getFakeConfigurationJobPersisted(5),
-        getFakeConfigurationJobPersisted(0),
+        getFakeSleepForJobPersisted(1),
+        getFakeSleepForJobPersisted(5),
+        getFakeSleepForJobPersisted(0),
       ];
       getItemById.resolves({
         id: '',
@@ -99,27 +131,160 @@ describe('JobRunner', () => {
   });
 
   describe('addJob', () => {
-    it('can add configurationSyncJob ', async () => {
+    it('can add FakeSleepForJob ', async () => {
       await runner.loadJobsFromDb();
-      const job = getFakeConfigurationJob(123);
+      const job = getFakeSleepForJob(123);
       const persisted = job.serializeJob();
-      await runner.addJob(job);
+      const result = await runner.addJob(job);
+      expect(result).to.be.eq('job_deferred');
 
       expect(runner.getJobList()).to.deep.eq([persisted]);
     });
-    it('does not add a second configurationSyncJob if one is already there', async () => {
+    it('does not add a second FakeSleepForJob if one is already there', async () => {
       await runner.loadJobsFromDb();
-      const job = getFakeConfigurationJob(123);
-      const job2 = getFakeConfigurationJob(1234);
-      await runner.addJob(job);
-      await runner.addJob(job2);
+      const job = getFakeSleepForJob(123);
+      const job2 = getFakeSleepForJob(1234);
+      let result = await runner.addJob(job);
+      expect(result).to.eq('job_deferred');
+      result = await runner.addJob(job2);
+      expect(result).to.eq('type_exists');
       const persisted = job.serializeJob();
 
       expect(runner.getJobList()).to.deep.eq([persisted]);
     });
+
+    it('can add a FakeSleepForJobMulti (sorted) even if one is already there', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 1234 });
+      const job2 = getFakeSleepForMultiJob({ timestamp: 123 });
+      const job3 = getFakeSleepForMultiJob({ timestamp: 1 });
+
+      let result = await runner.addJob(job);
+      expect(result).to.eq('job_deferred');
+
+      result = await runner.addJob(job2);
+      expect(result).to.eq('job_deferred');
+
+      result = await runner.addJob(job3);
+      expect(result).to.eq('job_deferred');
+
+      expect(runner.getJobList()).to.deep.eq([
+        job3.serializeJob(),
+        job2.serializeJob(),
+        job.serializeJob(),
+      ]);
+    });
+
+    it('cannot add a FakeSleepForJobMulti with an id already existing', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 1234 });
+      const job2 = getFakeSleepForMultiJob({ timestamp: 123, identifier: job.identifier });
+      let result = await runner.addJob(job);
+      expect(result).to.be.eq('job_deferred');
+      result = await runner.addJob(job2);
+      expect(result).to.be.eq('identifier_exists');
+
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+    });
+
+    it('two jobs are running sequentially', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 100 });
+      const job2 = getFakeSleepForMultiJob({ timestamp: 200 });
+      runner.startProcessing();
+      clock.tick(110);
+      // job should be started right away
+      let result = await runner.addJob(job);
+      expect(result).to.eq('job_started');
+      result = await runner.addJob(job2);
+      expect(result).to.eq('job_deferred');
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
+
+      // each job takes 5s to finish, so let's tick once the first one should be done
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+
+      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+
+      clock.tick(5000);
+      await runner.waitCurrentJob();
+
+      expect(runner.getJobList()).to.deep.eq([]);
+    });
+
+    it('adding one job after the first is done starts it', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 100 });
+      const job2 = getFakeSleepForMultiJob({ timestamp: 120 });
+      runner.startProcessing();
+      clock.tick(110);
+      // job should be started right away
+      let result = await runner.addJob(job);
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+
+      expect(result).to.eq('job_started');
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+      clock.tick(5010);
+
+      // just give some time for the runner to pick up a new job
+      await sleepFor(100);
+
+      // the first job should already be finished now
+      result = await runner.addJob(job2);
+      expect(result).to.eq('job_started');
+      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+
+      // each job takes 5s to finish, so let's tick once the first one should be done
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+
+      expect(runner.getJobList()).to.deep.eq([]);
+    });
+
+    it('adding one job after the first is done schedules it', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 100 });
+      runner.startProcessing();
+      clock.tick(110);
+      // job should be started right away
+      let result = await runner.addJob(job);
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+
+      expect(result).to.eq('job_started');
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+      clock.tick(5010);
+      // just give some time for the runner to pick up a new job
+
+      await sleepFor(100);
+
+      const job2 = getFakeSleepForMultiJob({ timestamp: clock.now + 100 });
+
+      // job should already be finished now
+      result = await runner.addJob(job2);
+      // new job should be deferred as timestamp is not in the past
+      expect(result).to.eq('job_deferred');
+      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+
+      // tick enough for the job to need to be started
+      clock.tick(100);
+
+      // that job2 should be running now
+      await sleepFor(100);
+      clock.tick(5000);
+
+      await job2.waitForCurrentTry();
+      await runner.waitCurrentJob();
+
+      expect(runner.getJobList()).to.deep.eq([]);
+    });
   });
 
-  describe('startProcessing Config Sync Jobs', () => {
+  describe('startProcessing FakeSleepForJob', () => {
     it('does not trigger anything if no job present ', async () => {
       await runner.loadJobsFromDb();
       expect(runner.startProcessing()).to.be.eq('no_job');
@@ -128,17 +293,107 @@ describe('JobRunner', () => {
     it('triggers a job right away if there is a job which should already be running', async () => {
       await runner.loadJobsFromDb();
       clock.tick(100);
-      const job = getFakeConfigurationJob(50);
+      const job = getFakeSleepForJob(50);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_started');
     });
 
-    it('plans a deffered job if there is a job starting later', async () => {
+    it('plans a deferred job if there is a job starting later', async () => {
       await runner.loadJobsFromDb();
       clock.tick(100);
-      const job = getFakeConfigurationJob(150);
+      const job = getFakeSleepForJob(150);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_deferred');
     });
   });
+
+  describe('stopAndWaitCurrentJob', () => {
+    it('does not await if no job at all ', async () => {
+      await runner.loadJobsFromDb();
+      runner.startProcessing();
+      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+    });
+
+    it('does not await if there are jobs but none are started', async () => {
+      await runner.loadJobsFromDb();
+      clock.tick(100);
+      const job = getFakeSleepForJob(150);
+      await runner.addJob(job);
+      expect(runner.startProcessing()).to.be.eq('job_deferred');
+      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+    });
+
+    it('does await if there are jobs and one is started', async () => {
+      await runner.loadJobsFromDb();
+      clock.tick(200);
+      const job = getFakeSleepForJob(150);
+      await runner.addJob(job);
+      expect(runner.startProcessing()).to.be.eq('job_started');
+      clock.tick(5000);
+
+      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('await');
+    });
+  });
+
+  describe('retriesFailing Jobns', () => {
+    it('does not await if no job at all ', async () => {
+      await runner.loadJobsFromDb();
+      runner.startProcessing();
+      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+    });
+
+    it('does not await if there are jobs but none are started', async () => {
+      await runner.loadJobsFromDb();
+      clock.tick(100);
+      const job = getFakeSleepForJob(150);
+      await runner.addJob(job);
+      expect(runner.startProcessing()).to.be.eq('job_deferred');
+      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+    });
+
+    it('does await if there are jobs and one is started', async () => {
+      await runner.loadJobsFromDb();
+      const job = getFakeSleepForMultiJob({ timestamp: 100, returnResult: false }); // this job keeps failing
+      runner.startProcessing();
+      clock.tick(110);
+      // job should be started right away
+      const result = await runner.addJob(job);
+      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+
+      expect(result).to.eq('job_started');
+      clock.tick(5010);
+      await runner.waitCurrentJob();
+      const jobUpdated = {
+        ...job.serializeJob(),
+        nextAttemptTimestamp: clock.now + 10000,
+        currentRetry: 1,
+      };
+      // just give  time for the runner to pick up a new job
+      await sleepFor(10);
+
+      // the job failed, so the job should still be there
+      expect(runner.getJobList()).to.deep.eq([jobUpdated]);
+
+      // that job should be retried now
+      clock.tick(11000);
+      await runner.waitCurrentJob();
+      const jobUpdated2 = {
+        ...job.serializeJob(),
+        nextAttemptTimestamp: clock.now + 10000,
+        currentRetry: 2,
+      };
+      await sleepFor(10);
+
+      await runner.waitCurrentJob();
+      expect(runner.getJobList()).to.deep.eq([jobUpdated2]);
+
+      // that job should be retried one more time and then removed from the list of jobs to be run
+      clock.tick(11000);
+      await runner.waitCurrentJob();
+      await sleepFor(10);
+
+      await runner.waitCurrentJob();
+      expect(runner.getJobList()).to.deep.eq([]);
+    });
+  });
 });
diff --git a/tslint.json b/tslint.json
index 357cccdee..0838b513f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -99,7 +99,7 @@
         "comment": "Usage has been approved by Maxim on 13 Dec 2019"
       }
     ],
-    "max-func-body-length": [true, 150]
+    "max-func-body-length": [true, 350]
   },
   "rulesDirectory": ["node_modules/tslint-microsoft-contrib"]
 }

From d1cefd4729f95d00d24f087076de42d873b65f0b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 25 Jan 2023 15:26:28 +1100
Subject: [PATCH 025/178] feat: add contacts & user profile handling of
 incoming messages

---
 protos/SignalService.proto                    |  10 +-
 .../dialog/SessionNicknameDialog.tsx          |   2 +-
 ts/components/leftpane/ActionsPanel.tsx       |  38 ++-
 ts/data/configDump/configDump.ts              |  21 +-
 ts/interactions/conversationInteractions.ts   |   2 +-
 ts/models/conversation.ts                     |   8 +-
 ts/node/migration/sessionMigrations.ts        |   9 +-
 ts/node/sql.ts                                |  36 ++-
 ts/receiver/configMessage.ts                  | 218 +++++++++++++++++-
 ts/receiver/contentMessage.ts                 |   2 +-
 ts/receiver/dataMessage.ts                    |   2 +-
 ts/receiver/queuedJob.ts                      |   2 +-
 ts/receiver/userProfileImageUpdates.ts        |  42 ++--
 ts/session/apis/snode_api/swarmPolling.ts     |  22 +-
 .../messages/incoming/IncomingMessage.ts      |  56 +++++
 ts/session/utils/job_runners/JobRunner.ts     |  10 +
 .../utils/libsession/libsession_utils.ts      |  44 ++++
 ts/types/Message.ts                           |  39 ----
 ts/types/sqlSharedTypes.ts                    |  15 +-
 ts/util/storage.ts                            |   3 +
 .../browser/libsession_worker_functions.d.ts  |  35 +--
 .../browser/libsession_worker_interface.ts    |   6 +-
 .../node/libsession/libsession.worker.ts      |  72 ++++--
 23 files changed, 543 insertions(+), 151 deletions(-)
 create mode 100644 ts/session/messages/incoming/IncomingMessage.ts
 create mode 100644 ts/session/utils/libsession/libsession_utils.ts

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 6734fa9a2..d913fbef0 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -42,11 +42,11 @@ message SharedConfigMessage {
   enum Kind {
     USER_PROFILE            = 1;
     CONTACTS                = 2;
-    CONVERSATION_INFO       = 3;
-    LEGACY_CLOSED_GROUPS    = 4;
-    CLOSED_GROUP_INFO       = 5;
-    CLOSED_GROUP_MEMBERS    = 6;
-    ENCRYPTION_KEYS         = 7;
+   // CONVERSATION_INFO       = 3;
+   // LEGACY_CLOSED_GROUPS    = 4;
+   // CLOSED_GROUP_INFO       = 5;
+   // CLOSED_GROUP_MEMBERS    = 6;
+   // ENCRYPTION_KEYS         = 7;
   }
 
   required Kind              kind             = 1;
diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx
index ed82ffc24..b4a26c0bf 100644
--- a/ts/components/dialog/SessionNicknameDialog.tsx
+++ b/ts/components/dialog/SessionNicknameDialog.tsx
@@ -43,7 +43,7 @@ export const SessionNicknameDialog = (props: Props) => {
       throw new Error('Cant save without conversation id');
     }
     const conversation = getConversationController().get(conversationId);
-    await conversation.setNickname(nickname);
+    await conversation.setNickname(nickname, true);
     onClickClose();
   };
 
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 2edebaa29..96b4b6882 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -47,12 +47,12 @@ import { switchThemeTo } from '../../themes/switchTheme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
-import { callLibSessionWorker } from '../../webworker/workers/browser/libsession_worker_interface';
 import { SharedConfigMessage } from '../../session/messages/outgoing/controlMessage/SharedConfigMessage';
 import { SignalService } from '../../protobuf';
 import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime';
 import Long from 'long';
 import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
+import { initializeLibSessionUtilWrappers } from '../../session/utils/libsession/libsession_utils';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -204,19 +204,12 @@ const triggerAvatarReUploadIfNeeded = async () => {
 /**
  * This function is called only once: on app startup with a logged in user
  */
-const doAppStartUp = () => {
-  // init the messageQueue. In the constructor, we add all not send messages
-  // this call does nothing except calling the constructor, which will continue sending message in the pipeline
-  void getMessageQueue().processAllPending();
+const doAppStartUp = async () => {
+  await initializeLibSessionUtilWrappers();
 
   void setupTheme();
   // this generates the key to encrypt attachments locally
-  void Data.generateAttachmentKeyIfEmpty();
-
-  /* Postpone a little bit of the polling of sogs messages to let the swarm messages come in first. */
-  global.setTimeout(() => {
-    void getOpenGroupManager().startPolling();
-  }, 5000);
+  await Data.generateAttachmentKeyIfEmpty();
 
   // trigger a sync message if needed for our other devices
   void triggerSyncIfNeeded();
@@ -224,19 +217,22 @@ const doAppStartUp = () => {
 
   void loadDefaultRooms();
 
+  // TODO make this a job of the JobRunner
   debounce(triggerAvatarReUploadIfNeeded, 200);
 
-  setTimeout(async () => {
-    const keypair = await UserUtils.getUserED25519KeyPairBytes();
-    if (!keypair) {
-      throw new Error('edkeypair not found for current user');
-    }
+  // init the messageQueue. In the constructor, we add all not send messages
+  // this call does nothing except calling the constructor, which will continue sending message in the pipeline
+  void getMessageQueue().processAllPending();
 
-    await callLibSessionWorker(['UserConfig', 'init', keypair.privKeyBytes, null]);
-    console.warn(`getName result:"${await callLibSessionWorker(['UserConfig', 'getName'])}"`);
-    console.warn('setName');
-    await callLibSessionWorker(['UserConfig', 'setName', 'MyName']);
-    console.warn(`getName result:"${await callLibSessionWorker(['UserConfig', 'getName'])}"`);
+  /* Postpone a little bit of the polling of sogs messages to let the swarm messages come in first. */
+  global.setTimeout(() => {
+    void getOpenGroupManager().startPolling();
+  }, 10000);
+
+  global.setTimeout(() => {
+    // init the messageQueue. In the constructor, we add all not send messages
+    // this call does nothing except calling the constructor, which will continue sending message in the pipeline
+    void getMessageQueue().processAllPending();
   }, 3000);
 };
 
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 1c9a8d1dc..cd5ce1a06 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -1,15 +1,16 @@
 import {
   AsyncWrapper,
   ConfigDumpRow,
+  GetAllDumps,
   GetByPubkeyConfigDump,
   GetByVariantAndPubkeyConfigDump,
   SaveConfigDump,
-  SharedConfigSupportedVariant,
 } from '../../types/sqlSharedTypes';
+import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
 
 const getByVariantAndPubkey: AsyncWrapper<GetByVariantAndPubkeyConfigDump> = (
-  variant: SharedConfigSupportedVariant,
+  variant: ConfigWrapperObjectTypes,
   pubkey: string
 ) => {
   return channels.getConfigDumpByVariantAndPubkey(variant, pubkey);
@@ -23,4 +24,18 @@ const saveConfigDump: AsyncWrapper<SaveConfigDump> = (dump: ConfigDumpRow) => {
   return channels.saveConfigDump(dump);
 };
 
-export const ConfigDumpData = { getByVariantAndPubkey, getByPubkey, saveConfigDump };
+const getAllDumpsWithData: AsyncWrapper<GetAllDumps> = () => {
+  return channels.getAllDumpsWithData();
+};
+
+const getAllDumpsWithoutData: AsyncWrapper<GetAllDumps> = () => {
+  return channels.getAllDumpsWithoutData();
+};
+
+export const ConfigDumpData = {
+  getByVariantAndPubkey,
+  getByPubkey,
+  saveConfigDump,
+  getAllDumpsWithData,
+  getAllDumpsWithoutData,
+};
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 8715fb5e7..90d32275e 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -298,7 +298,7 @@ export async function setNotificationForConvoId(
 }
 export async function clearNickNameByConvoId(conversationId: string) {
   const conversation = getConversationController().get(conversationId);
-  await conversation.setNickname(null);
+  await conversation.setNickname(null, true);
 }
 
 export function showChangeNickNameByConvoId(conversationId: string) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 33d95689e..1c6ad5df8 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1406,7 +1406,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
-  public async setNickname(nickname: string | null) {
+  public async setNickname(nickname: string | null, shouldCommit = false) {
     if (!this.isPrivate()) {
       window.log.info('cannot setNickname to a non private conversation.');
       return;
@@ -1425,7 +1425,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       this.set({ nickname: trimmed, displayNameInProfile: realUserName });
     }
 
-    await this.commit();
+    if (shouldCommit) {
+      await this.commit();
+    }
   }
 
   public async setSessionProfile(newProfile: {
@@ -1482,7 +1484,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * @returns `nickname` so the nickname we forced for that user. For a group, this returns `undefined`
    */
   public getNickname(): string | undefined {
-    return this.isPrivate() ? this.get('nickname') : undefined;
+    return this.isPrivate() ? this.get('nickname') || undefined : undefined;
   }
 
   /**
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 8a45af40d..69df8c3fa 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1233,7 +1233,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
   /**
    * Create a table to store our sharedConfigMessage dumps
-   **/
+   */
   db.transaction(() => {
     db.exec(`CREATE TABLE configDump(
       variant TEXT NOT NULL,
@@ -1241,6 +1241,13 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       data BLOB,
       combinedMessageHashes TEXT);
       `);
+
+    db.exec(`ALTER TABLE conversations
+      ADD COLUMN lastReadTimestampMs INTEGER;
+      ;
+        `);
+
+    // we need to populate those fields with the current state of the conversation so let's throw null until this is done
     throw null;
     writeSessionSchemaVersion(targetVersion, db);
   })();
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 0c80bce7c..2c09883f3 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -46,12 +46,7 @@ import {
   toSqliteBoolean,
 } from './database_utility';
 
-import {
-  ConfigDumpDataNode,
-  ConfigDumpRow,
-  SharedConfigSupportedVariant,
-  UpdateLastHashType,
-} from '../types/sqlSharedTypes';
+import { ConfigDumpDataNode, ConfigDumpRow, UpdateLastHashType } from '../types/sqlSharedTypes';
 import { OpenGroupV2Room } from '../data/opengroups';
 
 import {
@@ -67,6 +62,7 @@ import {
   initDbInstanceWith,
   isInstanceInitialized,
 } from './sqlInstance';
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -2031,7 +2027,7 @@ function removeV2OpenGroupRoom(conversationId: string) {
  */
 
 const configDumpData: ConfigDumpDataNode = {
-  getConfigDumpByVariantAndPubkey: (variant: SharedConfigSupportedVariant, pubkey: string) => {
+  getConfigDumpByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
     const rows = assertGlobalInstance()
       .prepare('SELECT * from configDump WHERE variant = $variant AND pubkey = $pubkey;')
       .get({
@@ -2084,6 +2080,32 @@ const configDumpData: ConfigDumpDataNode = {
         data,
       });
   },
+
+  getAllDumpsWithData: () => {
+    const rows = assertGlobalInstance()
+      .prepare('SELECT variant, publicKey, combinedMessageHashes, data from configDump;')
+      .get();
+
+    if (!rows) {
+      return [];
+    }
+    throw new Error(`getAllDumpsWithData: rows: ${JSON.stringify(rows)} `);
+
+    return rows;
+  },
+
+  getAllDumpsWithoutData: () => {
+    const rows = assertGlobalInstance()
+      .prepare('SELECT variant, publicKey, combinedMessageHashes from configDump;')
+      .get();
+
+    if (!rows) {
+      return [];
+    }
+    throw new Error(`getAllDumpsWithoutData: rows: ${JSON.stringify(rows)} `);
+
+    return rows;
+  },
 };
 
 /**
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 45f67056f..173776b6d 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { groupBy, isArray, isEmpty } from 'lodash';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import {
   joinOpenGroupV2WithUIEvents,
@@ -18,22 +18,230 @@ import { ConversationInteraction } from '../interactions';
 import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
 import { appendFetchAvatarAndProfileJob, updateOurProfileSync } from './userProfileImageUpdates';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { callLibSessionWorker } from '../webworker/workers/browser/libsession_worker_interface';
+import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
+import { Dictionary } from '@reduxjs/toolkit';
+import { ContactInfo, ProfilePicture } from 'session_util_wrapper';
 
-export async function handleConfigMessagesViaLibSession(
-  configMessages: Array<SignalService.ConfigurationMessage>
+type IncomingConfResult = {
+  needsPush: boolean;
+  needsDump: boolean;
+  messageHashes: Array<string>;
+  latestSentTimestamp: number;
+};
+
+function protobufSharedConfigTypeToWrapper(
+  kind: SignalService.SharedConfigMessage.Kind
+): ConfigWrapperObjectTypes | null {
+  switch (kind) {
+    case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
+      return 'UserConfig';
+    case SignalService.SharedConfigMessage.Kind.CONTACTS:
+      return 'ContactsConfig';
+    default:
+      return null;
+  }
+}
+
+async function mergeConfigsWithIncomingUpdates(
+  groupedByKind: Dictionary<Array<IncomingMessage<SignalService.SharedConfigMessage>>>
 ) {
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  const kindMessageMap: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult> = new Map();
+  // do the merging on all wrappers sequentially instead of with a promise.all()
+  const allKinds = (Object.keys(groupedByKind) as unknown) as Array<
+    SignalService.SharedConfigMessage.Kind
+  >;
+  for (let index = 0; index < allKinds.length; index++) {
+    const kind = allKinds[index];
+    // see comment above "groupedByKind = groupBy" about why this is needed
+    const castedKind = (kind as unknown) as SignalService.SharedConfigMessage.Kind;
+    const currentKindMessages = groupedByKind[castedKind];
+    if (!currentKindMessages) {
+      continue;
+    }
+    const toMerge = currentKindMessages.map(m => m.message.data);
+
+    const wrapperId = protobufSharedConfigTypeToWrapper(castedKind);
+    if (!wrapperId) {
+      throw new Error(`Invalid castedKind: ${castedKind}`);
+    }
+
+    await callLibSessionWorker([wrapperId, 'merge', toMerge]);
+    const needsPush = ((await callLibSessionWorker([wrapperId, 'needsPush'])) || false) as boolean;
+    const needsDump = ((await callLibSessionWorker([wrapperId, 'needsDump'])) || false) as boolean;
+    const messageHashes = currentKindMessages.map(m => m.messageHash);
+    const latestSentTimestamp = Math.max(...currentKindMessages.map(m => m.envelopeTimestamp));
+
+    const incomingConfResult: IncomingConfResult = {
+      latestSentTimestamp,
+      messageHashes,
+      needsDump,
+      needsPush,
+    };
+    kindMessageMap.set(kind, incomingConfResult);
+  }
+
+  return kindMessageMap;
+}
+
+async function handleUserProfileUpdate(result: IncomingConfResult) {
+  if (result.needsDump) {
+    return;
+  }
+
+  const updatedUserName = (await callLibSessionWorker(['UserConfig', 'getName'])) as
+    | string
+    | undefined;
+  const updatedProfilePicture = (await callLibSessionWorker([
+    'UserConfig',
+    'getProfilePicture',
+  ])) as ProfilePicture;
+
+  // fetch our own conversation
+  const userPublicKey = UserUtils.getOurPubKeyStrFromCache();
+  if (!userPublicKey) {
+    return;
+  }
+
+  const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
+
+  // trigger an update of our profileName and picture if there is one.
+  // this call checks for differences between updating anything
+  void updateOurProfileSync(
+    { displayName: updatedUserName, profilePicture: picUpdate ? updatedProfilePicture.url : null },
+    picUpdate ? updatedProfilePicture.key : null
+  );
+}
+
+async function handleContactsUpdate(result: IncomingConfResult) {
+  if (result.needsDump) {
+    return;
+  }
+
+  const allContacts = (await callLibSessionWorker(['ContactsConfig', 'getAll'])) as Array<
+    ContactInfo
+  >;
+
+  for (let index = 0; index < allContacts.length; index++) {
+    const wrapperConvo = allContacts[index];
+
+    if (wrapperConvo.id && getConversationController().get(wrapperConvo.id)) {
+      const existingConvo = getConversationController().get(wrapperConvo.id);
+      let changes = false;
+
+      // Note: the isApproved and didApproveMe flags are irreversible so they should only be updated when getting set to true
+      if (
+        existingConvo.get('isApproved') !== undefined &&
+        wrapperConvo.approved !== undefined &&
+        existingConvo.get('isApproved') !== wrapperConvo.approved
+      ) {
+        await existingConvo.setIsApproved(wrapperConvo.approved, false);
+        changes = true;
+      }
+
+      if (
+        existingConvo.get('didApproveMe') !== undefined &&
+        wrapperConvo.approvedMe !== undefined &&
+        existingConvo.get('didApproveMe') !== wrapperConvo.approvedMe
+      ) {
+        await existingConvo.setDidApproveMe(wrapperConvo.approvedMe, false);
+        changes = true;
+      }
+
+      const convoBlocked = wrapperConvo.blocked || false;
+      if (convoBlocked !== existingConvo.isBlocked()) {
+        if (existingConvo.isPrivate()) {
+          await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
+        } else {
+          await BlockedNumberController.setGroupBlocked(wrapperConvo.id, convoBlocked);
+        }
+      }
+
+      if (wrapperConvo.nickname !== existingConvo.getNickname()) {
+        await existingConvo.setNickname(wrapperConvo.nickname || null, false);
+        changes = true;
+      }
+      // make sure to write the changes to the database now as the `appendFetchAvatarAndProfileJob` call below might take some time before getting run
+      if (changes) {
+        await existingConvo.commit();
+      }
+
+      // we still need to handle the the `name` and the `profilePicture` but those are currently made asynchronously
+      void appendFetchAvatarAndProfileJob(
+        existingConvo.id,
+        {
+          displayName: wrapperConvo.name,
+          profilePicture: wrapperConvo.profilePicture?.url || null,
+        },
+        wrapperConvo.profilePicture?.key || null
+      );
+    }
+  }
+}
+
+async function processMergingResults(
+  results: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult>
+) {
+  const keys = [...results.keys()];
+
+  for (let index = 0; index < keys.length; index++) {
+    const kind = keys[index];
+    const result = results.get(kind);
+
+    if (!result) {
+      continue;
+    }
+
+    try {
+      switch (kind) {
+        case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
+          await handleUserProfileUpdate(result);
+          break;
+        case SignalService.SharedConfigMessage.Kind.CONTACTS:
+          await handleContactsUpdate(result);
+          break;
+      }
+    } catch (e) {
+      throw e;
+    }
+  }
+}
+
+async function handleConfigMessagesViaLibSession(
+  configMessages: Array<IncomingMessage<SignalService.SharedConfigMessage>>
+) {
+  // FIXME: Remove this once `useSharedUtilForUserConfig` is permanent
+
+  if (
+    !window.sessionFeatureFlags.useSharedUtilForUserConfig ||
+    !configMessages ||
+    !isArray(configMessages) ||
+    configMessages.length === 0
+  ) {
+    return;
   }
 
   window?.log?.info(
     `Handling our profileUdpates via libsession_util. count: ${configMessages.length}`
   );
+
+  // lodash does not have a way to give the type of the keys as generic parameter so this can only be a string: Array<>
+  const groupedByKind = groupBy(configMessages, m => m.message.kind);
+
+  const kindMessagesMap = await mergeConfigsWithIncomingUpdates(groupedByKind);
+
+  await processMergingResults(kindMessagesMap);
 }
 
 async function handleOurProfileUpdate(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
 ) {
+  // this call won't be needed with the new sharedUtilLibrary
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp();
   if (!latestProfileUpdateTimestamp || sentAt > latestProfileUpdateTimestamp) {
     window?.log?.info(
@@ -197,7 +405,7 @@ const handleContactFromConfig = async (
     }
 
     void appendFetchAvatarAndProfileJob(
-      contactConvo,
+      contactConvo.id,
       profileInDataMessage,
       contactReceived.profileKey
     );
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 400ddd918..855972c8a 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -688,7 +688,7 @@ async function handleMessageRequestResponse(
 
   if (messageRequestResponse.profile && !isEmpty(messageRequestResponse.profile)) {
     void appendFetchAvatarAndProfileJob(
-      conversationToApprove,
+      conversationToApprove.id,
       messageRequestResponse.profile,
       messageRequestResponse.profileKey
     );
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 402a9b6b0..ae5394e82 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -218,7 +218,7 @@ export async function handleSwarmDataMessage(
   ) {
     // do not await this
     void appendFetchAvatarAndProfileJob(
-      senderConversationModel,
+      senderConversationModel.id,
       cleanDataMessage.profile,
       cleanDataMessage.profileKey
     );
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index f1bb88927..b5bb6f505 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -394,7 +394,7 @@ export async function handleMessageJob(
     // as our profile is shared accross our devices with a ConfigurationMessage
     if (messageModel.isIncoming() && regularDataMessage.profile) {
       void appendFetchAvatarAndProfileJob(
-        sendingDeviceConversation,
+        sendingDeviceConversation.id,
         regularDataMessage.profile,
         regularDataMessage.profileKey
       );
diff --git a/ts/receiver/userProfileImageUpdates.ts b/ts/receiver/userProfileImageUpdates.ts
index f1c581c41..1e2c47020 100644
--- a/ts/receiver/userProfileImageUpdates.ts
+++ b/ts/receiver/userProfileImageUpdates.ts
@@ -10,7 +10,6 @@ import { processNewAttachment } from '../types/MessageAttachment';
 import { MIME } from '../types';
 import { autoScaleForIncomingAvatar } from '../util/attachmentsUtil';
 import { decryptProfile } from '../util/crypto/profileEncrypter';
-import { ConversationModel } from '../models/conversation';
 import { SignalService } from '../protobuf';
 import { getConversationController } from '../session/conversations';
 import { UserUtils } from '../session/utils';
@@ -25,26 +24,21 @@ queue.on('reject', error => {
 });
 
 export async function appendFetchAvatarAndProfileJob(
-  conversation: ConversationModel,
+  conversationId: string,
   profileInDataMessage: SignalService.DataMessage.ILokiProfile,
-  profileKey?: Uint8Array | null // was any
+  profileKey?: Uint8Array | null
 ) {
-  if (!conversation?.id) {
+  if (!conversationId) {
     window?.log?.warn('[profileupdate] Cannot update profile with empty convoid');
     return;
   }
-  const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${conversation.id}`;
+  const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${conversationId}`;
 
   if (hasAlreadyOneAtaTimeMatching(oneAtaTimeStr)) {
-    // window.log.debug(
-    //   '[profileupdate] not adding another task of "appendFetchAvatarAndProfileJob" as there is already one scheduled for the conversation: ',
-    //   conversation.id
-    // );
     return;
   }
-  // window.log.info(`[profileupdate] queuing fetching avatar for ${conversation.id}`);
   const task = allowOnlyOneAtATime(oneAtaTimeStr, async () => {
-    return createOrUpdateProfile(conversation, profileInDataMessage, profileKey);
+    return createOrUpdateProfile(conversationId, profileInDataMessage, profileKey);
   });
 
   queue.enqueue(async () => task);
@@ -56,7 +50,7 @@ export async function appendFetchAvatarAndProfileJob(
  */
 export async function updateOurProfileSync(
   profileInDataMessage: SignalService.DataMessage.ILokiProfile,
-  profileKey?: Uint8Array | null // was any
+  profileKey?: Uint8Array | null
 ) {
   const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
   if (!ourConvo?.id) {
@@ -65,7 +59,7 @@ export async function updateOurProfileSync(
   }
   const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${ourConvo.id}`;
   return allowOnlyOneAtATime(oneAtaTimeStr, async () => {
-    return createOrUpdateProfile(ourConvo, profileInDataMessage, profileKey);
+    return createOrUpdateProfile(ourConvo.id, profileInDataMessage, profileKey);
   });
 }
 
@@ -73,10 +67,14 @@ export async function updateOurProfileSync(
  * Creates a new profile from the profile provided. Creates the profile if it doesn't exist.
  */
 async function createOrUpdateProfile(
-  conversation: ConversationModel,
+  conversationId: string,
   profileInDataMessage: SignalService.DataMessage.ILokiProfile,
   profileKey?: Uint8Array | null
 ) {
+  const conversation = getConversationController().get(conversationId);
+  if (!conversation) {
+    return;
+  }
   if (!conversation.isPrivate()) {
     window.log.warn('createOrUpdateProfile can only be used for private convos');
     return;
@@ -143,6 +141,22 @@ async function createOrUpdateProfile(
     conversation.set({ avatarInProfile: undefined });
   }
 
+  if (conversation.id === UserUtils.getOurPubKeyStrFromCache()) {
+    // make sure the settings which should already set to `true` are
+    if (
+      !conversation.get('isTrustedForAttachmentDownload') ||
+      !conversation.get('isApproved') ||
+      !conversation.get('didApproveMe')
+    ) {
+      conversation.set({
+        isTrustedForAttachmentDownload: true,
+        isApproved: true,
+        didApproveMe: true,
+      });
+      changes = true;
+    }
+  }
+
   if (changes) {
     await conversation.commit();
   }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 44a95217d..8bd59b418 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -17,6 +17,8 @@ import pRetry from 'p-retry';
 import { SnodeAPIRetrieve } from './retrieveRequest';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
+import { ConfigMessageHandler } from '../../../receiver/configMessage';
+import { IncomingMessage } from '../../messages/incoming/IncomingMessage';
 
 // Some websocket nonsense
 export function processMessage(message: string, options: any = {}, messageHash: string) {
@@ -271,11 +273,27 @@ export class SwarmPolling {
     }
 
     perfStart(`handleSeenMessages-${pkStr}`);
-
     const newMessages = await this.handleSeenMessages(messages);
-
     perfEnd(`handleSeenMessages-${pkStr}`, 'handleSeenMessages');
 
+    // try {
+    //   if (
+    //     window.sessionFeatureFlags.useSharedUtilForUserConfig &&
+    //     userConfigMessagesMerged.length
+    //   ) {
+    //     const asIncomingMessages = userConfigMessagesMerged.map(msg => {
+    //       const incomingMessage: IncomingMessage<SignalService.SharedConfigMessage> = {
+    //         envelopeTimestamp: msg.timestamp,
+    //         message: msg.data,
+    //         messageHash: msg.hash,
+    //       };
+    //     });
+    //     await ConfigMessageHandler.handleConfigMessagesViaLibSession();
+    //   }
+    // } catch (e) {
+    //   console.error('shared util lib process messages failed with: ', e);
+    // }
+
     newMessages.forEach((m: RetrieveMessageItem) => {
       const options = isGroup ? { conversationId: pkStr } : {};
       processMessage(m.data, options, m.hash);
diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts
new file mode 100644
index 000000000..cab939c2e
--- /dev/null
+++ b/ts/session/messages/incoming/IncomingMessage.ts
@@ -0,0 +1,56 @@
+import Long from 'long';
+import { SignalService } from '../../../protobuf';
+
+type IncomingMessageAvailableTypes =
+  | SignalService.DataMessage
+  | SignalService.CallMessage
+  | SignalService.ReceiptMessage
+  | SignalService.TypingMessage
+  | SignalService.ConfigurationMessage
+  | SignalService.DataExtractionNotification
+  | SignalService.Unsend
+  | SignalService.MessageRequestResponse
+  | SignalService.SharedConfigMessage;
+
+export class IncomingMessage<T extends IncomingMessageAvailableTypes> {
+  public readonly envelopeTimestamp: number;
+  public readonly authorOrGroupPubkey: any;
+  public readonly authorInGroup: string | null;
+  public readonly messageHash: string;
+  public readonly message: T;
+
+  /**
+   *
+   * - `messageHash` is the hash as retrieved from the `/receive` request
+   * - `envelopeTimestamp` is part of the message envelope and the what our sent timestamp must be.
+   * - `authorOrGroupPubkey`:
+   *      * for a 1o1 message, the is the sender
+   *      * for a message in a group, this is the pubkey of the group (as everyone
+   *            in a group send message to the group pubkey)
+   * - `authorInGroup` is only set when this message is incoming from a closed group. This is the old `senderIdentity` and is the publicKey of the sender inside the message itself once decrypted. This is the real sender of a closed group message.
+   * - `message` is the data of the ContentMessage itself.
+   */
+  constructor({
+    envelopeTimestamp,
+    authorOrGroupPubkey,
+    authorInGroup,
+    message,
+    messageHash,
+  }: {
+    messageHash: string;
+    envelopeTimestamp: Long;
+    authorOrGroupPubkey: string;
+    authorInGroup: string | null;
+    message: T;
+  }) {
+    if (envelopeTimestamp > Long.fromNumber(Number.MAX_SAFE_INTEGER)) {
+      throw new Error('envelopeTimestamp as Long is > Number.MAX_SAFE_INTEGER');
+    }
+
+    this.envelopeTimestamp = envelopeTimestamp.toNumber();
+    this.authorOrGroupPubkey = authorOrGroupPubkey;
+    this.authorInGroup = authorInGroup;
+    this.messageHash = messageHash;
+    this.message = message;
+  }
+}
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index b75beebe4..a8a6f4a4a 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -21,6 +21,16 @@ export type JobEventListener = {
   onJobStarted: (job: SerializedPersistedJob) => void;
 };
 
+/**
+ * This class is used to plan jobs and make sure they are retried until the success.
+ * By having a specific type, we can find the logic to be run by that type of job.
+ *
+ * There are different type of jobs which can be scheduled, but we currently only use the SyncConfigurationJob.
+ *
+ * SyncConfigurationJob is a job which can only be planned once until it is a success. So in the queue  on jobs, there can only be one SyncConfigurationJob at all times.
+ *
+ *
+ */
 export class PersistedJobRunner {
   private isInit = false;
   private jobsScheduled: Array<Persistedjob> = [];
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
new file mode 100644
index 000000000..0d42013de
--- /dev/null
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -0,0 +1,44 @@
+import { difference } from 'lodash';
+import { UserUtils } from '..';
+import { ConfigDumpData } from '../../../data/configDump/configDump';
+import { ConfigWrapperObjectTypes } from '../../../webworker/workers/browser/libsession_worker_functions';
+import { callLibSessionWorker } from '../../../webworker/workers/browser/libsession_worker_interface';
+
+export async function initializeLibSessionUtilWrappers() {
+  const keypair = await UserUtils.getUserED25519KeyPairBytes();
+  if (!keypair) {
+    throw new Error('edkeypair not found for current user');
+  }
+  const privateKeyEd25519 = keypair.privKeyBytes;
+  const dumps = await ConfigDumpData.getAllDumpsWithData();
+
+  const userVariantsBuildWithoutErrors = new Set<ConfigWrapperObjectTypes>();
+
+  for (let index = 0; index < dumps.length; index++) {
+    const dump = dumps[index];
+    try {
+      await callLibSessionWorker([
+        dump.variant,
+        'init',
+        privateKeyEd25519,
+        dump.data.length ? dump.data : null,
+      ]);
+
+      userVariantsBuildWithoutErrors.add(dump.variant);
+    } catch (e) {
+      window.log.warn(`init of UserConfig failed with ${e.message} `);
+      throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`);
+    }
+  }
+
+  // TODO complete this list
+  const requiredVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
+  const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(requiredVariants, [
+    ...userVariantsBuildWithoutErrors.values(),
+  ]);
+
+  for (let index = 0; index < missingRequiredVariants.length; index++) {
+    const missingVariant = missingRequiredVariants[index];
+    await callLibSessionWorker([missingVariant, 'init', privateKeyEd25519, null]);
+  }
+}
diff --git a/ts/types/Message.ts b/ts/types/Message.ts
index d21f6a037..ba0fddb27 100644
--- a/ts/types/Message.ts
+++ b/ts/types/Message.ts
@@ -1,42 +1,3 @@
-import { Attachment } from './Attachment';
-
-export type Message = UserMessage;
-export type UserMessage = IncomingMessage;
-
-export type IncomingMessage = Readonly<
-  {
-    type: 'incoming';
-    // Required
-    attachments: Array<Attachment>;
-    id: string;
-    received_at: number;
-
-    // Optional
-    body?: string;
-    errors?: Array<any>;
-    expireTimer?: number;
-    flags?: number;
-    source?: string;
-  } & SharedMessageProperties &
-    ExpirationTimerUpdate
->;
-
-type SharedMessageProperties = Readonly<{
-  conversationId: string;
-  sent_at: number;
-  timestamp: number;
-}>;
-
-type ExpirationTimerUpdate = Partial<
-  Readonly<{
-    expirationTimerUpdate: Readonly<{
-      expireTimer: number;
-      fromSync: boolean;
-      source: string;
-    }>;
-  }>
->;
-
 export type LokiProfile = {
   displayName: string;
   avatarPointer?: string;
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index a64d56167..dc7248e10 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,3 +1,5 @@
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
+
 /**
  * This wrapper can be used to make a function type not async, asynced.
  * We use it in the typing of the database communication, because the data calls (renderer side) have essentially the same signature of the sql calls (node side), with an added `await`
@@ -20,14 +22,8 @@ export type UpdateLastHashType = {
   namespace: number;
 };
 
-/**
- * Shared config dump types
- */
-
-export type SharedConfigSupportedVariant = 'user-profile' | 'contacts';
-
 export type ConfigDumpRow = {
-  variant: SharedConfigSupportedVariant; // the variant this entry is about. (user-config, contacts, ...)
+  variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
   pubkey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
   data: Uint8Array; // the blob returned by libsession.dump() call
   combinedMessageHashes?: string; // array of lastHashes to keep track of, stringified
@@ -35,14 +31,17 @@ export type ConfigDumpRow = {
 };
 
 export type GetByVariantAndPubkeyConfigDump = (
-  variant: SharedConfigSupportedVariant,
+  variant: ConfigWrapperObjectTypes,
   pubkey: string
 ) => Array<ConfigDumpRow>;
 export type GetByPubkeyConfigDump = (pubkey: string) => Array<ConfigDumpRow>;
 export type SaveConfigDump = (dump: ConfigDumpRow) => void;
+export type GetAllDumps = () => Array<ConfigDumpRow>;
 
 export type ConfigDumpDataNode = {
   getConfigDumpByVariantAndPubkey: GetByVariantAndPubkeyConfigDump;
   getConfigDumpsByPubkey: GetByPubkeyConfigDump;
   saveConfigDump: SaveConfigDump;
+  getAllDumpsWithData: GetAllDumps;
+  getAllDumpsWithoutData: GetAllDumps;
 };
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index d67651cd5..853325dc6 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -126,6 +126,9 @@ export function getLastProfileUpdateTimestamp() {
 }
 
 export async function setLastProfileUpdateTimestamp(lastUpdateTimestamp: number) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   await put('last_profile_update_timestamp', lastUpdateTimestamp);
 }
 
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index 837f5f6a7..0ee7b79b1 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -1,21 +1,28 @@
-import { BaseConfigActions, BaseConfigWrapper, UserConfigActionsType } from 'session_util_wrapper';
+import {
+  BaseConfigActions,
+  BaseConfigWrapper,
+  ContactsConfigActionsType,
+  UserConfigActionsType,
+} from 'session_util_wrapper';
 
 type UserConfig = 'UserConfig'; // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
-type ClosedGroupConfigPrefix = 'ClosedGroupConfig-03'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
-type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
+type ContactsConfig = 'ContactsConfig';
 
-export type ConfigWrapperObjectTypes = UserConfig | ClosedGroupConfig;
+// type ClosedGroupConfigPrefix = 'ClosedGroupConfig-03'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
+// type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
+// | ClosedGroupConfig;
+export type ConfigWrapperObjectTypes = UserConfig | ContactsConfig;
 
-
-/**Those are the actions inherited from BaseConfigWrapper to UserConfigWrapper */
-type UserConfigInheritedActions = [UserConfig, ...BaseConfigActions];
-type UserConfigActions = [UserConfig,...UserConfigActionsType] | [UserConfig, 'init'];
+type UserConfigFunctions =
+  | [UserConfig, ...BaseConfigActions]
+  | [UserConfig, ...UserConfigActionsType];
+type ContactsConfigFunctions =
+  | [ContactsConfig, ...BaseConfigActions]
+  | [ContactsConfig, ...ContactsConfigActionsType];
 
 /**Those are the actions inherited from BaseConfigWrapper to ClosedGroupConfigWrapper */
-type ClosedGroupConfigFromBase = [ClosedGroupConfig, ...BaseConfigActions];
+// type ClosedGroupConfigFromBase = [ClosedGroupConfig, ...BaseConfigActions];
+// type ClosedGroupConfigFunctions = ClosedGroupConfigFromBase;
+//| ClosedGroupConfigFunctions;
 
-
-type UserConfigFunctions = UserConfigInheritedActions | UserConfigActions;
-type ClosedGroupConfigFunctions = ClosedGroupConfigFromBase;
-
-export type LibSessionWorkerFunctions = UserConfigFunctions | ClosedGroupConfigFunctions;
+export type LibSessionWorkerFunctions = UserConfigFunctions | ContactsConfigFunctions;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 4ddafcbb2..0f40f676d 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -9,7 +9,7 @@ const internalCallLibSessionWorker = async ([
   config,
   fnName,
   ...args
-]: LibSessionWorkerFunctions): Promise<any> => {
+]: LibSessionWorkerFunctions): Promise<unknown> => {
   if (!libsessionWorkerInterface) {
     const libsessionWorkerPath = join(
       getAppRootPath(),
@@ -26,6 +26,8 @@ const internalCallLibSessionWorker = async ([
   return libsessionWorkerInterface?.callWorker(config, fnName, ...args);
 };
 
-export const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<any> => {
+export const callLibSessionWorker = async (
+  callToMake: LibSessionWorkerFunctions
+): Promise<unknown> => {
   return internalCallLibSessionWorker(callToMake);
 };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index df55da608..0b31c9b42 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,51 +1,79 @@
 import _, { isEmpty, isNull } from 'lodash';
-import { UserConfigWrapper } from 'session_util_wrapper';
+import { BaseConfigWrapper, ContactsConfigWrapper, UserConfigWrapper } from 'session_util_wrapper';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
-// import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
 
-let userConfig: UserConfigWrapper;
+// we can only have one of those so don't worry about storing them in a map for now
+let userProfileWrapper: UserConfigWrapper | undefined;
+let contactsConfigWrapper: ContactsConfigWrapper | undefined;
 
-// async function getSodiumWorker() {
-//   await sodiumWrappers.ready;
+// const configWrappers: Array<EntryUserConfig | EntryContactsConfig> = new Array();
 
-//   return sodiumWrappers;
-// }
+type UserWrapperType = 'UserConfig' | 'ContactsConfig';
 
-async function getCorrespondingWrapper(config: ConfigWrapperObjectTypes) {
-  if (config !== 'UserConfig') {
-    throw new Error(`Invalid config: ${config}`);
+function getUserWrapper(type: UserWrapperType): BaseConfigWrapper | undefined {
+  switch (type) {
+    case 'UserConfig':
+      return userProfileWrapper;
+    case 'ContactsConfig':
+      return contactsConfigWrapper;
   }
-  if (!userConfig) {
-    throw new Error('UserConfig is not init yet');
+}
+
+function getCorrespondingWrapper(wrapperType: ConfigWrapperObjectTypes): BaseConfigWrapper {
+  switch (wrapperType) {
+    case 'UserConfig':
+    case 'ContactsConfig':
+      const wrapper = getUserWrapper(wrapperType);
+      if (!wrapper) {
+        throw new Error(`${wrapperType} is not init yet`);
+      }
+      return wrapper;
   }
-  return userConfig;
 }
 
 function isUInt8Array(value: any) {
   return value.constructor === Uint8Array;
 }
 
-function initUserConfigWrapper(options: Array<any>) {
-  if (userConfig) {
-    throw new Error('UserConfig already init');
+function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapperType {
+  if (wrapperType !== 'ContactsConfig' && wrapperType !== 'UserConfig') {
+    throw new Error(`wrapperType "${wrapperType} is not of type User"`);
+  }
+  return wrapperType;
+}
+
+/**
+ * This function can be used to initialize a wrapper which takes the private ed25519 key of the user and a dump as argument.
+ */
+function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): BaseConfigWrapper {
+  const wrapper = getUserWrapper(wrapperType);
+  if (wrapper) {
+    throw new Error(`${wrapperType} already init`);
   }
   if (options.length !== 2) {
-    throw new Error('UserConfig init needs two arguments');
+    throw new Error(`${wrapperType} init needs two arguments`);
   }
   const [edSecretKey, dump] = options;
 
   if (isEmpty(edSecretKey) || !isUInt8Array(edSecretKey)) {
-    throw new Error('UserConfig init needs a valid edSecretKey');
+    throw new Error(`${wrapperType} init needs a valid edSecretKey`);
   }
 
   if (!isNull(dump) && !isUInt8Array(dump)) {
-    throw new Error('UserConfig init needs a valid dump');
+    throw new Error('${wrapperType} init needs a valid dump');
+  }
+  const userType = assertUserWrapperType(wrapperType);
+  switch (userType) {
+    case 'UserConfig':
+      userProfileWrapper = new UserConfigWrapper(edSecretKey, dump);
+      return userProfileWrapper;
+    case 'ContactsConfig':
+      contactsConfigWrapper = new ContactsConfigWrapper(edSecretKey, dump);
+      return contactsConfigWrapper;
   }
-  console.warn('UserConfigWrapper', UserConfigWrapper);
-  userConfig = new UserConfigWrapper(edSecretKey, dump);
 }
 
 // tslint:disable: function-name no-console
@@ -55,7 +83,7 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any]
 
   try {
     if (action === 'init') {
-      initUserConfigWrapper(args);
+      initUserWrapper(args, config);
       postMessage([jobId, null, null]);
       return;
     }

From 9cf1419ca523faa8fe5df0f7d46227eb2bd764f2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 25 Jan 2023 17:46:30 +1100
Subject: [PATCH 026/178] feat: add first try to build SharedConfigMessages

---
 package.json                                  |   9 +-
 ts/components/dialog/EditProfileDialog.tsx    |  39 ++-
 ts/components/leftpane/ActionsPanel.tsx       |  44 +--
 ts/data/data.ts                               | 258 +++++++--------
 ts/interactions/conversationInteractions.ts   |   4 +
 ts/mains/main_renderer.tsx                    |   4 +-
 ts/models/conversationAttributes.ts           |   2 +-
 ts/node/database_utility.ts                   |   8 +-
 ts/node/migration/sessionMigrations.ts        |  12 +-
 ts/node/sql.ts                                | 303 +++++++-----------
 ts/receiver/cache.ts                          |  71 ++--
 ts/receiver/configMessage.ts                  |  69 ++--
 ts/receiver/contentMessage.ts                 |  23 +-
 ts/receiver/receiver.ts                       |  30 +-
 ts/receiver/userProfileImageUpdates.ts        |   1 +
 ts/session/apis/snode_api/retrieveRequest.ts  |   1 -
 ts/session/apis/snode_api/swarmPolling.ts     |  72 +++--
 ts/session/group/closed-group.ts              |   4 +-
 .../messages/incoming/IncomingMessage.ts      |   2 +-
 ts/session/sending/MessageQueue.ts            |   2 +-
 ts/session/utils/AttachmentsDownload.ts       |   3 +-
 ts/session/utils/job_runners/JobRunner.ts     |   7 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   4 +-
 .../unit/utils/job_runner/FakeSleepForJob.ts  |   8 +-
 .../unit/utils/job_runner/JobRunner_test.ts   |   8 +-
 ts/types/sqlSharedTypes.ts                    |  39 +++
 yarn.lock                                     |  23 +-
 27 files changed, 535 insertions(+), 515 deletions(-)

diff --git a/package.json b/package.json
index 10614b508..0273d4e89 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "filesize": "3.6.1",
     "firstline": "1.2.1",
     "fs-extra": "9.0.0",
+    "git": "^0.1.5",
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
@@ -139,7 +140,7 @@
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
-    "session_util_wrapper": "https://github.com/oxen-io/libsession-util-nodejs",
+    "session_util_wrapper": "/home/audric/pro/contribs/libsession-util-nodejs",
     "styled-components": "5.1.1",
     "uuid": "8.3.2"
   },
@@ -289,7 +290,11 @@
         "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
-      "target": ["deb", "rpm", "freebsd"],
+      "target": [
+        "deb",
+        "rpm",
+        "freebsd"
+      ],
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 788eb2964..7ff3a70be 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -21,6 +21,14 @@ import { sanitizeSessionUsername } from '../../session/utils/String';
 import { setLastProfileUpdateTimestamp } from '../../util/storage';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MAX_USERNAME_BYTES } from '../../session/constants';
+import { SharedConfigMessage } from '../../session/messages/outgoing/controlMessage/SharedConfigMessage';
+import { callLibSessionWorker } from '../../webworker/workers/browser/libsession_worker_interface';
+import { SignalService } from '../../protobuf';
+import Long from 'long';
+import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime';
+import { getMessageQueue } from '../../session/sending';
+import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
+import { from_string } from 'libsodium-wrappers-sumo';
 
 interface State {
   profileName: string;
@@ -337,8 +345,35 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
   }
   // do not update the avatar if it did not change
   conversation.setSessionDisplayNameNoCommit(newName);
+
   // might be good to not trigger a sync if the name did not change
   await conversation.commit();
-  await setLastProfileUpdateTimestamp(Date.now());
-  await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
+
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    await callLibSessionWorker(['UserConfig', 'setName', newName]);
+    const pointer = conversation.get('avatarPointer');
+    const profileKey = conversation.get('profileKey');
+    if (profileKey && pointer) {
+      await callLibSessionWorker([
+        'UserConfig',
+        'setProfilePicture',
+        pointer,
+        from_string(profileKey),
+      ]);
+    } else {
+      await callLibSessionWorker(['UserConfig', 'setProfilePicture', '', new Uint8Array()]);
+    }
+
+    const message = new SharedConfigMessage({
+      data: (await callLibSessionWorker(['UserConfig', 'dump'])) as Uint8Array,
+      kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
+      seqno: Long.fromNumber(0),
+      timestamp: GetNetworkTime.getNowWithNetworkOffset(),
+    });
+    await getMessageQueue().sendSyncMessage({ message, namespace: SnodeNamespaces.UserProfile });
+  } else {
+    await setLastProfileUpdateTimestamp(Date.now());
+
+    await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
+  }
 }
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 96b4b6882..247128de9 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -2,57 +2,52 @@ import React, { useEffect, useState } from 'react';
 import { getConversationController } from '../../session/conversations';
 import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
 
+import { useDispatch, useSelector } from 'react-redux';
 import {
   Data,
   hasSyncedInitialConfigurationItem,
   lastAvatarUploadTimestamp,
 } from '../../data/data';
 import { getMessageQueue } from '../../session/sending';
-import { useDispatch, useSelector } from 'react-redux';
 // tslint:disable: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 
-import { getOurNumber } from '../../state/selectors/user';
+import { clearSearch } from '../../state/ducks/search';
+import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
 import {
   getOurPrimaryConversation,
   getUnreadMessageCount,
 } from '../../state/selectors/conversations';
 import { getFocusedSection } from '../../state/selectors/section';
-import { clearSearch } from '../../state/ducks/search';
-import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
+import { getOurNumber } from '../../state/selectors/user';
 
 import { cleanUpOldDecryptedMedias } from '../../session/crypto/DecryptedAttachmentsManager';
 
 import { DURATION } from '../../session/constants';
 
-import { onionPathModal } from '../../state/ducks/modalDialog';
-import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { debounce, isEmpty, isString } from 'lodash';
+import { uploadOurAvatar } from '../../interactions/conversationInteractions';
+import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
 
 // tslint:disable-next-line: no-import-side-effect no-submodule-imports
 
-import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
+import { ipcRenderer } from 'electron';
 import { loadDefaultRooms } from '../../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getOpenGroupManager } from '../../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
+import { UserUtils } from '../../session/utils';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
+import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
 import { SessionIconButton } from '../icon';
 import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
-import { ipcRenderer } from 'electron';
-import { UserUtils } from '../../session/utils';
 
 import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
-import { switchThemeTo } from '../../themes/switchTheme';
-import { ThemeStateType } from '../../themes/constants/colors';
-import { isDarkTheme } from '../../state/selectors/theme';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
-import { SharedConfigMessage } from '../../session/messages/outgoing/controlMessage/SharedConfigMessage';
-import { SignalService } from '../../protobuf';
-import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime';
-import Long from 'long';
-import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
 import { initializeLibSessionUtilWrappers } from '../../session/utils/libsession/libsession_utils';
+import { isDarkTheme } from '../../state/selectors/theme';
+import { ThemeStateType } from '../../themes/constants/colors';
+import { switchThemeTo } from '../../themes/switchTheme';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -67,15 +62,7 @@ const Section = (props: { type: SectionType }) => {
   const handleClick = async () => {
     /* tslint:disable:no-void-expression */
     if (type === SectionType.Profile) {
-      const message = new SharedConfigMessage({
-        data: new Uint8Array([1, 2, 3]),
-        kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
-        seqno: Long.fromNumber(0),
-        timestamp: GetNetworkTime.getNowWithNetworkOffset(),
-      });
-      await getMessageQueue().sendSyncMessage({ message, namespace: SnodeNamespaces.UserProfile });
-      console.warn('FIXME');
-      // dispatch(editProfileModal({}));
+      dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
       const currentTheme = String(window.Events.getThemeSetting());
       const newTheme = (isDarkMode
@@ -220,10 +207,6 @@ const doAppStartUp = async () => {
   // TODO make this a job of the JobRunner
   debounce(triggerAvatarReUploadIfNeeded, 200);
 
-  // init the messageQueue. In the constructor, we add all not send messages
-  // this call does nothing except calling the constructor, which will continue sending message in the pipeline
-  void getMessageQueue().processAllPending();
-
   /* Postpone a little bit of the polling of sogs messages to let the swarm messages come in first. */
   global.setTimeout(() => {
     void getOpenGroupManager().startPolling();
@@ -311,7 +294,6 @@ export const ActionsPanel = () => {
         <Section type={SectionType.Profile} />
         <Section type={SectionType.Message} />
         <Section type={SectionType.Settings} />
-
         <Section type={SectionType.PathIndicator} />
         <Section type={SectionType.ColorMode} />
       </LeftPaneSectionContainer>
diff --git a/ts/data/data.ts b/ts/data/data.ts
index bc5b92a1d..828d10ab0 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -11,7 +11,12 @@ import { HexKeyPair } from '../receiver/keypairs';
 import { getConversationController } from '../session/conversations';
 import { getSodiumRenderer } from '../session/crypto';
 import { PubKey } from '../session/types';
-import { MsgDuplicateSearchOpenGroup, UpdateLastHashType } from '../types/sqlSharedTypes';
+import {
+  AsyncWrapper,
+  MsgDuplicateSearchOpenGroup,
+  UnprocessedDataNode,
+  UpdateLastHashType,
+} from '../types/sqlSharedTypes';
 import { ExpirationTimerOptions } from '../util/expiringMessages';
 import { Storage } from '../util/storage';
 import { channels } from './channels';
@@ -101,96 +106,6 @@ function _cleanData(data: any): any {
   return data;
 }
 
-// we export them like this instead of directly with the `export function` cause this is helping a lot for testing
-export const Data = {
-  shutdown,
-  close,
-  removeDB,
-  getPasswordHash,
-
-  // items table logic
-  createOrUpdateItem,
-  getItemById,
-  getAllItems,
-  removeItemById,
-
-  // guard nodes
-  getGuardNodes,
-  updateGuardNodes,
-  generateAttachmentKeyIfEmpty,
-  getSwarmNodesForPubkey,
-  updateSwarmNodesForPubkey,
-  getAllEncryptionKeyPairsForGroup,
-  getLatestClosedGroupEncryptionKeyPair,
-  addClosedGroupEncryptionKeyPair,
-  removeAllClosedGroupEncryptionKeyPairs,
-  saveConversation,
-  getConversationById,
-  removeConversation,
-  getAllConversations,
-  getPubkeysInPublicConversation,
-  searchConversations,
-  searchMessages,
-  searchMessagesInConversation,
-  cleanSeenMessages,
-  cleanLastHashes,
-  saveSeenMessageHashes,
-  updateLastHash,
-  saveMessage,
-  saveMessages,
-  removeMessage,
-  removeMessagesByIds,
-  getMessageIdsFromServerIds,
-  getMessageById,
-  getMessageBySenderAndSentAt,
-  getMessageByServerId,
-  filterAlreadyFetchedOpengroupMessage,
-  getMessageBySenderAndTimestamp,
-  getUnreadByConversation,
-  getUnreadCountByConversation,
-  markAllAsReadByConversationNoExpiration,
-  getMessageCountByType,
-  getMessagesByConversation,
-  getLastMessagesByConversation,
-  getLastMessageIdInConversation,
-  getLastMessageInConversation,
-  getOldestMessageInConversation,
-  getMessageCount,
-  getFirstUnreadMessageIdInConversation,
-  getFirstUnreadMessageWithMention,
-  hasConversationOutgoingMessage,
-  getLastHashBySnode,
-  getSeenMessagesByHashList,
-  removeAllMessagesInConversation,
-  getMessagesBySentAt,
-  getExpiredMessages,
-  getOutgoingWithoutExpiresAt,
-  getNextExpiringMessage,
-  getUnprocessedCount,
-  getAllUnprocessed,
-  getUnprocessedById,
-  saveUnprocessed,
-  updateUnprocessedAttempts,
-  updateUnprocessedWithData,
-  removeUnprocessed,
-  removeAllUnprocessed,
-  getNextAttachmentDownloadJobs,
-  saveAttachmentDownloadJob,
-  setAttachmentDownloadJobPending,
-  resetAttachmentDownloadPending,
-  removeAttachmentDownloadJob,
-  removeAllAttachmentDownloadJobs,
-  removeAll,
-  removeAllConversations,
-  cleanupOrphanedAttachments,
-  removeOtherData,
-  getMessagesWithVisualMediaAttachments,
-  getMessagesWithFileAttachments,
-  getSnodePoolFromDb,
-  updateSnodePoolOnDb,
-  fillWithTestData,
-};
-
 // Basic
 async function shutdown(): Promise<void> {
   // Stop accepting new SQL jobs, flush outstanding queue
@@ -674,49 +589,42 @@ async function getNextExpiringMessage(): Promise<MessageCollection> {
 
 // Unprocessed
 
-async function getUnprocessedCount(): Promise<number> {
+const getUnprocessedCount: AsyncWrapper<UnprocessedDataNode['getUnprocessedCount']> = () => {
   return channels.getUnprocessedCount();
-}
-
-async function getAllUnprocessed(): Promise<Array<UnprocessedParameter>> {
-  return channels.getAllUnprocessed();
-}
-
-async function getUnprocessedById(id: string): Promise<UnprocessedParameter | undefined> {
-  return channels.getUnprocessedById(id);
-}
-
-export type UnprocessedParameter = {
-  id: string;
-  version: number;
-  envelope: string;
-  timestamp: number;
-  attempts: number;
-  messageHash: string;
-  senderIdentity?: string;
-  decrypted?: string; // added once the envelopes's content is decrypted with updateCache
-  source?: string; // added once the envelopes's content is decrypted with updateCache
 };
 
-async function saveUnprocessed(data: UnprocessedParameter): Promise<string> {
-  const id = await channels.saveUnprocessed(_cleanData(data));
-  return id;
-}
+const getAllUnprocessed: AsyncWrapper<UnprocessedDataNode['getAllUnprocessed']> = () => {
+  return channels.getAllUnprocessed();
+};
 
-async function updateUnprocessedAttempts(id: string, attempts: number): Promise<void> {
-  await channels.updateUnprocessedAttempts(id, attempts);
-}
-async function updateUnprocessedWithData(id: string, data: any): Promise<void> {
-  await channels.updateUnprocessedWithData(id, data);
-}
+const getUnprocessedById: AsyncWrapper<UnprocessedDataNode['getUnprocessedById']> = id => {
+  return channels.getUnprocessedById(id);
+};
 
-async function removeUnprocessed(id: string): Promise<void> {
-  await channels.removeUnprocessed(id);
-}
+const saveUnprocessed: AsyncWrapper<UnprocessedDataNode['saveUnprocessed']> = data => {
+  return channels.saveUnprocessed(_cleanData(data));
+};
 
-async function removeAllUnprocessed(): Promise<void> {
-  await channels.removeAllUnprocessed();
-}
+const updateUnprocessedAttempts: AsyncWrapper<UnprocessedDataNode['updateUnprocessedAttempts']> = (
+  id,
+  attempts
+) => {
+  return channels.updateUnprocessedAttempts(id, attempts);
+};
+const updateUnprocessedWithData: AsyncWrapper<UnprocessedDataNode['updateUnprocessedWithData']> = (
+  id,
+  data
+) => {
+  return channels.updateUnprocessedWithData(id, _cleanData(data));
+};
+
+const removeUnprocessed: AsyncWrapper<UnprocessedDataNode['removeUnprocessed']> = id => {
+  return channels.removeUnprocessed(id);
+};
+
+const removeAllUnprocessed: AsyncWrapper<UnprocessedDataNode['removeAllUnprocessed']> = () => {
+  return channels.removeAllUnprocessed();
+};
 
 // Attachment downloads
 
@@ -908,3 +816,97 @@ export async function getAllItems(): Promise<Array<StorageItem>> {
 export async function removeItemById(id: string): Promise<void> {
   await channels.removeItemById(id);
 }
+
+// we export them like this instead of directly with the `export function` cause this is helping a lot for testing
+export const Data = {
+  shutdown,
+  close,
+  removeDB,
+  getPasswordHash,
+
+  // items table logic
+  createOrUpdateItem,
+  getItemById,
+  getAllItems,
+  removeItemById,
+
+  // guard nodes
+  getGuardNodes,
+  updateGuardNodes,
+  generateAttachmentKeyIfEmpty,
+  getSwarmNodesForPubkey,
+  updateSwarmNodesForPubkey,
+  getAllEncryptionKeyPairsForGroup,
+  getLatestClosedGroupEncryptionKeyPair,
+  addClosedGroupEncryptionKeyPair,
+  removeAllClosedGroupEncryptionKeyPairs,
+  saveConversation,
+  getConversationById,
+  removeConversation,
+  getAllConversations,
+  getPubkeysInPublicConversation,
+  searchConversations,
+  searchMessages,
+  searchMessagesInConversation,
+  cleanSeenMessages,
+  cleanLastHashes,
+  saveSeenMessageHashes,
+  updateLastHash,
+  saveMessage,
+  saveMessages,
+  removeMessage,
+  removeMessagesByIds,
+  getMessageIdsFromServerIds,
+  getMessageById,
+  getMessageBySenderAndSentAt,
+  getMessageByServerId,
+  filterAlreadyFetchedOpengroupMessage,
+  getMessageBySenderAndTimestamp,
+  getUnreadByConversation,
+  getUnreadCountByConversation,
+  markAllAsReadByConversationNoExpiration,
+  getMessageCountByType,
+  getMessagesByConversation,
+  getLastMessagesByConversation,
+  getLastMessageIdInConversation,
+  getLastMessageInConversation,
+  getOldestMessageInConversation,
+  getMessageCount,
+  getFirstUnreadMessageIdInConversation,
+  getFirstUnreadMessageWithMention,
+  hasConversationOutgoingMessage,
+  getLastHashBySnode,
+  getSeenMessagesByHashList,
+  removeAllMessagesInConversation,
+  getMessagesBySentAt,
+  getExpiredMessages,
+  getOutgoingWithoutExpiresAt,
+  getNextExpiringMessage,
+
+  // Unprocessed messages data
+  getUnprocessedCount,
+  getAllUnprocessed,
+  getUnprocessedById,
+  saveUnprocessed,
+  updateUnprocessedAttempts,
+  updateUnprocessedWithData,
+  removeUnprocessed,
+  removeAllUnprocessed,
+
+  // attachments download jobs
+  getNextAttachmentDownloadJobs,
+  saveAttachmentDownloadJob,
+  setAttachmentDownloadJobPending,
+  resetAttachmentDownloadPending,
+  removeAttachmentDownloadJob,
+  removeAllAttachmentDownloadJobs,
+  removeAll,
+  removeAllConversations,
+  cleanupOrphanedAttachments,
+  removeOtherData,
+  getMessagesWithVisualMediaAttachments,
+  getMessagesWithFileAttachments,
+  getSnodePoolFromDb,
+  updateSnodePoolOnDb,
+  fillWithTestData,
+};
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 90d32275e..3cdf64033 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -455,6 +455,10 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
       `Reuploading avatar finished at ${newTimestampReupload}, newAttachmentPointer ${fileUrl}`
     );
   }
+  return {
+    avatarPointer: ourConvo.get('avatarPointer'),
+    profileKey: ourConvo.get('profileKey'),
+  };
 }
 
 export async function replyToMessage(messageId: string) {
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index c5879d65c..d57cf8655 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -440,7 +440,9 @@ async function connect() {
     Notifications.enable();
   }, 10 * 1000); // 10 sec
 
-  await queueAllCached();
+  setTimeout(() => {
+    void queueAllCached();
+  }, 10 * 1000); // 10 sec
   await AttachmentDownloads.start({
     logger: window.log,
   });
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 83938d2a0..eb5aa4566 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -91,7 +91,7 @@ export interface ConversationAttributes {
   /**
    * When we create a closed group v3 or get promoted to admim, we need to save the private key of that closed group.
    */
-  identityPrivateKey?: string;
+  // identityPrivateKey?: string;
 }
 
 /**
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 1a8087342..988f37070 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -169,10 +169,10 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
     convo.active_at = 0;
   }
 
-  convo.identityPrivateKey = row.identityPrivateKey;
-  if (!convo.identityPrivateKey) {
-    convo.identityPrivateKey = undefined;
-  }
+  // convo.identityPrivateKey = row.identityPrivateKey;
+  // if (!convo.identityPrivateKey) {
+  //   convo.identityPrivateKey = undefined;
+  // }
 
   return convo;
 }
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 69df8c3fa..36b9d44f4 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1242,13 +1242,15 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       combinedMessageHashes TEXT);
       `);
 
-    db.exec(`ALTER TABLE conversations
-      ADD COLUMN lastReadTimestampMs INTEGER;
-      ;
-        `);
+    // db.exec(`ALTER TABLE conversations
+    //   ADD COLUMN lastReadTimestampMs INTEGER;
+    //   ;
+    //     `);
+
+    db.exec(`ALTER TABLE unprocessed DROP COLUMN serverTimestamp;`);
 
     // we need to populate those fields with the current state of the conversation so let's throw null until this is done
-    throw null;
+    // throw new Error('update me');
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 2c09883f3..8481be09e 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -17,6 +17,7 @@ import {
   isString,
   last,
   map,
+  omit,
 } from 'lodash';
 import { redactAll } from '../util/privacy'; // checked - only node
 import { LocaleMessagesType } from './locale'; // checked - only node
@@ -46,7 +47,14 @@ import {
   toSqliteBoolean,
 } from './database_utility';
 
-import { ConfigDumpDataNode, ConfigDumpRow, UpdateLastHashType } from '../types/sqlSharedTypes';
+import {
+  ConfigDumpDataNode,
+  ConfigDumpRow,
+  MsgDuplicateSearchOpenGroup,
+  UnprocessedDataNode,
+  UnprocessedParameter,
+  UpdateLastHashType,
+} from '../types/sqlSharedTypes';
 import { OpenGroupV2Room } from '../data/opengroups';
 
 import {
@@ -437,9 +445,16 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     avatarInProfile,
     displayNameInProfile,
     conversationIdOrigin,
-    identityPrivateKey,
+    // identityPrivateKey,
   } = formatted;
 
+  //FIXME
+  console.warn('FIXME omit(formatted, identityPrivateKey);');
+  const omited = omit(formatted, 'identityPrivateKey');
+  const keys = Object.keys(omited);
+  const columnsCommaSeparated = keys.join(', ');
+  const valuesArgs = keys.map(k => `$${k}`).join(', ');
+
   const maxLength = 300;
   // shorten the last message as we never need more than `maxLength` chars (and it bloats the redux/ipc calls uselessly.
 
@@ -450,73 +465,9 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
   assertGlobalInstanceOrInstance(instance)
     .prepare(
       `INSERT OR REPLACE INTO ${CONVERSATIONS_TABLE} (
-	id,
-	active_at,
-	type,
-	members,
-  nickname,
-  profileKey,
-  zombies,
-  left,
-  expireTimer,
-  mentionedUs,
-  unreadCount,
-  lastMessageStatus,
-  lastMessage,
-  lastJoinedTimestamp,
-  groupAdmins,
-  groupModerators,
-  isKickedFromGroup,
-  subscriberCount,
-  readCapability,
-  writeCapability,
-  uploadCapability,
-  is_medium_group,
-  avatarPointer,
-  avatarImageId,
-  triggerNotificationsFor,
-  isTrustedForAttachmentDownload,
-  isPinned,
-  isApproved,
-  didApproveMe,
-  avatarInProfile,
-  displayNameInProfile,
-  conversationIdOrigin,
-  identityPrivateKey
+	${columnsCommaSeparated}
 	) values (
-	    $id,
-	    $active_at,
-	    $type,
-	    $members,
-      $nickname,
-      $profileKey,
-      $zombies,
-      $left,
-      $expireTimer,
-      $mentionedUs,
-      $unreadCount,
-      $lastMessageStatus,
-      $lastMessage,
-      $lastJoinedTimestamp,
-      $groupAdmins,
-      $groupModerators,
-      $isKickedFromGroup,
-      $subscriberCount,
-      $readCapability,
-      $writeCapability,
-      $uploadCapability,
-      $is_medium_group,
-      $avatarPointer,
-      $avatarImageId,
-      $triggerNotificationsFor,
-      $isTrustedForAttachmentDownload,
-      $isPinned,
-      $isApproved,
-      $didApproveMe,
-      $avatarInProfile,
-      $displayNameInProfile,
-      $conversationIdOrigin,
-      $identityPrivateKey
+	   ${valuesArgs}
       )`
     )
     .run({
@@ -555,7 +506,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       avatarInProfile,
       displayNameInProfile,
       conversationIdOrigin,
-      identityPrivateKey,
+      // identityPrivateKey,
     });
 }
 
@@ -1076,8 +1027,8 @@ function getMessageBySenderAndTimestamp({
 }
 
 function filterAlreadyFetchedOpengroupMessage(
-  msgDetails: Array<{ sender: string; serverTimestamp: number }> // MsgDuplicateSearchOpenGroup
-): Array<{ sender: string; serverTimestamp: number }> {
+  msgDetails: MsgDuplicateSearchOpenGroup
+): MsgDuplicateSearchOpenGroup {
   const filteredNonBlinded = msgDetails.filter(msg => {
     const rows = assertGlobalInstance()
       .prepare(
@@ -1478,127 +1429,119 @@ function getNextExpiringMessage() {
 }
 
 /* Unproccessed a received messages not yet processed */
-function saveUnprocessed(data: any) {
-  const { id, timestamp, version, attempts, envelope, senderIdentity, messageHash } = data;
-  if (!id) {
-    throw new Error(`saveUnprocessed: id was falsey: ${id}`);
-  }
+const unprocessed: UnprocessedDataNode = {
+  saveUnprocessed: (data: UnprocessedParameter) => {
+    const { id, timestamp, version, attempts, envelope, senderIdentity, messageHash } = data;
+    if (!id) {
+      throw new Error(`saveUnprocessed: id was falsey: ${id}`);
+    }
 
-  assertGlobalInstance()
-    .prepare(
-      `INSERT OR REPLACE INTO unprocessed (
-      id,
-      timestamp,
-      version,
-      attempts,
-      envelope,
-      senderIdentity,
-      serverHash
-    ) values (
-      $id,
-      $timestamp,
-      $version,
-      $attempts,
-      $envelope,
-      $senderIdentity,
-      $messageHash
-    );`
-    )
-    .run({
-      id,
-      timestamp,
-      version,
-      attempts,
-      envelope,
-      senderIdentity,
-      messageHash,
-    });
+    assertGlobalInstance()
+      .prepare(
+        `INSERT OR REPLACE INTO unprocessed (
+        id,
+        timestamp,
+        version,
+        attempts,
+        envelope,
+        senderIdentity,
+        serverHash
+      ) values (
+        $id,
+        $timestamp,
+        $version,
+        $attempts,
+        $envelope,
+        $senderIdentity,
+        $messageHash
+      );`
+      )
+      .run({
+        id,
+        timestamp,
+        version,
+        attempts,
+        envelope,
+        senderIdentity,
+        messageHash,
+      });
+  },
 
-  return id;
-}
+  updateUnprocessedAttempts: (id: string, attempts: number) => {
+    assertGlobalInstance()
+      .prepare('UPDATE unprocessed SET attempts = $attempts WHERE id = $id;')
+      .run({
+        id,
+        attempts,
+      });
+  },
 
-function updateUnprocessedAttempts(id: string, attempts: number) {
-  assertGlobalInstance()
-    .prepare('UPDATE unprocessed SET attempts = $attempts WHERE id = $id;')
-    .run({
-      id,
-      attempts,
-    });
-}
-function updateUnprocessedWithData(id: string, data: any = {}) {
-  const { source, serverTimestamp, decrypted, senderIdentity } = data;
+  updateUnprocessedWithData: (id: string, data: UnprocessedParameter) => {
+    const { source, decrypted, senderIdentity } = data;
 
-  assertGlobalInstance()
-    .prepare(
-      `UPDATE unprocessed SET
-      source = $source,
-      serverTimestamp = $serverTimestamp,
-      decrypted = $decrypted,
-      senderIdentity = $senderIdentity
-    WHERE id = $id;`
-    )
-    .run({
-      id,
-      source,
-      serverTimestamp,
-      decrypted,
-      senderIdentity,
-    });
-}
+    assertGlobalInstance()
+      .prepare(
+        `UPDATE unprocessed SET
+        source = $source,
+        decrypted = $decrypted,
+        senderIdentity = $senderIdentity
+      WHERE id = $id;`
+      )
+      .run({
+        id,
+        source,
+        decrypted,
+        senderIdentity,
+      });
+  },
 
-function getUnprocessedById(id: string) {
-  const row = assertGlobalInstance()
-    .prepare('SELECT * FROM unprocessed WHERE id = $id;')
-    .get({
-      id,
-    });
+  getUnprocessedById: (id: string) => {
+    const row = assertGlobalInstance()
+      .prepare('SELECT * FROM unprocessed WHERE id = $id;')
+      .get({
+        id,
+      });
 
-  return row;
-}
+    return row;
+  },
 
-function getUnprocessedCount() {
-  const row = assertGlobalInstance()
-    .prepare('SELECT count(*) from unprocessed;')
-    .get();
+  getUnprocessedCount: () => {
+    const row = assertGlobalInstance()
+      .prepare('SELECT count(*) from unprocessed;')
+      .get();
 
-  if (!row) {
-    throw new Error('getMessageCount: Unable to get count of unprocessed');
-  }
+    if (!row) {
+      throw new Error('getMessageCount: Unable to get count of unprocessed');
+    }
 
-  return row['count(*)'];
-}
+    return row['count(*)'];
+  },
 
-function getAllUnprocessed() {
-  const rows = assertGlobalInstance()
-    .prepare('SELECT * FROM unprocessed ORDER BY timestamp ASC;')
-    .all();
+  getAllUnprocessed: () => {
+    const rows = assertGlobalInstance()
+      .prepare('SELECT * FROM unprocessed ORDER BY timestamp ASC;')
+      .all();
 
-  return rows;
-}
+    return rows;
+  },
 
-function removeUnprocessed(id: string) {
-  if (!Array.isArray(id)) {
+  removeUnprocessed: (id: string): void => {
+    if (Array.isArray(id)) {
+      console.warn('removeUnprocessed only supports single ids at a time');
+      throw new Error('removeUnprocessed only supports single ids at a time');
+    }
     assertGlobalInstance()
       .prepare('DELETE FROM unprocessed WHERE id = $id;')
       .run({ id });
     return;
-  }
+  },
 
-  if (!id.length) {
-    throw new Error('removeUnprocessed: No ids to delete!');
-  }
-
-  // Our node interface doesn't seem to allow you to replace one single ? with an array
-  assertGlobalInstance()
-    .prepare(`DELETE FROM unprocessed WHERE id IN ( ${id.map(() => '?').join(', ')} );`)
-    .run(id);
-}
-
-function removeAllUnprocessed() {
-  assertGlobalInstance()
-    .prepare('DELETE FROM unprocessed;')
-    .run();
-}
+  removeAllUnprocessed: () => {
+    assertGlobalInstance()
+      .prepare('DELETE FROM unprocessed;')
+      .run();
+  },
+};
 
 function getNextAttachmentDownloadJobs(limit: number) {
   const timestamp = Date.now();
@@ -2565,14 +2508,8 @@ export const sqlNode = {
   hasConversationOutgoingMessage,
   fillWithTestData,
 
-  getUnprocessedCount,
-  getAllUnprocessed,
-  saveUnprocessed,
-  updateUnprocessedAttempts,
-  updateUnprocessedWithData,
-  getUnprocessedById,
-  removeUnprocessed,
-  removeAllUnprocessed,
+  // add all the calls related to the unprocessed cache of incoming messages
+  ...unprocessed,
 
   getNextAttachmentDownloadJobs,
   saveAttachmentDownloadJob,
diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts
index e67e98374..5e334c1a8 100644
--- a/ts/receiver/cache.ts
+++ b/ts/receiver/cache.ts
@@ -1,12 +1,11 @@
 import { EnvelopePlus } from './types';
 import { StringUtils } from '../session/utils';
 import _ from 'lodash';
-import { Data, UnprocessedParameter } from '../data/data';
+import { Data } from '../data/data';
+import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
 export async function removeFromCache(envelope: EnvelopePlus) {
-  const { id } = envelope;
-  // window?.log?.info(`removing from cache envelope: ${id}`);
-  return Data.removeUnprocessed(id);
+  return Data.removeUnprocessed(envelope.id);
 }
 
 export async function addToCache(
@@ -15,7 +14,6 @@ export async function addToCache(
   messageHash: string
 ) {
   const { id } = envelope;
-  // window?.log?.info(`adding to cache envelope: ${id}`);
 
   const encodedEnvelope = StringUtils.decode(plaintext, 'base64');
   const data: UnprocessedParameter = {
@@ -30,10 +28,10 @@ export async function addToCache(
   if (envelope.senderIdentity) {
     data.senderIdentity = envelope.senderIdentity;
   }
-  return Data.saveUnprocessed(data);
+  await Data.saveUnprocessed(data);
 }
 
-async function fetchAllFromCache(): Promise<Array<any>> {
+async function fetchAllFromCache(): Promise<Array<UnprocessedParameter>> {
   const count = await Data.getUnprocessedCount();
 
   if (count > 1500) {
@@ -42,30 +40,26 @@ async function fetchAllFromCache(): Promise<Array<any>> {
     return [];
   }
 
-  const items = await Data.getAllUnprocessed();
-  return items;
+  return Data.getAllUnprocessed();
 }
 
-export async function getAllFromCache() {
-  window?.log?.info('getAllFromCache');
-  const items = await fetchAllFromCache();
-
-  window?.log?.info('getAllFromCache loaded', items.length, 'saved envelopes');
-
+async function increaseAttemptsOrRemove(
+  items: Array<UnprocessedParameter>
+): Promise<Array<UnprocessedParameter>> {
   return Promise.all(
-    _.map(items, async (item: any) => {
+    _.map(items, async item => {
       const attempts = _.toNumber(item.attempts || 0) + 1;
 
       try {
         if (attempts >= 10) {
-          window?.log?.warn('getAllFromCache final attempt for envelope', item.id);
+          window?.log?.warn('increaseAttemptsOrRemove final attempt for envelope', item.id);
           await Data.removeUnprocessed(item.id);
         } else {
           await Data.updateUnprocessedAttempts(item.id, attempts);
         }
       } catch (error) {
         window?.log?.error(
-          'getAllFromCache error updating item after load:',
+          'increaseAttemptsOrRemove error updating item after load:',
           error && error.stack ? error.stack : error
         );
       }
@@ -75,6 +69,14 @@ export async function getAllFromCache() {
   );
 }
 
+export async function getAllFromCache() {
+  window?.log?.info('getAllFromCache');
+  const items = await fetchAllFromCache();
+
+  window?.log?.info('getAllFromCache loaded', items.length, 'saved envelopes');
+  return increaseAttemptsOrRemove(items);
+}
+
 export async function getAllFromCacheForSource(source: string) {
   const items = await fetchAllFromCache();
 
@@ -85,34 +87,19 @@ export async function getAllFromCacheForSource(source: string) {
 
   window?.log?.info('getAllFromCacheForSource loaded', itemsFromSource.length, 'saved envelopes');
 
-  return Promise.all(
-    _.map(items, async (item: any) => {
-      const attempts = _.toNumber(item.attempts || 0) + 1;
-
-      try {
-        if (attempts >= 10) {
-          window?.log?.warn('getAllFromCache final attempt for envelope', item.id);
-          await Data.removeUnprocessed(item.id);
-        } else {
-          await Data.updateUnprocessedAttempts(item.id, attempts);
-        }
-      } catch (error) {
-        window?.log?.error(
-          'getAllFromCache error updating item after load:',
-          error && error.stack ? error.stack : error
-        );
-      }
-
-      return item;
-    })
-  );
+  return increaseAttemptsOrRemove(itemsFromSource);
 }
 
-export async function updateCache(envelope: EnvelopePlus, plaintext: ArrayBuffer): Promise<void> {
+export async function updateCacheWithDecryptedContent(
+  envelope: EnvelopePlus,
+  plaintext: ArrayBuffer
+): Promise<void> {
   const { id } = envelope;
   const item = await Data.getUnprocessedById(id);
   if (!item) {
-    window?.log?.error(`updateCache: Didn't find item ${id} in cache to update`);
+    window?.log?.error(
+      `updateCacheWithDecryptedContent: Didn't find item ${id} in cache to update`
+    );
     return;
   }
 
@@ -125,5 +112,5 @@ export async function updateCache(envelope: EnvelopePlus, plaintext: ArrayBuffer
 
   item.decrypted = StringUtils.decode(plaintext, 'base64');
 
-  return Data.updateUnprocessedWithData(item.id, item);
+  await Data.updateUnprocessedWithData(item.id, item);
 }
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 173776b6d..a612c13f4 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,28 +1,27 @@
-import _, { groupBy, isArray, isEmpty } from 'lodash';
+import _, { isEmpty } from 'lodash';
+import { ContactInfo, ProfilePicture } from 'session_util_wrapper';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
+import { ConversationInteraction } from '../interactions';
+import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { SignalService } from '../protobuf';
 import {
   joinOpenGroupV2WithUIEvents,
   parseOpenGroupV2,
 } from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
 import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
-import { SignalService } from '../protobuf';
 import { getConversationController } from '../session/conversations';
+import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { UserUtils } from '../session/utils';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { BlockedNumberController } from '../util';
+import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
+import { callLibSessionWorker } from '../webworker/workers/browser/libsession_worker_interface';
 import { removeFromCache } from './cache';
 import { handleNewClosedGroup } from './closedGroups';
 import { EnvelopePlus } from './types';
-import { ConversationInteraction } from '../interactions';
-import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
 import { appendFetchAvatarAndProfileJob, updateOurProfileSync } from './userProfileImageUpdates';
-import { ConversationTypeEnum } from '../models/conversationAttributes';
-import { callLibSessionWorker } from '../webworker/workers/browser/libsession_worker_interface';
-import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
-import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
-import { Dictionary } from '@reduxjs/toolkit';
-import { ContactInfo, ProfilePicture } from 'session_util_wrapper';
 
 type IncomingConfResult = {
   needsPush: boolean;
@@ -45,26 +44,22 @@ function protobufSharedConfigTypeToWrapper(
 }
 
 async function mergeConfigsWithIncomingUpdates(
-  groupedByKind: Dictionary<Array<IncomingMessage<SignalService.SharedConfigMessage>>>
+  incomingConfig: IncomingMessage<SignalService.ISharedConfigMessage>
 ) {
   const kindMessageMap: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult> = new Map();
-  // do the merging on all wrappers sequentially instead of with a promise.all()
-  const allKinds = (Object.keys(groupedByKind) as unknown) as Array<
-    SignalService.SharedConfigMessage.Kind
-  >;
+  const allKinds = [incomingConfig.message.kind];
   for (let index = 0; index < allKinds.length; index++) {
     const kind = allKinds[index];
-    // see comment above "groupedByKind = groupBy" about why this is needed
-    const castedKind = (kind as unknown) as SignalService.SharedConfigMessage.Kind;
-    const currentKindMessages = groupedByKind[castedKind];
+
+    const currentKindMessages = [incomingConfig];
     if (!currentKindMessages) {
       continue;
     }
     const toMerge = currentKindMessages.map(m => m.message.data);
 
-    const wrapperId = protobufSharedConfigTypeToWrapper(castedKind);
+    const wrapperId = protobufSharedConfigTypeToWrapper(kind);
     if (!wrapperId) {
-      throw new Error(`Invalid castedKind: ${castedKind}`);
+      throw new Error(`Invalid kind: ${kind}`);
     }
 
     await callLibSessionWorker([wrapperId, 'merge', toMerge]);
@@ -181,6 +176,7 @@ async function handleContactsUpdate(result: IncomingConfResult) {
 }
 
 async function processMergingResults(
+  envelope: EnvelopePlus,
   results: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult>
 ) {
   const keys = [...results.keys()];
@@ -206,32 +202,30 @@ async function processMergingResults(
       throw e;
     }
   }
+  await removeFromCache(envelope);
 }
 
-async function handleConfigMessagesViaLibSession(
-  configMessages: Array<IncomingMessage<SignalService.SharedConfigMessage>>
+async function handleConfigMessageViaLibSession(
+  envelope: EnvelopePlus,
+  configMessage: IncomingMessage<SignalService.ISharedConfigMessage>
 ) {
   // FIXME: Remove this once `useSharedUtilForUserConfig` is permanent
-
-  if (
-    !window.sessionFeatureFlags.useSharedUtilForUserConfig ||
-    !configMessages ||
-    !isArray(configMessages) ||
-    configMessages.length === 0
-  ) {
+  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    await removeFromCache(envelope);
     return;
   }
 
-  window?.log?.info(
-    `Handling our profileUdpates via libsession_util. count: ${configMessages.length}`
-  );
+  if (!configMessage) {
+    await removeFromCache(envelope);
 
-  // lodash does not have a way to give the type of the keys as generic parameter so this can only be a string: Array<>
-  const groupedByKind = groupBy(configMessages, m => m.message.kind);
+    return;
+  }
 
-  const kindMessagesMap = await mergeConfigsWithIncomingUpdates(groupedByKind);
+  window?.log?.info(`Handling our profileUdpates via libsession_util.`);
 
-  await processMergingResults(kindMessagesMap);
+  const kindMessagesMap = await mergeConfigsWithIncomingUpdates(configMessage);
+
+  await processMergingResults(envelope, kindMessagesMap);
 }
 
 async function handleOurProfileUpdate(
@@ -426,6 +420,7 @@ async function handleConfigurationMessage(
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessage()"'
     );
+    await removeFromCache(envelope);
     return;
   }
 
@@ -449,5 +444,5 @@ async function handleConfigurationMessage(
 
 export const ConfigMessageHandler = {
   handleConfigurationMessage,
-  handleConfigMessagesViaLibSession,
+  handleConfigMessageViaLibSession,
 };
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 855972c8a..04958329d 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -1,7 +1,7 @@
 import { EnvelopePlus } from './types';
 import { handleSwarmDataMessage } from './dataMessage';
 
-import { removeFromCache, updateCache } from './cache';
+import { removeFromCache, updateCacheWithDecryptedContent } from './cache';
 import { SignalService } from '../protobuf';
 import { compact, flatten, identity, isEmpty, pickBy, toNumber } from 'lodash';
 import { KeyPrefixType, PubKey } from '../session/types';
@@ -28,6 +28,7 @@ import {
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { appendFetchAvatarAndProfileJob } from './userProfileImageUpdates';
+import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
@@ -39,7 +40,7 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH
       return;
     }
     const sentAtTimestamp = toNumber(envelope.timestamp);
-    // swarm messages already comes with a timestamp is milliseconds, so this sentAtTimestamp is correct.
+    // swarm messages already comes with a timestamp in milliseconds, so this sentAtTimestamp is correct.
     // the sogs messages do not come as milliseconds but just seconds, so we override it
     await innerHandleSwarmContentMessage(envelope, sentAtTimestamp, plaintext, messageHash);
   } catch (e) {
@@ -270,15 +271,15 @@ async function decrypt(envelope: EnvelopePlus, ciphertext: ArrayBuffer): Promise
       return null;
     }
 
-    perfStart(`updateCache-${envelope.id}`);
+    perfStart(`updateCacheWithDecryptedContent-${envelope.id}`);
 
-    await updateCache(envelope, plaintext).catch((error: any) => {
+    await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => {
       window?.log?.error(
         'decrypt failed to save decrypted message contents to cache:',
         error && error.stack ? error.stack : error
       );
     });
-    perfEnd(`updateCache-${envelope.id}`, 'updateCache');
+    perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent');
 
     return plaintext;
   } catch (error) {
@@ -433,6 +434,18 @@ export async function innerHandleSwarmContentMessage(
       );
       return;
     }
+    if (content.sharedConfigMessage) {
+      if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+        const asIncomingMsg: IncomingMessage<SignalService.ISharedConfigMessage> = {
+          envelopeTimestamp: sentAtTimestamp,
+          message: content.sharedConfigMessage,
+          messageHash: messageHash,
+          authorOrGroupPubkey: envelope.source,
+          authorInGroup: envelope.senderIdentity,
+        };
+        await ConfigMessageHandler.handleConfigMessageViaLibSession(envelope, asIncomingMsg);
+      }
+    }
     if (content.dataExtractionNotification) {
       perfStart(`handleDataExtractionNotification-${envelope.id}`);
 
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index c2e2e7c44..1382c9dee 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -14,12 +14,11 @@ import { SignalService } from '../protobuf';
 import { Data } from '../data/data';
 import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { perfEnd, perfStart } from '../session/utils/Performance';
+import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
-// TODO: check if some of these exports no longer needed
-
-interface ReqOptions {
+export type ReqOptions = {
   conversationId: string;
-}
+};
 
 const incomingMessagePromises: Array<Promise<any>> = [];
 
@@ -29,7 +28,7 @@ async function handleSwarmEnvelope(envelope: EnvelopePlus, messageHash: string)
   }
 
   await removeFromCache(envelope);
-  throw new Error('Received message with no content and no legacyMessage');
+  throw new Error('Received message with no content');
 }
 
 class EnvelopeQueue {
@@ -57,8 +56,6 @@ const envelopeQueue = new EnvelopeQueue();
 
 function queueSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) {
   const id = getEnvelopeId(envelope);
-  // window?.log?.info('queueing envelope', id);
-
   const task = handleSwarmEnvelope.bind(null, envelope, messageHash);
   const taskWithTimeout = createTaskWithTimeout(task, `queueSwarmEnvelope ${id}`);
 
@@ -102,7 +99,7 @@ async function handleRequestDetail(
     envelope.senderIdentity = senderIdentity;
   }
 
-  envelope.id = envelope.serverGuid || uuidv4();
+  envelope.id = uuidv4();
   envelope.serverTimestamp = envelope.serverTimestamp ? envelope.serverTimestamp.toNumber() : null;
   envelope.messageHash = messageHash;
 
@@ -115,11 +112,7 @@ async function handleRequestDetail(
     await addToCache(envelope, plaintext, messageHash);
     perfEnd(`addToCache-${envelope.id}`, 'addToCache');
 
-    // TODO: This is the glue between the first and the last part of the
-    // receiving pipeline refactor. It is to be implemented in the next PR.
-
     // To ensure that we queue in the same order we receive messages
-
     await lastPromise;
 
     queueSwarmEnvelope(envelope, messageHash);
@@ -131,7 +124,11 @@ async function handleRequestDetail(
   }
 }
 
-export function handleRequest(plaintext: any, options: ReqOptions, messageHash: string): void {
+export function handleRequest(
+  plaintext: Uint8Array,
+  options: ReqOptions,
+  messageHash: string
+): void {
   // tslint:disable-next-line no-promise-as-boolean
   const lastPromise = _.last(incomingMessagePromises) || Promise.resolve();
 
@@ -163,7 +160,7 @@ export async function queueAllCachedFromSource(source: string) {
   }, Promise.resolve());
 }
 
-async function queueCached(item: any) {
+async function queueCached(item: UnprocessedParameter) {
   try {
     const envelopePlaintext = StringUtils.encode(item.envelope, 'base64');
     const envelopeArray = new Uint8Array(envelopePlaintext);
@@ -174,7 +171,7 @@ async function queueCached(item: any) {
 
     // Why do we need to do this???
     envelope.senderIdentity = envelope.senderIdentity || item.senderIdentity;
-    envelope.serverTimestamp = envelope.serverTimestamp || item.serverTimestamp;
+    envelope.serverTimestamp = envelope.serverTimestamp;
 
     const { decrypted } = item;
 
@@ -194,8 +191,7 @@ async function queueCached(item: any) {
     );
 
     try {
-      const { id } = item;
-      await Data.removeUnprocessed(id);
+      await Data.removeUnprocessed(item.id);
     } catch (deleteError) {
       window?.log?.error(
         'queueCached error deleting item',
diff --git a/ts/receiver/userProfileImageUpdates.ts b/ts/receiver/userProfileImageUpdates.ts
index 1e2c47020..34e8d4f98 100644
--- a/ts/receiver/userProfileImageUpdates.ts
+++ b/ts/receiver/userProfileImageUpdates.ts
@@ -57,6 +57,7 @@ export async function updateOurProfileSync(
     window?.log?.warn('[profileupdate] Cannot update our profile with empty convoid');
     return;
   }
+
   const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${ourConvo.id}`;
   return allowOnlyOneAtATime(oneAtaTimeStr, async () => {
     return createOrUpdateProfile(ourConvo.id, profileInDataMessage, profileKey);
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 85d1aefa6..f8dca046f 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -110,7 +110,6 @@ async function retrieveNextMessages(
   const firstResult = results[0];
 
   // TODO we should probably check for status code of all the results (when polling for a few namespaces at a time)
-  console.warn('what should we do if we dont get a 200 on any of those fetches?');
 
   if (firstResult.code !== 200) {
     window?.log?.warn(`retrieveNextMessages result is not 200 but ${firstResult.code}`);
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 8bd59b418..a42b8e71d 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -17,23 +17,33 @@ import pRetry from 'p-retry';
 import { SnodeAPIRetrieve } from './retrieveRequest';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
-import { ConfigMessageHandler } from '../../../receiver/configMessage';
-import { IncomingMessage } from '../../messages/incoming/IncomingMessage';
 
-// Some websocket nonsense
-export function processMessage(message: string, options: any = {}, messageHash: string) {
+export function extractWebSocketContent(
+  message: string,
+  options: any = {},
+  messageHash: string
+): null | {
+  body: Uint8Array;
+  messageHash: string;
+  options: any;
+} {
   try {
     const dataPlaintext = new Uint8Array(StringUtils.encode(message, 'base64'));
     const messageBuf = SignalService.WebSocketMessage.decode(dataPlaintext);
-    if (messageBuf.type === SignalService.WebSocketMessage.Type.REQUEST) {
-      Receiver.handleRequest(messageBuf.request?.body, options, messageHash);
+    if (
+      messageBuf.type === SignalService.WebSocketMessage.Type.REQUEST &&
+      messageBuf.request?.body?.length
+    ) {
+      return {
+        body: messageBuf.request.body,
+        messageHash,
+        options,
+      };
     }
+    return null;
   } catch (error) {
-    const info = {
-      message,
-      error: error.message,
-    };
-    window?.log?.warn('HTTP-Resources Failed to handle message:', info);
+    window?.log?.warn('processMessage Failed to handle message:', error.message);
+    return null;
   }
 }
 
@@ -276,27 +286,27 @@ export class SwarmPolling {
     const newMessages = await this.handleSeenMessages(messages);
     perfEnd(`handleSeenMessages-${pkStr}`, 'handleSeenMessages');
 
-    // try {
-    //   if (
-    //     window.sessionFeatureFlags.useSharedUtilForUserConfig &&
-    //     userConfigMessagesMerged.length
-    //   ) {
-    //     const asIncomingMessages = userConfigMessagesMerged.map(msg => {
-    //       const incomingMessage: IncomingMessage<SignalService.SharedConfigMessage> = {
-    //         envelopeTimestamp: msg.timestamp,
-    //         message: msg.data,
-    //         messageHash: msg.hash,
-    //       };
-    //     });
-    //     await ConfigMessageHandler.handleConfigMessagesViaLibSession();
-    //   }
-    // } catch (e) {
-    //   console.error('shared util lib process messages failed with: ', e);
-    // }
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      const extractedUserConfigMessage = compact(
+        userConfigMessagesMerged.map((m: RetrieveMessageItem) => {
+          return extractWebSocketContent(m.data, {}, m.hash);
+        })
+      );
 
-    newMessages.forEach((m: RetrieveMessageItem) => {
-      const options = isGroup ? { conversationId: pkStr } : {};
-      processMessage(m.data, options, m.hash);
+      extractedUserConfigMessage.forEach(m => {
+        Receiver.handleRequest(m.body, m.options, m.messageHash);
+      });
+    }
+
+    const extractedContentMessage = compact(
+      newMessages.map((m: RetrieveMessageItem) => {
+        const options = isGroup ? { conversationId: pkStr } : {};
+        return extractWebSocketContent(m.data, options, m.hash);
+      })
+    );
+
+    extractedContentMessage.forEach(m => {
+      Receiver.handleRequest(m.body, m.options, m.messageHash);
     });
   }
 
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index d16c33a31..a484e2db2 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -245,7 +245,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
   const updates: Pick<
     ConversationAttributes,
     | 'type'
-    | 'identityPrivateKey'
+    // | 'identityPrivateKey'
     | 'members'
     | 'displayNameInProfile'
     | 'is_medium_group'
@@ -260,7 +260,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
-    identityPrivateKey: isV3(details) ? details.identityPrivateKey : undefined,
+    // identityPrivateKey: isV3(details) ? details.identityPrivateKey : undefined,
   };
   console.warn('updates', updates);
 
diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts
index cab939c2e..e489d2ca3 100644
--- a/ts/session/messages/incoming/IncomingMessage.ts
+++ b/ts/session/messages/incoming/IncomingMessage.ts
@@ -10,7 +10,7 @@ type IncomingMessageAvailableTypes =
   | SignalService.DataExtractionNotification
   | SignalService.Unsend
   | SignalService.MessageRequestResponse
-  | SignalService.SharedConfigMessage;
+  | SignalService.ISharedConfigMessage;
 
 export class IncomingMessage<T extends IncomingMessageAvailableTypes> {
   public readonly envelopeTimestamp: number;
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 3ceff61e3..6355e1cf1 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -333,7 +333,7 @@ export class MessageQueue {
         message instanceof SharedConfigMessage ||
         (message as any).syncTarget?.length > 0
       ) {
-        window?.log?.warn('Processing sync message');
+        window?.log?.warn('OutgoingMessageQueue: Processing sync message');
         isSyncMessage = true;
       } else {
         window?.log?.warn('Dropping message in process() to be sent to ourself');
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index acdec08ea..15f1c2e29 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -9,6 +9,7 @@ import { downloadAttachment, downloadAttachmentSogsV3 } from '../../receiver/att
 import { initializeAttachmentLogic, processNewAttachment } from '../../types/MessageAttachment';
 import { getAttachmentMetadata } from '../../types/message/initializeAttachmentMetadata';
 import { was404Error } from '../apis/snode_api/onions';
+import { AttachmentDownloadMessageDetails } from '../../types/sqlSharedTypes';
 
 // this may cause issues if we increment that value to > 1, but only having one job will block the whole queue while one attachment is downloading
 const MAX_ATTACHMENT_JOB_PARALLELISM = 3;
@@ -49,7 +50,7 @@ export function stop() {
   }
 }
 
-export async function addJob(attachment: any, job: any = {}) {
+export async function addJob(attachment: any, job: AttachmentDownloadMessageDetails) {
   if (!attachment) {
     throw new Error('attachments_download/addJob: attachment is required');
   }
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index a8a6f4a4a..6e305f409 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -43,7 +43,7 @@ export class PersistedJobRunner {
   constructor(jobRunnerType: JobRunnerType, jobEventsListener: JobEventListener | null) {
     this.jobRunnerType = jobRunnerType;
     this.jobEventsListener = jobEventsListener;
-    console.warn('new runner');
+    window.log.warn('new runner');
   }
 
   public async loadJobsFromDb() {
@@ -157,7 +157,7 @@ export class PersistedJobRunner {
 
   private async writeJobsToDB() {
     const serialized = this.getSerializedJobs();
-    console.warn('writing to db', serialized);
+    window.log.warn('writing to db', serialized);
     await Data.createOrUpdateItem({
       id: this.getJobRunnerItemId(),
       value: JSON.stringify(serialized),
@@ -171,7 +171,6 @@ export class PersistedJobRunner {
     // a new job was added. trigger it if we can/have to start it
     const result = this.planNextJob();
 
-    console.warn('addJobUnchecked: ', result);
     if (result === 'no_job') {
       throw new Error('We just pushed a job, there cannot be no job');
     }
@@ -258,7 +257,7 @@ export class PersistedJobRunner {
 
     // if the time is 101, and that task is to be run at t=101, we need to start it right away.
     if (nextJob.nextAttemptTimestamp > Date.now()) {
-      console.warn(
+      window.log.warn(
         'next job is not due to be run just yet. Going idle.',
         nextJob.nextAttemptTimestamp - Date.now()
       );
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 0be0d07cc..88ce0c650 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -28,10 +28,10 @@ export class ConfigurationSyncJob extends Persistedjob {
 
   public async run() {
     // blablha do everything from the notion page, and if success, return true.
-    console.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
+    window.log.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
 
     await sleepFor(5000);
-    console.warn(
+    window.log.warn(
       `running job ${this.jobType} with id:"${this.identifier}" done and returning failed `
     );
 
diff --git a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
index 68a7340c7..c96abbe9b 100644
--- a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
+++ b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
@@ -42,11 +42,11 @@ export class FakeSleepForMultiJob extends Persistedjob {
   }
 
   public async run() {
-    console.warn(
+    window.log.warn(
       `running job ${this.jobType} with id:"${this.identifier}". sleeping for ${this.sleepDuration} & returning ${this.returnResult} `
     );
     await sleepFor(this.sleepDuration);
-    console.warn(`${this.jobType} with id:"${this.identifier}" done. returning success `);
+    window.log.warn(`${this.jobType} with id:"${this.identifier}" done. returning success `);
     return this.returnResult;
   }
 
@@ -85,9 +85,9 @@ export class FakeSleepForJob extends Persistedjob {
   }
 
   public async run() {
-    console.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
+    window.log.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
     await sleepFor(5000);
-    console.warn(`${this.jobType} with id:"${this.identifier}" done. returning failed `);
+    window.log.warn(`${this.jobType} with id:"${this.identifier}" done. returning failed `);
     return false;
   }
 
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 8dc5ff062..5299f3738 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -58,16 +58,16 @@ describe('JobRunner', () => {
     clock = Sinon.useFakeTimers({ shouldAdvanceTime: true });
     jobEventsListener = {
       onJobDeferred: (_job: SerializedPersistedJob) => {
-        // console.warn('listener got deferred for job ', job);
+        // window.log.warn('listener got deferred for job ', job);
       },
       onJobSuccess: (_job: SerializedPersistedJob) => {
-        // console.warn('listener got success for job ', job);
+        // window.log.warn('listener got success for job ', job);
       },
       onJobError: (_job: SerializedPersistedJob) => {
-        // console.warn('listener got error for job ', job);
+        // window.log.warn('listener got error for job ', job);
       },
       onJobStarted: (_job: SerializedPersistedJob) => {
-        // console.warn('listener got started for job ', job);
+        // window.log.warn('listener got started for job ', job);
       },
     };
     runner = new PersistedJobRunner('FakeSleepForJob', jobEventsListener);
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index dc7248e10..54c7da67e 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,3 +1,4 @@
+import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 
 /**
@@ -30,6 +31,8 @@ export type ConfigDumpRow = {
   // we might need to add a `seqno` field here.
 };
 
+// ========== configdump
+
 export type GetByVariantAndPubkeyConfigDump = (
   variant: ConfigWrapperObjectTypes,
   pubkey: string
@@ -45,3 +48,39 @@ export type ConfigDumpDataNode = {
   getAllDumpsWithData: GetAllDumps;
   getAllDumpsWithoutData: GetAllDumps;
 };
+
+// ========== unprocessed
+
+export type UnprocessedParameter = {
+  id: string;
+  version: number;
+  envelope: string;
+  timestamp: number;
+  // serverTimestamp: number;
+  attempts: number;
+  messageHash: string;
+  senderIdentity?: string;
+  decrypted?: string; // added once the envelopes's content is decrypted with updateCacheWithDecryptedContent
+  source?: string; // added once the envelopes's content is decrypted with updateCacheWithDecryptedContent
+};
+
+export type UnprocessedDataNode = {
+  saveUnprocessed: (data: UnprocessedParameter) => void;
+  updateUnprocessedAttempts: (id: string, attempts: number) => void;
+  updateUnprocessedWithData: (id: string, data: UnprocessedParameter) => void;
+  getUnprocessedById: (id: string) => UnprocessedParameter | undefined;
+  getUnprocessedCount: () => number;
+  getAllUnprocessed: () => Array<UnprocessedParameter>;
+  removeUnprocessed: (id: string) => void;
+  removeAllUnprocessed: () => void;
+};
+
+// ======== attachment downloads
+
+export type AttachmentDownloadMessageDetails = {
+  messageId: string;
+  type: 'preview' | 'quote' | 'attachment';
+  index: number;
+  isOpenGroupV2: boolean;
+  openGroupV2Details: OpenGroupRequestCommonType | undefined;
+};
diff --git a/yarn.lock b/yarn.lock
index de65cf2e6..006523619 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4965,6 +4965,13 @@ getobject@^1.0.0, getobject@~0.1.0, getobject@~1.0.0:
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45"
   integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg==
 
+git@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/git/-/git-0.1.5.tgz#9ef62df93f851c27542143bf52d1c68b1017ca15"
+  integrity sha512-N+bfOrXyKMU/fQtCj6D/U9MQOEN0DAA8TLHSLdUQRSWBOkeRvsjJHdrdkvcq05xO7GSDKWc3nDEGoTZ4DfCCSg==
+  dependencies:
+    mime "1.2.9"
+
 glob-parent@^6.0.1, glob-parent@~5.1.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
@@ -6494,6 +6501,11 @@ mime-types@^2.1.12, mime-types@^2.1.27:
   dependencies:
     mime-db "1.52.0"
 
+mime@1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.9.tgz#009cd40867bd35de521b3b966f04e2f8d4d13d09"
+  integrity sha512-WiLgbHTIq5AYUvU/Luli4mZ1bUcHpGNHyCsbl+KPMg4zt+XUDpQehWjuBjdLaEvDTinvKj/FgfQt3fPoT7j08g==
+
 mime@^2.4.6:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
@@ -6810,9 +6822,9 @@ node-gyp@9.0.0:
     which "^2.0.2"
 
 node-gyp@^9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319"
-  integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
+  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
@@ -8392,15 +8404,14 @@ serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-"session_util_wrapper@file:../libsession-util-nodejs":
+session_util_wrapper@/home/audric/pro/contribs/libsession-util-nodejs:
   version "0.1.0"
   dependencies:
     nan "^2.17.0"
     node-gyp "^9.3.0"
 
-"session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs":
+"session_util_wrapper@file:../libsession-util-nodejs":
   version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#0951d0138a289795257198d556409b2e73068fc1"
   dependencies:
     nan "^2.17.0"
     node-gyp "^9.3.0"

From 08a15b210af11535590a0ffa00ffb490501471a8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 31 Jan 2023 11:30:56 +1100
Subject: [PATCH 027/178] feat: move avatar downloading to JobRunner

---
 ts/components/leftpane/ActionsPanel.tsx       |  16 ++
 ts/receiver/configMessage.ts                  |  35 ++-
 ts/receiver/contentMessage.ts                 |   7 +-
 ts/receiver/dataMessage.ts                    |   8 +-
 ts/receiver/queuedJob.ts                      |   7 +-
 ts/receiver/userProfileImageUpdates.ts        | 164 ------------
 ts/session/profile_manager/ProfileManager.ts  |  73 ++++++
 .../utils/job_runners/JobDeserialization.ts   |  39 ++-
 ts/session/utils/job_runners/JobRunner.ts     | 133 ++++++----
 ts/session/utils/job_runners/PersistedJob.ts  | 143 ++++++-----
 .../job_runners/jobs/AvatarDownloadJob.ts     | 233 ++++++++++++++++++
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  45 ++--
 .../utils/job_runners/jobs/JobRunnerType.ts   |   6 +-
 .../unit/utils/job_runner/FakeSleepForJob.ts  | 105 +++++---
 .../unit/utils/job_runner/JobRunner_test.ts   | 141 ++++++-----
 15 files changed, 704 insertions(+), 451 deletions(-)
 delete mode 100644 ts/receiver/userProfileImageUpdates.ts
 create mode 100644 ts/session/profile_manager/ProfileManager.ts
 create mode 100644 ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 247128de9..1bb547ee3 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -48,6 +48,8 @@ import { initializeLibSessionUtilWrappers } from '../../session/utils/libsession
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
+import { AvatarDownloadJob } from '../../session/utils/job_runners/jobs/AvatarDownloadJob';
+import { runners } from '../../session/utils/job_runners/JobRunner';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -62,6 +64,20 @@ const Section = (props: { type: SectionType }) => {
   const handleClick = async () => {
     /* tslint:disable:no-void-expression */
     if (type === SectionType.Profile) {
+      const us = UserUtils.getOurPubKeyStrFromCache();
+      const ourConvo = getConversationController().get(us);
+
+      const job = new AvatarDownloadJob({
+        conversationId: us,
+        currentRetry: 0,
+        delayBetweenRetries: 3000,
+        maxAttempts: 3,
+        profileKeyHex: ourConvo.get('profileKey') || null,
+        profilePictureUrl: ourConvo.get('avatarPointer') || null,
+      });
+      await runners.avatarDownloadRunner.loadJobsFromDb();
+      runners.avatarDownloadRunner.startProcessing();
+      await runners.avatarDownloadRunner.addJob(job);
       dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
       const currentTheme = String(window.Events.getThemeSetting());
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index a612c13f4..69f965454 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -11,6 +11,7 @@ import {
 import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
 import { getConversationController } from '../session/conversations';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
+import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { UserUtils } from '../session/utils';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
@@ -21,7 +22,6 @@ import { callLibSessionWorker } from '../webworker/workers/browser/libsession_wo
 import { removeFromCache } from './cache';
 import { handleNewClosedGroup } from './closedGroups';
 import { EnvelopePlus } from './types';
-import { appendFetchAvatarAndProfileJob, updateOurProfileSync } from './userProfileImageUpdates';
 
 type IncomingConfResult = {
   needsPush: boolean;
@@ -101,10 +101,9 @@ async function handleUserProfileUpdate(result: IncomingConfResult) {
 
   const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
 
-  // trigger an update of our profileName and picture if there is one.
-  // this call checks for differences between updating anything
-  void updateOurProfileSync(
-    { displayName: updatedUserName, profilePicture: picUpdate ? updatedProfilePicture.url : null },
+  await ProfileManager.updateOurProfileSync(
+    updatedUserName,
+    picUpdate ? updatedProfilePicture.url : null,
     picUpdate ? updatedProfilePicture.key : null
   );
 }
@@ -157,18 +156,16 @@ async function handleContactsUpdate(result: IncomingConfResult) {
         await existingConvo.setNickname(wrapperConvo.nickname || null, false);
         changes = true;
       }
-      // make sure to write the changes to the database now as the `appendFetchAvatarAndProfileJob` call below might take some time before getting run
+      // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
       if (changes) {
         await existingConvo.commit();
       }
 
-      // we still need to handle the the `name` and the `profilePicture` but those are currently made asynchronously
-      void appendFetchAvatarAndProfileJob(
+      // we still need to handle the the `name` (sync) and the `profilePicture` (asynchronous)
+      await ProfileManager.updateProfileOfContact(
         existingConvo.id,
-        {
-          displayName: wrapperConvo.name,
-          profilePicture: wrapperConvo.profilePicture?.url || null,
-        },
+        wrapperConvo.name,
+        wrapperConvo.profilePicture?.url || null,
         wrapperConvo.profilePicture?.key || null
       );
     }
@@ -243,11 +240,8 @@ async function handleOurProfileUpdate(
     );
     const { profileKey, profilePicture, displayName } = configMessage;
 
-    const lokiProfile = {
-      displayName,
-      profilePicture,
-    };
-    await updateOurProfileSync(lokiProfile, profileKey);
+    await ProfileManager.updateOurProfileSync(displayName, profilePicture, profileKey);
+
     await setLastProfileUpdateTimestamp(_.toNumber(sentAt));
     // do not trigger a signin by linking if the display name is empty
     if (displayName) {
@@ -398,10 +392,11 @@ const handleContactFromConfig = async (
       await BlockedNumberController.unblock(contactConvo.id);
     }
 
-    void appendFetchAvatarAndProfileJob(
+    await ProfileManager.updateProfileOfContact(
       contactConvo.id,
-      profileInDataMessage,
-      contactReceived.profileKey
+      profileInDataMessage.displayName || undefined,
+      profileInDataMessage.profilePicture || null,
+      contactReceived.profileKey || null
     );
   } catch (e) {
     window?.log?.warn('failed to handle  a new closed group from configuration message');
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 04958329d..876890d5b 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -27,8 +27,8 @@ import {
 } from '../interactions/conversations/unsendingInteractions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { appendFetchAvatarAndProfileJob } from './userProfileImageUpdates';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
+import { ProfileManager } from '../session/profile_manager/ProfileManager';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
@@ -700,9 +700,10 @@ async function handleMessageRequestResponse(
   }
 
   if (messageRequestResponse.profile && !isEmpty(messageRequestResponse.profile)) {
-    void appendFetchAvatarAndProfileJob(
+    await ProfileManager.updateProfileOfContact(
       conversationToApprove.id,
-      messageRequestResponse.profile,
+      messageRequestResponse.profile.displayName,
+      messageRequestResponse.profile.profilePicture,
       messageRequestResponse.profileKey
     );
   }
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index ae5394e82..a6e142916 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -18,11 +18,11 @@ import {
 } from '../models/messageFactory';
 import { MessageModel } from '../models/message';
 import { isUsFromCache } from '../session/utils/User';
-import { appendFetchAvatarAndProfileJob } from './userProfileImageUpdates';
 import { toLogFormat } from '../types/attachments/Errors';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { Reactions } from '../util/reactions';
 import { Action, Reaction } from '../types/Reaction';
+import { ProfileManager } from '../session/profile_manager/ProfileManager';
 
 function cleanAttachment(attachment: any) {
   return {
@@ -216,10 +216,10 @@ export async function handleSwarmDataMessage(
     cleanDataMessage.profile &&
     cleanDataMessage.profileKey?.length
   ) {
-    // do not await this
-    void appendFetchAvatarAndProfileJob(
+    await ProfileManager.updateProfileOfContact(
       senderConversationModel.id,
-      cleanDataMessage.profile,
+      cleanDataMessage.profile.displayName,
+      cleanDataMessage.profile.profilePicture,
       cleanDataMessage.profileKey
     );
   }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index b5bb6f505..39aebf1ab 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -13,9 +13,9 @@ import { showMessageRequestBanner } from '../state/ducks/userConfig';
 import { MessageDirection } from '../models/messageType';
 import { LinkPreviews } from '../util/linkPreviews';
 import { GoogleChrome } from '../util';
-import { appendFetchAvatarAndProfileJob } from './userProfileImageUpdates';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { getUsBlindedInThatServer } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { ProfileManager } from '../session/profile_manager/ProfileManager';
 
 function contentTypeSupported(type: string): boolean {
   const Chrome = GoogleChrome;
@@ -393,9 +393,10 @@ export async function handleMessageJob(
     // the only profile we don't update with what is coming here is ours,
     // as our profile is shared accross our devices with a ConfigurationMessage
     if (messageModel.isIncoming() && regularDataMessage.profile) {
-      void appendFetchAvatarAndProfileJob(
+      await ProfileManager.updateProfileOfContact(
         sendingDeviceConversation.id,
-        regularDataMessage.profile,
+        regularDataMessage.profile.displayName,
+        regularDataMessage.profile.profilePicture,
         regularDataMessage.profileKey
       );
     }
diff --git a/ts/receiver/userProfileImageUpdates.ts b/ts/receiver/userProfileImageUpdates.ts
deleted file mode 100644
index 34e8d4f98..000000000
--- a/ts/receiver/userProfileImageUpdates.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import Queue from 'queue-promise';
-import ByteBuffer from 'bytebuffer';
-import _ from 'lodash';
-
-import { downloadAttachment } from './attachments';
-
-import { allowOnlyOneAtATime, hasAlreadyOneAtaTimeMatching } from '../session/utils/Promise';
-import { toHex } from '../session/utils/String';
-import { processNewAttachment } from '../types/MessageAttachment';
-import { MIME } from '../types';
-import { autoScaleForIncomingAvatar } from '../util/attachmentsUtil';
-import { decryptProfile } from '../util/crypto/profileEncrypter';
-import { SignalService } from '../protobuf';
-import { getConversationController } from '../session/conversations';
-import { UserUtils } from '../session/utils';
-
-const queue = new Queue({
-  concurrent: 1,
-  interval: 500,
-});
-
-queue.on('reject', error => {
-  window.log.warn('[profileupdate] task profile image update failed with', error);
-});
-
-export async function appendFetchAvatarAndProfileJob(
-  conversationId: string,
-  profileInDataMessage: SignalService.DataMessage.ILokiProfile,
-  profileKey?: Uint8Array | null
-) {
-  if (!conversationId) {
-    window?.log?.warn('[profileupdate] Cannot update profile with empty convoid');
-    return;
-  }
-  const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${conversationId}`;
-
-  if (hasAlreadyOneAtaTimeMatching(oneAtaTimeStr)) {
-    return;
-  }
-  const task = allowOnlyOneAtATime(oneAtaTimeStr, async () => {
-    return createOrUpdateProfile(conversationId, profileInDataMessage, profileKey);
-  });
-
-  queue.enqueue(async () => task);
-}
-
-/**
- * This function should be used only when we have to do a sync update to our conversation with a new profile/avatar image or display name
- * It tries to fetch the profile image, scale it, save it, and update the conversationModel
- */
-export async function updateOurProfileSync(
-  profileInDataMessage: SignalService.DataMessage.ILokiProfile,
-  profileKey?: Uint8Array | null
-) {
-  const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
-  if (!ourConvo?.id) {
-    window?.log?.warn('[profileupdate] Cannot update our profile with empty convoid');
-    return;
-  }
-
-  const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${ourConvo.id}`;
-  return allowOnlyOneAtATime(oneAtaTimeStr, async () => {
-    return createOrUpdateProfile(ourConvo.id, profileInDataMessage, profileKey);
-  });
-}
-
-/**
- * Creates a new profile from the profile provided. Creates the profile if it doesn't exist.
- */
-async function createOrUpdateProfile(
-  conversationId: string,
-  profileInDataMessage: SignalService.DataMessage.ILokiProfile,
-  profileKey?: Uint8Array | null
-) {
-  const conversation = getConversationController().get(conversationId);
-  if (!conversation) {
-    return;
-  }
-  if (!conversation.isPrivate()) {
-    window.log.warn('createOrUpdateProfile can only be used for private convos');
-    return;
-  }
-
-  const existingDisplayName = conversation.get('displayNameInProfile');
-  const newDisplayName = profileInDataMessage.displayName;
-
-  let changes = false;
-  if (existingDisplayName !== newDisplayName) {
-    changes = true;
-    conversation.set('displayNameInProfile', newDisplayName || undefined);
-  }
-
-  if (profileInDataMessage.profilePicture && profileKey) {
-    const prevPointer = conversation.get('avatarPointer');
-    const needsUpdate =
-      !prevPointer || !_.isEqual(prevPointer, profileInDataMessage.profilePicture);
-
-    if (needsUpdate) {
-      try {
-        window.log.debug(`[profileupdate] starting downloading task for  ${conversation.id}`);
-        const downloaded = await downloadAttachment({
-          url: profileInDataMessage.profilePicture,
-          isRaw: true,
-        });
-
-        // null => use placeholder with color and first letter
-        let path = null;
-        if (profileKey) {
-          // Convert profileKey to ArrayBuffer, if needed
-          const encoding = typeof profileKey === 'string' ? 'base64' : undefined;
-          try {
-            const profileKeyArrayBuffer = ByteBuffer.wrap(profileKey, encoding).toArrayBuffer();
-            const decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
-            window.log.info(
-              `[profileupdate] about to auto scale avatar for convo ${conversation.id}`
-            );
-
-            const scaledData = await autoScaleForIncomingAvatar(decryptedData);
-            const upgraded = await processNewAttachment({
-              data: await scaledData.blob.arrayBuffer(),
-              contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
-            });
-            // Only update the convo if the download and decrypt is a success
-            conversation.set('avatarPointer', profileInDataMessage.profilePicture);
-            conversation.set('profileKey', toHex(profileKey));
-            ({ path } = upgraded);
-          } catch (e) {
-            window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`);
-          }
-        }
-        conversation.set({ avatarInProfile: path || undefined });
-
-        changes = true;
-      } catch (e) {
-        window.log.warn(
-          `[profileupdate] Failed to download attachment at ${profileInDataMessage.profilePicture}. Maybe it expired? ${e.message}`
-        );
-        // do not return here, we still want to update the display name even if the avatar failed to download
-      }
-    }
-  } else if (profileKey) {
-    conversation.set({ avatarInProfile: undefined });
-  }
-
-  if (conversation.id === UserUtils.getOurPubKeyStrFromCache()) {
-    // make sure the settings which should already set to `true` are
-    if (
-      !conversation.get('isTrustedForAttachmentDownload') ||
-      !conversation.get('isApproved') ||
-      !conversation.get('didApproveMe')
-    ) {
-      conversation.set({
-        isTrustedForAttachmentDownload: true,
-        isApproved: true,
-        didApproveMe: true,
-      });
-      changes = true;
-    }
-  }
-
-  if (changes) {
-    await conversation.commit();
-  }
-}
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
new file mode 100644
index 000000000..e428d557f
--- /dev/null
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -0,0 +1,73 @@
+import { to_hex } from 'libsodium-wrappers-sumo';
+import { isEmpty } from 'lodash';
+import { getConversationController } from '../conversations';
+import { UserUtils } from '../utils';
+import { runners } from '../utils/job_runners/JobRunner';
+import {
+  AvatarDownloadJob,
+  shouldAddAvatarDownloadJob,
+} from '../utils/job_runners/jobs/AvatarDownloadJob';
+
+/**
+ * This can be used to update our conversation display name with the given name right away, and plan an AvatarDownloadJob to retrieve the new avatar if needed to download it
+ */
+async function updateOurProfileSync(
+  displayName: string | undefined,
+  profileUrl: string | null,
+  profileKey: Uint8Array | null
+) {
+  const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
+  if (!ourConvo?.id) {
+    window?.log?.warn('[profileupdate] Cannot update our profile with empty convoid');
+    return;
+  }
+
+  return updateProfileOfContact(
+    UserUtils.getOurPubKeyStrFromCache(),
+    displayName,
+    profileUrl,
+    profileKey
+  );
+}
+
+/**
+ * This can be used to update the display name of the given pubkey right away, and plan an AvatarDownloadJob to retrieve the new avatar if needed to download it.
+ */
+async function updateProfileOfContact(
+  pubkey: string,
+  displayName: string | null | undefined,
+  profileUrl: string | null | undefined,
+  profileKey: Uint8Array | null | undefined
+) {
+  const conversation = getConversationController().get(pubkey);
+
+  if (!conversation || !conversation.isPrivate()) {
+    window.log.warn('updateProfileOfContact can only be used for existing and private convos');
+    return;
+  }
+
+  const existingDisplayName = conversation.get('displayNameInProfile');
+
+  // avoid setting the display name to an invalid value
+  if (existingDisplayName !== displayName && !isEmpty(displayName)) {
+    conversation.set('displayNameInProfile', displayName || undefined);
+    await conversation.commit();
+  }
+  // add an avatar download job only if needed
+
+  const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : to_hex(profileKey);
+  if (shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
+    const avatarDownloadJob = new AvatarDownloadJob({
+      conversationId: pubkey,
+      profileKeyHex,
+      profilePictureUrl: profileUrl || null,
+    });
+
+    await runners.avatarDownloadRunner.addJob(avatarDownloadJob);
+  }
+}
+
+export const ProfileManager = {
+  updateOurProfileSync,
+  updateProfileOfContact,
+};
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index 0e800613e..ed991b578 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -3,40 +3,29 @@ import {
   FakeSleepForJob,
   FakeSleepForMultiJob,
 } from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
+import { AvatarDownloadJob } from './jobs/AvatarDownloadJob';
 import { ConfigurationSyncJob } from './jobs/ConfigurationSyncJob';
-import { Persistedjob, PersistedJobType, SerializedPersistedJob } from './PersistedJob';
+import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
 
-export function persistedJobFromData(data: SerializedPersistedJob): Persistedjob | null {
+export function persistedJobFromData<T extends TypeOfPersistedData>(
+  data: T
+): PersistedJob<T> | null {
   if (!data || isEmpty(data.jobType) || !isString(data?.jobType)) {
     return null;
   }
-  const jobType: PersistedJobType = data.jobType as PersistedJobType;
-  switch (jobType) {
+
+  switch (data.jobType) {
     case 'ConfigurationSyncJobType':
-      return new ConfigurationSyncJob({
-        maxAttempts: data.maxAttempts,
-        identifier: data.identifier,
-        nextAttemptTimestamp: data.nextAttemptTimestamp,
-        currentRetry: data.currentRetry,
-      });
+      return (new ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
+
+    case 'AvatarDownloadJobType':
+      return (new AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
     case 'FakeSleepForJobType':
-      return new FakeSleepForJob({
-        maxAttempts: data.maxAttempts,
-        identifier: data.identifier,
-        nextAttemptTimestamp: data.nextAttemptTimestamp,
-        currentRetry: data.currentRetry,
-      });
+      return (new FakeSleepForJob(data) as unknown) as PersistedJob<T>;
     case 'FakeSleepForJobMultiType':
-      return new FakeSleepForMultiJob({
-        maxAttempts: data.maxAttempts,
-        identifier: data.identifier,
-        nextAttemptTimestamp: data.nextAttemptTimestamp,
-        currentRetry: data.currentRetry,
-        returnResult: data.returnResult,
-        sleepDuration: data.sleepDuration,
-      });
+      return (new FakeSleepForMultiJob(data) as unknown) as PersistedJob<T>;
     default:
-      console.warn('unknown persisted job type:', jobType);
+      console.warn('unknown persisted job type:', (data as any).jobType);
       return null;
   }
 }
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 6e305f409..aa7838143 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -2,7 +2,12 @@ import { cloneDeep, compact, isArray, isString } from 'lodash';
 import { Data } from '../../../data/data';
 import { persistedJobFromData } from './JobDeserialization';
 import { JobRunnerType } from './jobs/JobRunnerType';
-import { Persistedjob, SerializedPersistedJob } from './PersistedJob';
+import {
+  AvatarDownloadPersistedData,
+  ConfigurationSyncPersistedData,
+  PersistedJob,
+  TypeOfPersistedData,
+} from './PersistedJob';
 
 /**
  * 'job_in_progress' if there is already a job in progress
@@ -15,10 +20,10 @@ export type StartProcessingResult = 'job_in_progress' | 'job_deferred' | 'job_st
 export type AddJobResult = 'job_deferred' | 'job_started';
 
 export type JobEventListener = {
-  onJobSuccess: (job: SerializedPersistedJob) => void;
-  onJobDeferred: (job: SerializedPersistedJob) => void;
-  onJobError: (job: SerializedPersistedJob) => void;
-  onJobStarted: (job: SerializedPersistedJob) => void;
+  onJobSuccess: (job: TypeOfPersistedData) => void;
+  onJobDeferred: (job: TypeOfPersistedData) => void;
+  onJobError: (job: TypeOfPersistedData) => void;
+  onJobStarted: (job: TypeOfPersistedData) => void;
 };
 
 /**
@@ -31,26 +36,26 @@ export type JobEventListener = {
  *
  *
  */
-export class PersistedJobRunner {
+export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private isInit = false;
-  private jobsScheduled: Array<Persistedjob> = [];
+  private jobsScheduled: Array<PersistedJob<T>> = [];
   private isStarted = false;
   private readonly jobRunnerType: JobRunnerType;
   private nextJobStartTimer: NodeJS.Timeout | null = null;
-  private currentJob: Persistedjob | null = null;
+  private currentJob: PersistedJob<T> | null = null;
   private readonly jobEventsListener: JobEventListener | null;
 
   constructor(jobRunnerType: JobRunnerType, jobEventsListener: JobEventListener | null) {
     this.jobRunnerType = jobRunnerType;
     this.jobEventsListener = jobEventsListener;
-    window.log.warn('new runner');
+    window?.log?.warn(`new runner of type ${jobRunnerType} built`);
   }
 
   public async loadJobsFromDb() {
     if (this.isInit) {
-      throw new Error('job runner already init');
+      return;
     }
-    let jobsArray: Array<SerializedPersistedJob> = [];
+    let jobsArray: Array<T> = [];
     const found = await Data.getItemById(this.getJobRunnerItemId());
     if (found && found.value && isString(found.value)) {
       const asStr = found.value;
@@ -67,7 +72,7 @@ export class PersistedJobRunner {
         jobsArray = [];
       }
     }
-    const jobs: Array<Persistedjob> = compact(jobsArray.map(persistedJobFromData));
+    const jobs: Array<PersistedJob<T>> = compact(jobsArray.map(persistedJobFromData));
     this.jobsScheduled = cloneDeep(jobs);
     // make sure the list is sorted
     this.sortJobsList();
@@ -75,29 +80,42 @@ export class PersistedJobRunner {
   }
 
   public async addJob(
-    job: Persistedjob
+    job: PersistedJob<T>
   ): Promise<'type_exists' | 'identifier_exists' | AddJobResult> {
     this.assertIsInitialized();
 
-    if (job.singleJobInQueue) {
-      // make sure there is no job with that same type already scheduled.
-      if (this.jobsScheduled.find(j => j.jobType === job.jobType)) {
-        console.info(
-          `job runner has already a job with type:"${job.jobType}" planned so not adding another one`
-        );
-        return 'type_exists';
-      }
-      return this.addJobUnchecked(job);
-    }
-
-    // make sure there is no job with that same identifier already .
-    if (this.jobsScheduled.find(j => j.identifier === job.identifier)) {
-      console.info(
-        `job runner has already a job with id:"${job.identifier}" planned so not adding another one`
+    if (this.jobsScheduled.find(j => j.persistedData.identifier === job.persistedData.identifier)) {
+      window.log.info(
+        `job runner has already a job with id:"${job.persistedData.identifier}" planned so not adding another one`
       );
       return 'identifier_exists';
     }
-    console.info(`job runner adding type :"${job.jobType}" `);
+
+    const serializedNonRunningJobs = this.jobsScheduled
+      .filter(j => j !== this.currentJob)
+      .map(k => k.serializeJob());
+
+    const addJobChecks = job.addJobCheck(serializedNonRunningJobs);
+    if (addJobChecks === 'skipAsJobTypeAlreadyPresent') {
+      window.log.warn(
+        `job runner has already a job with type:"${job.persistedData.jobType}" planned so not adding another one`
+      );
+      return 'type_exists';
+    }
+
+    // if addJobCheck returned 'removeJobsFromQueue it means that job logic estimates some jobs have to remove before adding that one.
+    // so let's grab the jobs to remove, remove them, and then add that new job nevertheless
+    if (addJobChecks === 'removeJobsFromQueue') {
+      // fetch all the jobs which we should remove and remove them
+      const toRemove = job.nonRunningJobsToRemove(serializedNonRunningJobs);
+      this.deleteJobsByIdentifier(toRemove.map(m => m.identifier));
+      this.sortJobsList();
+      await this.writeJobsToDB();
+    }
+
+    // make sure there is no job with that same identifier already .
+
+    window.log.info(`job runner adding type :"${job.persistedData.jobType}" `);
     return this.addJobUnchecked(job);
   }
 
@@ -145,14 +163,16 @@ export class PersistedJobRunner {
 
   public startProcessing(): StartProcessingResult {
     if (this.isStarted) {
-      throw new Error('startProcessing already called');
+      return this.planNextJob();
     }
     this.isStarted = true;
     return this.planNextJob();
   }
 
   private sortJobsList() {
-    this.jobsScheduled.sort((a, b) => a.nextAttemptTimestamp - b.nextAttemptTimestamp);
+    this.jobsScheduled.sort(
+      (a, b) => a.persistedData.nextAttemptTimestamp - b.persistedData.nextAttemptTimestamp
+    );
   }
 
   private async writeJobsToDB() {
@@ -164,7 +184,8 @@ export class PersistedJobRunner {
     });
   }
 
-  private async addJobUnchecked(job: Persistedjob) {
+  private async addJobUnchecked(job: PersistedJob<T>) {
+    console.warn('job', job);
     this.jobsScheduled.push(cloneDeep(job));
     this.sortJobsList();
     await this.writeJobsToDB();
@@ -202,6 +223,7 @@ export class PersistedJobRunner {
         return 'no_job';
       }
     }
+
     if (this.currentJob) {
       return 'job_in_progress';
     }
@@ -211,7 +233,7 @@ export class PersistedJobRunner {
       return 'no_job';
     }
 
-    if (nextJob.nextAttemptTimestamp <= Date.now()) {
+    if (nextJob.persistedData.nextAttemptTimestamp <= Date.now()) {
       if (this.nextJobStartTimer) {
         global.clearTimeout(this.nextJobStartTimer);
         this.nextJobStartTimer = null;
@@ -233,18 +255,20 @@ export class PersistedJobRunner {
         this.nextJobStartTimer = null;
       }
       void this.runNextJob();
-    }, Math.max(nextJob.nextAttemptTimestamp - Date.now(), 1));
+    }, Math.max(nextJob.persistedData.nextAttemptTimestamp - Date.now(), 1));
 
     return 'job_deferred';
   }
 
-  private deleteJobByIdentifier(identifier: string) {
-    const jobIndex = this.jobsScheduled.findIndex(f => f.identifier === identifier);
-    console.info('deleteJobByIdentifier job', identifier, ' index', jobIndex);
+  private deleteJobsByIdentifier(identifiers: Array<string>) {
+    identifiers.forEach(identifier => {
+      const jobIndex = this.jobsScheduled.findIndex(f => f.persistedData.identifier === identifier);
+      window.log.info('deleteJobsByIdentifier job', identifier, ' index', jobIndex);
 
-    if (jobIndex >= 0) {
-      this.jobsScheduled.splice(jobIndex, 1);
-    }
+      if (jobIndex >= 0) {
+        this.jobsScheduled.splice(jobIndex, 1);
+      }
+    });
   }
 
   private async runNextJob() {
@@ -256,10 +280,10 @@ export class PersistedJobRunner {
     const nextJob = this.jobsScheduled[0];
 
     // if the time is 101, and that task is to be run at t=101, we need to start it right away.
-    if (nextJob.nextAttemptTimestamp > Date.now()) {
+    if (nextJob.persistedData.nextAttemptTimestamp > Date.now()) {
       window.log.warn(
         'next job is not due to be run just yet. Going idle.',
-        nextJob.nextAttemptTimestamp - Date.now()
+        nextJob.persistedData.nextAttemptTimestamp - Date.now()
       );
       this.planNextJob();
       return;
@@ -274,25 +298,26 @@ export class PersistedJobRunner {
       this.jobEventsListener?.onJobStarted(this.currentJob.serializeJob());
 
       const success = await this.currentJob.runJob();
+
       if (!success) {
-        throw new Error(`job ${nextJob.identifier} failed`);
+        throw new Error(`job ${nextJob.persistedData.identifier} failed`);
       }
 
       // here the job did not throw and didn't return false. Consider it OK then and remove it from the list of jobs to run.
-      this.deleteJobByIdentifier(this.currentJob.identifier);
+      this.deleteJobsByIdentifier([this.currentJob.persistedData.identifier]);
       await this.writeJobsToDB();
     } catch (e) {
-      // either the job throw or didn't return 'OK'
-      if (nextJob.currentRetry >= nextJob.maxAttempts - 1) {
+      if (nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1) {
         // we cannot restart this job anymore. Remove the entry completely
-        this.deleteJobByIdentifier(nextJob.identifier);
+        this.deleteJobsByIdentifier([nextJob.persistedData.identifier]);
         if (this.jobEventsListener && this.currentJob) {
           this.jobEventsListener.onJobError(this.currentJob.serializeJob());
         }
       } else {
-        nextJob.currentRetry = nextJob.currentRetry + 1;
+        nextJob.persistedData.currentRetry = nextJob.persistedData.currentRetry + 1;
         // that job can be restarted. Plan a retry later with the already defined retry
-        nextJob.nextAttemptTimestamp = Date.now() + nextJob.delayBetweenRetries;
+        nextJob.persistedData.nextAttemptTimestamp =
+          Date.now() + nextJob.persistedData.delayBetweenRetries;
         if (this.jobEventsListener && this.currentJob) {
           this.jobEventsListener.onJobDeferred(this.currentJob.serializeJob());
         }
@@ -322,8 +347,16 @@ export class PersistedJobRunner {
   }
 }
 
-const configurationSyncRunner = new PersistedJobRunner('ConfigurationSyncJob', null);
+const configurationSyncRunner = new PersistedJobRunner<ConfigurationSyncPersistedData>(
+  'ConfigurationSyncJob',
+  null
+);
+const avatarDownloadRunner = new PersistedJobRunner<AvatarDownloadPersistedData>(
+  'AvatarDownloadJob',
+  null
+);
 
 export const runners = {
   configurationSyncRunner,
+  avatarDownloadRunner,
 };
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index 632429b4f..b9f3350c6 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -1,75 +1,84 @@
-import { isEmpty } from 'lodash';
+import { cloneDeep, isEmpty } from 'lodash';
 
 export type PersistedJobType =
   | 'ConfigurationSyncJobType'
+  | 'AvatarDownloadJobType'
   | 'FakeSleepForJobType'
   | 'FakeSleepForJobMultiType';
 
-export type SerializedPersistedJob = {
-  // we  need at least those as they are needed to do lookups of the list of jobs.
-  jobType: string;
+interface PersistedJobData {
+  jobType: PersistedJobType;
   identifier: string;
   nextAttemptTimestamp: number;
-  maxAttempts: number; // to run try to run it twice, set this to 2.
-  currentRetry: number; //
-  // then we can have other details on a specific type of job case
-  [key: string]: any;
-};
+  delayBetweenRetries: number;
+  maxAttempts: number; // to try to run this job twice, set this to 2.
+  currentRetry: number;
+}
 
-export abstract class Persistedjob {
-  public readonly identifier: string;
-  public readonly singleJobInQueue: boolean;
-  public readonly delayBetweenRetries: number;
-  public readonly maxAttempts: number;
-  public readonly jobType: PersistedJobType;
-  public currentRetry: number;
-  public nextAttemptTimestamp: number;
+export interface FakeSleepJobData extends PersistedJobData {
+  jobType: 'FakeSleepForJobType';
+  returnResult: boolean;
+  sleepDuration: number;
+}
+export interface FakeSleepForMultiJobData extends PersistedJobData {
+  jobType: 'FakeSleepForJobMultiType';
+  returnResult: boolean;
+  sleepDuration: number;
+}
+
+export interface AvatarDownloadPersistedData extends PersistedJobData {
+  jobType: 'AvatarDownloadJobType';
+  conversationId: string;
+  profileKeyHex: string | null;
+  profilePictureUrl: string | null;
+}
+
+export interface ConfigurationSyncPersistedData extends PersistedJobData {
+  jobType: 'ConfigurationSyncJobType';
+}
+
+export type TypeOfPersistedData =
+  | ConfigurationSyncPersistedData
+  | AvatarDownloadPersistedData
+  | FakeSleepJobData
+  | FakeSleepForMultiJobData;
+
+/**
+ * This class can be used to save and run jobs from the database.
+ * Every child class must take the minimum amount of arguments, and make sure they are unlikely to change.
+ * For instance, don't have the attachments to downloads as arguments, just the messageId and the index.
+ * Don't have the new profileImage url for an avatar download job, just the conversationId.
+ *
+ * It is the role of the job to fetch the latest data, and decide if a process is needed or not
+ * If the job throws or returns false, it will be retried by the corresponding job runner.
+ */
+export abstract class PersistedJob<T extends PersistedJobData> {
+  public persistedData: T;
 
   private runningPromise: Promise<boolean> | null = null;
 
-  public constructor({
-    maxAttempts,
-    delayBetweenRetries,
-    identifier,
-    singleJobInQueue,
-    jobType,
-    nextAttemptTimestamp,
-  }: {
-    identifier: string;
-    maxAttempts: number;
-    delayBetweenRetries: number;
-    singleJobInQueue: boolean;
-    jobType: PersistedJobType;
-    nextAttemptTimestamp: number;
-    currentRetry: number;
-  }) {
-    this.identifier = identifier;
-    this.jobType = jobType;
-    this.delayBetweenRetries = delayBetweenRetries;
-    this.maxAttempts = maxAttempts;
-    this.currentRetry = 0;
-    this.singleJobInQueue = singleJobInQueue;
-    this.nextAttemptTimestamp = nextAttemptTimestamp;
-
-    if (maxAttempts < 1) {
+  public constructor(data: T) {
+    if (data.maxAttempts < 1) {
       throw new Error('maxAttempts must be >= 1');
     }
 
-    if (isEmpty(identifier)) {
+    if (isEmpty(data.identifier)) {
       throw new Error('identifier must be not empty');
     }
 
-    if (isEmpty(jobType)) {
-      throw new Error('identifier must be not empty');
+    if (isEmpty(data.jobType)) {
+      throw new Error('jobType must be not empty');
     }
 
-    if (delayBetweenRetries <= 0) {
+    if (data.delayBetweenRetries <= 0) {
       throw new Error('delayBetweenRetries must be at least > 0');
     }
 
-    if (nextAttemptTimestamp <= 0) {
+    if (data.nextAttemptTimestamp <= 0) {
       throw new Error('nextAttemptTimestamp must be set and > 0');
     }
+
+    this.persistedData = data;
   }
 
   public async runJob() {
@@ -86,30 +95,40 @@ export abstract class Persistedjob {
   public async waitForCurrentTry() {
     try {
       // tslint:disable-next-line: no-promise-as-boolean
-      return this.runningPromise || Promise.resolve();
+      return this.runningPromise || Promise.resolve(true);
     } catch (e) {
       window.log.warn('waitForCurrentTry got an error: ', e.message);
-      return Promise.resolve();
+      return Promise.resolve(true);
     }
   }
 
   /**
    * This one must be reimplemented in the child class, and must first call `super.serializeBase()`
    */
-  public abstract serializeJob(): SerializedPersistedJob;
+  public abstract serializeJob(): T;
 
-  protected abstract run(): Promise<boolean>; // must return true if that job is a success and doesn't need to be retried
+  public abstract nonRunningJobsToRemove(jobs: Array<T>): Array<T>;
 
-  protected serializeBase(): SerializedPersistedJob {
-    return {
-      // those are mandatory
-      jobType: this.jobType,
-      identifier: this.identifier,
-      nextAttemptTimestamp: this.nextAttemptTimestamp,
-      maxAttempts: this.maxAttempts,
-      currentRetry: this.currentRetry,
-      delayBetweenRetries: this.delayBetweenRetries,
-      singleJobInQueue: this.singleJobInQueue,
-    };
+  public abstract addJobCheck(
+    jobs: Array<T>
+  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null;
+
+  public addJobCheckSameTypePresent(jobs: Array<T>): 'skipAsJobTypeAlreadyPresent' | null {
+    return jobs.some(j => j.jobType === this.persistedData.jobType)
+      ? 'skipAsJobTypeAlreadyPresent'
+      : null;
+  }
+
+  /**
+   * This function will be called by the runner do run the logic of that job.
+   * It **must** return true if that job is a success and doesn't need to be retried.
+   * If it returns false, or throws, it will be retried (if not reach the retries limit yet).
+   *
+   * Note: you should check the this.isAborted() to know if you should cancel the current processing of your logic.
+   */
+  protected abstract run(): Promise<boolean>;
+
+  protected serializeBase(): T {
+    return cloneDeep(this.persistedData);
   }
 }
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
new file mode 100644
index 000000000..7fa074011
--- /dev/null
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -0,0 +1,233 @@
+import { isEmpty, isEqual, isNumber } from 'lodash';
+import { v4 } from 'uuid';
+import { UserUtils } from '../..';
+import { downloadAttachment } from '../../../../receiver/attachments';
+import { MIME } from '../../../../types';
+import { processNewAttachment } from '../../../../types/MessageAttachment';
+import { autoScaleForIncomingAvatar } from '../../../../util/attachmentsUtil';
+import { decryptProfile } from '../../../../util/crypto/profileEncrypter';
+import { getConversationController } from '../../../conversations';
+import { fromHexToArray } from '../../String';
+import { AvatarDownloadPersistedData, PersistedJob } from '../PersistedJob';
+
+const defaultMsBetweenRetries = 10000;
+const defaultMaxAttemps = 3;
+
+/**
+ * Returns true if given those details we should add an Avatar Download Job to the list of jobs to run
+ */
+export function shouldAddAvatarDownloadJob({
+  profileKeyHex,
+  profileUrl,
+  pubkey,
+}: {
+  pubkey: string;
+  profileUrl: string | null | undefined;
+  profileKeyHex: string | null | undefined;
+}) {
+  const conversation = getConversationController().get(pubkey);
+  if (!conversation) {
+    // return true so we do not retry this task.
+    window.log.warn('shouldAddAvatarDownloadJob did not corresponding conversation');
+
+    return false;
+  }
+  if (!conversation.isPrivate()) {
+    window.log.warn('shouldAddAvatarDownloadJob can only be used for private convos currently');
+    return false;
+  }
+  if (profileUrl && !isEmpty(profileKeyHex)) {
+    const prevPointer = conversation.get('avatarPointer');
+    const needsUpdate = !prevPointer || !isEqual(prevPointer, profileUrl);
+
+    return needsUpdate;
+  }
+  return false;
+}
+
+/**
+ * This job can be used to add the downloading of the avatar of a conversation to the list of jobs to be run.
+ * The conversationId is used as identifier so we can only have a single job per conversation.
+ * When the jobRunners starts this job, the job first checks if a download is required or not (avatarPointer changed and wasn't already downloaded).
+ * If yes, it downloads the new avatar, decrypt it and store it before updating the conversation with the new url,profilekey and local file storage.
+ */
+export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
+  constructor({
+    conversationId,
+    nextAttemptTimestamp,
+    maxAttempts,
+    currentRetry,
+    profileKeyHex,
+    profilePictureUrl,
+    identifier,
+  }: Pick<AvatarDownloadPersistedData, 'profileKeyHex' | 'profilePictureUrl'> & {
+    conversationId: string;
+  } & Partial<
+      Pick<
+        AvatarDownloadPersistedData,
+        | 'nextAttemptTimestamp'
+        | 'identifier'
+        | 'maxAttempts'
+        | 'delayBetweenRetries'
+        | 'currentRetry'
+      >
+    >) {
+    super({
+      jobType: 'AvatarDownloadJobType',
+      identifier: identifier || v4(),
+      conversationId,
+      delayBetweenRetries: defaultMsBetweenRetries,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries,
+      currentRetry: isNumber(currentRetry) ? currentRetry : 0,
+      profileKeyHex,
+      profilePictureUrl,
+    });
+  }
+
+  // tslint:disable-next-line: cyclomatic-complexity
+  public async run(): Promise<boolean> {
+    const convoId = this.persistedData.conversationId;
+
+    window.log.warn(
+      `running job ${this.persistedData.jobType} with conversationId:"${convoId}" id:"${this.persistedData.identifier}" `
+    );
+
+    if (!this.persistedData.identifier || !convoId) {
+      // return true so we do not retry this task.
+      return true;
+    }
+
+    let conversation = getConversationController().get(convoId);
+    if (!conversation) {
+      // return true so we do not retry this task.
+      window.log.warn('AvatarDownloadJob did not corresponding conversation');
+
+      return true;
+    }
+    if (!conversation.isPrivate()) {
+      window.log.warn('AvatarDownloadJob can only be used for private convos currently');
+      return true;
+    }
+    let changes = false;
+
+    const shouldRunJob = shouldAddAvatarDownloadJob({
+      pubkey: convoId,
+      profileKeyHex: this.persistedData.profileKeyHex,
+      profileUrl: this.persistedData.profilePictureUrl,
+    });
+    if (!shouldRunJob) {
+      // return true so we do not retry this task.
+      window.log.warn('AvatarDownloadJob shouldAddAvatarDownloadJob said no');
+
+      return true;
+    }
+
+    if (this.persistedData.profilePictureUrl && this.persistedData.profileKeyHex) {
+      const prevPointer = conversation.get('avatarPointer');
+      const needsUpdate =
+        !prevPointer || !isEqual(prevPointer, this.persistedData.profilePictureUrl);
+
+      if (needsUpdate) {
+        try {
+          window.log.debug(`[profileupdate] starting downloading task for  ${conversation.id}`);
+          const downloaded = await downloadAttachment({
+            url: this.persistedData.profilePictureUrl,
+            isRaw: true,
+          });
+          conversation = getConversationController().getOrThrow(convoId);
+
+          // null => use placeholder with color and first letter
+          let path = null;
+
+          try {
+            const profileKeyArrayBuffer = fromHexToArray(this.persistedData.profileKeyHex);
+            const decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
+
+            window.log.info(
+              `[profileupdate] about to auto scale avatar for convo ${conversation.id}`
+            );
+
+            const scaledData = await autoScaleForIncomingAvatar(decryptedData);
+
+            const upgraded = await processNewAttachment({
+              data: await scaledData.blob.arrayBuffer(),
+              contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
+            });
+            conversation = getConversationController().getOrThrow(convoId);
+
+            // Only update the convo if the download and decrypt is a success
+            conversation.set('avatarPointer', this.persistedData.profilePictureUrl);
+            conversation.set('profileKey', this.persistedData.profileKeyHex || undefined);
+            ({ path } = upgraded);
+          } catch (e) {
+            window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`);
+          }
+
+          conversation.set({ avatarInProfile: path || undefined });
+
+          changes = true;
+        } catch (e) {
+          window.log.warn(
+            `[profileupdate] Failed to download attachment at ${this.persistedData.profilePictureUrl}. Maybe it expired? ${e.message}`
+          );
+          // do not return here, we still want to update the display name even if the avatar failed to download
+        }
+      }
+    } else {
+      if (
+        conversation.get('avatarInProfile') ||
+        conversation.get('avatarPointer') ||
+        conversation.get('profileKey')
+      ) {
+        changes = true;
+        conversation.set({
+          avatarInProfile: undefined,
+          avatarPointer: undefined,
+          profileKey: undefined,
+        });
+      }
+    }
+
+    if (conversation.id === UserUtils.getOurPubKeyStrFromCache()) {
+      // make sure the settings which should already set to `true` are
+      if (
+        !conversation.get('isTrustedForAttachmentDownload') ||
+        !conversation.get('isApproved') ||
+        !conversation.get('didApproveMe')
+      ) {
+        conversation.set({
+          isTrustedForAttachmentDownload: true,
+          isApproved: true,
+          didApproveMe: true,
+        });
+        changes = true;
+      }
+    }
+
+    if (changes) {
+      await conversation.commit();
+    }
+
+    // return true so this job is marked as a success
+    return true;
+  }
+
+  public serializeJob(): AvatarDownloadPersistedData {
+    return super.serializeBase();
+  }
+
+  public nonRunningJobsToRemove(jobs: Array<AvatarDownloadPersistedData>) {
+    // for an avatar download job, we want to remove any job matching the same conversationID.
+    return jobs.filter(j => j.conversationId === this.persistedData.conversationId);
+  }
+
+  public addJobCheck(
+    jobs: Array<AvatarDownloadPersistedData>
+  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+    if (this.nonRunningJobsToRemove(jobs).length) {
+      return 'removeJobsFromQueue';
+    }
+    return null;
+  }
+}
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 88ce0c650..cb5b8778d 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,45 +1,58 @@
-import { isNumber } from 'lodash';
 import { v4 } from 'uuid';
 import { sleepFor } from '../../Promise';
-import { Persistedjob, SerializedPersistedJob } from '../PersistedJob';
+import { ConfigurationSyncPersistedData, PersistedJob } from '../PersistedJob';
 
-export class ConfigurationSyncJob extends Persistedjob {
+const defaultMsBetweenRetries = 3000;
+
+export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData> {
   constructor({
     identifier,
     nextAttemptTimestamp,
     maxAttempts,
     currentRetry,
-  }: {
-    identifier: string | null;
-    nextAttemptTimestamp: number | null;
-    maxAttempts: number | null;
-    currentRetry: number;
-  }) {
+  }: Pick<ConfigurationSyncPersistedData, 'identifier' | 'currentRetry' | 'maxAttempts'> &
+    Partial<Pick<ConfigurationSyncPersistedData, 'nextAttemptTimestamp'>>) {
     super({
       jobType: 'ConfigurationSyncJobType',
       identifier: identifier || v4(),
-      delayBetweenRetries: 3000,
-      maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
-      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
-      singleJobInQueue: true,
+      delayBetweenRetries: defaultMsBetweenRetries,
+      maxAttempts: maxAttempts,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries,
       currentRetry,
     });
   }
 
   public async run() {
     // blablha do everything from the notion page, and if success, return true.
-    window.log.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
+    window.log.warn(
+      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" `
+    );
 
     await sleepFor(5000);
     window.log.warn(
-      `running job ${this.jobType} with id:"${this.identifier}" done and returning failed `
+      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done and returning failed `
     );
 
     return false;
   }
 
-  public serializeJob(): SerializedPersistedJob {
+  public serializeJob(): ConfigurationSyncPersistedData {
     const fromParent = super.serializeBase();
     return fromParent;
   }
+
+  public addJobCheck(
+    jobs: Array<ConfigurationSyncPersistedData>
+  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+    return this.addJobCheckSameTypePresent(jobs);
+  }
+
+  /**
+   * For the SharedConfig job, we do not care about the jobs already in the list.
+   * We never want to add a new sync configuration job if there is already one in the queue.
+   * This is done by the `addJobCheck` method above
+   */
+  public nonRunningJobsToRemove(_jobs: Array<ConfigurationSyncPersistedData>) {
+    return [];
+  }
 }
diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
index 1b448416b..d24a2dc78 100644
--- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts
+++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
@@ -1 +1,5 @@
-export type JobRunnerType = 'ConfigurationSyncJob' | 'FakeSleepForJob';
+export type JobRunnerType =
+  | 'ConfigurationSyncJob'
+  | 'FakeSleepForJob'
+  | 'FakeSleepForMultiJob'
+  | 'AvatarDownloadJob';
diff --git a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
index c96abbe9b..cedab8f53 100644
--- a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
+++ b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
@@ -2,14 +2,12 @@ import { isNumber } from 'lodash';
 import { v4 } from 'uuid';
 import { sleepFor } from '../../../../../session/utils/Promise';
 import {
-  Persistedjob,
-  SerializedPersistedJob,
+  FakeSleepForMultiJobData,
+  FakeSleepJobData,
+  PersistedJob,
 } from '../../../../../session/utils/job_runners/PersistedJob';
 
-export class FakeSleepForMultiJob extends Persistedjob {
-  private readonly sleepDuration: number;
-  private readonly returnResult: boolean;
-
+export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData> {
   constructor({
     identifier,
     nextAttemptTimestamp,
@@ -17,25 +15,20 @@ export class FakeSleepForMultiJob extends Persistedjob {
     currentRetry,
     returnResult,
     sleepDuration,
-  }: {
-    identifier: string | null;
-    nextAttemptTimestamp: number | null;
-    maxAttempts: number | null;
-    currentRetry: number;
-    sleepDuration: number;
-    returnResult: boolean;
-  }) {
+  }: Pick<FakeSleepForMultiJobData, 'currentRetry' | 'returnResult' | 'sleepDuration'> &
+    Partial<
+      Pick<FakeSleepForMultiJobData, 'nextAttemptTimestamp' | 'maxAttempts' | 'identifier'>
+    >) {
     super({
       jobType: 'FakeSleepForJobMultiType',
       identifier: identifier || v4(),
       delayBetweenRetries: 10000,
       maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
       nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
-      singleJobInQueue: false,
       currentRetry,
+      returnResult,
+      sleepDuration,
     });
-    this.returnResult = returnResult;
-    this.sleepDuration = sleepDuration;
     if (process.env.NODE_APP_INSTANCE !== undefined) {
       throw new Error('FakeSleepForJobMultiType are only meant for testing purposes');
     }
@@ -43,41 +36,53 @@ export class FakeSleepForMultiJob extends Persistedjob {
 
   public async run() {
     window.log.warn(
-      `running job ${this.jobType} with id:"${this.identifier}". sleeping for ${this.sleepDuration} & returning ${this.returnResult} `
+      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}". sleeping for ${this.persistedData.sleepDuration} & returning ${this.persistedData.returnResult} `
     );
-    await sleepFor(this.sleepDuration);
-    window.log.warn(`${this.jobType} with id:"${this.identifier}" done. returning success `);
-    return this.returnResult;
+    await sleepFor(this.persistedData.sleepDuration);
+    window.log.warn(
+      `${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done. returning success `
+    );
+    return this.persistedData.returnResult;
   }
 
-  public serializeJob(): SerializedPersistedJob {
-    const fromParent = super.serializeBase();
-    fromParent.sleepDuration = this.sleepDuration;
-    fromParent.returnResult = this.returnResult;
-    return fromParent;
+  public serializeJob(): FakeSleepForMultiJobData {
+    return super.serializeBase();
+  }
+
+  /**
+   * For the fakesleep for multi, we want to allow as many job as we want, so this returns null
+   */
+  public addJobCheck(
+    _jobs: Array<FakeSleepForMultiJobData>
+  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+    return null;
+  }
+
+  /**
+   * For the MultiFakeSleep job, there are no jobs to remove if we try to add a new one of the same type.
+   */
+  public nonRunningJobsToRemove(_jobs: Array<FakeSleepForMultiJobData>) {
+    return [];
   }
 }
 
-export class FakeSleepForJob extends Persistedjob {
+export class FakeSleepForJob extends PersistedJob<FakeSleepJobData> {
   constructor({
     identifier,
     nextAttemptTimestamp,
     maxAttempts,
     currentRetry,
-  }: {
-    identifier: string | null;
-    nextAttemptTimestamp: number | null;
-    maxAttempts: number | null;
-    currentRetry: number;
-  }) {
+  }: Pick<FakeSleepJobData, 'currentRetry' | 'maxAttempts'> &
+    Partial<Pick<FakeSleepJobData, 'nextAttemptTimestamp' | 'identifier'>>) {
     super({
       jobType: 'FakeSleepForJobType',
       identifier: identifier || v4(),
       delayBetweenRetries: 10000,
-      maxAttempts: isNumber(maxAttempts) ? maxAttempts : 3,
+      maxAttempts,
       nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + 3000,
-      singleJobInQueue: true,
       currentRetry,
+      returnResult: false,
+      sleepDuration: 5000,
     });
     if (process.env.NODE_APP_INSTANCE !== undefined) {
       throw new Error('FakeSleepForJob are only meant for testing purposes');
@@ -85,14 +90,32 @@ export class FakeSleepForJob extends Persistedjob {
   }
 
   public async run() {
-    window.log.warn(`running job ${this.jobType} with id:"${this.identifier}" `);
-    await sleepFor(5000);
-    window.log.warn(`${this.jobType} with id:"${this.identifier}" done. returning failed `);
+    window.log.warn(
+      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" `
+    );
+    await sleepFor(this.persistedData.sleepDuration);
+    window.log.warn(
+      `${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done. returning failed `
+    );
     return false;
   }
 
-  public serializeJob(): SerializedPersistedJob {
-    const fromParent = super.serializeBase();
-    return fromParent;
+  public serializeJob(): FakeSleepJobData {
+    return super.serializeBase();
+  }
+
+  public addJobCheck(
+    jobs: Array<FakeSleepJobData>
+  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+    return this.addJobCheckSameTypePresent(jobs);
+  }
+
+  /**
+   * For the FakeSleep job, we do not care about the jobs already in the list.
+   * We just never want to add a new job of that type if there is already one in the queue.
+   * This is done by the `addJobCheck` method above
+   */
+  public nonRunningJobsToRemove(_jobs: Array<FakeSleepJobData>) {
+    return [];
   }
 }
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 5299f3738..4592596d5 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -7,7 +7,11 @@ import {
   PersistedJobRunner,
 } from '../../../../../session/utils/job_runners/JobRunner';
 import { FakeSleepForJob, FakeSleepForMultiJob } from './FakeSleepForJob';
-import { SerializedPersistedJob } from '../../../../../session/utils/job_runners/PersistedJob';
+import {
+  FakeSleepForMultiJobData,
+  FakeSleepJobData,
+  TypeOfPersistedData,
+} from '../../../../../session/utils/job_runners/PersistedJob';
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
 
@@ -21,7 +25,7 @@ function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
   return job;
 }
 
-function getFakeSleepForJobPersisted(timestamp: number): SerializedPersistedJob {
+function getFakeSleepForJobPersisted(timestamp: number): FakeSleepJobData {
   return getFakeSleepForJob(timestamp).serializeJob();
 }
 
@@ -49,7 +53,8 @@ function getFakeSleepForMultiJob({
 describe('JobRunner', () => {
   let getItemById: Sinon.SinonStub;
   let clock: Sinon.SinonFakeTimers;
-  let runner: PersistedJobRunner;
+  let runner: PersistedJobRunner<FakeSleepJobData>;
+  let runnerMulti: PersistedJobRunner<FakeSleepForMultiJobData>;
   let jobEventsListener: JobEventListener;
 
   beforeEach(() => {
@@ -57,31 +62,40 @@ describe('JobRunner', () => {
     stubData('createOrUpdateItem');
     clock = Sinon.useFakeTimers({ shouldAdvanceTime: true });
     jobEventsListener = {
-      onJobDeferred: (_job: SerializedPersistedJob) => {
+      onJobDeferred: (_job: TypeOfPersistedData) => {
         // window.log.warn('listener got deferred for job ', job);
       },
-      onJobSuccess: (_job: SerializedPersistedJob) => {
+      onJobSuccess: (_job: TypeOfPersistedData) => {
         // window.log.warn('listener got success for job ', job);
       },
-      onJobError: (_job: SerializedPersistedJob) => {
+      onJobError: (_job: TypeOfPersistedData) => {
         // window.log.warn('listener got error for job ', job);
       },
-      onJobStarted: (_job: SerializedPersistedJob) => {
+      onJobStarted: (_job: TypeOfPersistedData) => {
         // window.log.warn('listener got started for job ', job);
       },
     };
-    runner = new PersistedJobRunner('FakeSleepForJob', jobEventsListener);
+    runner = new PersistedJobRunner<FakeSleepJobData>('FakeSleepForJob', jobEventsListener);
+    runnerMulti = new PersistedJobRunner<FakeSleepForMultiJobData>(
+      'FakeSleepForMultiJob',
+      jobEventsListener
+    );
   });
 
   afterEach(() => {
     Sinon.restore();
     runner.resetForTesting();
+    runnerMulti.resetForTesting();
   });
 
   describe('loadJobsFromDb', () => {
-    it('throw if already loaded', async () => {
-      await runner.loadJobsFromDb();
+    it('throw if not loaded', async () => {
       try {
+        getItemById.resolves({
+          id: '',
+          value: JSON.stringify([]),
+        });
+
         await runner.loadJobsFromDb();
         throw new Error('PLOP'); // the line above should throw something else
       } catch (e) {
@@ -154,21 +168,21 @@ describe('JobRunner', () => {
     });
 
     it('can add a FakeSleepForJobMulti (sorted) even if one is already there', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 1234 });
       const job2 = getFakeSleepForMultiJob({ timestamp: 123 });
       const job3 = getFakeSleepForMultiJob({ timestamp: 1 });
 
-      let result = await runner.addJob(job);
+      let result = await runnerMulti.addJob(job);
       expect(result).to.eq('job_deferred');
 
-      result = await runner.addJob(job2);
+      result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_deferred');
 
-      result = await runner.addJob(job3);
+      result = await runnerMulti.addJob(job3);
       expect(result).to.eq('job_deferred');
 
-      expect(runner.getJobList()).to.deep.eq([
+      expect(runnerMulti.getJobList()).to.deep.eq([
         job3.serializeJob(),
         job2.serializeJob(),
         job.serializeJob(),
@@ -176,87 +190,90 @@ describe('JobRunner', () => {
     });
 
     it('cannot add a FakeSleepForJobMulti with an id already existing', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 1234 });
-      const job2 = getFakeSleepForMultiJob({ timestamp: 123, identifier: job.identifier });
-      let result = await runner.addJob(job);
+      const job2 = getFakeSleepForMultiJob({
+        timestamp: 123,
+        identifier: job.persistedData.identifier,
+      });
+      let result = await runnerMulti.addJob(job);
       expect(result).to.be.eq('job_deferred');
-      result = await runner.addJob(job2);
+      result = await runnerMulti.addJob(job2);
       expect(result).to.be.eq('identifier_exists');
 
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
     });
 
     it('two jobs are running sequentially', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 100 });
       const job2 = getFakeSleepForMultiJob({ timestamp: 200 });
-      runner.startProcessing();
+      runnerMulti.startProcessing();
       clock.tick(110);
       // job should be started right away
-      let result = await runner.addJob(job);
+      let result = await runnerMulti.addJob(job);
       expect(result).to.eq('job_started');
-      result = await runner.addJob(job2);
+      result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_deferred');
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
 
       // each job takes 5s to finish, so let's tick once the first one should be done
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
 
-      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
 
       clock.tick(5000);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
 
-      expect(runner.getJobList()).to.deep.eq([]);
+      expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
 
     it('adding one job after the first is done starts it', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 100 });
       const job2 = getFakeSleepForMultiJob({ timestamp: 120 });
-      runner.startProcessing();
+      runnerMulti.startProcessing();
       clock.tick(110);
       // job should be started right away
-      let result = await runner.addJob(job);
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+      let result = await runnerMulti.addJob(job);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
 
       expect(result).to.eq('job_started');
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
       clock.tick(5010);
 
-      // just give some time for the runner to pick up a new job
+      // just give some time for the runnerMulti to pick up a new job
       await sleepFor(100);
 
       // the first job should already be finished now
-      result = await runner.addJob(job2);
+      result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_started');
-      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
 
       // each job takes 5s to finish, so let's tick once the first one should be done
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
 
-      expect(runner.getJobList()).to.deep.eq([]);
+      expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
 
     it('adding one job after the first is done schedules it', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 100 });
-      runner.startProcessing();
+      runnerMulti.startProcessing();
       clock.tick(110);
       // job should be started right away
-      let result = await runner.addJob(job);
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+      let result = await runnerMulti.addJob(job);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
 
       expect(result).to.eq('job_started');
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
       clock.tick(5010);
       // just give some time for the runner to pick up a new job
 
@@ -265,10 +282,10 @@ describe('JobRunner', () => {
       const job2 = getFakeSleepForMultiJob({ timestamp: clock.now + 100 });
 
       // job should already be finished now
-      result = await runner.addJob(job2);
+      result = await runnerMulti.addJob(job2);
       // new job should be deferred as timestamp is not in the past
       expect(result).to.eq('job_deferred');
-      expect(runner.getJobList()).to.deep.eq([job2.serializeJob()]);
+      expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
 
       // tick enough for the job to need to be started
       clock.tick(100);
@@ -278,9 +295,9 @@ describe('JobRunner', () => {
       clock.tick(5000);
 
       await job2.waitForCurrentTry();
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
 
-      expect(runner.getJobList()).to.deep.eq([]);
+      expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
   });
 
@@ -352,27 +369,27 @@ describe('JobRunner', () => {
     });
 
     it('does await if there are jobs and one is started', async () => {
-      await runner.loadJobsFromDb();
+      await runnerMulti.loadJobsFromDb();
       const job = getFakeSleepForMultiJob({ timestamp: 100, returnResult: false }); // this job keeps failing
-      runner.startProcessing();
+      runnerMulti.startProcessing();
       clock.tick(110);
       // job should be started right away
-      const result = await runner.addJob(job);
-      expect(runner.getJobList()).to.deep.eq([job.serializeJob()]);
+      const result = await runnerMulti.addJob(job);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
 
       expect(result).to.eq('job_started');
       clock.tick(5010);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
       const jobUpdated = {
         ...job.serializeJob(),
         nextAttemptTimestamp: clock.now + 10000,
         currentRetry: 1,
       };
-      // just give  time for the runner to pick up a new job
+      // just give  time for the runnerMulti to pick up a new job
       await sleepFor(10);
 
       // the job failed, so the job should still be there
-      expect(runner.getJobList()).to.deep.eq([jobUpdated]);
+      expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated]);
 
       // that job should be retried now
       clock.tick(11000);
@@ -384,16 +401,16 @@ describe('JobRunner', () => {
       };
       await sleepFor(10);
 
-      await runner.waitCurrentJob();
-      expect(runner.getJobList()).to.deep.eq([jobUpdated2]);
+      await runnerMulti.waitCurrentJob();
+      expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated2]);
 
       // that job should be retried one more time and then removed from the list of jobs to be run
       clock.tick(11000);
-      await runner.waitCurrentJob();
+      await runnerMulti.waitCurrentJob();
       await sleepFor(10);
 
-      await runner.waitCurrentJob();
-      expect(runner.getJobList()).to.deep.eq([]);
+      await runnerMulti.waitCurrentJob();
+      expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
   });
 });

From 90804491d6c4140cbd77afcd05908b7dc64d253b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 31 Jan 2023 12:01:14 +1100
Subject: [PATCH 028/178] feat: add job result enum with success, retry and
 permanent fail

---
 ts/components/leftpane/ActionsPanel.tsx       | 18 +---
 ts/node/sql.ts                                |  1 -
 ts/session/profile_manager/ProfileManager.ts  | 31 +++----
 .../utils/job_runners/JobDeserialization.ts   |  4 +-
 ts/session/utils/job_runners/JobRunner.ts     | 42 +++------
 ts/session/utils/job_runners/PersistedJob.ts  | 24 +++--
 .../job_runners/jobs/AvatarDownloadJob.ts     | 89 +++++++++++++++----
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 15 ++--
 .../unit/utils/job_runner/FakeSleepForJob.ts  | 21 ++---
 .../unit/utils/job_runner/JobRunner_test.ts   | 31 ++-----
 10 files changed, 140 insertions(+), 136 deletions(-)

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 1bb547ee3..c03160023 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -48,7 +48,6 @@ import { initializeLibSessionUtilWrappers } from '../../session/utils/libsession
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
-import { AvatarDownloadJob } from '../../session/utils/job_runners/jobs/AvatarDownloadJob';
 import { runners } from '../../session/utils/job_runners/JobRunner';
 
 const Section = (props: { type: SectionType }) => {
@@ -64,20 +63,6 @@ const Section = (props: { type: SectionType }) => {
   const handleClick = async () => {
     /* tslint:disable:no-void-expression */
     if (type === SectionType.Profile) {
-      const us = UserUtils.getOurPubKeyStrFromCache();
-      const ourConvo = getConversationController().get(us);
-
-      const job = new AvatarDownloadJob({
-        conversationId: us,
-        currentRetry: 0,
-        delayBetweenRetries: 3000,
-        maxAttempts: 3,
-        profileKeyHex: ourConvo.get('profileKey') || null,
-        profilePictureUrl: ourConvo.get('avatarPointer') || null,
-      });
-      await runners.avatarDownloadRunner.loadJobsFromDb();
-      runners.avatarDownloadRunner.startProcessing();
-      await runners.avatarDownloadRunner.addJob(job);
       dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
       const currentTheme = String(window.Events.getThemeSetting());
@@ -214,6 +199,9 @@ const doAppStartUp = async () => {
   // this generates the key to encrypt attachments locally
   await Data.generateAttachmentKeyIfEmpty();
 
+  await runners.avatarDownloadRunner.loadJobsFromDb();
+  runners.avatarDownloadRunner.startProcessing();
+
   // trigger a sync message if needed for our other devices
   void triggerSyncIfNeeded();
   void getSwarmPollingInstance().start();
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 8481be09e..4e10e7bef 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -410,7 +410,6 @@ function getConversationCount() {
 // tslint:disable-next-line: max-func-body-length
 function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3.Database) {
   const formatted = assertValidConversationAttributes(data);
-  console.warn('formatted', formatted);
 
   const {
     id,
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index e428d557f..b585a4241 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -2,11 +2,7 @@ import { to_hex } from 'libsodium-wrappers-sumo';
 import { isEmpty } from 'lodash';
 import { getConversationController } from '../conversations';
 import { UserUtils } from '../utils';
-import { runners } from '../utils/job_runners/JobRunner';
-import {
-  AvatarDownloadJob,
-  shouldAddAvatarDownloadJob,
-} from '../utils/job_runners/jobs/AvatarDownloadJob';
+import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob';
 
 /**
  * This can be used to update our conversation display name with the given name right away, and plan an AvatarDownloadJob to retrieve the new avatar if needed to download it
@@ -16,18 +12,14 @@ async function updateOurProfileSync(
   profileUrl: string | null,
   profileKey: Uint8Array | null
 ) {
-  const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  const ourConvo = getConversationController().get(us);
   if (!ourConvo?.id) {
-    window?.log?.warn('[profileupdate] Cannot update our profile with empty convoid');
+    window?.log?.warn('[profileupdate] Cannot update our profile without convo associated');
     return;
   }
 
-  return updateProfileOfContact(
-    UserUtils.getOurPubKeyStrFromCache(),
-    displayName,
-    profileUrl,
-    profileKey
-  );
+  return updateProfileOfContact(us, displayName, profileUrl, profileKey);
 }
 
 /**
@@ -56,15 +48,12 @@ async function updateProfileOfContact(
   // add an avatar download job only if needed
 
   const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : to_hex(profileKey);
-  if (shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
-    const avatarDownloadJob = new AvatarDownloadJob({
-      conversationId: pubkey,
-      profileKeyHex,
-      profilePictureUrl: profileUrl || null,
-    });
 
-    await runners.avatarDownloadRunner.addJob(avatarDownloadJob);
-  }
+  await AvatarDownload.addAvatarDownloadJobIfNeeded({
+    profileKeyHex,
+    profileUrl,
+    pubkey,
+  });
 }
 
 export const ProfileManager = {
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index ed991b578..c7bb79049 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -3,7 +3,7 @@ import {
   FakeSleepForJob,
   FakeSleepForMultiJob,
 } from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
-import { AvatarDownloadJob } from './jobs/AvatarDownloadJob';
+import { AvatarDownload } from './jobs/AvatarDownloadJob';
 import { ConfigurationSyncJob } from './jobs/ConfigurationSyncJob';
 import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
 
@@ -19,7 +19,7 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
       return (new ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
 
     case 'AvatarDownloadJobType':
-      return (new AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
+      return (new AvatarDownload.AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
     case 'FakeSleepForJobType':
       return (new FakeSleepForJob(data) as unknown) as PersistedJob<T>;
     case 'FakeSleepForJobMultiType':
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index aa7838143..9c27d0318 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -6,6 +6,7 @@ import {
   AvatarDownloadPersistedData,
   ConfigurationSyncPersistedData,
   PersistedJob,
+  RunJobResult,
   TypeOfPersistedData,
 } from './PersistedJob';
 
@@ -19,13 +20,6 @@ export type StartProcessingResult = 'job_in_progress' | 'job_deferred' | 'job_st
 
 export type AddJobResult = 'job_deferred' | 'job_started';
 
-export type JobEventListener = {
-  onJobSuccess: (job: TypeOfPersistedData) => void;
-  onJobDeferred: (job: TypeOfPersistedData) => void;
-  onJobError: (job: TypeOfPersistedData) => void;
-  onJobStarted: (job: TypeOfPersistedData) => void;
-};
-
 /**
  * This class is used to plan jobs and make sure they are retried until the success.
  * By having a specific type, we can find the logic to be run by that type of job.
@@ -43,11 +37,9 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private readonly jobRunnerType: JobRunnerType;
   private nextJobStartTimer: NodeJS.Timeout | null = null;
   private currentJob: PersistedJob<T> | null = null;
-  private readonly jobEventsListener: JobEventListener | null;
 
-  constructor(jobRunnerType: JobRunnerType, jobEventsListener: JobEventListener | null) {
+  constructor(jobRunnerType: JobRunnerType, _jobEventsListener: null) {
     this.jobRunnerType = jobRunnerType;
-    this.jobEventsListener = jobEventsListener;
     window?.log?.warn(`new runner of type ${jobRunnerType} built`);
   }
 
@@ -96,10 +88,8 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       .map(k => k.serializeJob());
 
     const addJobChecks = job.addJobCheck(serializedNonRunningJobs);
-    if (addJobChecks === 'skipAsJobTypeAlreadyPresent') {
-      window.log.warn(
-        `job runner has already a job with type:"${job.persistedData.jobType}" planned so not adding another one`
-      );
+    if (addJobChecks === 'skipAddSameJobPresent') {
+      window.log.warn(`addjobCheck returned "${addJobChecks}" so not adding it`);
       return 'type_exists';
     }
 
@@ -288,6 +278,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       this.planNextJob();
       return;
     }
+    let success: RunJobResult | null = null;
 
     try {
       if (this.currentJob) {
@@ -295,11 +286,9 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       }
       this.currentJob = nextJob;
 
-      this.jobEventsListener?.onJobStarted(this.currentJob.serializeJob());
+      success = await this.currentJob.runJob();
 
-      const success = await this.currentJob.runJob();
-
-      if (!success) {
+      if (success !== RunJobResult.Success) {
         throw new Error(`job ${nextJob.persistedData.identifier} failed`);
       }
 
@@ -307,30 +296,23 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       this.deleteJobsByIdentifier([this.currentJob.persistedData.identifier]);
       await this.writeJobsToDB();
     } catch (e) {
-      if (nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1) {
+      if (
+        success === RunJobResult.PermanentFailure ||
+        nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1
+      ) {
         // we cannot restart this job anymore. Remove the entry completely
         this.deleteJobsByIdentifier([nextJob.persistedData.identifier]);
-        if (this.jobEventsListener && this.currentJob) {
-          this.jobEventsListener.onJobError(this.currentJob.serializeJob());
-        }
       } else {
         nextJob.persistedData.currentRetry = nextJob.persistedData.currentRetry + 1;
         // that job can be restarted. Plan a retry later with the already defined retry
         nextJob.persistedData.nextAttemptTimestamp =
           Date.now() + nextJob.persistedData.delayBetweenRetries;
-        if (this.jobEventsListener && this.currentJob) {
-          this.jobEventsListener.onJobDeferred(this.currentJob.serializeJob());
-        }
       }
       // in any case, either we removed a job or changed one of the timestamp.
       // so sort the list again, and persist it
       this.sortJobsList();
       await this.writeJobsToDB();
     } finally {
-      if (this.jobEventsListener && this.currentJob) {
-        this.jobEventsListener.onJobSuccess(this.currentJob.serializeJob());
-      }
-
       this.currentJob = null;
 
       // start the next job if there is any to be started now, or just plan the wakeup of our runner for the right time.
@@ -341,7 +323,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private assertIsInitialized() {
     if (!this.isInit) {
       throw new Error(
-        'persisted job runner was not initlized yet. Call initWithData with what you have persisted first'
+        'persisted job runner was not initlized yet. Call loadJobsFromDb with what you have persisted first'
       );
     }
   }
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index b9f3350c6..1faa0f0d8 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -43,6 +43,18 @@ export type TypeOfPersistedData =
   | FakeSleepJobData
   | FakeSleepForMultiJobData;
 
+export type AddJobCheckReturn =
+  | 'skipAddSameJobPresent'
+  | 'removeJobsFromQueue'
+  | 'sameJobDataAlreadyInQueue'
+  | null;
+
+export enum RunJobResult {
+  Success = 1,
+  RetryJobIfPossible = 2,
+  PermanentFailure = 3,
+}
+
 /**
  * This class can be used to save and run jobs from the database.
  * Every child class must take the minimum amount of arguments, and make sure they are unlikely to change.
@@ -55,7 +67,7 @@ export type TypeOfPersistedData =
 export abstract class PersistedJob<T extends PersistedJobData> {
   public persistedData: T;
 
-  private runningPromise: Promise<boolean> | null = null;
+  private runningPromise: Promise<RunJobResult> | null = null;
 
   public constructor(data: T) {
     if (data.maxAttempts < 1) {
@@ -109,13 +121,11 @@ export abstract class PersistedJob<T extends PersistedJobData> {
 
   public abstract nonRunningJobsToRemove(jobs: Array<T>): Array<T>;
 
-  public abstract addJobCheck(
-    jobs: Array<T>
-  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null;
+  public abstract addJobCheck(jobs: Array<T>): AddJobCheckReturn;
 
-  public addJobCheckSameTypePresent(jobs: Array<T>): 'skipAsJobTypeAlreadyPresent' | null {
+  public addJobCheckSameTypePresent(jobs: Array<T>): 'skipAddSameJobPresent' | null {
     return jobs.some(j => j.jobType === this.persistedData.jobType)
-      ? 'skipAsJobTypeAlreadyPresent'
+      ? 'skipAddSameJobPresent'
       : null;
   }
 
@@ -126,7 +136,7 @@ export abstract class PersistedJob<T extends PersistedJobData> {
    *
    * Note: you should check the this.isAborted() to know if you should cancel the current processing of your logic.
    */
-  protected abstract run(): Promise<boolean>;
+  protected abstract run(): Promise<RunJobResult>;
 
   protected serializeBase(): T {
     return cloneDeep(this.persistedData);
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index 7fa074011..74c43be68 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -1,4 +1,4 @@
-import { isEmpty, isEqual, isNumber } from 'lodash';
+import { isEmpty, isEqual, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { downloadAttachment } from '../../../../receiver/attachments';
@@ -8,7 +8,13 @@ import { autoScaleForIncomingAvatar } from '../../../../util/attachmentsUtil';
 import { decryptProfile } from '../../../../util/crypto/profileEncrypter';
 import { getConversationController } from '../../../conversations';
 import { fromHexToArray } from '../../String';
-import { AvatarDownloadPersistedData, PersistedJob } from '../PersistedJob';
+import { runners } from '../JobRunner';
+import {
+  AddJobCheckReturn,
+  AvatarDownloadPersistedData,
+  PersistedJob,
+  RunJobResult,
+} from '../PersistedJob';
 
 const defaultMsBetweenRetries = 10000;
 const defaultMaxAttemps = 3;
@@ -16,7 +22,7 @@ const defaultMaxAttemps = 3;
 /**
  * Returns true if given those details we should add an Avatar Download Job to the list of jobs to run
  */
-export function shouldAddAvatarDownloadJob({
+function shouldAddAvatarDownloadJob({
   profileKeyHex,
   profileUrl,
   pubkey,
@@ -36,22 +42,47 @@ export function shouldAddAvatarDownloadJob({
     window.log.warn('shouldAddAvatarDownloadJob can only be used for private convos currently');
     return false;
   }
-  if (profileUrl && !isEmpty(profileKeyHex)) {
-    const prevPointer = conversation.get('avatarPointer');
-    const needsUpdate = !prevPointer || !isEqual(prevPointer, profileUrl);
+  const prevPointer = conversation.get('avatarPointer');
 
-    return needsUpdate;
+  if (!isEmpty(profileUrl) && !isEmpty(profileKeyHex) && !isEqual(prevPointer, profileUrl)) {
+    return true;
   }
   return false;
 }
 
+async function addAvatarDownloadJobIfNeeded({
+  profileKeyHex,
+  profileUrl,
+  pubkey,
+}: {
+  pubkey: string;
+  profileUrl: string | null | undefined;
+  profileKeyHex: string | null | undefined;
+}) {
+  if (profileKeyHex && shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
+    const avatarDownloadJob = new AvatarDownloadJob({
+      conversationId: pubkey,
+      profileKeyHex,
+      profilePictureUrl: profileUrl || null,
+    });
+    window.log.debug(
+      `addAvatarDownloadJobIfNeeded: adding job download for ${pubkey}:${profileUrl}:${profileKeyHex} `
+    );
+    await runners.avatarDownloadRunner.addJob(avatarDownloadJob);
+  } else {
+    window.log.debug(
+      `addAvatarDownloadJobIfNeeded: no download required for ${pubkey}:${profileUrl}:${profileKeyHex} `
+    );
+  }
+}
+
 /**
  * This job can be used to add the downloading of the avatar of a conversation to the list of jobs to be run.
  * The conversationId is used as identifier so we can only have a single job per conversation.
  * When the jobRunners starts this job, the job first checks if a download is required or not (avatarPointer changed and wasn't already downloaded).
  * If yes, it downloads the new avatar, decrypt it and store it before updating the conversation with the new url,profilekey and local file storage.
  */
-export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
+class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
   constructor({
     conversationId,
     nextAttemptTimestamp,
@@ -86,7 +117,7 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
   }
 
   // tslint:disable-next-line: cyclomatic-complexity
-  public async run(): Promise<boolean> {
+  public async run(): Promise<RunJobResult> {
     const convoId = this.persistedData.conversationId;
 
     window.log.warn(
@@ -95,7 +126,7 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
 
     if (!this.persistedData.identifier || !convoId) {
       // return true so we do not retry this task.
-      return true;
+      return RunJobResult.PermanentFailure;
     }
 
     let conversation = getConversationController().get(convoId);
@@ -103,11 +134,11 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
       // return true so we do not retry this task.
       window.log.warn('AvatarDownloadJob did not corresponding conversation');
 
-      return true;
+      return RunJobResult.PermanentFailure;
     }
     if (!conversation.isPrivate()) {
       window.log.warn('AvatarDownloadJob can only be used for private convos currently');
-      return true;
+      return RunJobResult.PermanentFailure;
     }
     let changes = false;
 
@@ -120,7 +151,7 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
       // return true so we do not retry this task.
       window.log.warn('AvatarDownloadJob shouldAddAvatarDownloadJob said no');
 
-      return true;
+      return RunJobResult.PermanentFailure;
     }
 
     if (this.persistedData.profilePictureUrl && this.persistedData.profileKeyHex) {
@@ -162,16 +193,23 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
             ({ path } = upgraded);
           } catch (e) {
             window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`);
+            return RunJobResult.RetryJobIfPossible; // so we retry this job
           }
 
           conversation.set({ avatarInProfile: path || undefined });
 
           changes = true;
         } catch (e) {
+          if (isString(e.message) && (e.message as string).includes('404')) {
+            window.log.warn(
+              `[profileupdate] Failed to download attachment at ${this.persistedData.profilePictureUrl}. We got 404 error: "${e.message}"`
+            );
+            return RunJobResult.PermanentFailure;
+          }
           window.log.warn(
             `[profileupdate] Failed to download attachment at ${this.persistedData.profilePictureUrl}. Maybe it expired? ${e.message}`
           );
-          // do not return here, we still want to update the display name even if the avatar failed to download
+          return RunJobResult.RetryJobIfPossible;
         }
       }
     } else {
@@ -210,7 +248,7 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
     }
 
     // return true so this job is marked as a success
-    return true;
+    return RunJobResult.Success;
   }
 
   public serializeJob(): AvatarDownloadPersistedData {
@@ -222,12 +260,27 @@ export class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData>
     return jobs.filter(j => j.conversationId === this.persistedData.conversationId);
   }
 
-  public addJobCheck(
-    jobs: Array<AvatarDownloadPersistedData>
-  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+  public addJobCheck(jobs: Array<AvatarDownloadPersistedData>): AddJobCheckReturn {
+    // avoid adding the same job if the exact same one is already planned
+    const hasSameJob = jobs.some(j => {
+      return (
+        j.conversationId === this.persistedData.conversationId &&
+        j.profileKeyHex === this.persistedData.profileKeyHex &&
+        j.profilePictureUrl === this.persistedData.profilePictureUrl
+      );
+    });
+
+    if (hasSameJob) {
+      return 'skipAddSameJobPresent';
+    }
     if (this.nonRunningJobsToRemove(jobs).length) {
       return 'removeJobsFromQueue';
     }
     return null;
   }
 }
+
+export const AvatarDownload = {
+  AvatarDownloadJob,
+  addAvatarDownloadJobIfNeeded,
+};
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index cb5b8778d..0757db304 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,6 +1,11 @@
 import { v4 } from 'uuid';
 import { sleepFor } from '../../Promise';
-import { ConfigurationSyncPersistedData, PersistedJob } from '../PersistedJob';
+import {
+  AddJobCheckReturn,
+  ConfigurationSyncPersistedData,
+  PersistedJob,
+  RunJobResult,
+} from '../PersistedJob';
 
 const defaultMsBetweenRetries = 3000;
 
@@ -22,7 +27,7 @@ export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersiste
     });
   }
 
-  public async run() {
+  public async run(): Promise<RunJobResult> {
     // blablha do everything from the notion page, and if success, return true.
     window.log.warn(
       `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" `
@@ -33,7 +38,7 @@ export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersiste
       `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done and returning failed `
     );
 
-    return false;
+    return RunJobResult.RetryJobIfPossible;
   }
 
   public serializeJob(): ConfigurationSyncPersistedData {
@@ -41,9 +46,7 @@ export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersiste
     return fromParent;
   }
 
-  public addJobCheck(
-    jobs: Array<ConfigurationSyncPersistedData>
-  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+  public addJobCheck(jobs: Array<ConfigurationSyncPersistedData>): AddJobCheckReturn {
     return this.addJobCheckSameTypePresent(jobs);
   }
 
diff --git a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
index cedab8f53..a3263d100 100644
--- a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
+++ b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
@@ -2,9 +2,11 @@ import { isNumber } from 'lodash';
 import { v4 } from 'uuid';
 import { sleepFor } from '../../../../../session/utils/Promise';
 import {
+  AddJobCheckReturn,
   FakeSleepForMultiJobData,
   FakeSleepJobData,
   PersistedJob,
+  RunJobResult,
 } from '../../../../../session/utils/job_runners/PersistedJob';
 
 export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData> {
@@ -34,7 +36,7 @@ export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData>
     }
   }
 
-  public async run() {
+  public async run(): Promise<RunJobResult> {
     window.log.warn(
       `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}". sleeping for ${this.persistedData.sleepDuration} & returning ${this.persistedData.returnResult} `
     );
@@ -42,7 +44,10 @@ export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData>
     window.log.warn(
       `${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done. returning success `
     );
-    return this.persistedData.returnResult;
+    if (this.persistedData.returnResult) {
+      return RunJobResult.Success;
+    }
+    return RunJobResult.RetryJobIfPossible;
   }
 
   public serializeJob(): FakeSleepForMultiJobData {
@@ -52,9 +57,7 @@ export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData>
   /**
    * For the fakesleep for multi, we want to allow as many job as we want, so this returns null
    */
-  public addJobCheck(
-    _jobs: Array<FakeSleepForMultiJobData>
-  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+  public addJobCheck(_jobs: Array<FakeSleepForMultiJobData>): AddJobCheckReturn {
     return null;
   }
 
@@ -89,7 +92,7 @@ export class FakeSleepForJob extends PersistedJob<FakeSleepJobData> {
     }
   }
 
-  public async run() {
+  public async run(): Promise<RunJobResult> {
     window.log.warn(
       `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" `
     );
@@ -97,16 +100,14 @@ export class FakeSleepForJob extends PersistedJob<FakeSleepJobData> {
     window.log.warn(
       `${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done. returning failed `
     );
-    return false;
+    return RunJobResult.RetryJobIfPossible;
   }
 
   public serializeJob(): FakeSleepJobData {
     return super.serializeBase();
   }
 
-  public addJobCheck(
-    jobs: Array<FakeSleepJobData>
-  ): 'skipAsJobTypeAlreadyPresent' | 'removeJobsFromQueue' | null {
+  public addJobCheck(jobs: Array<FakeSleepJobData>): AddJobCheckReturn {
     return this.addJobCheckSameTypePresent(jobs);
   }
 
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 4592596d5..9060e0639 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -2,15 +2,11 @@ import { expect } from 'chai';
 import _, { isUndefined } from 'lodash';
 import Sinon from 'sinon';
 import { v4 } from 'uuid';
-import {
-  JobEventListener,
-  PersistedJobRunner,
-} from '../../../../../session/utils/job_runners/JobRunner';
+import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner';
 import { FakeSleepForJob, FakeSleepForMultiJob } from './FakeSleepForJob';
 import {
   FakeSleepForMultiJobData,
   FakeSleepJobData,
-  TypeOfPersistedData,
 } from '../../../../../session/utils/job_runners/PersistedJob';
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
@@ -55,31 +51,13 @@ describe('JobRunner', () => {
   let clock: Sinon.SinonFakeTimers;
   let runner: PersistedJobRunner<FakeSleepJobData>;
   let runnerMulti: PersistedJobRunner<FakeSleepForMultiJobData>;
-  let jobEventsListener: JobEventListener;
 
   beforeEach(() => {
     getItemById = stubData('getItemById');
     stubData('createOrUpdateItem');
     clock = Sinon.useFakeTimers({ shouldAdvanceTime: true });
-    jobEventsListener = {
-      onJobDeferred: (_job: TypeOfPersistedData) => {
-        // window.log.warn('listener got deferred for job ', job);
-      },
-      onJobSuccess: (_job: TypeOfPersistedData) => {
-        // window.log.warn('listener got success for job ', job);
-      },
-      onJobError: (_job: TypeOfPersistedData) => {
-        // window.log.warn('listener got error for job ', job);
-      },
-      onJobStarted: (_job: TypeOfPersistedData) => {
-        // window.log.warn('listener got started for job ', job);
-      },
-    };
-    runner = new PersistedJobRunner<FakeSleepJobData>('FakeSleepForJob', jobEventsListener);
-    runnerMulti = new PersistedJobRunner<FakeSleepForMultiJobData>(
-      'FakeSleepForMultiJob',
-      jobEventsListener
-    );
+    runner = new PersistedJobRunner<FakeSleepJobData>('FakeSleepForJob', null);
+    runnerMulti = new PersistedJobRunner<FakeSleepForMultiJobData>('FakeSleepForMultiJob', null);
   });
 
   afterEach(() => {
@@ -95,8 +73,9 @@ describe('JobRunner', () => {
           id: '',
           value: JSON.stringify([]),
         });
+        const job = getFakeSleepForJob(123);
 
-        await runner.loadJobsFromDb();
+        await runner.addJob(job);
         throw new Error('PLOP'); // the line above should throw something else
       } catch (e) {
         expect(e.message).to.not.eq('PLOP');

From 4bfcf911939934e402f3740e0950c87df02cbd9b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 1 Feb 2023 15:03:58 +1100
Subject: [PATCH 029/178] fix: add return types for libsession wrapper
 functions

---
 ts/components/dialog/EditProfileDialog.tsx    |  48 +----
 ts/components/leftpane/ActionsPanel.tsx       |   6 +-
 ts/data/configDump/configDump.ts              |  58 +++---
 ts/interactions/conversationInteractions.ts   |   7 +-
 ts/node/migration/sessionMigrations.ts        |   4 +
 ts/node/sql.ts                                |  90 +-------
 ts/node/sql_calls/config_dump.ts              | 147 ++++++++++++++
 ts/receiver/configMessage.ts                  | 192 +++++++++++-------
 ts/session/sending/MessageQueue.ts            |   3 +-
 ts/session/sending/MessageSender.ts           |   4 +-
 .../utils/job_runners/JobDeserialization.ts   |   4 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  91 +++++++--
 .../utils/libsession/libsession_utils.ts      |  75 +++++--
 .../libsession_wrapper_test_skip.ts           |   1 -
 ts/types/sqlSharedTypes.ts                    |  42 ++--
 .../browser/libsession_worker_functions.d.ts  |   6 -
 .../browser/libsession_worker_interface.ts    | 145 ++++++++++++-
 .../node/libsession/libsession.worker.ts      |  23 ++-
 18 files changed, 641 insertions(+), 305 deletions(-)
 create mode 100644 ts/node/sql_calls/config_dump.ts

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 7ff3a70be..1cccdc3c8 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -3,32 +3,25 @@ import { QRCode } from 'react-qr-svg';
 
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 
-import { YourSessionIDPill, YourSessionIDSelectable } from '../basic/YourSessionIDPill';
 import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
+import { YourSessionIDPill, YourSessionIDSelectable } from '../basic/YourSessionIDPill';
 
 import { ConversationModel } from '../../models/conversation';
 
-import { getConversationController } from '../../session/conversations';
 import autoBind from 'auto-bind';
-import { editProfileModal } from '../../state/ducks/modalDialog';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
+import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { MAX_USERNAME_BYTES } from '../../session/constants';
+import { getConversationController } from '../../session/conversations';
+import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { sanitizeSessionUsername } from '../../session/utils/String';
+import { editProfileModal } from '../../state/ducks/modalDialog';
+import { pickFileForAvatar } from '../../types/attachments/VisualAttachment';
+import { setLastProfileUpdateTimestamp } from '../../util/storage';
 import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIconButton } from '../icon';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import { pickFileForAvatar } from '../../types/attachments/VisualAttachment';
-import { sanitizeSessionUsername } from '../../session/utils/String';
-import { setLastProfileUpdateTimestamp } from '../../util/storage';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { MAX_USERNAME_BYTES } from '../../session/constants';
-import { SharedConfigMessage } from '../../session/messages/outgoing/controlMessage/SharedConfigMessage';
-import { callLibSessionWorker } from '../../webworker/workers/browser/libsession_worker_interface';
-import { SignalService } from '../../protobuf';
-import Long from 'long';
-import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime';
-import { getMessageQueue } from '../../session/sending';
-import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces';
-import { from_string } from 'libsodium-wrappers-sumo';
 
 interface State {
   profileName: string;
@@ -350,27 +343,8 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
   await conversation.commit();
 
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    await callLibSessionWorker(['UserConfig', 'setName', newName]);
-    const pointer = conversation.get('avatarPointer');
-    const profileKey = conversation.get('profileKey');
-    if (profileKey && pointer) {
-      await callLibSessionWorker([
-        'UserConfig',
-        'setProfilePicture',
-        pointer,
-        from_string(profileKey),
-      ]);
-    } else {
-      await callLibSessionWorker(['UserConfig', 'setProfilePicture', '', new Uint8Array()]);
-    }
-
-    const message = new SharedConfigMessage({
-      data: (await callLibSessionWorker(['UserConfig', 'dump'])) as Uint8Array,
-      kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
-      seqno: Long.fromNumber(0),
-      timestamp: GetNetworkTime.getNowWithNetworkOffset(),
-    });
-    await getMessageQueue().sendSyncMessage({ message, namespace: SnodeNamespaces.UserProfile });
+    await ConfigurationSync.queueNewJobIfNeeded();
+    await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
 
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index c03160023..5922ad299 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -44,7 +44,7 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
 import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
-import { initializeLibSessionUtilWrappers } from '../../session/utils/libsession/libsession_utils';
+import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
@@ -193,7 +193,7 @@ const triggerAvatarReUploadIfNeeded = async () => {
  * This function is called only once: on app startup with a logged in user
  */
 const doAppStartUp = async () => {
-  await initializeLibSessionUtilWrappers();
+  await LibSessionUtil.initializeLibSessionUtilWrappers();
 
   void setupTheme();
   // this generates the key to encrypt attachments locally
@@ -201,6 +201,8 @@ const doAppStartUp = async () => {
 
   await runners.avatarDownloadRunner.loadJobsFromDb();
   runners.avatarDownloadRunner.startProcessing();
+  await runners.configurationSyncRunner.loadJobsFromDb();
+  runners.configurationSyncRunner.startProcessing();
 
   // trigger a sync message if needed for our other devices
   void triggerSyncIfNeeded();
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index cd5ce1a06..098bbf9ec 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -1,41 +1,31 @@
 import {
-  AsyncWrapper,
+  AsyncObjectWrapper,
+  ConfigDumpDataNode,
   ConfigDumpRow,
-  GetAllDumps,
-  GetByPubkeyConfigDump,
-  GetByVariantAndPubkeyConfigDump,
-  SaveConfigDump,
+  ConfigDumpRowWithoutData,
 } from '../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
 
-const getByVariantAndPubkey: AsyncWrapper<GetByVariantAndPubkeyConfigDump> = (
-  variant: ConfigWrapperObjectTypes,
-  pubkey: string
-) => {
-  return channels.getConfigDumpByVariantAndPubkey(variant, pubkey);
-};
-
-const getByPubkey: AsyncWrapper<GetByPubkeyConfigDump> = (pubkey: string) => {
-  return channels.getConfigDumpsByPk(pubkey);
-};
-
-const saveConfigDump: AsyncWrapper<SaveConfigDump> = (dump: ConfigDumpRow) => {
-  return channels.saveConfigDump(dump);
-};
-
-const getAllDumpsWithData: AsyncWrapper<GetAllDumps> = () => {
-  return channels.getAllDumpsWithData();
-};
-
-const getAllDumpsWithoutData: AsyncWrapper<GetAllDumps> = () => {
-  return channels.getAllDumpsWithoutData();
-};
-
-export const ConfigDumpData = {
-  getByVariantAndPubkey,
-  getByPubkey,
-  saveConfigDump,
-  getAllDumpsWithData,
-  getAllDumpsWithoutData,
+export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
+  getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
+    return channels.getByVariantAndPubkey(variant, pubkey);
+  },
+  getMessageHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
+    return channels.getMessageHashesByVariantAndPubkey(variant, pubkey);
+  },
+  saveConfigDump: (dump: ConfigDumpRow) => {
+    console.warn('saveConfigDump', dump);
+    return channels.saveConfigDump(dump);
+  },
+  saveCombinedMessageHashesForMatching: (dump: ConfigDumpRowWithoutData) => {
+    console.warn('saveCombinedMessageHashesForMatching', dump);
+    return channels.saveCombinedMessageHashesForMatching(dump);
+  },
+  getAllDumpsWithData: () => {
+    return channels.getAllDumpsWithData();
+  },
+  getAllDumpsWithoutData: () => {
+    return channels.getAllDumpsWithoutData();
+  },
 };
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 3cdf64033..47c64a070 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -40,6 +40,7 @@ import { setLastProfileUpdateTimestamp } from '../util/storage';
 import { getSodiumRenderer } from '../session/crypto';
 import { encryptProfile } from '../util/crypto/profileEncrypter';
 import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 
 export const getCompleteUrlForV2ConvoId = async (convoId: string) => {
   if (convoId.match(openGroupV2ConversationIdRegex)) {
@@ -449,7 +450,11 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
 
   if (newAvatarDecrypted) {
     await setLastProfileUpdateTimestamp(Date.now());
-    await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      await ConfigurationSync.queueNewJobIfNeeded();
+    } else {
+      await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
+    }
   } else {
     window.log.info(
       `Reuploading avatar finished at ${newTimestampReupload}, newAttachmentPointer ${fileUrl}`
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 36b9d44f4..2879db030 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1247,6 +1247,10 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
     //   ;
     //     `);
 
+    // for manually flagging conversations as :unread"
+    db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN markedAsUnread BOOLEAN;`);
+
+    // Didn't find any reference to this serverTimestamp in the unprocessed table needed.
     db.exec(`ALTER TABLE unprocessed DROP COLUMN serverTimestamp;`);
 
     // we need to populate those fields with the current state of the conversation so let's throw null until this is done
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 4e10e7bef..a17403f72 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -48,8 +48,6 @@ import {
 } from './database_utility';
 
 import {
-  ConfigDumpDataNode,
-  ConfigDumpRow,
   MsgDuplicateSearchOpenGroup,
   UnprocessedDataNode,
   UnprocessedParameter,
@@ -70,7 +68,7 @@ import {
   initDbInstanceWith,
   isInstanceInitialized,
 } from './sqlInstance';
-import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
+import { configDumpData } from './sql_calls/config_dump';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -1964,92 +1962,6 @@ function removeV2OpenGroupRoom(conversationId: string) {
     });
 }
 
-/**
- * Config dumps sql calls
- */
-
-const configDumpData: ConfigDumpDataNode = {
-  getConfigDumpByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
-    const rows = assertGlobalInstance()
-      .prepare('SELECT * from configDump WHERE variant = $variant AND pubkey = $pubkey;')
-      .get({
-        pubkey,
-        variant,
-      });
-
-    if (!rows) {
-      return [];
-    }
-    throw new Error(`getConfigDumpByVariantAndPubkey: rows: ${JSON.stringify(rows)} `);
-
-    return rows;
-  },
-
-  getConfigDumpsByPubkey: (pubkey: string) => {
-    const rows = assertGlobalInstance()
-      .prepare('SELECT * from configDump WHERE pubkey = $pubkey;')
-      .get({
-        pubkey,
-      });
-
-    if (!rows) {
-      return [];
-    }
-    throw new Error(`getConfigDumpsByPubkey: rows: ${JSON.stringify(rows)} `);
-
-    return rows;
-  },
-
-  saveConfigDump: ({ data, pubkey, variant, combinedMessageHashes }: ConfigDumpRow) => {
-    assertGlobalInstance()
-      .prepare(
-        `INSERT OR REPLACE INTO configDump (
-          pubkey,
-          variant,
-          combinedMessageHashes,
-          data
-      ) values (
-        $pubkey,
-        $variant,
-        $combinedMessageHashes,
-        $data,
-      );`
-      )
-      .run({
-        pubkey,
-        variant,
-        combinedMessageHashes,
-        data,
-      });
-  },
-
-  getAllDumpsWithData: () => {
-    const rows = assertGlobalInstance()
-      .prepare('SELECT variant, publicKey, combinedMessageHashes, data from configDump;')
-      .get();
-
-    if (!rows) {
-      return [];
-    }
-    throw new Error(`getAllDumpsWithData: rows: ${JSON.stringify(rows)} `);
-
-    return rows;
-  },
-
-  getAllDumpsWithoutData: () => {
-    const rows = assertGlobalInstance()
-      .prepare('SELECT variant, publicKey, combinedMessageHashes from configDump;')
-      .get();
-
-    if (!rows) {
-      return [];
-    }
-    throw new Error(`getAllDumpsWithoutData: rows: ${JSON.stringify(rows)} `);
-
-    return rows;
-  },
-};
-
 /**
  * Others
  */
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
new file mode 100644
index 000000000..c4c5a71d2
--- /dev/null
+++ b/ts/node/sql_calls/config_dump.ts
@@ -0,0 +1,147 @@
+/**
+ * Config dumps sql calls
+ */
+
+import { compact, flatten, isEmpty, uniq } from 'lodash';
+import {
+  ConfigDumpDataNode,
+  ConfigDumpRow,
+  ConfigDumpRowWithoutData,
+} from '../../types/sqlSharedTypes';
+import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
+import { assertGlobalInstance } from '../sqlInstance';
+
+type CombinedMessageHashes = { combinedMessageHashes?: string };
+
+function parseRow(
+  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'> & CombinedMessageHashes
+): ConfigDumpRow | null {
+  const parsedNoData = parseRowNoData(row);
+  if (!parsedNoData) {
+    return null;
+  }
+  return { ...parsedNoData, data: row.data };
+}
+
+function parseRowNoData(
+  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'> & CombinedMessageHashes
+): ConfigDumpRowWithoutData | null {
+  const toRet: ConfigDumpRowWithoutData = {
+    publicKey: row.publicKey,
+    variant: row.variant,
+    combinedMessageHashes: [],
+  };
+  toRet.combinedMessageHashes = parseRowMessageHashes(row);
+
+  return toRet;
+}
+
+function parseRowMessageHashes(row: CombinedMessageHashes): Array<string> {
+  if (!isEmpty(row.combinedMessageHashes) && row.combinedMessageHashes) {
+    try {
+      return JSON.parse(row.combinedMessageHashes) || [];
+    } catch (e) {
+      console.warn('parseRowMessageHashes row failed');
+    }
+  }
+  return [];
+}
+
+export const configDumpData: ConfigDumpDataNode = {
+  getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
+    const rows = assertGlobalInstance()
+      .prepare(
+        'SELECT publicKey, variant, combinedMessageHashes, data from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+      )
+      .all({
+        publicKey,
+        variant,
+      });
+
+    if (!rows) {
+      return [];
+    }
+
+    return compact(rows.map(parseRow));
+  },
+
+  getMessageHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
+    const rows = assertGlobalInstance()
+      .prepare(
+        'SELECT combinedMessageHashes from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+      )
+      .all({
+        publicKey,
+        variant,
+      });
+
+    if (!rows) {
+      return [];
+    }
+    return uniq(flatten(rows.map(parseRowMessageHashes)));
+  },
+
+  getAllDumpsWithData: () => {
+    const rows = assertGlobalInstance()
+      .prepare('SELECT variant, publicKey, combinedMessageHashes, data from configDump;')
+      .all();
+
+    if (!rows) {
+      return [];
+    }
+
+    return compact(rows.map(parseRow));
+  },
+
+  getAllDumpsWithoutData: () => {
+    const rows = assertGlobalInstance()
+      .prepare('SELECT variant, publicKey, combinedMessageHashes from configDump;')
+      .all();
+
+    if (!rows) {
+      return [];
+    }
+
+    return compact(rows.map(parseRowNoData));
+  },
+
+  saveConfigDump: ({ data, publicKey, variant, combinedMessageHashes }: ConfigDumpRow) => {
+    assertGlobalInstance()
+      .prepare(
+        `INSERT OR REPLACE INTO configDump (
+              publicKey,
+              variant,
+              combinedMessageHashes,
+              data
+          ) values (
+            $publicKey,
+            $variant,
+            $combinedMessageHashes,
+            $data
+          );`
+      )
+      .run({
+        publicKey,
+        variant,
+        combinedMessageHashes: JSON.stringify(combinedMessageHashes || []),
+        data,
+      });
+  },
+  saveCombinedMessageHashesForMatching: ({
+    publicKey,
+    variant,
+    combinedMessageHashes,
+  }: ConfigDumpRowWithoutData) => {
+    assertGlobalInstance()
+      .prepare(
+        `UPDATE configDump SET
+         combinedMessageHashes = $combinedMessageHashes
+         WHERE publicKey=$publicKey AND variant=$variant;`
+      )
+      .run({
+        publicKey,
+        variant,
+        combinedMessageHashes: JSON.stringify(combinedMessageHashes || []),
+      });
+  },
+};
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 69f965454..d991f0f21 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,5 +1,5 @@
-import _, { isEmpty } from 'lodash';
-import { ContactInfo, ProfilePicture } from 'session_util_wrapper';
+import _, { compact, flattenDeep, isEmpty, isEqual } from 'lodash';
+import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
@@ -13,12 +13,17 @@ import { getConversationController } from '../session/conversations';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { UserUtils } from '../session/utils';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { BlockedNumberController } from '../util';
 import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
-import { callLibSessionWorker } from '../webworker/workers/browser/libsession_worker_interface';
+import {
+  ContactsWrapperActions,
+  GenericWrapperActions,
+  UserConfigWrapperActions,
+} from '../webworker/workers/browser/libsession_worker_interface';
 import { removeFromCache } from './cache';
 import { handleNewClosedGroup } from './closedGroups';
 import { EnvelopePlus } from './types';
@@ -30,7 +35,7 @@ type IncomingConfResult = {
   latestSentTimestamp: number;
 };
 
-function protobufSharedConfigTypeToWrapper(
+function pbKindToVariant(
   kind: SignalService.SharedConfigMessage.Kind
 ): ConfigWrapperObjectTypes | null {
   switch (kind) {
@@ -45,59 +50,44 @@ function protobufSharedConfigTypeToWrapper(
 
 async function mergeConfigsWithIncomingUpdates(
   incomingConfig: IncomingMessage<SignalService.ISharedConfigMessage>
-) {
-  const kindMessageMap: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult> = new Map();
-  const allKinds = [incomingConfig.message.kind];
-  for (let index = 0; index < allKinds.length; index++) {
-    const kind = allKinds[index];
+): Promise<{ kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }> {
+  const { kind } = incomingConfig.message;
 
-    const currentKindMessages = [incomingConfig];
-    if (!currentKindMessages) {
-      continue;
-    }
-    const toMerge = currentKindMessages.map(m => m.message.data);
+  const toMerge = [incomingConfig.message.data];
 
-    const wrapperId = protobufSharedConfigTypeToWrapper(kind);
-    if (!wrapperId) {
-      throw new Error(`Invalid kind: ${kind}`);
-    }
-
-    await callLibSessionWorker([wrapperId, 'merge', toMerge]);
-    const needsPush = ((await callLibSessionWorker([wrapperId, 'needsPush'])) || false) as boolean;
-    const needsDump = ((await callLibSessionWorker([wrapperId, 'needsDump'])) || false) as boolean;
-    const messageHashes = currentKindMessages.map(m => m.messageHash);
-    const latestSentTimestamp = Math.max(...currentKindMessages.map(m => m.envelopeTimestamp));
-
-    const incomingConfResult: IncomingConfResult = {
-      latestSentTimestamp,
-      messageHashes,
-      needsDump,
-      needsPush,
-    };
-    kindMessageMap.set(kind, incomingConfResult);
+  const wrapperId = pbKindToVariant(kind);
+  if (!wrapperId) {
+    throw new Error(`Invalid kind: ${kind}`);
   }
 
-  return kindMessageMap;
+  await GenericWrapperActions.merge(wrapperId, toMerge);
+  const needsPush = await GenericWrapperActions.needsPush(wrapperId);
+  const needsDump = await GenericWrapperActions.needsDump(wrapperId);
+  const messageHashes = [incomingConfig.messageHash];
+  const latestSentTimestamp = incomingConfig.envelopeTimestamp;
+
+  const incomingConfResult: IncomingConfResult = {
+    latestSentTimestamp,
+    messageHashes,
+    needsDump,
+    needsPush,
+  };
+
+  return { kind, result: incomingConfResult };
 }
 
-async function handleUserProfileUpdate(result: IncomingConfResult) {
+async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
+  const updatedUserName = await UserConfigWrapperActions.getName();
+  console.warn('got', updatedUserName);
+
   if (result.needsDump) {
-    return;
+    return result;
   }
 
-  const updatedUserName = (await callLibSessionWorker(['UserConfig', 'getName'])) as
-    | string
-    | undefined;
-  const updatedProfilePicture = (await callLibSessionWorker([
-    'UserConfig',
-    'getProfilePicture',
-  ])) as ProfilePicture;
-
-  // fetch our own conversation
-  const userPublicKey = UserUtils.getOurPubKeyStrFromCache();
-  if (!userPublicKey) {
-    return;
+  if (!updatedUserName) {
+    debugger;
   }
+  const updatedProfilePicture = await UserConfigWrapperActions.getProfilePicture();
 
   const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
 
@@ -106,16 +96,15 @@ async function handleUserProfileUpdate(result: IncomingConfResult) {
     picUpdate ? updatedProfilePicture.url : null,
     picUpdate ? updatedProfilePicture.key : null
   );
+  return result;
 }
 
-async function handleContactsUpdate(result: IncomingConfResult) {
+async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   if (result.needsDump) {
-    return;
+    return result;
   }
 
-  const allContacts = (await callLibSessionWorker(['ContactsConfig', 'getAll'])) as Array<
-    ContactInfo
-  >;
+  const allContacts = await ContactsWrapperActions.getAll();
 
   for (let index = 0; index < allContacts.length; index++) {
     const wrapperConvo = allContacts[index];
@@ -161,7 +150,7 @@ async function handleContactsUpdate(result: IncomingConfResult) {
         await existingConvo.commit();
       }
 
-      // we still need to handle the the `name` (sync) and the `profilePicture` (asynchronous)
+      // we still need to handle the the `name` (synchronous) and the `profilePicture` (asynchronous)
       await ProfileManager.updateProfileOfContact(
         existingConvo.id,
         wrapperConvo.name,
@@ -170,36 +159,85 @@ async function handleContactsUpdate(result: IncomingConfResult) {
       );
     }
   }
+  return result;
 }
 
 async function processMergingResults(
   envelope: EnvelopePlus,
-  results: Map<SignalService.SharedConfigMessage.Kind, IncomingConfResult>
+  result: { kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }
 ) {
-  const keys = [...results.keys()];
+  const pubkey = envelope.source;
 
-  for (let index = 0; index < keys.length; index++) {
-    const kind = keys[index];
-    const result = results.get(kind);
+  const { kind, result: incomingResult } = result;
 
-    if (!result) {
-      continue;
-    }
-
-    try {
-      switch (kind) {
-        case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
-          await handleUserProfileUpdate(result);
-          break;
-        case SignalService.SharedConfigMessage.Kind.CONTACTS:
-          await handleContactsUpdate(result);
-          break;
-      }
-    } catch (e) {
-      throw e;
-    }
+  if (!incomingResult) {
+    await removeFromCache(envelope);
+    return;
   }
+
+  try {
+    let finalResult = incomingResult;
+
+    switch (kind) {
+      case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
+        finalResult = await handleUserProfileUpdate(incomingResult);
+        break;
+      case SignalService.SharedConfigMessage.Kind.CONTACTS:
+        finalResult = await handleContactsUpdate(incomingResult);
+        break;
+      default:
+        throw new Error(`processMergingResults unknown kind of contact : ${kind}`);
+    }
+    const variant = pbKindToVariant(kind);
+    if (!variant) {
+      throw new Error('unknown variant');
+    }
+    // We need to get the existing message hashes and combine them with the latest from the
+    // service node to ensure the next push will properly clean up old messages
+    const oldMessageHashesWithDup = (
+      await ConfigDumpData.getByVariantAndPubkey(variant, envelope.source)
+    ).map(m => m.combinedMessageHashes);
+    const oldMessageHashes = new Set(...flattenDeep(compact(oldMessageHashesWithDup)));
+    const allMessageHashes = new Set([...oldMessageHashes, ...finalResult.messageHashes]);
+    const finalResultsHashes = new Set([...finalResult.messageHashes]);
+
+    // lodash does deep compare of Sets
+    const messageHashesChanged = !isEqual(oldMessageHashes, finalResultsHashes);
+
+    if (finalResult.needsDump) {
+      // The config data had changes so regenerate the dump and save it
+
+      const dump = await GenericWrapperActions.dump(variant);
+      await ConfigDumpData.saveConfigDump({
+        data: dump,
+        publicKey: pubkey,
+        variant,
+        combinedMessageHashes: [...allMessageHashes],
+      });
+    } else if (messageHashesChanged) {
+      // The config data didn't change but there were different messages on the service node
+      // so just update the message hashes so the next sync can properly remove any old ones
+      await ConfigDumpData.saveCombinedMessageHashesForMatching({
+        publicKey: pubkey,
+        variant,
+        combinedMessageHashes: [...allMessageHashes],
+      });
+    }
+
+    console.warn('all dumps in DB: ', await ConfigDumpData.getAllDumpsWithoutData());
+    await removeFromCache(envelope);
+  } catch (e) {
+    window.log.error(`processMergingResults failed with ${e.message}`);
+    await removeFromCache(envelope);
+    return;
+  }
+
   await removeFromCache(envelope);
+  // Now that the local state has been updated, trigger a config sync (this will push any
+  // pending updates and properly update the state)
+  if (result.result.needsPush) {
+    await ConfigurationSync.queueNewJobIfNeeded();
+  }
 }
 
 async function handleConfigMessageViaLibSession(
@@ -218,11 +256,11 @@ async function handleConfigMessageViaLibSession(
     return;
   }
 
-  window?.log?.info(`Handling our profileUdpates via libsession_util.`);
+  window?.log?.info('Handling our profileUdpates via libsession_util.');
 
-  const kindMessagesMap = await mergeConfigsWithIncomingUpdates(configMessage);
+  const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessage);
 
-  await processMergingResults(envelope, kindMessagesMap);
+  await processMergingResults(envelope, incomingMergeResult);
 }
 
 async function handleOurProfileUpdate(
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 6355e1cf1..527fd15de 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -231,7 +231,7 @@ export class MessageQueue {
     pubkey,
   }: {
     pubkey: PubKey;
-    message: ClosedGroupNewMessage | CallMessage;
+    message: ClosedGroupNewMessage | CallMessage | SharedConfigMessage;
     namespace: SnodeNamespaces;
   }): Promise<boolean | number> {
     let rawMessage;
@@ -258,6 +258,7 @@ export class MessageQueue {
    */
   public async processPending(device: PubKey, isSyncMessage: boolean = false) {
     const messages = await this.pendingMessageCache.getForDevice(device);
+    console.warn('processPending', messages);
 
     const jobQueue = this.getJobQueue(device);
     messages.forEach(async message => {
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 4f3fd2348..f6a28e138 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -124,7 +124,7 @@ export async function send(
           ? SnodeNamespaces.ClosedGroupMessage
           : SnodeNamespaces.UserMessages;
       }
-      let timestamp = networkTimestamp;
+      const timestamp = networkTimestamp;
       // the user config namespaces requires a signature to be added
       let signOpts: SnodeSignatureResult | undefined;
       if (SnodeNamespace.isUserConfigNamespace(namespace)) {
@@ -247,7 +247,7 @@ export async function sendMessageToSnode({
     window?.log?.info(
       `loki_message:::sendMessage - Successfully stored message to ${ed25519Str(pubKey)} via ${
         snode.ip
-      }:${snode.port}`
+      }:${snode.port} on namespace: ${namespace}`
     );
   }
 }
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index c7bb79049..4c70a9ac9 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -4,7 +4,7 @@ import {
   FakeSleepForMultiJob,
 } from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
 import { AvatarDownload } from './jobs/AvatarDownloadJob';
-import { ConfigurationSyncJob } from './jobs/ConfigurationSyncJob';
+import { ConfigurationSync } from './jobs/ConfigurationSyncJob';
 import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
 
 export function persistedJobFromData<T extends TypeOfPersistedData>(
@@ -16,7 +16,7 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
 
   switch (data.jobType) {
     case 'ConfigurationSyncJobType':
-      return (new ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
+      return (new ConfigurationSync.ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
 
     case 'AvatarDownloadJobType':
       return (new AvatarDownload.AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 0757db304..306c3b21e 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,5 +1,17 @@
+import { from_string } from 'libsodium-wrappers-sumo';
+import { isNumber } from 'lodash';
+import Long from 'long';
 import { v4 } from 'uuid';
-import { sleepFor } from '../../Promise';
+import { UserUtils } from '../..';
+import { SignalService } from '../../../../protobuf';
+import { UserConfigWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
+import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../../../apis/snode_api/namespaces';
+import { getConversationController } from '../../../conversations';
+import { SharedConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage';
+import { getMessageQueue } from '../../../sending';
+import { PubKey } from '../../../types';
+import { runners } from '../JobRunner';
 import {
   AddJobCheckReturn,
   ConfigurationSyncPersistedData,
@@ -8,35 +20,75 @@ import {
 } from '../PersistedJob';
 
 const defaultMsBetweenRetries = 3000;
+const defaultMaxAttempts = 3;
 
-export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData> {
+class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData> {
   constructor({
     identifier,
     nextAttemptTimestamp,
     maxAttempts,
     currentRetry,
-  }: Pick<ConfigurationSyncPersistedData, 'identifier' | 'currentRetry' | 'maxAttempts'> &
-    Partial<Pick<ConfigurationSyncPersistedData, 'nextAttemptTimestamp'>>) {
+  }: Partial<
+    Pick<
+      ConfigurationSyncPersistedData,
+      'identifier' | 'nextAttemptTimestamp' | 'currentRetry' | 'maxAttempts'
+    >
+  >) {
     super({
       jobType: 'ConfigurationSyncJobType',
       identifier: identifier || v4(),
       delayBetweenRetries: defaultMsBetweenRetries,
-      maxAttempts: maxAttempts,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts,
+      currentRetry: isNumber(currentRetry) ? currentRetry : 0,
       nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries,
-      currentRetry,
     });
   }
 
   public async run(): Promise<RunJobResult> {
-    // blablha do everything from the notion page, and if success, return true.
-    window.log.warn(
-      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" `
+    window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
+
+    const us = UserUtils.getOurPubKeyStrFromCache();
+    const conversation = getConversationController().get(us);
+    if (!us || !conversation) {
+      window.log.warn('did not find our own conversation');
+      return RunJobResult.PermanentFailure;
+    }
+    const name = conversation.get('displayNameInProfile');
+    const pointer = conversation.get('avatarPointer');
+    const profileKey = conversation.get('profileKey');
+    await UserConfigWrapperActions.setName(name || '');
+
+    if (profileKey && pointer) {
+      await UserConfigWrapperActions.setProfilePicture(pointer, from_string(profileKey));
+    } else {
+      await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
+    }
+
+    const data = await UserConfigWrapperActions.push();
+
+    const message = new SharedConfigMessage({
+      data: data.data,
+      kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
+      seqno: Long.fromNumber(data.seqno),
+      timestamp: GetNetworkTime.getNowWithNetworkOffset(),
+    });
+
+    const result = await getMessageQueue().sendToPubKeyNonDurably({
+      message,
+      namespace: SnodeNamespaces.UserProfile,
+      pubkey: PubKey.cast(us),
+    });
+    console.warn(
+      `ConfigurationSyncJob sendToPubKeyNonDurably ${this.persistedData.identifier} returned: "${result}"`
     );
 
-    await sleepFor(5000);
-    window.log.warn(
-      `running job ${this.persistedData.jobType} with id:"${this.persistedData.identifier}" done and returning failed `
-    );
+    if (isNumber(result)) {
+      // try {
+      //   markAsPushed
+      // }
+      debugger;
+      return RunJobResult.Success;
+    }
 
     return RunJobResult.RetryJobIfPossible;
   }
@@ -59,3 +111,16 @@ export class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersiste
     return [];
   }
 }
+
+/**
+ * Queue a new Sync Configuration if needed job.
+ * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
+ */
+async function queueNewJobIfNeeded() {
+  await runners.configurationSyncRunner.addJob(new ConfigurationSyncJob({}));
+}
+
+export const ConfigurationSync = {
+  ConfigurationSyncJob,
+  queueNewJobIfNeeded,
+};
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 0d42013de..2b7079329 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -1,28 +1,77 @@
-import { difference } from 'lodash';
+import { difference, isEqual } from 'lodash';
 import { UserUtils } from '..';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 import { ConfigWrapperObjectTypes } from '../../../webworker/workers/browser/libsession_worker_functions';
-import { callLibSessionWorker } from '../../../webworker/workers/browser/libsession_worker_interface';
+import {
+  GenericWrapperActions,
+  UserConfigWrapperActions,
+} from '../../../webworker/workers/browser/libsession_worker_interface';
+import { getConversationController } from '../../conversations';
+import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 
-export async function initializeLibSessionUtilWrappers() {
+// TODO complete this list
+const requiredVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
+
+async function insertUserProfileIntoWrapper() {
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  const ourConvo = getConversationController().get(us);
+
+  if (!ourConvo) {
+    throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist');
+  }
+  const currentWrapperName = await UserConfigWrapperActions.getName();
+  const currentWrapperProfileUrl = await UserConfigWrapperActions.getProfilePicture();
+
+  const currentDbName = ourConvo.get('displayNameInProfile') || '';
+  if (!isEqual(currentDbName, currentWrapperName)) {
+    await UserConfigWrapperActions.setName(currentDbName);
+  }
+}
+
+/**
+ * Right after we migrated, we won't have any dumps in DB. We must create them from our database state,
+ */
+async function createConfigDumpsFromDbFirstStart(privateKeyEd25519: Uint8Array) {
+  let countCreated = 0;
+  try {
+    // build the userconfig
+    await UserConfigWrapperActions.init(privateKeyEd25519, null);
+
+    countCreated++;
+  } catch (e) {
+    window.log.warn('Failed to init the UserConfig with createConfigDumpsFromDbFirstStart');
+  }
+
+  if (countCreated > 0) {
+    await ConfigurationSync.queueNewJobIfNeeded();
+  }
+}
+
+async function initializeLibSessionUtilWrappers() {
   const keypair = await UserUtils.getUserED25519KeyPairBytes();
-  if (!keypair) {
+  if (!keypair || !keypair.privKeyBytes) {
     throw new Error('edkeypair not found for current user');
   }
   const privateKeyEd25519 = keypair.privKeyBytes;
-  const dumps = await ConfigDumpData.getAllDumpsWithData();
+  let dumps = await ConfigDumpData.getAllDumpsWithData();
+
+  if (!dumps?.length) {
+    await createConfigDumpsFromDbFirstStart(privateKeyEd25519);
+  }
+
+  // refetch them as the createConfigDumpsFromDb might have created them
+  dumps = await ConfigDumpData.getAllDumpsWithData();
 
   const userVariantsBuildWithoutErrors = new Set<ConfigWrapperObjectTypes>();
 
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
     try {
-      await callLibSessionWorker([
+      await GenericWrapperActions.init(
         dump.variant,
-        'init',
         privateKeyEd25519,
-        dump.data.length ? dump.data : null,
-      ]);
+        dump.data.length ? dump.data : null
+      );
 
       userVariantsBuildWithoutErrors.add(dump.variant);
     } catch (e) {
@@ -31,14 +80,16 @@ export async function initializeLibSessionUtilWrappers() {
     }
   }
 
-  // TODO complete this list
-  const requiredVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
+  console.warn('requiredVariants: FIXME add conversation volatile wrapper as required ');
+
   const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(requiredVariants, [
     ...userVariantsBuildWithoutErrors.values(),
   ]);
 
   for (let index = 0; index < missingRequiredVariants.length; index++) {
     const missingVariant = missingRequiredVariants[index];
-    await callLibSessionWorker([missingVariant, 'init', privateKeyEd25519, null]);
+    await GenericWrapperActions.init(missingVariant, privateKeyEd25519, null);
   }
 }
+
+export const LibSessionUtil = { initializeLibSessionUtilWrappers };
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
index e01e92059..acbc3605c 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
@@ -35,7 +35,6 @@ describe('libsession_wrapper', () => {
     expect(pushResult.seqno).to.be.eq(0);
     expect(pushResult.data.length).to.be.eq(256);
 
-    expect(conf.encryptionDomain()).to.be.eq('UserProfile');
     expect(conf.storageNamespace()).to.be.eq(2);
     expect(to_hex(pushResult.data)).to.be.deep.eq(
       '9ffb5347e061ac40d937ae4f1a890031475bdc11653f94c8ae1d516ffda71d9ee9cdaf9fbaeb15d835cdc7b3b6ecc120361f004ff172dd5e757c80ede10e88945536e6841255a7bca73664ab8a0607fcfe2579c05bb3d9d4b34ac1de2921e703783ce39e317a512cb9d4e3b59176cbde47b5ba24a03065bf8fefe3e8ca2609e0ad10c7c9c3f81dc6d3a399bda0c190e8a228d0acb22863ab84c2d0c411be74dac4de1f8bc18539635db01ea1ef7f28e505703d67786cb419690edd4bd8c92926fc1d6449eaccc31d7d9639e1b36222e5672b87d1e34b7860308c3f40b3997f39fecf6ceb889323826fa69e001816307799fc9fed302a90faa1e43f7cd7367c3c'
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 54c7da67e..adf7d4430 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -9,6 +9,13 @@ export type AsyncWrapper<T extends (...args: any) => any> = (
   ...args: Parameters<T>
 ) => Promise<ReturnType<T>>;
 
+/**
+ * This type is used to build from an objectType filled with functions, a new object type where all the functions their async equivalent
+ */
+export type AsyncObjectWrapper<Type extends Record<string, (...args: any) => any>> = {
+  [Property in keyof Type]: AsyncWrapper<Type[Property]>;
+};
+
 export type MsgDuplicateSearchOpenGroup = Array<{
   sender: string;
   serverTimestamp: number;
@@ -25,28 +32,33 @@ export type UpdateLastHashType = {
 
 export type ConfigDumpRow = {
   variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
-  pubkey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
+  publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
   data: Uint8Array; // the blob returned by libsession.dump() call
-  combinedMessageHashes?: string; // array of lastHashes to keep track of, stringified
+  combinedMessageHashes: Array<string>; // array of lastHashes to keep track of
   // we might need to add a `seqno` field here.
 };
 
+export type ConfigDumpRowWithoutData = Pick<
+  ConfigDumpRow,
+  'publicKey' | 'combinedMessageHashes' | 'variant'
+>;
+
 // ========== configdump
 
-export type GetByVariantAndPubkeyConfigDump = (
-  variant: ConfigWrapperObjectTypes,
-  pubkey: string
-) => Array<ConfigDumpRow>;
-export type GetByPubkeyConfigDump = (pubkey: string) => Array<ConfigDumpRow>;
-export type SaveConfigDump = (dump: ConfigDumpRow) => void;
-export type GetAllDumps = () => Array<ConfigDumpRow>;
-
 export type ConfigDumpDataNode = {
-  getConfigDumpByVariantAndPubkey: GetByVariantAndPubkeyConfigDump;
-  getConfigDumpsByPubkey: GetByPubkeyConfigDump;
-  saveConfigDump: SaveConfigDump;
-  getAllDumpsWithData: GetAllDumps;
-  getAllDumpsWithoutData: GetAllDumps;
+  getByVariantAndPubkey: (
+    variant: ConfigWrapperObjectTypes,
+    publicKey: string
+  ) => Array<ConfigDumpRow>;
+  getMessageHashesByVariantAndPubkey: (
+    variant: ConfigWrapperObjectTypes,
+    publicKey: string
+  ) => Array<string>;
+  saveConfigDump: (dump: ConfigDumpRow) => void;
+  saveCombinedMessageHashesForMatching: (row: ConfigDumpRowWithoutData) => void;
+
+  getAllDumpsWithData: () => Array<ConfigDumpRow>;
+  getAllDumpsWithoutData: () => Array<ConfigDumpRowWithoutData>;
 };
 
 // ========== unprocessed
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index 0ee7b79b1..81b18e5e0 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -1,6 +1,5 @@
 import {
   BaseConfigActions,
-  BaseConfigWrapper,
   ContactsConfigActionsType,
   UserConfigActionsType,
 } from 'session_util_wrapper';
@@ -20,9 +19,4 @@ type ContactsConfigFunctions =
   | [ContactsConfig, ...BaseConfigActions]
   | [ContactsConfig, ...ContactsConfigActionsType];
 
-/**Those are the actions inherited from BaseConfigWrapper to ClosedGroupConfigWrapper */
-// type ClosedGroupConfigFromBase = [ClosedGroupConfig, ...BaseConfigActions];
-// type ClosedGroupConfigFunctions = ClosedGroupConfigFromBase;
-//| ClosedGroupConfigFunctions;
-
 export type LibSessionWorkerFunctions = UserConfigFunctions | ContactsConfigFunctions;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 0f40f676d..49b8c4304 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -1,7 +1,14 @@
 import { WorkerInterface } from '../../worker_interface';
 import { join } from 'path';
 import { getAppRootPath } from '../../../node/getRootPath';
-import { LibSessionWorkerFunctions } from './libsession_worker_functions';
+import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
+
+import {
+  BaseWrapperActionsCalls,
+  ContactInfo,
+  ContactsWrapperActionsCalls,
+  UserConfigWrapperActionsCalls,
+} from 'session_util_wrapper';
 
 let libsessionWorkerInterface: WorkerInterface | undefined;
 
@@ -26,8 +33,138 @@ const internalCallLibSessionWorker = async ([
   return libsessionWorkerInterface?.callWorker(config, fnName, ...args);
 };
 
-export const callLibSessionWorker = async (
-  callToMake: LibSessionWorkerFunctions
-): Promise<unknown> => {
+export const GenericWrapperActions = {
+  init: async (
+    wrapperId: ConfigWrapperObjectTypes,
+    ed25519Key: Uint8Array,
+    dump: Uint8Array | null
+  ) =>
+    /** base wrapper generic actions */
+    callLibSessionWorker([wrapperId, 'init', ed25519Key, dump]) as Promise<void>,
+  confirmPushed: async (wrapperId: ConfigWrapperObjectTypes, seqno: number) =>
+    callLibSessionWorker([wrapperId, 'confirmPushed', seqno]) as ReturnType<
+      BaseWrapperActionsCalls['confirmPushed']
+    >,
+  dump: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'dump']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['dump']>
+    >,
+  merge: async (wrapperId: ConfigWrapperObjectTypes, toMerge: Array<Uint8Array>) =>
+    callLibSessionWorker([wrapperId, 'merge', toMerge]) as Promise<
+      ReturnType<BaseWrapperActionsCalls['merge']>
+    >,
+  needsDump: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'needsDump']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['needsDump']>
+    >,
+  needsPush: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'needsPush']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['needsPush']>
+    >,
+  push: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'push']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['push']>
+    >,
+  storageNamespace: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'storageNamespace']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['storageNamespace']>
+    >,
+};
+
+export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
+  /* Reuse the GenericWrapperActions with the UserConfig argument */
+  init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
+    GenericWrapperActions.init('UserConfig', ed25519Key, dump),
+  confirmPushed: async (seqno: number) => GenericWrapperActions.confirmPushed('UserConfig', seqno),
+  dump: async () => GenericWrapperActions.dump('UserConfig'),
+  merge: async (toMerge: Array<Uint8Array>) => GenericWrapperActions.merge('UserConfig', toMerge),
+  needsDump: async () => GenericWrapperActions.needsDump('UserConfig'),
+  needsPush: async () => GenericWrapperActions.needsPush('UserConfig'),
+  push: async () => GenericWrapperActions.push('UserConfig'),
+  storageNamespace: async () => GenericWrapperActions.storageNamespace('UserConfig'),
+
+  /** UserConfig wrapper specific actions */
+  getName: async () =>
+    callLibSessionWorker(['UserConfig', 'getName']) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['getName']>
+    >,
+  getProfilePicture: async () =>
+    callLibSessionWorker(['UserConfig', 'getProfilePicture']) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['getProfilePicture']>
+    >,
+  setName: async (name: string) =>
+    callLibSessionWorker(['UserConfig', 'setName', name]) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['setName']>
+    >,
+  setProfilePicture: async (url: string, key: Uint8Array) =>
+    callLibSessionWorker(['UserConfig', 'setProfilePicture', url, key]) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['setProfilePicture']>
+    >,
+};
+
+export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
+  /* Reuse the GenericWrapperActions with the ContactConfig argument */
+  init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
+    GenericWrapperActions.init('ContactsConfig', ed25519Key, dump),
+  confirmPushed: async (seqno: number) =>
+    GenericWrapperActions.confirmPushed('ContactsConfig', seqno),
+  dump: async () => GenericWrapperActions.dump('ContactsConfig'),
+  merge: async (toMerge: Array<Uint8Array>) =>
+    GenericWrapperActions.merge('ContactsConfig', toMerge),
+  needsDump: async () => GenericWrapperActions.needsDump('ContactsConfig'),
+  needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'),
+  push: async () => GenericWrapperActions.push('ContactsConfig'),
+  storageNamespace: async () => GenericWrapperActions.storageNamespace('ContactsConfig'),
+
+  /** ContactsConfig wrapper specific actions */
+  get: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ContactsConfig', 'get', pubkeyHex]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['get']>
+    >,
+  getOrCreate: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ContactsConfig', 'getOrCreate', pubkeyHex]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['getOrCreate']>
+    >,
+  getAll: async () =>
+    callLibSessionWorker(['ContactsConfig', 'getAll']) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['getAll']>
+    >,
+
+  erase: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ContactsConfig', 'erase', pubkeyHex]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['erase']>
+    >,
+
+  set: async (contact: ContactInfo) =>
+    callLibSessionWorker(['ContactsConfig', 'set', contact]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['set']>
+    >,
+  setApproved: async (pubkeyHex: string, approved: boolean) =>
+    callLibSessionWorker(['ContactsConfig', 'setApproved', pubkeyHex, approved]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setApproved']>
+    >,
+  setApprovedMe: async (pubkeyHex: string, approvedMe: boolean) =>
+    callLibSessionWorker(['ContactsConfig', 'setApprovedMe', pubkeyHex, approvedMe]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setApprovedMe']>
+    >,
+  setBlocked: async (pubkeyHex: string, blocked: boolean) =>
+    callLibSessionWorker(['ContactsConfig', 'setBlocked', pubkeyHex, blocked]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setBlocked']>
+    >,
+  setName: async (pubkeyHex: string, name: string) =>
+    callLibSessionWorker(['ContactsConfig', 'setName', pubkeyHex, name]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setName']>
+    >,
+  setNickname: async (pubkeyHex: string, nickname: string) =>
+    callLibSessionWorker(['ContactsConfig', 'setNickname', pubkeyHex, nickname]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setNickname']>
+    >,
+  setProfilePicture: async (pubkeyHex: string, url: string, key: Uint8Array) =>
+    callLibSessionWorker(['ContactsConfig', 'setProfilePicture', pubkeyHex, url, key]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['setProfilePicture']>
+    >,
+};
+
+const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {
   return internalCallLibSessionWorker(callToMake);
 };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 0b31c9b42..51b8b82fa 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,19 +1,22 @@
 import _, { isEmpty, isNull } from 'lodash';
-import { BaseConfigWrapper, ContactsConfigWrapper, UserConfigWrapper } from 'session_util_wrapper';
+import {
+  BaseConfigWrapper,
+  BaseConfigWrapperInsideWorker,
+  ContactsConfigWrapperInsideWorker,
+  UserConfigWrapperInsideWorker,
+} from 'session_util_wrapper';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
 
 // we can only have one of those so don't worry about storing them in a map for now
-let userProfileWrapper: UserConfigWrapper | undefined;
-let contactsConfigWrapper: ContactsConfigWrapper | undefined;
-
-// const configWrappers: Array<EntryUserConfig | EntryContactsConfig> = new Array();
+let userProfileWrapper: UserConfigWrapperInsideWorker | undefined;
+let contactsConfigWrapper: ContactsConfigWrapperInsideWorker | undefined;
 
 type UserWrapperType = 'UserConfig' | 'ContactsConfig';
 
-function getUserWrapper(type: UserWrapperType): BaseConfigWrapper | undefined {
+function getUserWrapper(type: UserWrapperType): BaseConfigWrapperInsideWorker | undefined {
   switch (type) {
     case 'UserConfig':
       return userProfileWrapper;
@@ -22,7 +25,9 @@ function getUserWrapper(type: UserWrapperType): BaseConfigWrapper | undefined {
   }
 }
 
-function getCorrespondingWrapper(wrapperType: ConfigWrapperObjectTypes): BaseConfigWrapper {
+function getCorrespondingWrapper(
+  wrapperType: ConfigWrapperObjectTypes
+): BaseConfigWrapperInsideWorker {
   switch (wrapperType) {
     case 'UserConfig':
     case 'ContactsConfig':
@@ -68,10 +73,10 @@ function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): Bas
   const userType = assertUserWrapperType(wrapperType);
   switch (userType) {
     case 'UserConfig':
-      userProfileWrapper = new UserConfigWrapper(edSecretKey, dump);
+      userProfileWrapper = new UserConfigWrapperInsideWorker(edSecretKey, dump);
       return userProfileWrapper;
     case 'ContactsConfig':
-      contactsConfigWrapper = new ContactsConfigWrapper(edSecretKey, dump);
+      contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(edSecretKey, dump);
       return contactsConfigWrapper;
   }
 }

From 7c56310e69ad2ab3264f495416416b0d53bdefd1 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 8 Feb 2023 10:50:23 +1100
Subject: [PATCH 030/178] feat: addConfSyncJob start

---
 ts/data/configDump/configDump.ts              |   6 +
 ts/data/data.ts                               |  38 +-
 ts/data/dataInit.ts                           |   1 -
 ts/models/conversationAttributes.ts           |   2 +
 ts/node/config/base_config.ts                 |   1 +
 ts/node/database_utility.ts                   |   3 +
 ts/node/migration/sessionMigrations.ts        |   4 +-
 ts/node/sql.ts                                | 160 +-----
 ts/node/sql_calls/config_dump.ts              |  25 +
 ts/receiver/configMessage.ts                  |  63 +--
 ts/session/apis/snode_api/SNodeAPI.ts         | 151 +++---
 .../apis/snode_api/SnodeRequestTypes.ts       |  68 ++-
 ts/session/apis/snode_api/batchRequest.ts     |  13 +-
 ts/session/apis/snode_api/configMessages.ts   |  82 +++
 ts/session/apis/snode_api/retrieveRequest.ts  |   2 +-
 ts/session/apis/snode_api/sessionRpc.ts       |   8 +-
 ts/session/apis/snode_api/snodeSignatures.ts  |  54 +-
 ts/session/apis/snode_api/storeMessage.ts     |  76 ++-
 ts/session/constants.ts                       |   1 +
 .../controlMessage/SharedConfigMessage.ts     |   5 +
 ts/session/profile_manager/ProfileManager.ts  |   5 +-
 ts/session/sending/MessageQueue.ts            |  14 +-
 ts/session/sending/MessageSender.ts           | 512 ++++++++++++------
 ts/session/sending/index.ts                   |   5 +-
 ts/session/utils/Promise.ts                   |   2 +-
 ts/session/utils/job_runners/JobRunner.ts     |   3 +-
 ts/session/utils/job_runners/PersistedJob.ts  |   2 +
 .../job_runners/jobs/AvatarDownloadJob.ts     |   5 +
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 230 ++++++--
 .../utils/libsession/libsession_utils.ts      | 181 ++++++-
 .../unit/sending/MessageSender_test.ts        |   2 +-
 .../unit/utils/job_runner/FakeSleepForJob.ts  |   8 +
 ts/types/sqlSharedTypes.ts                    |   4 +
 .../node/libsession/libsession.worker.ts      |   3 +-
 34 files changed, 1117 insertions(+), 622 deletions(-)
 create mode 100644 ts/session/apis/snode_api/configMessages.ts

diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 098bbf9ec..8b4698655 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -16,6 +16,9 @@ export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
   },
   saveConfigDump: (dump: ConfigDumpRow) => {
     console.warn('saveConfigDump', dump);
+    if (dump.combinedMessageHashes.some(m => m && m.length < 5)) {
+      throw new Error('saveConfigDump combinedMessageHashes have invalid size');
+    }
     return channels.saveConfigDump(dump);
   },
   saveCombinedMessageHashesForMatching: (dump: ConfigDumpRowWithoutData) => {
@@ -28,4 +31,7 @@ export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
   getAllDumpsWithoutData: () => {
     return channels.getAllDumpsWithoutData();
   },
+  getCombinedHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
+    return channels.getCombinedHashesByVariantAndPubkey(variant, pubkey);
+  },
 };
diff --git a/ts/data/data.ts b/ts/data/data.ts
index 828d10ab0..18a0ae855 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -4,11 +4,10 @@
 import _ from 'lodash';
 import { MessageResultProps } from '../components/search/MessageSearchResults';
 import { ConversationCollection, ConversationModel } from '../models/conversation';
-import { ConversationAttributes, ConversationTypeEnum } from '../models/conversationAttributes';
+import { ConversationAttributes } from '../models/conversationAttributes';
 import { MessageCollection, MessageModel } from '../models/message';
 import { MessageAttributes, MessageDirection } from '../models/messageType';
 import { HexKeyPair } from '../receiver/keypairs';
-import { getConversationController } from '../session/conversations';
 import { getSodiumRenderer } from '../session/crypto';
 import { PubKey } from '../session/types';
 import {
@@ -702,40 +701,6 @@ async function updateSnodePoolOnDb(snodesAsJsonString: string): Promise<void> {
   await Data.createOrUpdateItem({ id: SNODE_POOL_ITEM_ID, value: snodesAsJsonString });
 }
 
-/**
- * Generates fake conversations and distributes messages amongst the conversations randomly
- * @param numConvosToAdd Amount of fake conversations to generate
- * @param numMsgsToAdd Number of fake messages to generate
- */
-async function fillWithTestData(convs: number, msgs: number) {
-  const newConvos = [];
-  for (let convsAddedCount = 0; convsAddedCount < convs; convsAddedCount++) {
-    const convoId = `${Date.now()} + ${convsAddedCount}`;
-    const newConvo = await getConversationController().getOrCreateAndWait(
-      convoId,
-      ConversationTypeEnum.PRIVATE
-    );
-    newConvos.push(newConvo);
-  }
-
-  for (let msgsAddedCount = 0; msgsAddedCount < msgs; msgsAddedCount++) {
-    // tslint:disable: insecure-random
-    const convoToChoose = newConvos[Math.floor(Math.random() * newConvos.length)];
-    const direction = Math.random() > 0.5 ? 'outgoing' : 'incoming';
-    const body = `spongebob ${new Date().toString()}`;
-    if (direction === 'outgoing') {
-      await convoToChoose.addSingleOutgoingMessage({
-        body,
-      });
-    } else {
-      await convoToChoose.addSingleIncomingMessage({
-        source: convoToChoose.id,
-        body,
-      });
-    }
-  }
-}
-
 function keysToArrayBuffer(keys: any, data: any) {
   const updated = _.cloneDeep(data);
   // tslint:disable: one-variable-per-declaration
@@ -908,5 +873,4 @@ export const Data = {
   getMessagesWithFileAttachments,
   getSnodePoolFromDb,
   updateSnodePoolOnDb,
-  fillWithTestData,
 };
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index 93f75f963..7638f1b57 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -90,7 +90,6 @@ const channelsToMake = new Set([
   'getLatestClosedGroupEncryptionKeyPair',
   'addClosedGroupEncryptionKeyPair',
   'removeAllClosedGroupEncryptionKeyPairs',
-  'fillWithTestData',
   ...channelsToMakeForOpengroupV2,
   ...channelsToMakeForConfigDumps,
 ]);
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index eb5aa4566..11b3fa958 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -88,6 +88,8 @@ export interface ConversationAttributes {
   /** The open group chat this conversation originated from (if from closed group) */
   conversationIdOrigin?: string;
 
+  markedAsUnread: boolean;
+
   /**
    * When we create a closed group v3 or get promoted to admim, we need to save the private key of that closed group.
    */
diff --git a/ts/node/config/base_config.ts b/ts/node/config/base_config.ts
index 91e5b6310..e064d867c 100644
--- a/ts/node/config/base_config.ts
+++ b/ts/node/config/base_config.ts
@@ -42,6 +42,7 @@ export function start(
     console.log(`config/set: Saving ${name} config to disk`);
     const text = JSON.stringify(cachedValue, null, '  ');
     writeFileSync(targetPath, text, ENCODING);
+    console.log(`config/set: Saved ${name} config to disk`);
   }
 
   function remove() {
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 988f37070..69a68ad85 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -77,6 +77,7 @@ const allowedKeysFormatRowOfConversation = [
   'displayNameInProfile',
   'conversationIdOrigin',
   'identityPrivateKey',
+  'markedAsUnread',
 ];
 // tslint:disable: cyclomatic-complexity
 export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
@@ -132,6 +133,7 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
   convo.readCapability = Boolean(convo.readCapability);
   convo.writeCapability = Boolean(convo.writeCapability);
   convo.uploadCapability = Boolean(convo.uploadCapability);
+  convo.markedAsUnread = Boolean(convo.markedAsUnread);
 
   if (!convo.conversationIdOrigin) {
     convo.conversationIdOrigin = undefined;
@@ -211,6 +213,7 @@ const allowedKeysOfConversationAttributes = [
   'displayNameInProfile',
   'conversationIdOrigin',
   'identityPrivateKey',
+  'markedAsUnread',
 ];
 
 /**
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 2879db030..6b6695b54 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1239,7 +1239,9 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       variant TEXT NOT NULL,
       publicKey TEXT NOT NULL,
       data BLOB,
-      combinedMessageHashes TEXT);
+      combinedMessageHashes TEXT,
+      PRIMARY KEY (publicKey, variant)
+      );
       `);
 
     // db.exec(`ALTER TABLE conversations
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index a17403f72..1adfe0c5b 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -23,7 +23,7 @@ import { redactAll } from '../util/privacy'; // checked - only node
 import { LocaleMessagesType } from './locale'; // checked - only node
 import { PubKey } from '../session/types/PubKey'; // checked - only node
 import { StorageItem } from './storage_item'; // checked - only node
-import { ConversationAttributes, ConversationTypeEnum } from '../models/conversationAttributes';
+import { ConversationAttributes } from '../models/conversationAttributes';
 import {
   arrayStrToJson,
   assertValidConversationAttributes,
@@ -447,7 +447,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
 
   //FIXME
   console.warn('FIXME omit(formatted, identityPrivateKey);');
-  const omited = omit(formatted, 'identityPrivateKey');
+  const omited = omit(formatted, 'identityPrivateKey', 'markedAsUnread');
   const keys = Object.keys(omited);
   const columnsCommaSeparated = keys.join(', ');
   const valuesArgs = keys.map(k => `$${k}`).join(', ');
@@ -2187,161 +2187,6 @@ function cleanUpOldOpengroupsOnStart() {
   })();
 }
 
-// tslint:disable: binary-expression-operand-order insecure-random
-/**
- * Only using this for development. Populate conversation and message tables.
- */
-function fillWithTestData(numConvosToAdd: number, numMsgsToAdd: number) {
-  const convoBeforeCount = assertGlobalInstance()
-    .prepare(`SELECT count(*) from ${CONVERSATIONS_TABLE};`)
-    .get()['count(*)'];
-
-  const lipsum =
-    // eslint:disable-next-line max-line-length
-    `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac ornare lorem,
-    non suscipit      purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-    Suspendisse cursus aliquet       velit a dignissim. Integer at nisi sed velit consequat
-    dictum. Phasellus congue tellus ante.        Ut rutrum hendrerit dapibus. Fusce
-    luctus, ante nec interdum molestie, purus urna volutpat         turpis, eget mattis
-    lectus velit at velit. Praesent vel tellus turpis. Praesent eget purus          at
-    nisl blandit pharetra.  Cras dapibus sem vitae rutrum dapibus. Vivamus vitae mi
-    ante.           Donec aliquam porta nibh, vel scelerisque orci condimentum sed.
-    Proin in mattis ipsum,            ac euismod sem. Donec malesuada sem nisl, at
-    vehicula ante efficitur sed. Curabitur             in sapien eros. Morbi tempor ante ut
-    metus scelerisque condimentum. Integer sit amet              tempus nulla. Vivamus
-    imperdiet dui ac luctus vulputate.  Sed a accumsan risus. Nulla               facilisi.
-    Nulla mauris dui, luctus in sagittis at, sodales id mauris. Integer efficitur
-            viverra ex, ut dignissim eros tincidunt placerat. Sed facilisis gravida
-    mauris in luctus                . Fusce dapibus, est vitae tincidunt eleifend, justo
-    odio porta dui, sed ultrices mi arcu                 vitae ante. Mauris ut libero
-    erat. Nam ut mi quis ante tincidunt facilisis sit amet id enim.
-    Vestibulum in molestie mi. In ac felis est. Vestibulum vel blandit ex. Morbi vitae
-    viverra augue                  . Ut turpis quam, cursus quis ex a, convallis
-    ullamcorper purus.  Nam eget libero arcu. Integer fermentum enim nunc, non consequat urna
-    fermentum condimentum. Nulla vitae malesuada est. Donec imperdiet tortor interdum
-    malesuada feugiat. Integer pulvinar dui ex, eget tristique arcu mattis at. Nam eu neque
-    eget mauris varius suscipit. Quisque ac enim vitae mauris laoreet congue nec sed
-    justo. Curabitur fermentum quam eget est tincidunt, at faucibus lacus maximus.  Donec
-    auctor enim dolor, faucibus egestas diam consectetur sed. Donec eget rutrum arcu, at
-    tempus mi. Fusce quis volutpat sapien. In aliquet fringilla purus. Ut eu nunc non
-    augue lacinia ultrices at eget tortor. Maecenas pulvinar odio sit amet purus
-    elementum, a vehicula lorem maximus. Pellentesque eu lorem magna. Vestibulum ut facilisis
-    lorem. Proin et enim cursus, vulputate neque sit amet, posuere enim. Praesent
-    faucibus tellus vel mi tincidunt, nec malesuada nibh malesuada. In laoreet sapien vitae
-    aliquet sollicitudin.
-    `;
-
-  const msgBeforeCount = assertGlobalInstance()
-    .prepare(`SELECT count(*) from ${MESSAGES_TABLE};`)
-    .get()['count(*)'];
-
-  console.info('==== fillWithTestData ====');
-  console.info({
-    convoBeforeCount,
-    msgBeforeCount,
-    convoToAdd: numConvosToAdd,
-    msgToAdd: numMsgsToAdd,
-  });
-
-  const convosIdsAdded = [];
-  // eslint-disable-next-line no-plusplus
-  for (let index = 0; index < numConvosToAdd; index++) {
-    const activeAt = Date.now() - index;
-    const id = Date.now() - 1000 * index;
-    const convoObjToAdd: ConversationAttributes = {
-      active_at: activeAt,
-      members: [],
-      displayNameInProfile: `${activeAt}`,
-      id: `05${id}`,
-      type: ConversationTypeEnum.GROUPV3,
-      didApproveMe: false,
-      expireTimer: 0,
-      groupAdmins: [],
-      groupModerators: [],
-      isApproved: false,
-      isKickedFromGroup: false,
-      isPinned: false,
-      isTrustedForAttachmentDownload: false,
-      is_medium_group: false,
-      lastJoinedTimestamp: 0,
-      lastMessage: null,
-      lastMessageStatus: undefined,
-      left: false,
-      mentionedUs: false,
-      subscriberCount: 0,
-      readCapability: true,
-      writeCapability: true,
-      uploadCapability: true,
-      triggerNotificationsFor: 'all',
-      unreadCount: 0,
-      zombies: [],
-    };
-    convosIdsAdded.push(id);
-    try {
-      saveConversation(convoObjToAdd);
-      // eslint-disable-next-line no-empty
-    } catch (e) {
-      console.error(e);
-    }
-  }
-  // eslint-disable-next-line no-plusplus
-  for (let index = 0; index < numMsgsToAdd; index++) {
-    const activeAt = Date.now() - index;
-    const id = Date.now() - 1000 * index;
-
-    const lipsumStartIdx = Math.floor(Math.random() * lipsum.length);
-    const lipsumLength = Math.floor(Math.random() * lipsum.length - lipsumStartIdx);
-    const fakeBodyText = lipsum.substring(lipsumStartIdx, lipsumStartIdx + lipsumLength);
-
-    const convoId = convosIdsAdded[Math.floor(Math.random() * convosIdsAdded.length)];
-    const msgObjToAdd = {
-      // body: `fake body ${activeAt}`,
-      body: `fakeMsgIdx-spongebob-${index} ${fakeBodyText} ${activeAt}`,
-      conversationId: `05${id}`,
-      // eslint-disable-next-line camelcase
-      expires_at: 0,
-      hasAttachments: 0,
-      hasFileAttachments: 0,
-      hasVisualMediaAttachments: 0,
-      id: `${id}`,
-      serverId: 0,
-      serverTimestamp: 0,
-      // eslint-disable-next-line camelcase
-      received_at: Date.now(),
-      sent: 0,
-      // eslint-disable-next-line camelcase
-      sent_at: Date.now(),
-      source: `${convoId}`,
-      type: 'outgoing',
-      unread: 1,
-      expireTimer: 0,
-      expirationStartTimestamp: 0,
-    };
-
-    if (convoId % 10 === 0) {
-      console.info('uyo , convoId ', { index, convoId });
-    }
-
-    try {
-      saveMessage(msgObjToAdd);
-      // eslint-disable-next-line no-empty
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  const convoAfterCount = assertGlobalInstance()
-    .prepare(`SELECT count(*) from ${CONVERSATIONS_TABLE};`)
-    .get()['count(*)'];
-
-  const msgAfterCount = assertGlobalInstance()
-    .prepare(`SELECT count(*) from ${MESSAGES_TABLE};`)
-    .get()['count(*)'];
-
-  console.info({ convoAfterCount, msgAfterCount });
-  return convosIdsAdded;
-}
-
 export type SqlNodeType = typeof sqlNode;
 
 export function close() {
@@ -2417,7 +2262,6 @@ export const sqlNode = {
   getFirstUnreadMessageIdInConversation,
   getFirstUnreadMessageWithMention,
   hasConversationOutgoingMessage,
-  fillWithTestData,
 
   // add all the calls related to the unprocessed cache of incoming messages
   ...unprocessed,
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index c4c5a71d2..d6e2db1bf 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -144,4 +144,29 @@ export const configDumpData: ConfigDumpDataNode = {
         combinedMessageHashes: JSON.stringify(combinedMessageHashes || []),
       });
   },
+
+  getCombinedHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
+    const rows = assertGlobalInstance()
+      .prepare(
+        'SELECT combinedMessageHashes from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+      )
+      .all({
+        publicKey,
+        variant,
+      });
+
+    if (!rows) {
+      return new Set();
+    }
+    const asArrays = compact(
+      rows.map(t => {
+        try {
+          return JSON.parse(t.combinedMessageHashes);
+        } catch {
+          return null;
+        }
+      })
+    );
+    return new Set(asArrays.flat(1));
+  },
 };
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index d991f0f21..d33ce0ea5 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { compact, flattenDeep, isEmpty, isEqual } from 'lodash';
+import _, { isEmpty, isEqual } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -14,11 +14,11 @@ import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { UserUtils } from '../session/utils';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { BlockedNumberController } from '../util';
 import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
-import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
   GenericWrapperActions,
@@ -28,26 +28,6 @@ import { removeFromCache } from './cache';
 import { handleNewClosedGroup } from './closedGroups';
 import { EnvelopePlus } from './types';
 
-type IncomingConfResult = {
-  needsPush: boolean;
-  needsDump: boolean;
-  messageHashes: Array<string>;
-  latestSentTimestamp: number;
-};
-
-function pbKindToVariant(
-  kind: SignalService.SharedConfigMessage.Kind
-): ConfigWrapperObjectTypes | null {
-  switch (kind) {
-    case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
-      return 'UserConfig';
-    case SignalService.SharedConfigMessage.Kind.CONTACTS:
-      return 'ContactsConfig';
-    default:
-      return null;
-  }
-}
-
 async function mergeConfigsWithIncomingUpdates(
   incomingConfig: IncomingMessage<SignalService.ISharedConfigMessage>
 ): Promise<{ kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }> {
@@ -55,11 +35,7 @@ async function mergeConfigsWithIncomingUpdates(
 
   const toMerge = [incomingConfig.message.data];
 
-  const wrapperId = pbKindToVariant(kind);
-  if (!wrapperId) {
-    throw new Error(`Invalid kind: ${kind}`);
-  }
-
+  const wrapperId = LibSessionUtil.kindToVariant(kind);
   await GenericWrapperActions.merge(wrapperId, toMerge);
   const needsPush = await GenericWrapperActions.needsPush(wrapperId);
   const needsDump = await GenericWrapperActions.needsDump(wrapperId);
@@ -78,19 +54,13 @@ async function mergeConfigsWithIncomingUpdates(
 
 async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   const updatedUserName = await UserConfigWrapperActions.getName();
-  console.warn('got', updatedUserName);
-
-  if (result.needsDump) {
+  if (!result.needsDump) {
     return result;
   }
 
-  if (!updatedUserName) {
-    debugger;
-  }
   const updatedProfilePicture = await UserConfigWrapperActions.getProfilePicture();
-
+  debugger;
   const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
-
   await ProfileManager.updateOurProfileSync(
     updatedUserName,
     picUpdate ? updatedProfilePicture.url : null,
@@ -100,7 +70,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
 }
 
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  if (result.needsDump) {
+  if (!result.needsDump) {
     return result;
   }
 
@@ -188,21 +158,19 @@ async function processMergingResults(
       default:
         throw new Error(`processMergingResults unknown kind of contact : ${kind}`);
     }
-    const variant = pbKindToVariant(kind);
-    if (!variant) {
-      throw new Error('unknown variant');
-    }
+    const variant = LibSessionUtil.kindToVariant(kind);
     // We need to get the existing message hashes and combine them with the latest from the
     // service node to ensure the next push will properly clean up old messages
-    const oldMessageHashesWithDup = (
-      await ConfigDumpData.getByVariantAndPubkey(variant, envelope.source)
-    ).map(m => m.combinedMessageHashes);
-    const oldMessageHashes = new Set(...flattenDeep(compact(oldMessageHashesWithDup)));
-    const allMessageHashes = new Set([...oldMessageHashes, ...finalResult.messageHashes]);
-    const finalResultsHashes = new Set([...finalResult.messageHashes]);
+    const oldMessagesHashesSet = await ConfigDumpData.getCombinedHashesByVariantAndPubkey(
+      variant,
+      envelope.source
+    );
+    const allMessageHashes = new Set([...oldMessagesHashesSet, ...finalResult.messageHashes]);
+
+    const finalResultsHashes = new Set(finalResult.messageHashes);
 
     // lodash does deep compare of Sets
-    const messageHashesChanged = !isEqual(oldMessageHashes, finalResultsHashes);
+    const messageHashesChanged = !isEqual(oldMessagesHashesSet, finalResultsHashes);
 
     if (finalResult.needsDump) {
       // The config data had changes so regenerate the dump and save it
@@ -236,6 +204,7 @@ async function processMergingResults(
   // Now that the local state has been updated, trigger a config sync (this will push any
   // pending updates and properly update the state)
   if (result.result.needsPush) {
+    console.warn(`processMergingResults  ${LibSessionUtil.kindToVariant(result.kind)} needs push`);
     await ConfigurationSync.queueNewJobIfNeeded();
   }
 }
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index 48b2080d5..0a8559eec 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -1,18 +1,19 @@
-import { snodeRpc } from './sessionRpc';
-
-import { getSwarmFor } from './snodePool';
-import { getSodiumRenderer } from '../../crypto';
-import _, { compact, sample } from 'lodash';
+import { compact, sample } from 'lodash';
 import pRetry from 'p-retry';
-import { fromBase64ToArray, fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { Snode } from '../../../data/data';
+import { getSodiumRenderer } from '../../crypto';
 import { ed25519Str } from '../../onions/onionPath';
 import { StringUtils, UserUtils } from '../../utils';
-import { GetNetworkTime } from './getNetworkTime';
+import { fromBase64ToArray, fromHexToArray } from '../../utils/String';
+import { doSnodeBatchRequest } from './batchRequest';
+import { getSwarmFor } from './snodePool';
+import { SnodeSignature } from './snodeSignatures';
 
 export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.';
 
-// tslint:disable-next-line: max-func-body-length
+// tslint:disable: max-func-body-length
+
+// TODO we should merge those two functions together as they are almost exactly the same
 const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();
@@ -23,14 +24,13 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
     window?.log?.warn('Cannot forceNetworkDeletion, did not find user ed25519 key.');
     return null;
   }
-  const edKeyPriv = userED25519KeyPair.privKey;
+  const method = 'delete_all' as const;
 
   try {
     const maliciousSnodes = await pRetry(
       async () => {
         const userSwarm = await getSwarmFor(userX25519PublicKey);
         const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm);
-        const edKeyPrivBytes = fromHexToArray(edKeyPriv);
 
         if (!snodeToMakeRequestTo) {
           window?.log?.warn('Cannot forceNetworkDeletion, without a valid swarm node.');
@@ -39,51 +39,44 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
 
         return pRetry(
           async () => {
-            const timestamp = await GetNetworkTime.getNetworkTime(snodeToMakeRequestTo);
-
-            const verificationData = StringUtils.encode(`delete_all${timestamp}`, 'utf8');
-            const message = new Uint8Array(verificationData);
-            const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
-            const signatureBase64 = fromUInt8ArrayToBase64(signature);
-
-            const deleteMessageParams = {
+            const signOpts = await SnodeSignature.getSnodeSignatureParams({
+              method,
+              namespace: null,
               pubkey: userX25519PublicKey,
-              pubkey_ed25519: userED25519KeyPair.pubKey.toUpperCase(),
-              timestamp,
-              signature: signatureBase64,
-            };
-            const ret = await snodeRpc({
-              method: 'delete_all',
-              params: deleteMessageParams,
-              targetNode: snodeToMakeRequestTo,
-              associatedWith: userX25519PublicKey,
             });
 
-            if (!ret) {
+            const ret = await doSnodeBatchRequest(
+              [{ method, params: signOpts }],
+              snodeToMakeRequestTo,
+              10000,
+              userX25519PublicKey
+            );
+
+            if (!ret || !ret?.[0].body || ret[0].code !== 200) {
               throw new Error(
-                `Empty response got for delete_all on snode ${ed25519Str(
+                `Empty response got for ${method} on snode ${ed25519Str(
                   snodeToMakeRequestTo.pubkey_ed25519
                 )}`
               );
             }
 
             try {
-              const parsedResponse = JSON.parse(ret.body);
-              const { swarm } = parsedResponse;
+              const firstResultParsedBody = ret[0].body;
+              const { swarm } = firstResultParsedBody;
 
               if (!swarm) {
                 throw new Error(
-                  `Invalid JSON swarm response got for delete_all on snode ${ed25519Str(
+                  `Invalid JSON swarm response got for ${method} on snode ${ed25519Str(
                     snodeToMakeRequestTo.pubkey_ed25519
-                  )}, ${ret?.body}`
+                  )}, ${firstResultParsedBody}`
                 );
               }
               const swarmAsArray = Object.entries(swarm) as Array<Array<any>>;
               if (!swarmAsArray.length) {
                 throw new Error(
-                  `Invalid JSON swarmAsArray response got for delete_all on snode ${ed25519Str(
+                  `Invalid JSON swarmAsArray response got for ${method} on snode ${ed25519Str(
                     snodeToMakeRequestTo.pubkey_ed25519
-                  )}, ${ret?.body}`
+                  )}, ${firstResultParsedBody}`
                 );
               }
               // results will only contains the snode pubkeys which returned invalid/empty results
@@ -99,19 +92,19 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                     const statusCode = snodeJson.code;
                     if (reason && statusCode) {
                       window?.log?.warn(
-                        `Could not delete data from ${ed25519Str(
+                        `Could not ${method} from ${ed25519Str(
                           snodeToMakeRequestTo.pubkey_ed25519
                         )} due to error: ${reason}: ${statusCode}`
                       );
                       // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
                       if (statusCode === 421) {
                         throw new pRetry.AbortError(
-                          '421 error on network delete_all. Retrying with a new snode'
+                          `421 error on network ${method}. Retrying with a new snode`
                         );
                       }
                     } else {
                       window?.log?.warn(
-                        `Could not delete data from ${ed25519Str(
+                        `Could not ${method} from ${ed25519Str(
                           snodeToMakeRequestTo.pubkey_ed25519
                         )}`
                       );
@@ -122,7 +115,9 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                   const hashes = snodeJson.deleted as Array<string>;
                   const signatureSnode = snodeJson.signature as string;
                   // The signature format is ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
-                  const dataToVerify = `${userX25519PublicKey}${timestamp}${hashes.join('')}`;
+                  const dataToVerify = `${userX25519PublicKey}${signOpts.timestamp}${hashes.join(
+                    ''
+                  )}`;
                   const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8');
                   const isValid = sodium.crypto_sign_verify_detached(
                     fromBase64ToArray(signatureSnode),
@@ -139,9 +134,9 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
               return results;
             } catch (e) {
               throw new Error(
-                `Invalid JSON response got for delete_all on snode ${ed25519Str(
+                `Invalid JSON response got for ${method} on snode ${ed25519Str(
                   snodeToMakeRequestTo.pubkey_ed25519
-                )}, ${ret?.body}`
+                )}, ${ret}`
               );
             }
           },
@@ -150,7 +145,7 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
             minTimeout: SnodeAPI.TEST_getMinTimeout(),
             onFailedAttempt: e => {
               window?.log?.warn(
-                `delete_all INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+                `${method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
               );
             },
           }
@@ -161,7 +156,7 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
         minTimeout: SnodeAPI.TEST_getMinTimeout(),
         onFailedAttempt: e => {
           window?.log?.warn(
-            `delete_all OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}`
+            `${method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}`
           );
         },
       }
@@ -169,7 +164,7 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
 
     return maliciousSnodes;
   } catch (e) {
-    window?.log?.warn('failed to delete everything on network:', e);
+    window?.log?.warn(`failed to ${method} everything on network:`, e);
     return null;
   }
 };
@@ -180,7 +175,6 @@ const TEST_getMinTimeout = () => 500;
 /**
  * Locally deletes message and deletes message on the network (all nodes that contain the message)
  */
-// tslint:disable-next-line: max-func-body-length
 const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();
@@ -191,14 +185,13 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
     window?.log?.warn('Cannot networkDeleteMessages, did not find user ed25519 key.');
     return null;
   }
-  const edKeyPriv = userED25519KeyPair.privKey;
+  const method = 'delete' as const;
 
   try {
     const maliciousSnodes = await pRetry(
       async () => {
         const userSwarm = await getSwarmFor(userX25519PublicKey);
         const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm);
-        const edKeyPrivBytes = fromHexToArray(edKeyPriv);
 
         if (!snodeToMakeRequestTo) {
           window?.log?.warn('Cannot networkDeleteMessages, without a valid swarm node.');
@@ -207,48 +200,44 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
 
         return pRetry(
           async () => {
-            const verificationData = StringUtils.encode(`delete${hashes.join('')}`, 'utf8');
-            const message = new Uint8Array(verificationData);
-            const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
-            const signatureBase64 = fromUInt8ArrayToBase64(signature);
-
-            const deleteMessageParams = {
-              pubkey: userX25519PublicKey,
-              pubkey_ed25519: userED25519KeyPair.pubKey.toUpperCase(),
+            const signOpts = await SnodeSignature.getSnodeSignatureByHashesParams({
               messages: hashes,
-              signature: signatureBase64,
-            };
-            const ret = await snodeRpc({
-              method: 'delete',
-              params: deleteMessageParams,
-              targetNode: snodeToMakeRequestTo,
-              associatedWith: userX25519PublicKey,
+              method,
+              pubkey: userX25519PublicKey,
             });
-            if (!ret) {
+
+            const ret = await doSnodeBatchRequest(
+              [{ method, params: signOpts }],
+              snodeToMakeRequestTo,
+              10000,
+              userX25519PublicKey
+            );
+
+            if (!ret || !ret?.[0].body || ret[0].code !== 200) {
               throw new Error(
-                `Empty response got for delete on snode ${ed25519Str(
+                `Empty response got for ${method} on snode ${ed25519Str(
                   snodeToMakeRequestTo.pubkey_ed25519
                 )}`
               );
             }
 
             try {
-              const parsedResponse = JSON.parse(ret.body);
-              const { swarm } = parsedResponse;
+              const firstResultParsedBody = ret[0].body;
+              const { swarm } = firstResultParsedBody;
 
               if (!swarm) {
                 throw new Error(
-                  `Invalid JSON swarm response got for delete on snode ${ed25519Str(
+                  `Invalid JSON swarm response got for ${method} on snode ${ed25519Str(
                     snodeToMakeRequestTo.pubkey_ed25519
-                  )}, ${ret?.body}`
+                  )}, ${firstResultParsedBody}`
                 );
               }
               const swarmAsArray = Object.entries(swarm) as Array<Array<any>>;
               if (!swarmAsArray.length) {
                 throw new Error(
-                  `Invalid JSON swarmAsArray response got for delete on snode ${ed25519Str(
+                  `Invalid JSON swarmAsArray response got for ${method} on snode ${ed25519Str(
                     snodeToMakeRequestTo.pubkey_ed25519
-                  )}, ${ret?.body}`
+                  )}, ${firstResultParsedBody}`
                 );
               }
               // results will only contains the snode pubkeys which returned invalid/empty results
@@ -257,7 +246,6 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
                   const snodePubkey = snode[0];
                   const snodeJson = snode[1];
 
-                  //#region failure handling
                   const isFailed = snodeJson.failed || false;
 
                   if (isFailed) {
@@ -265,28 +253,26 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
                     const statusCode = snodeJson.code;
                     if (reason && statusCode) {
                       window?.log?.warn(
-                        `Could not delete msgs from ${ed25519Str(
+                        `Could not ${method} from ${ed25519Str(
                           snodeToMakeRequestTo.pubkey_ed25519
                         )} due to error: ${reason}: ${statusCode}`
                       );
                       // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
                       if (statusCode === 421) {
                         throw new pRetry.AbortError(
-                          '421 error on network delete_all. Retrying with a new snode'
+                          `421 error on network ${method}. Retrying with a new snode`
                         );
                       }
                     } else {
-                      window?.log?.info(
-                        `Could not delete msgs from ${ed25519Str(
+                      window?.log?.warn(
+                        `Could not ${method} from ${ed25519Str(
                           snodeToMakeRequestTo.pubkey_ed25519
                         )}`
                       );
                     }
                     return snodePubkey;
                   }
-                  //#endregion
 
-                  //#region verification
                   const responseHashes = snodeJson.deleted as Array<string>;
                   const signatureSnode = snodeJson.signature as string;
                   // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] )
@@ -303,16 +289,15 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
                     return snodePubkey;
                   }
                   return null;
-                  //#endregion
                 })
               );
 
               return results;
             } catch (e) {
               throw new Error(
-                `Invalid JSON response got for delete on snode ${ed25519Str(
+                `Invalid JSON response got for ${method} on snode ${ed25519Str(
                   snodeToMakeRequestTo.pubkey_ed25519
-                )}, ${ret?.body}`
+                )}, ${ret}`
               );
             }
           },
@@ -321,7 +306,7 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
             minTimeout: SnodeAPI.TEST_getMinTimeout(),
             onFailedAttempt: e => {
               window?.log?.warn(
-                `delete INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+                `${method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
               );
             },
           }
@@ -332,7 +317,7 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
         minTimeout: SnodeAPI.TEST_getMinTimeout(),
         onFailedAttempt: e => {
           window?.log?.warn(
-            `delete OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+            `${method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}`
           );
         },
       }
@@ -340,7 +325,7 @@ const networkDeleteMessages = async (hashes: Array<string>): Promise<Array<strin
 
     return maliciousSnodes;
   } catch (e) {
-    window?.log?.warn('failed to delete message on network:', e);
+    window?.log?.warn(`failed to ${method} message on network:`, e);
     return null;
   }
 };
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 5388098c3..e0b14d0af 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -1,3 +1,4 @@
+import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { SnodeNamespaces } from './namespaces';
 
 export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } };
@@ -51,30 +52,6 @@ export type RetrieveSubRequestType =
   | RetrievePubkeySubRequestType
   | RetrieveSubKeySubRequestType;
 
-// FIXME those store types are not right
-// type StoreAlwaysNeeded = { pubkey: string; timestamp: number; data: string };
-
-// type StoreUnauthenticatedSubRequest = {
-//   method: 'store';
-//   params: {
-//     ttl?: string; // required, unless expiry is given
-//     expiry?: number; // required, unless ttl is given
-//     namespace: UnauthenticatedNamespaces; // we can only store without authentication on namespaces divisible by 10 (...-60...0...60...)
-//   } & StoreAlwaysNeeded;
-// };
-
-// type StoreAuthenticatedSubRequest = {
-//   method: 'store';
-//   params: {
-//     ttl?: string; // required, unless expiry is given
-//     expiry?: number; // required, unless ttl is given
-//     subkey?: string;
-//     signature: string; // base64 encoded
-//     pubkey_ed25519: string;
-//     sig_timestamp?: number;
-//   } & StoreAlwaysNeeded;
-// };
-
 /**
  * OXEND_REQUESTS
  */
@@ -105,19 +82,54 @@ export type GetServiceNodesSubRequest = {
   };
 };
 
+export type StoreOnNodeParamsNoSig = {
+  pubkey: string;
+  ttl: number;
+  timestamp: number;
+  data64: string;
+  namespace: number;
+};
+
 export type StoreOnNodeParams = {
   pubkey: string;
-  ttl: string;
-  timestamp: string;
+  ttl: number;
+  timestamp: number;
   data: string;
   namespace: number;
   signature?: string;
   pubkey_ed25519?: string;
 };
+export type DeleteFromNodeWithTimestampParams = {
+  timestamp: string | number;
+} & DeleteSigParameters;
+export type DeleteByHashesFromNodeParams = { messages: Array<string> } & DeleteSigParameters;
+
+export type StoreOnNodeMessage = {
+  pubkey: string;
+  timestamp: number;
+  namespace: number;
+  message: SharedConfigMessage;
+};
 
 export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams };
 export type NetworkTimeSubRequest = { method: 'info'; params: {} };
 
+type DeleteSigParameters = {
+  pubkey: string;
+  pubkey_ed25519: string;
+  signature: string;
+};
+
+export type DeleteAllFromNodeSubRequest = {
+  method: 'delete_all';
+  params: DeleteFromNodeWithTimestampParams;
+};
+
+export type DeleteFromNodeSubRequest = {
+  method: 'delete';
+  params: DeleteByHashesFromNodeParams;
+};
+
 export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest;
 
 export type SnodeApiSubRequests =
@@ -125,7 +137,9 @@ export type SnodeApiSubRequests =
   | SwarmForSubRequest
   | OxendSubRequest
   | StoreOnNodeSubRequest
-  | NetworkTimeSubRequest;
+  | NetworkTimeSubRequest
+  | DeleteFromNodeSubRequest
+  | DeleteAllFromNodeSubRequest;
 
 // tslint:disable: array-type
 export type NonEmptyArray<T> = [T, ...T[]];
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index dfade5612..ee541f300 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -5,22 +5,29 @@ import { snodeRpc } from './sessionRpc';
 import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequestTypes';
 
 /**
- * This is the equivalent to the batch send on sogs. The target node  runs each sub request and returns a list of all the sub status and bodies.
+ * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies.
  * If the global status code is not 200, an exception is thrown.
  * The body is already parsed from json and is enforced to be an Array of at least one element
  * @param subRequests the list of requests to do
  * @param targetNode the node to do the request to, once all the onion routing is done
  * @param timeout the timeout at which we should cancel this request.
  * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to
+ * @param method can be either batch or sequence. A batch call will run all calls even if one of them fails. A sequence call will stop as soon as the first one fails
  */
 export async function doSnodeBatchRequest(
   subRequests: Array<SnodeApiSubRequests>,
   targetNode: Snode,
   timeout: number,
-  associatedWith?: string
+  associatedWith?: string,
+  method: 'batch' | 'sequence' = 'batch'
 ): Promise<NotEmptyArrayOfBatchResults> {
+  console.warn(
+    `doSnodeBatchRequest "${method}":`,
+    subRequests.map(m => m.method),
+    subRequests
+  );
   const result = await snodeRpc({
-    method: 'batch',
+    method,
     params: { requests: subRequests },
     targetNode,
     associatedWith,
diff --git a/ts/session/apis/snode_api/configMessages.ts b/ts/session/apis/snode_api/configMessages.ts
new file mode 100644
index 000000000..a1fc030ee
--- /dev/null
+++ b/ts/session/apis/snode_api/configMessages.ts
@@ -0,0 +1,82 @@
+// import { isEmpty, sample } from 'lodash';
+// import pRetry from 'p-retry';
+// import { Snode } from '../../../data/data';
+// import { ed25519Str } from '../../onions/onionPath';
+// import { SingleDestinationChanges } from '../../utils/job_runners/jobs/ConfigurationSyncJob';
+// import { doSnodeBatchRequest } from './batchRequest';
+// import { SnodeAPI } from './SNodeAPI';
+// import { getSwarmFor } from './snodePool';
+// import { StoreOnNodeSubRequest } from './SnodeRequestTypes';
+
+// function prepareRequest(singleDestChange: SingleDestinationChanges): Array<StoreOnNodeSubRequest> {
+//   if (isEmpty(singleDestChange) || isEmpty(singleDestChange.messages)) {
+//     return [];
+//   }
+
+//   return singleDestChange.messages.map(message => {
+//     return { method: 'store', params: {} };
+//   });
+// }
+
+/**
+ * Locally deletes message and deletes message on the network (all nodes that contain the message)
+ */
+// const sendConfigMessages = async (
+//     singleDestChange: SingleDestinationChanges
+// ): Promise<Array<string> | null> => {
+//     if (isEmpty(singleDestChange) || isEmpty(singleDestChange.messages)) {
+//         return true;
+//     }
+//     try {
+//       const result = await pRetry(
+//         async () => {
+//           const swarmToSendTo = await getSwarmFor(singleDestChange.destination);
+//           const snodeToMakeRequestTo: Snode | undefined = sample(swarmToSendTo);
+
+//           if (!snodeToMakeRequestTo) {
+//             window?.log?.warn('Cannot networkDeleteMessages, without a valid swarm node.');
+//             return null;
+//           }
+
+//           return pRetry(
+//             async () => {
+//               const ret = await doSnodeBatchRequest([{method: 'store', params: {}}]);
+//               if (!ret) {
+//                 throw new Error(
+//                   `Empty response got for delete on snode ${ed25519Str(
+//                     snodeToMakeRequestTo.pubkey_ed25519
+//                   )}`
+//                 );
+//               }
+
+//                 return results;
+//               }
+//             },
+//             {
+//               retries: 3,
+//               minTimeout: SnodeAPI.TEST_getMinTimeout(),
+//               onFailedAttempt: e => {
+//                 window?.log?.warn(
+//                   `delete INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+//                 );
+//               },
+//             }
+//           );
+//         },
+//         {
+//           retries: 3,
+//           minTimeout: SnodeAPI.TEST_getMinTimeout(),
+//           onFailedAttempt: e => {
+//             window?.log?.warn(
+//               `delete OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
+//             );
+//           },
+//         }
+//       );
+
+//       return maliciousSnodes;
+//     } catch (e) {
+//       window?.log?.warn('failed to delete message on network:', e);
+//       return null;
+//     }
+//   };
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index f8dca046f..f6e947c78 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -56,7 +56,7 @@ async function buildRetrieveRequest(
       if (pubkey !== ourPubkey) {
         throw new Error('not a legacy closed group. pubkey can only be ours');
       }
-      const signatureArgs = { ...retrieveParam, method: 'retrieve' as 'retrieve', ourPubkey };
+      const signatureArgs = { ...retrieveParam, method: 'retrieve' as const, ourPubkey };
       const signatureBuilt = await SnodeSignature.getSnodeSignatureParams(signatureArgs);
       const retrieve: RetrieveSubRequestType = {
         method: 'retrieve',
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 197de119a..776908248 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -19,7 +19,7 @@ export interface LokiFetchOptions {
  * A small wrapper around node-fetch which deserializes response
  * returns insecureNodeFetch response or false
  */
-async function lokiFetch({
+async function doRequest({
   options,
   url,
   associatedWith,
@@ -61,7 +61,7 @@ async function lokiFetch({
     }
 
     if (url.match(/https:\/\//)) {
-      // import that this does not get set in lokiFetch fetchOptions
+      // import that this does not get set in doRequest fetchOptions
       fetchOptions.agent = snodeHttpsAgent;
     }
 
@@ -71,7 +71,7 @@ async function lokiFetch({
       'Content-Type': APPLICATION_JSON,
     };
 
-    window?.log?.warn(`insecureNodeFetch => lokiFetch of ${url}`);
+    window?.log?.warn(`insecureNodeFetch => doRequest of ${url}`);
 
     const response = await insecureNodeFetch(url, {
       ...fetchOptions,
@@ -136,7 +136,7 @@ export async function snodeRpc(
     agent: null,
   };
 
-  return lokiFetch({
+  return doRequest({
     url,
     options: fetchOptions,
     targetNode,
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index 22d4db730..206feb0e0 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -1,5 +1,5 @@
 import { getSodiumRenderer } from '../../crypto';
-import { UserUtils, StringUtils } from '../../utils';
+import { StringUtils, UserUtils } from '../../utils';
 import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String';
 import { GetNetworkTime } from './getNetworkTime';
 
@@ -7,14 +7,54 @@ export type SnodeSignatureResult = {
   timestamp: number;
   signature: string;
   pubkey_ed25519: string;
-  namespace: number;
+  pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually)
 };
 
+async function getSnodeSignatureByHashesParams({
+  messages,
+  method,
+  pubkey,
+}: {
+  pubkey: string;
+  messages: Array<string>;
+  method: 'delete';
+}): Promise<
+  Pick<SnodeSignatureResult, 'pubkey_ed25519' | 'signature' | 'pubkey'> & {
+    messages: Array<string>;
+  }
+> {
+  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
+
+  if (!ourEd25519Key) {
+    const err = `getSnodeSignatureParams "${method}": User has no getUserED25519KeyPair()`;
+    window.log.warn(err);
+    throw new Error(err);
+  }
+  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
+  const verificationData = StringUtils.encode(`${method}${messages.join('')}`, 'utf8');
+  const message = new Uint8Array(verificationData);
+
+  const sodium = await getSodiumRenderer();
+  try {
+    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
+    const signatureBase64 = fromUInt8ArrayToBase64(signature);
+
+    return {
+      signature: signatureBase64,
+      pubkey_ed25519: ourEd25519Key.pubKey,
+      pubkey,
+      messages,
+    };
+  } catch (e) {
+    window.log.warn('getSnodeSignatureParams failed with: ', e.message);
+    throw e;
+  }
+}
+
 async function getSnodeSignatureParams(params: {
   pubkey: string;
-  namespace: number;
-  ourPubkey: string;
-  method: 'retrieve' | 'store';
+  namespace: number | null;
+  method: 'retrieve' | 'store' | 'delete_all';
 }): Promise<SnodeSignatureResult> {
   const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
 
@@ -44,7 +84,7 @@ async function getSnodeSignatureParams(params: {
       timestamp: signatureTimestamp,
       signature: signatureBase64,
       pubkey_ed25519: ourEd25519Key.pubKey,
-      namespace,
+      pubkey: params.pubkey,
     };
   } catch (e) {
     window.log.warn('getSnodeSignatureParams failed with: ', e.message);
@@ -52,4 +92,4 @@ async function getSnodeSignatureParams(params: {
   }
 }
 
-export const SnodeSignature = { getSnodeSignatureParams };
+export const SnodeSignature = { getSnodeSignatureParams, getSnodeSignatureByHashesParams };
diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts
index 90c7eee81..00ea30f86 100644
--- a/ts/session/apis/snode_api/storeMessage.ts
+++ b/ts/session/apis/snode_api/storeMessage.ts
@@ -1,23 +1,63 @@
+import { isEmpty } from 'lodash';
 import { Snode } from '../../../data/data';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
-import { StoreOnNodeParams, StoreOnNodeSubRequest } from './SnodeRequestTypes';
+import {
+  DeleteByHashesFromNodeParams,
+  DeleteFromNodeSubRequest,
+  NotEmptyArrayOfBatchResults,
+  StoreOnNodeParams,
+  StoreOnNodeSubRequest,
+} from './SnodeRequestTypes';
 
-function buildStoreRequests(params: StoreOnNodeParams): Array<StoreOnNodeSubRequest> {
-  const request: StoreOnNodeSubRequest = {
-    method: 'store',
-    params,
-  };
-  return [request];
+function justStores(params: Array<StoreOnNodeParams>) {
+  return params.map(p => {
+    return {
+      method: 'store',
+      params: p,
+    } as StoreOnNodeSubRequest;
+  });
 }
 
+function buildStoreRequests(
+  params: Array<StoreOnNodeParams>,
+  toDeleteOnSequence: DeleteByHashesFromNodeParams | null
+): Array<StoreOnNodeSubRequest | DeleteFromNodeSubRequest> {
+  if (!toDeleteOnSequence || isEmpty(toDeleteOnSequence)) {
+    return justStores(params);
+  }
+  return [...justStores(params), ...buildDeleteByHashesSubRequest(toDeleteOnSequence)];
+}
+
+function buildDeleteByHashesSubRequest(
+  params: DeleteByHashesFromNodeParams
+): Array<DeleteFromNodeSubRequest> {
+  return [
+    {
+      method: 'delete',
+      params,
+    },
+  ];
+}
+
+/**
+ * Send a 'store' request to the specified targetNode, using params as argument
+ * @returns the Array of stored hashes if it is a success, or null
+ */
 async function storeOnNode(
   targetNode: Snode,
-  params: StoreOnNodeParams
-): Promise<string | null | boolean> {
+  params: Array<StoreOnNodeParams>,
+  toDeleteOnSequence: DeleteByHashesFromNodeParams | null
+): Promise<NotEmptyArrayOfBatchResults> {
   try {
-    const subRequests = buildStoreRequests(params);
-    const result = await doSnodeBatchRequest(subRequests, targetNode, 4000, params.pubkey);
+    const subRequests = buildStoreRequests(params, toDeleteOnSequence);
+    const result = await doSnodeBatchRequest(
+      subRequests,
+      targetNode,
+      4000,
+      params[0].pubkey,
+      toDeleteOnSequence ? 'sequence' : 'batch'
+    );
 
     if (!result || !result.length) {
       window?.log?.warn(
@@ -28,24 +68,16 @@ async function storeOnNode(
     }
 
     const firstResult = result[0];
+    console.warn('we should probably check other results code');
 
     if (firstResult.code !== 200) {
       window?.log?.warn('first result status is not 200 for storeOnNode but: ', firstResult.code);
       throw new Error('storeOnNode: Invalid status code');
     }
 
-    // no retry here. If an issue is with the path this is handled in lokiOnionFetch
-    // if there is an issue with the targetNode, we still send a few times this request to a few snodes in // already so it's handled
+    GetNetworkTime.handleTimestampOffsetFromNetwork('store', firstResult.body.t);
 
-    const parsed = firstResult.body;
-    GetNetworkTime.handleTimestampOffsetFromNetwork('store', parsed.t);
-
-    const messageHash = parsed.hash;
-    if (messageHash) {
-      return messageHash;
-    }
-
-    return true;
+    return result;
   } catch (e) {
     window?.log?.warn('store - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`);
     throw e;
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 35bd981fb..e4105d43a 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -16,6 +16,7 @@ export const TTL_DEFAULT = {
   TYPING_MESSAGE: 20 * DURATION.SECONDS,
   CALL_MESSAGE: 5 * 60 * DURATION.SECONDS,
   TTL_MAX: 14 * DURATION.DAYS,
+  TTL_CONFIG: 30 * DURATION.DAYS,
 };
 
 export const SWARM_POLLING_TIMEOUT = {
diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
index b7e915804..9ff10de83 100644
--- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
@@ -4,6 +4,7 @@ import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
 import Long from 'long';
+import { TTL_DEFAULT } from '../../../constants';
 
 interface SharedConfigParams extends MessageParams {
   seqno: Long;
@@ -29,6 +30,10 @@ export class SharedConfigMessage extends ContentMessage {
     });
   }
 
+  public ttl(): number {
+    return TTL_DEFAULT.TTL_CONFIG;
+  }
+
   protected sharedConfigProto(): SignalService.SharedConfigMessage {
     return new SignalService.SharedConfigMessage({
       data: this.data,
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index b585a4241..162fdd951 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -1,8 +1,8 @@
-import { to_hex } from 'libsodium-wrappers-sumo';
 import { isEmpty } from 'lodash';
 import { getConversationController } from '../conversations';
 import { UserUtils } from '../utils';
 import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob';
+import { toHex } from '../utils/String';
 
 /**
  * This can be used to update our conversation display name with the given name right away, and plan an AvatarDownloadJob to retrieve the new avatar if needed to download it
@@ -47,7 +47,8 @@ async function updateProfileOfContact(
   }
   // add an avatar download job only if needed
 
-  const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : to_hex(profileKey);
+  debugger;
+  const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : toHex(profileKey);
 
   await AvatarDownload.addAvatarDownloadJobIfNeeded({
     profileKeyHex,
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 527fd15de..3dd786990 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -1,7 +1,7 @@
 import { PendingMessageCache } from './PendingMessageCache';
 import { JobQueue, MessageUtils, UserUtils } from '../utils';
 import { PubKey, RawMessage } from '../types';
-import { MessageSender } from '.';
+import { MessageSender } from './';
 import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage';
 import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage';
 import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
@@ -321,19 +321,13 @@ export class MessageQueue {
     isGroup = false
   ): Promise<void> {
     // Don't send to ourselves
-    const currentDevice = UserUtils.getOurPubKeyFromCache();
+    const us = UserUtils.getOurPubKeyFromCache();
     let isSyncMessage = false;
-    if (currentDevice && destinationPk.isEqual(currentDevice)) {
+    if (us && destinationPk.isEqual(us)) {
       // We allow a message for ourselve only if it's a ConfigurationMessage, a ClosedGroupNewMessage,
       // or a message with a syncTarget set.
 
-      if (
-        message instanceof ConfigurationMessage ||
-        message instanceof ClosedGroupNewMessage ||
-        message instanceof UnsendMessage ||
-        message instanceof SharedConfigMessage ||
-        (message as any).syncTarget?.length > 0
-      ) {
+      if (MessageSender.isSyncMessage(message)) {
         window?.log?.warn('OutgoingMessageQueue: Processing sync message');
         isSyncMessage = true;
       } else {
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index f6a28e138..445ca431b 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -1,38 +1,46 @@
 // REMOVE COMMENT AFTER: This can just export pure functions as it doesn't need state
 
-import { RawMessage } from '../types/RawMessage';
-import { SignalService } from '../../protobuf';
-import { MessageEncrypter } from '../crypto';
+import { AbortController } from 'abort-controller';
+import ByteBuffer from 'bytebuffer';
+import _, { isEmpty, isNil, isString, sample } from 'lodash';
 import pRetry from 'p-retry';
-import { PubKey } from '../types';
+import { Data } from '../../../ts/data/data';
+import { SignalService } from '../../protobuf';
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
-import { fromUInt8ArrayToBase64 } from '../utils/String';
-import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
-import { addMessagePadding } from '../crypto/BufferPadding';
-import _ from 'lodash';
-import { getSwarmFor } from '../apis/snode_api/snodePool';
-import { MessageSender } from '.';
-import { Data, Snode } from '../../../ts/data/data';
-import { getConversationController } from '../conversations';
-import { ed25519Str } from '../onions/onionPath';
-import { EmptySwarmError } from '../utils/errors';
-import ByteBuffer from 'bytebuffer';
 import {
   sendMessageOnionV4BlindedRequest,
   sendSogsMessageOnionV4,
 } from '../apis/open_group_api/sogsv3/sogsV3SendMessage';
-import { AbortController } from 'abort-controller';
-import { SnodeAPIStore } from '../apis/snode_api/storeMessage';
-import { StoreOnNodeParams } from '../apis/snode_api/SnodeRequestTypes';
 import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { getSwarmFor } from '../apis/snode_api/snodePool';
+import {
+  NotEmptyArrayOfBatchResults,
+  StoreOnNodeMessage,
+  StoreOnNodeParams,
+  StoreOnNodeParamsNoSig,
+} from '../apis/snode_api/SnodeRequestTypes';
 import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/snodeSignatures';
-import { UserUtils } from '../utils';
+import { SnodeAPIStore } from '../apis/snode_api/storeMessage';
+import { getConversationController } from '../conversations';
+import { MessageEncrypter } from '../crypto';
+import { addMessagePadding } from '../crypto/BufferPadding';
+import { ContentMessage } from '../messages/outgoing';
+import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage';
+import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
+import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage';
+import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage';
+import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
+import { ed25519Str } from '../onions/onionPath';
+import { PubKey } from '../types';
+import { RawMessage } from '../types/RawMessage';
+import { EmptySwarmError } from '../utils/errors';
+import { fromUInt8ArrayToBase64 } from '../utils/String';
 
 // ================ SNODE STORE ================
 
-function overwriteOutgoingTimestampWithNetworkTimestamp(message: RawMessage) {
+function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuffer: Uint8Array }) {
   const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
   const { plainTextBuffer } = message;
@@ -63,89 +71,106 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: RawMessage) {
   return { overRiddenTimestampBuffer, networkTimestamp };
 }
 
-export function getMinRetryTimeout() {
+function getMinRetryTimeout() {
   return 1000;
 }
 
+function isSyncMessage(message: ContentMessage) {
+  if (
+    message instanceof ConfigurationMessage ||
+    message instanceof ClosedGroupNewMessage ||
+    message instanceof UnsendMessage ||
+    message instanceof SharedConfigMessage ||
+    (message as any).syncTarget?.length > 0
+  ) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
 /**
- * Send a message via service nodes.
+ * Send a single message via service nodes.
  *
  * @param message The message to send.
  * @param attempts The amount of times to attempt sending. Minimum value is 1.
  */
-export async function send(
+async function send(
   message: RawMessage,
   attempts: number = 3,
   retryMinTimeout?: number, // in ms
-  isSyncMessage?: boolean
+  isASyncMessage?: boolean
 ): Promise<{ wrappedEnvelope: Uint8Array; effectiveTimestamp: number }> {
   return pRetry(
     async () => {
       const recipient = PubKey.cast(message.device);
-      const { encryption, ttl } = message;
-      let namespace = message.namespace;
+      const { ttl } = message;
 
-      const {
-        overRiddenTimestampBuffer,
-        networkTimestamp,
-      } = overwriteOutgoingTimestampWithNetworkTimestamp(message);
+      // we can only have a single message in this send function for now
+      const [encryptedAndWrapped] = await encryptMessagesAndWrap([
+        {
+          destination: message.device,
+          plainTextBuffer: message.plainTextBuffer,
+          namespace: message.namespace,
+          ttl,
+          identifier: message.identifier,
+          isSyncMessage: Boolean(isASyncMessage),
+        },
+      ]);
 
-      const { envelopeType, cipherText } = await MessageEncrypter.encrypt(
-        recipient,
-        overRiddenTimestampBuffer,
-        encryption
-      );
-
-      const envelope = await buildEnvelope(
-        envelopeType,
-        recipient.key,
-        networkTimestamp,
-        cipherText
-      );
-
-      const data = wrapEnvelope(envelope);
       // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side
       // before we return from the await below.
       // and the isDuplicate messages relies on sent_at timestamp to be valid.
-      const found = await Data.getMessageById(message.identifier);
-
+      const found = await Data.getMessageById(encryptedAndWrapped.identifier);
       // make sure to not update the sent timestamp if this a currently syncing message
       if (found && !found.get('sentSync')) {
-        found.set({ sent_at: networkTimestamp });
+        found.set({ sent_at: encryptedAndWrapped.networkTimestamp });
         await found.commit();
       }
 
-      // right when we upgrade from not having namespaces stored in the outgoing cached messages our messages won't have a namespace associated.
-      // So we need to keep doing the lookup of where they should go if the namespace is not set.
-      if (namespace === null || namespace === undefined) {
-        namespace = getConversationController()
-          .get(recipient.key)
-          ?.isClosedGroup()
-          ? SnodeNamespaces.ClosedGroupMessage
-          : SnodeNamespaces.UserMessages;
+      const batchResult = await MessageSender.sendMessagesDataToSnode(
+        [
+          {
+            pubkey: recipient.key,
+            data64: encryptedAndWrapped.data64,
+            ttl,
+            timestamp: encryptedAndWrapped.networkTimestamp,
+            namespace: encryptedAndWrapped.namespace,
+          },
+        ],
+        recipient.key,
+        null
+      );
+
+      const isDestinationClosedGroup = getConversationController()
+        .get(recipient.key)
+        ?.isClosedGroup();
+      // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case.
+      if (
+        encryptedAndWrapped.identifier &&
+        (encryptedAndWrapped.isSyncMessage || isDestinationClosedGroup) &&
+        batchResult &&
+        !isEmpty(batchResult) &&
+        batchResult[0].code === 200 &&
+        !isEmpty(batchResult[0].body.hash)
+      ) {
+        const messageSendHash = batchResult[0].body.hash;
+        const foundMessage = await Data.getMessageById(encryptedAndWrapped.identifier);
+        if (foundMessage) {
+          await foundMessage.updateMessageHash(messageSendHash);
+          await foundMessage.commit();
+          window?.log?.info(
+            `updated message ${foundMessage.get('id')} with hash: ${foundMessage.get(
+              'messageHash'
+            )}`
+          );
+        }
       }
-      const timestamp = networkTimestamp;
-      // the user config namespaces requires a signature to be added
-      let signOpts: SnodeSignatureResult | undefined;
-      if (SnodeNamespace.isUserConfigNamespace(namespace)) {
-        signOpts = await SnodeSignature.getSnodeSignatureParams({
-          method: 'store' as 'store',
-          namespace,
-          ourPubkey: UserUtils.getOurPubKeyStrFromCache(),
-          pubkey: recipient.key,
-        });
-      }
-      await MessageSender.sendMessageToSnode({
-        pubKey: recipient.key,
-        data,
-        ttl,
-        timestamp,
-        isSyncMessage,
-        messageId: message.identifier,
-        namespace,
-        ...signOpts,
-      });
-      return { wrappedEnvelope: data, effectiveTimestamp: networkTimestamp };
+
+      return {
+        wrappedEnvelope: encryptedAndWrapped.data,
+        effectiveTimestamp: encryptedAndWrapped.networkTimestamp,
+      };
     },
     {
       retries: Math.max(attempts - 1, 0),
@@ -155,100 +180,267 @@ export async function send(
   );
 }
 
-export type SendMessageSignatureOpts = {
-  signature?: string; // needed for some namespaces
-  namespace: SnodeNamespaces;
-  pubkey_ed25519?: string;
-  timestamp: number;
-};
+async function sendMessagesDataToSnode(
+  params: Array<StoreOnNodeParamsNoSig>,
+  destination: string,
+  oldMessageHashes: Array<string> | null
+): Promise<NotEmptyArrayOfBatchResults> {
+  const rightDestination = params.filter(m => m.pubkey === destination);
+  const swarm = await getSwarmFor(destination);
 
-// tslint:disable-next-line: function-name
-export async function sendMessageToSnode({
-  data,
-  namespace,
-  pubKey,
-  timestamp,
-  ttl,
-  isSyncMessage,
-  signature,
-  messageId,
-  pubkey_ed25519,
-}: {
-  pubKey: string;
-  data: Uint8Array;
-  ttl: number;
-  namespace: SnodeNamespaces;
-  isSyncMessage?: boolean;
-  messageId?: string;
-} & SendMessageSignatureOpts): Promise<void> {
-  const data64 = ByteBuffer.wrap(data).toString('base64');
-  const swarm = await getSwarmFor(pubKey);
+  const withSigWhenRequired: Array<StoreOnNodeParams> = await Promise.all(
+    rightDestination.map(async item => {
+      // some namespaces require a signature to be added
+      let signOpts: SnodeSignatureResult | undefined;
+      if (SnodeNamespace.isUserConfigNamespace(item.namespace)) {
+        signOpts = await SnodeSignature.getSnodeSignatureParams({
+          method: 'store' as const,
+          namespace: item.namespace,
+          pubkey: destination,
+        });
+      }
+      const store: StoreOnNodeParams = {
+        data: item.data64,
+        namespace: item.namespace,
+        pubkey: item.pubkey,
+        timestamp: item.timestamp,
+        ttl: item.ttl,
+        ...signOpts,
+      };
+      return store;
+    })
+  );
 
-  const conversation = getConversationController().get(pubKey);
-  const isClosedGroup = conversation?.isClosedGroup();
+  debugger;
+  const signedDeleteOldHashesRequest = oldMessageHashes?.length
+    ? await SnodeSignature.getSnodeSignatureByHashesParams({
+        method: 'delete' as const,
+        messages: oldMessageHashes,
+        pubkey: destination,
+      })
+    : null;
 
-  // send parameters
-  const params: StoreOnNodeParams = {
-    pubkey: pubKey,
-    ttl: `${ttl}`,
-    timestamp: `${timestamp}`,
-    data: data64,
-    namespace,
-  };
-
-  if (signature && pubkey_ed25519) {
-    params.signature = signature;
-    params.pubkey_ed25519 = pubkey_ed25519;
+  const snode = sample(swarm);
+  if (!snode) {
+    throw new EmptySwarmError(destination, 'Ran out of swarm nodes to query');
   }
 
-  const usedNodes = _.slice(swarm, 0, 1);
-  if (!usedNodes || usedNodes.length === 0) {
-    throw new EmptySwarmError(pubKey, 'Ran out of swarm nodes to query');
-  }
-
-  let successfulSendHash: string | undefined;
-
-  let snode: Snode | undefined;
-  const snodeTried = usedNodes[0];
-
   try {
     // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch.
-    // the only case we could care about a retry would be when the usedNode is not correct,
-    // but considering we trigger this request with a few snode in //, this should be fine.
-    const successfulSend = await SnodeAPIStore.storeOnNode(snodeTried, params);
+    const storeResults = await SnodeAPIStore.storeOnNode(
+      snode,
+      withSigWhenRequired,
+      signedDeleteOldHashesRequest
+    );
 
-    if (successfulSend) {
-      if (_.isString(successfulSend)) {
-        successfulSendHash = successfulSend;
-      }
-      snode = snodeTried;
+    if (snode) {
+      window?.log?.info(
+        `sendMessagesToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${
+          snode.ip
+        }:${snode.port} on namespaces: ${rightDestination.map(m => m.namespace).join(',')}`
+      );
     }
+
+    return storeResults;
   } catch (e) {
-    const snodeStr = snodeTried ? `${snodeTried.ip}:${snodeTried.port}` : 'null';
+    const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
     window?.log?.warn(
-      `loki_message:::sendMessage - "${e.code}:${e.message}" to ${pubKey} via snode:${snodeStr}`
+      `sendMessagesToSnode - "${e.code}:${e.message}" to ${destination} via snode:${snodeStr}`
     );
     throw e;
   }
+}
 
-  // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case.
-  if (messageId && (isSyncMessage || isClosedGroup) && successfulSendHash) {
-    const message = await Data.getMessageById(messageId);
-    if (message) {
-      await message.updateMessageHash(successfulSendHash);
-      await message.commit();
-      window?.log?.info(
-        `updated message ${message.get('id')} with hash: ${message.get('messageHash')}`
-      );
-    }
+function encryptionBasedOnConversation(destination: PubKey) {
+  if (
+    getConversationController()
+      .get(destination.key)
+      ?.isClosedGroup()
+  ) {
+    return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
+  } else {
+    return SignalService.Envelope.Type.SESSION_MESSAGE;
   }
+}
 
-  if (snode) {
-    window?.log?.info(
-      `loki_message:::sendMessage - Successfully stored message to ${ed25519Str(pubKey)} via ${
-        snode.ip
-      }:${snode.port} on namespace: ${namespace}`
+type SharedEncryptAndWrap = {
+  ttl: number;
+  identifier: string;
+  isSyncMessage: boolean;
+};
+
+type EncryptAndWrapMessage = {
+  plainTextBuffer: Uint8Array;
+  destination: string;
+  namespace: number | null;
+} & SharedEncryptAndWrap;
+
+type EncryptAndWrapMessageResults = {
+  data64: string;
+  networkTimestamp: number;
+  data: Uint8Array;
+  namespace: number;
+} & SharedEncryptAndWrap;
+
+async function encryptMessageAndWrap(
+  params: EncryptAndWrapMessage
+): Promise<EncryptAndWrapMessageResults> {
+  const {
+    destination,
+    identifier,
+    isSyncMessage: syncMessage,
+    namespace,
+    plainTextBuffer,
+    ttl,
+  } = params;
+
+  const {
+    overRiddenTimestampBuffer,
+    networkTimestamp,
+  } = overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer });
+  const recipient = PubKey.cast(destination);
+
+  const { envelopeType, cipherText } = await MessageEncrypter.encrypt(
+    recipient,
+    overRiddenTimestampBuffer,
+    encryptionBasedOnConversation(recipient)
+  );
+
+  const envelope = await buildEnvelope(envelopeType, recipient.key, networkTimestamp, cipherText);
+
+  const data = wrapEnvelope(envelope);
+  const data64 = ByteBuffer.wrap(data).toString('base64');
+
+  // override the namespaces if those are unset in the incoming messages
+  // right when we upgrade from not having namespaces stored in the outgoing cached messages our messages won't have a namespace associated.
+  // So we need to keep doing the lookup of where they should go if the namespace is not set.
+
+  const overridenNamespace = !isNil(namespace)
+    ? namespace
+    : getConversationController()
+        .get(recipient.key)
+        ?.isClosedGroup()
+    ? SnodeNamespaces.ClosedGroupMessage
+    : SnodeNamespaces.UserMessages;
+
+  return {
+    data64,
+    networkTimestamp,
+    data,
+    namespace: overridenNamespace,
+    ttl,
+    identifier,
+    isSyncMessage: syncMessage,
+  };
+}
+
+async function encryptMessagesAndWrap(
+  messages: Array<EncryptAndWrapMessage>
+): Promise<Array<EncryptAndWrapMessageResults>> {
+  return Promise.all(messages.map(encryptMessageAndWrap));
+}
+
+/**
+ * Send a list of messages to a single service node.
+ * Used currently only for sending SharedConfigMessage to multiple messages at a time.
+ *
+ * @param params the messages to deposit
+ * @param destination the pubkey we should deposit those message for
+ * @returns the hashes of successful deposit
+ */
+async function sendMessagesToSnode(
+  params: Array<StoreOnNodeMessage>,
+  destination: string,
+  oldMessageHashes: Array<string> | null
+): Promise<NotEmptyArrayOfBatchResults | null> {
+  try {
+    const recipient = PubKey.cast(destination);
+
+    const encryptedAndWrapped = await encryptMessagesAndWrap(
+      params.map(m => ({
+        destination: m.pubkey,
+        plainTextBuffer: m.message.plainTextBuffer(),
+        namespace: m.namespace,
+        ttl: m.message.ttl(),
+        identifier: m.message.identifier,
+        isSyncMessage: MessageSender.isSyncMessage(m.message),
+      }))
     );
+
+    // first update all the associated timestamps of our messages in DB, if the outgoing messages are associated with one.
+    await Promise.all(
+      encryptedAndWrapped.map(async (m, index) => {
+        // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side
+        // before we return from the await below.
+        // and the isDuplicate messages relies on sent_at timestamp to be valid.
+        const found = await Data.getMessageById(m.identifier);
+
+        // make sure to not update the sent timestamp if this a currently syncing message
+        if (found && !found.get('sentSync')) {
+          found.set({ sent_at: encryptedAndWrapped[index].networkTimestamp });
+          await found.commit();
+        }
+      })
+    );
+
+    const batchResults = await pRetry(
+      async () => {
+        return MessageSender.sendMessagesDataToSnode(
+          encryptedAndWrapped.map(wrapped => ({
+            pubkey: recipient.key,
+            data64: wrapped.data64,
+            ttl: wrapped.ttl,
+            timestamp: wrapped.networkTimestamp,
+            namespace: wrapped.namespace,
+          })),
+          recipient.key,
+          oldMessageHashes
+        );
+      },
+      {
+        retries: 2,
+        factor: 1,
+        minTimeout: MessageSender.getMinRetryTimeout(),
+      }
+    );
+
+    if (!batchResults || isEmpty(batchResults)) {
+      throw new Error('result is empty for sendMessagesToSnode');
+    }
+
+    const isDestinationClosedGroup = getConversationController()
+      .get(recipient.key)
+      ?.isClosedGroup();
+
+    await Promise.all(
+      encryptedAndWrapped.map(async (message, index) => {
+        // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case.
+        if (
+          message.identifier &&
+          (message.isSyncMessage || isDestinationClosedGroup) &&
+          batchResults[index] &&
+          !isEmpty(batchResults[index]) &&
+          isString(batchResults[index].body.hash)
+        ) {
+          const hashFoundInResponse = batchResults[index].body.hash;
+          const foundMessage = await Data.getMessageById(message.identifier);
+          if (foundMessage) {
+            await foundMessage.updateMessageHash(hashFoundInResponse);
+            await foundMessage.commit();
+            window?.log?.info(
+              `updated message ${foundMessage.get('id')} with hash: ${foundMessage.get(
+                'messageHash'
+              )}`
+            );
+          }
+        }
+      })
+    );
+
+    return batchResults;
+  } catch (e) {
+    window.log.warn(`sendMessagesToSnode failed with ${e.message}`);
+    return null;
   }
 }
 
@@ -296,7 +488,7 @@ function wrapEnvelope(envelope: SignalService.Envelope): Uint8Array {
  * Send a message to an open group v2.
  * @param message The open group message.
  */
-export async function sendToOpenGroupV2(
+async function sendToOpenGroupV2(
   rawMessage: OpenGroupVisibleMessage,
   roomInfos: OpenGroupRequestCommonType,
   blinded: boolean,
@@ -324,7 +516,7 @@ export async function sendToOpenGroupV2(
  * Send a message to an open group v2.
  * @param message The open group message.
  */
-export async function sendToOpenGroupV2BlindedRequest(
+async function sendToOpenGroupV2BlindedRequest(
   encryptedContent: Uint8Array,
   roomInfos: OpenGroupRequestCommonType,
   recipientBlindedId: string
@@ -344,3 +536,13 @@ export async function sendToOpenGroupV2BlindedRequest(
   );
   return msg;
 }
+
+export const MessageSender = {
+  sendToOpenGroupV2BlindedRequest,
+  sendMessagesDataToSnode,
+  sendMessagesToSnode,
+  getMinRetryTimeout,
+  sendToOpenGroupV2,
+  send,
+  isSyncMessage,
+};
diff --git a/ts/session/sending/index.ts b/ts/session/sending/index.ts
index 251c5d04b..07f98fc1b 100644
--- a/ts/session/sending/index.ts
+++ b/ts/session/sending/index.ts
@@ -1,6 +1,3 @@
-// TS 3.8 supports export * as X from 'Y'
-import * as MessageSender from './MessageSender';
-export { MessageSender };
-
 export * from './PendingMessageCache';
 export * from './MessageQueue';
+export * from './MessageSender';
diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts
index 7d082cc2d..362d07d02 100644
--- a/ts/session/utils/Promise.ts
+++ b/ts/session/utils/Promise.ts
@@ -188,7 +188,7 @@ export async function waitUntil(check: () => Return<boolean>, timeoutMs: number
   );
 }
 
-export async function timeout<T>(promise: Promise<T>, timeoutMs: number = 2000): Promise<T> {
+export async function timeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T> {
   const timeoutPromise = new Promise<T>((_, rej) => {
     const wait = setTimeout(() => {
       clearTimeout(wait);
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 9c27d0318..edbb9ab40 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -1,5 +1,6 @@
 import { cloneDeep, compact, isArray, isString } from 'lodash';
 import { Data } from '../../../data/data';
+import { timeout } from '../Promise';
 import { persistedJobFromData } from './JobDeserialization';
 import { JobRunnerType } from './jobs/JobRunnerType';
 import {
@@ -286,7 +287,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       }
       this.currentJob = nextJob;
 
-      success = await this.currentJob.runJob();
+      success = await timeout(this.currentJob.runJob(), this.currentJob.getJobTimeoutMs());
 
       if (success !== RunJobResult.Success) {
         throw new Error(`job ${nextJob.persistedData.identifier} failed`);
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index 1faa0f0d8..a21495289 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -129,6 +129,8 @@ export abstract class PersistedJob<T extends PersistedJobData> {
       : null;
   }
 
+  public abstract getJobTimeoutMs(): number;
+
   /**
    * This function will be called by the runner do run the logic of that job.
    * It **must** return true if that job is a success and doesn't need to be retried.
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index 74c43be68..9c7f836ae 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -60,6 +60,7 @@ async function addAvatarDownloadJobIfNeeded({
   profileKeyHex: string | null | undefined;
 }) {
   if (profileKeyHex && shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
+    debugger;
     const avatarDownloadJob = new AvatarDownloadJob({
       conversationId: pubkey,
       profileKeyHex,
@@ -278,6 +279,10 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     }
     return null;
   }
+
+  public getJobTimeoutMs(): number {
+    return 10000;
+  }
 }
 
 export const AvatarDownload = {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 306c3b21e..c0c06a0a1 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,16 +1,17 @@
 import { from_string } from 'libsodium-wrappers-sumo';
-import { isNumber } from 'lodash';
-import Long from 'long';
+import { compact, groupBy, isArray, isEmpty, isNumber, isString, uniq } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
-import { SignalService } from '../../../../protobuf';
-import { UserConfigWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
-import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime';
-import { SnodeNamespaces } from '../../../apis/snode_api/namespaces';
+import { ConfigDumpData } from '../../../../data/configDump/configDump';
+import {
+  GenericWrapperActions,
+  UserConfigWrapperActions,
+} from '../../../../webworker/workers/browser/libsession_worker_interface';
+import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes';
 import { getConversationController } from '../../../conversations';
 import { SharedConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage';
-import { getMessageQueue } from '../../../sending';
-import { PubKey } from '../../../types';
+import { MessageSender } from '../../../sending/MessageSender';
+import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils';
 import { runners } from '../JobRunner';
 import {
   AddJobCheckReturn,
@@ -22,6 +23,148 @@ import {
 const defaultMsBetweenRetries = 3000;
 const defaultMaxAttempts = 3;
 
+export type SingleDestinationChanges = {
+  destination: string;
+  messages: Array<OutgoingConfResult>;
+  allOldHashes: Array<string>;
+};
+
+type SuccessfulChange = {
+  message: SharedConfigMessage;
+  publicKey: string;
+  updatedHash: Array<string>;
+};
+
+/**
+ * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call.
+ * To make this easier, this function prebuilds and merges together all the changes for each pubkey.
+ */
+async function retrieveSingleDestinationChanges(): Promise<Array<SingleDestinationChanges>> {
+  const outgoingConfResults = await LibSessionUtil.pendingChangesForPubkey(
+    UserUtils.getOurPubKeyStrFromCache()
+  );
+
+  const groupedByDestination = groupBy(outgoingConfResults, m => m.destination);
+
+  const singleDestChanges: Array<SingleDestinationChanges> = Object.keys(groupedByDestination).map(
+    destination => {
+      const messages = groupedByDestination[destination];
+      const uniqHashes = compact(
+        uniq(messages.filter(m => m.oldMessageHashes).map(m => m.oldMessageHashes)).flat()
+      );
+
+      return { allOldHashes: uniqHashes, destination, messages };
+    }
+  );
+
+  return singleDestChanges;
+}
+
+/**
+ * This function is run once we get the results from the multiple batch-send.
+ * For each results, it checks wha
+ */
+function resultsToSuccessfulChange(
+  allResults: Array<PromiseSettledResult<NotEmptyArrayOfBatchResults | null>>,
+  requests: Array<SingleDestinationChanges>
+): Array<SuccessfulChange> {
+  const successfulChanges: Array<SuccessfulChange> = [];
+
+  /**
+   * For each batch request, we get as result
+   * - status code + hash of the new config message
+   * - status code of the delete of all messages as given by the request hashes.
+   *
+   * As it is a sequence, the delete might have failed but the new config message might still be posted.
+   * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes
+   */
+  debugger;
+
+  try {
+    for (let i = 0; i < allResults.length; i++) {
+      const result = allResults[i];
+
+      // the batch send was rejected. Let's skip handling those results altogether. Another job will handle the retry logic.
+      if (result.status !== 'fulfilled') {
+        continue;
+      }
+
+      const resultValue = result.value;
+      if (!resultValue) {
+        continue;
+      }
+
+      const request = requests?.[i];
+      if (!result) {
+        continue;
+      }
+
+      const didDeleteOldConfigMessages = Boolean(
+        !isEmpty(request.allOldHashes) &&
+          resultValue &&
+          resultValue?.length &&
+          request &&
+          resultValue[resultValue.length - 1].code === 200
+      );
+
+      for (let j = 0; j < resultValue.length; j++) {
+        const batchResult = resultValue[j];
+        const messagePostedHashes = batchResult?.body?.hash;
+
+        if (
+          batchResult.code === 200 &&
+          isString(messagePostedHashes) &&
+          request.messages?.[j].message &&
+          request.destination
+        ) {
+          // a message was posted. We need to add it to the tracked list of hashes
+          console.warn(
+            `messagePostedHashes for j:${j}; didDeleteOldConfigMessages:${didDeleteOldConfigMessages}: `,
+            messagePostedHashes
+          );
+          successfulChanges.push({
+            publicKey: request.destination,
+            updatedHash: didDeleteOldConfigMessages
+              ? [messagePostedHashes]
+              : [...request.allOldHashes, messagePostedHashes],
+            message: request.messages?.[j].message,
+          });
+        }
+      }
+    }
+  } catch (e) {
+    console.warn('eeee', e);
+    debugger;
+    throw e;
+  }
+
+  return successfulChanges;
+}
+
+async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<void> {
+  for (let i = 0; i < changes.length; i++) {
+    const change = changes[i];
+    const variant = LibSessionUtil.kindToVariant(change.message.kind);
+    const needsDump = await LibSessionUtil.markAsPushed(
+      variant,
+      change.publicKey,
+      change.message.seqno.toNumber()
+    );
+
+    if (!needsDump) {
+      continue;
+    }
+    const dump = await GenericWrapperActions.dump(variant);
+    console.warn('change.updatedHash', change.updatedHash);
+    await ConfigDumpData.saveConfigDump({
+      data: dump,
+      publicKey: change.publicKey,
+      variant,
+      combinedMessageHashes: change.updatedHash,
+    });
+  }
+}
+
 class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData> {
   constructor({
     identifier,
@@ -45,11 +188,16 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   }
 
   public async run(): Promise<RunJobResult> {
+    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      return RunJobResult.Success;
+    }
     window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
 
     const us = UserUtils.getOurPubKeyStrFromCache();
+    const ed25519Key = await UserUtils.getUserED25519KeyPairBytes();
     const conversation = getConversationController().get(us);
-    if (!us || !conversation) {
+    if (!us || !conversation || !ed25519Key) {
+      // we check for ed25519Key because it is needed for authenticated requests
       window.log.warn('did not find our own conversation');
       return RunJobResult.PermanentFailure;
     }
@@ -64,33 +212,49 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
     }
 
-    const data = await UserConfigWrapperActions.push();
+    const singleDestChanges = await retrieveSingleDestinationChanges();
 
-    const message = new SharedConfigMessage({
-      data: data.data,
-      kind: SignalService.SharedConfigMessage.Kind.USER_PROFILE,
-      seqno: Long.fromNumber(data.seqno),
-      timestamp: GetNetworkTime.getNowWithNetworkOffset(),
-    });
+    // If there are no pending changes then the job can just complete (next time something
+    // is updated we want to try and run immediately so don't scuedule another run in this case)
 
-    const result = await getMessageQueue().sendToPubKeyNonDurably({
-      message,
-      namespace: SnodeNamespaces.UserProfile,
-      pubkey: PubKey.cast(us),
-    });
-    console.warn(
-      `ConfigurationSyncJob sendToPubKeyNonDurably ${this.persistedData.identifier} returned: "${result}"`
-    );
-
-    if (isNumber(result)) {
-      // try {
-      //   markAsPushed
-      // }
-      debugger;
+    if (isEmpty(singleDestChanges)) {
       return RunJobResult.Success;
     }
 
-    return RunJobResult.RetryJobIfPossible;
+    const allResults = await Promise.allSettled(
+      singleDestChanges.map(async dest => {
+        const msgs = dest.messages.map(item => {
+          return {
+            namespace: item.namespace,
+            pubkey: item.destination,
+            timestamp: item.message.timestamp,
+            ttl: item.message.ttl(),
+            message: item.message,
+          };
+        });
+        return MessageSender.sendMessagesToSnode(msgs, dest.destination, dest.allOldHashes);
+      })
+    );
+
+    console.warn(
+      `ConfigurationSyncJob sendToPubKeyNonDurably ${this.persistedData.identifier} returned: "${allResults}"`
+    );
+    // we do a sequence call here. If we do not have the right expected number of results, consider it
+
+    debugger;
+    if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
+      return RunJobResult.RetryJobIfPossible;
+    }
+
+    const changes = resultsToSuccessfulChange(allResults, singleDestChanges);
+    if (isEmpty(changes)) {
+      return RunJobResult.RetryJobIfPossible;
+    }
+    // Now that we have the successful changes, we need to mark them as pushed and
+    // generate any config dumps which need to be stored
+
+    await buildAndSaveDumpsToDB(changes);
+    return RunJobResult.Success;
   }
 
   public serializeJob(): ConfigurationSyncPersistedData {
@@ -110,6 +274,10 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   public nonRunningJobsToRemove(_jobs: Array<ConfigurationSyncPersistedData>) {
     return [];
   }
+
+  public getJobTimeoutMs(): number {
+    return 20000;
+  }
 }
 
 /**
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 2b7079329..71ea3c08e 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -1,50 +1,90 @@
-import { difference, isEqual } from 'lodash';
+import { from_hex } from 'libsodium-wrappers-sumo';
+import { difference, isEqual, omit } from 'lodash';
+import Long from 'long';
 import { UserUtils } from '..';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
+import { SignalService } from '../../../protobuf';
 import { ConfigWrapperObjectTypes } from '../../../webworker/workers/browser/libsession_worker_functions';
 import {
   GenericWrapperActions,
   UserConfigWrapperActions,
 } from '../../../webworker/workers/browser/libsession_worker_interface';
+import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { getConversationController } from '../../conversations';
+import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 
 // TODO complete this list
-const requiredVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
+const requiredUserDumpVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
 
-async function insertUserProfileIntoWrapper() {
+export type IncomingConfResult = {
+  needsPush: boolean;
+  needsDump: boolean;
+  messageHashes: Array<string>;
+  latestSentTimestamp: number;
+};
+
+export type OutgoingConfResult = {
+  message: SharedConfigMessage;
+  namespace: SnodeNamespaces;
+  destination: string;
+  oldMessageHashes?: Array<string>;
+};
+
+async function insertUserProfileIntoWrapperIfChanged() {
   const us = UserUtils.getOurPubKeyStrFromCache();
   const ourConvo = getConversationController().get(us);
 
   if (!ourConvo) {
     throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist');
   }
-  const currentWrapperName = await UserConfigWrapperActions.getName();
-  const currentWrapperProfileUrl = await UserConfigWrapperActions.getProfilePicture();
+  const wrapperName = await UserConfigWrapperActions.getName();
+  const wrapperProfilePicture = await UserConfigWrapperActions.getProfilePicture();
+  const wrapperProfileUrl = wrapperProfilePicture.url || '';
+  const wrapperProfileKey = wrapperProfilePicture.key || '';
 
-  const currentDbName = ourConvo.get('displayNameInProfile') || '';
-  if (!isEqual(currentDbName, currentWrapperName)) {
-    await UserConfigWrapperActions.setName(currentDbName);
+  const dbName = ourConvo.get('displayNameInProfile') || '';
+  const dbProfileUrl = ourConvo.get('avatarPointer') || '';
+  const dbProfileKey = from_hex(ourConvo.get('profileKey') || '');
+  if (!isEqual(dbName, wrapperName)) {
+    await UserConfigWrapperActions.setName(dbName);
+  }
+  if (!isEqual(dbProfileUrl, wrapperProfileUrl) || !isEqual(dbProfileKey, wrapperProfileKey)) {
+    await UserConfigWrapperActions.setProfilePicture(wrapperProfileUrl, dbProfileKey);
   }
 }
 
 /**
  * Right after we migrated, we won't have any dumps in DB. We must create them from our database state,
  */
-async function createConfigDumpsFromDbFirstStart(privateKeyEd25519: Uint8Array) {
-  let countCreated = 0;
+async function createConfigDumpsFromDbFirstStart(
+  privateKeyEd25519: Uint8Array
+): Promise<Array<ConfigWrapperObjectTypes>> {
+  const justCreated: Array<ConfigWrapperObjectTypes> = [];
   try {
+    console.warn('createConfigDumpsFromDbFirstStart');
+
     // build the userconfig
     await UserConfigWrapperActions.init(privateKeyEd25519, null);
-
-    countCreated++;
+    await insertUserProfileIntoWrapperIfChanged();
+    const data = await UserConfigWrapperActions.dump();
+    // save it to the DB
+    await ConfigDumpData.saveConfigDump({
+      combinedMessageHashes: [],
+      data,
+      publicKey: UserUtils.getOurPubKeyStrFromCache(),
+      variant: 'UserConfig',
+    });
+    justCreated.push('UserConfig');
   } catch (e) {
     window.log.warn('Failed to init the UserConfig with createConfigDumpsFromDbFirstStart');
   }
 
-  if (countCreated > 0) {
-    await ConfigurationSync.queueNewJobIfNeeded();
+  if (justCreated.length > 0) {
+    setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 3000);
   }
+  return justCreated;
 }
 
 async function initializeLibSessionUtilWrappers() {
@@ -55,24 +95,31 @@ async function initializeLibSessionUtilWrappers() {
   const privateKeyEd25519 = keypair.privKeyBytes;
   let dumps = await ConfigDumpData.getAllDumpsWithData();
 
+  let createdDuringFirstStart: Array<ConfigWrapperObjectTypes> = [];
   if (!dumps?.length) {
-    await createConfigDumpsFromDbFirstStart(privateKeyEd25519);
+    createdDuringFirstStart = await createConfigDumpsFromDbFirstStart(privateKeyEd25519);
   }
 
   // refetch them as the createConfigDumpsFromDb might have created them
   dumps = await ConfigDumpData.getAllDumpsWithData();
+  console.warn(
+    'dumps',
+    dumps.map(m => omit(m, 'data'))
+  );
 
   const userVariantsBuildWithoutErrors = new Set<ConfigWrapperObjectTypes>();
 
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
+    console.warn('forl oop init', dump.variant);
     try {
-      await GenericWrapperActions.init(
-        dump.variant,
-        privateKeyEd25519,
-        dump.data.length ? dump.data : null
-      );
-
+      if (!createdDuringFirstStart.includes(dump.variant)) {
+        await GenericWrapperActions.init(
+          dump.variant,
+          privateKeyEd25519,
+          dump.data.length ? dump.data : null
+        );
+      }
       userVariantsBuildWithoutErrors.add(dump.variant);
     } catch (e) {
       window.log.warn(`init of UserConfig failed with ${e.message} `);
@@ -82,9 +129,10 @@ async function initializeLibSessionUtilWrappers() {
 
   console.warn('requiredVariants: FIXME add conversation volatile wrapper as required ');
 
-  const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(requiredVariants, [
-    ...userVariantsBuildWithoutErrors.values(),
-  ]);
+  const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(
+    requiredUserDumpVariants,
+    [...userVariantsBuildWithoutErrors.values()]
+  );
 
   for (let index = 0; index < missingRequiredVariants.length; index++) {
     const missingVariant = missingRequiredVariants[index];
@@ -92,4 +140,87 @@ async function initializeLibSessionUtilWrappers() {
   }
 }
 
-export const LibSessionUtil = { initializeLibSessionUtilWrappers };
+async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingConfResult>> {
+  const dumps = await ConfigDumpData.getAllDumpsWithoutData();
+  const us = UserUtils.getOurPubKeyStrFromCache();
+
+  // Ensure we always check the required user config types for changes even if there is no dump
+  // data yet (to deal with first launch cases)
+  if (pubkey === us) {
+    LibSessionUtil.requiredUserDumpVariants.forEach(requiredVariant => {
+      if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) {
+        dumps.push({ publicKey: us, variant: requiredVariant, combinedMessageHashes: [] });
+      }
+    });
+  }
+
+  const results: Array<OutgoingConfResult> = [];
+
+  for (let index = 0; index < dumps.length; index++) {
+    const dump = dumps[index];
+    const variant = dump.variant;
+    const needsPush = await GenericWrapperActions.needsPush(variant);
+    if (!needsPush) {
+      continue;
+    }
+
+    const { data, seqno } = await GenericWrapperActions.push(variant);
+    const kind = variantToKind(variant);
+    const namespace = await GenericWrapperActions.storageNamespace(variant);
+    results.push({
+      destination: pubkey,
+      message: new SharedConfigMessage({
+        data,
+        kind,
+        seqno: Long.fromNumber(seqno),
+        timestamp: GetNetworkTime.getNowWithNetworkOffset(),
+      }),
+      oldMessageHashes: dump.combinedMessageHashes,
+      namespace,
+    });
+  }
+
+  return results;
+}
+
+function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrapperObjectTypes {
+  switch (kind) {
+    case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
+      return 'UserConfig';
+    case SignalService.SharedConfigMessage.Kind.CONTACTS:
+      return 'ContactsConfig';
+    default:
+      throw new Error(`kindToVariant: Unsupported variant: "${kind}"`);
+  }
+}
+
+function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedConfigMessage.Kind {
+  switch (variant) {
+    case 'UserConfig':
+      return SignalService.SharedConfigMessage.Kind.USER_PROFILE;
+    case 'ContactsConfig':
+      return SignalService.SharedConfigMessage.Kind.CONTACTS;
+    default:
+      throw new Error(`variantToKind: Unsupported variant: "${variant}"`);
+  }
+}
+
+/**
+ * Returns true if the config needs to be dumped afterwards
+ */
+async function markAsPushed(variant: ConfigWrapperObjectTypes, pubkey: string, seqno: number) {
+  if (pubkey !== UserUtils.getOurPubKeyStrFromCache()) {
+    //FIXME libsession closed group
+    throw new Error('FIXME, generic case is to be done');
+  }
+  await GenericWrapperActions.confirmPushed(variant, seqno);
+  return GenericWrapperActions.needsDump(variant);
+}
+
+export const LibSessionUtil = {
+  initializeLibSessionUtilWrappers,
+  requiredUserDumpVariants,
+  pendingChangesForPubkey,
+  kindToVariant,
+  markAsPushed,
+};
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 9db043876..dda6de8b5 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -35,7 +35,7 @@ describe('MessageSender', () => {
     let encryptStub: sinon.SinonStub<[PubKey, Uint8Array, SignalService.Envelope.Type]>;
 
     beforeEach(() => {
-      sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessageToSnode').resolves();
+      sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessagesToSnode').resolves();
 
       stubData('getMessageById').resolves();
 
diff --git a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
index a3263d100..31dadf68e 100644
--- a/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
+++ b/ts/test/session/unit/utils/job_runner/FakeSleepForJob.ts
@@ -67,6 +67,10 @@ export class FakeSleepForMultiJob extends PersistedJob<FakeSleepForMultiJobData>
   public nonRunningJobsToRemove(_jobs: Array<FakeSleepForMultiJobData>) {
     return [];
   }
+
+  public getJobTimeoutMs(): number {
+    return 10000;
+  }
 }
 
 export class FakeSleepForJob extends PersistedJob<FakeSleepJobData> {
@@ -119,4 +123,8 @@ export class FakeSleepForJob extends PersistedJob<FakeSleepJobData> {
   public nonRunningJobsToRemove(_jobs: Array<FakeSleepJobData>) {
     return [];
   }
+
+  public getJobTimeoutMs(): number {
+    return 10000;
+  }
 }
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index adf7d4430..5b1712dd8 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -59,6 +59,10 @@ export type ConfigDumpDataNode = {
 
   getAllDumpsWithData: () => Array<ConfigDumpRow>;
   getAllDumpsWithoutData: () => Array<ConfigDumpRowWithoutData>;
+  getCombinedHashesByVariantAndPubkey: (
+    variant: ConfigWrapperObjectTypes,
+    pubkey: string
+  ) => Set<string>;
 };
 
 // ========== unprocessed
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 51b8b82fa..0a85469c8 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -55,6 +55,7 @@ function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapp
  */
 function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): BaseConfigWrapper {
   const wrapper = getUserWrapper(wrapperType);
+  console.warn('initUserWrapper: ', wrapperType);
   if (wrapper) {
     throw new Error(`${wrapperType} already init`);
   }
@@ -68,7 +69,7 @@ function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): Bas
   }
 
   if (!isNull(dump) && !isUInt8Array(dump)) {
-    throw new Error('${wrapperType} init needs a valid dump');
+    throw new Error(`${wrapperType} init needs a valid dump`);
   }
   const userType = assertUserWrapperType(wrapperType);
   switch (userType) {

From 6bbb16b46d9d9ee280332f1bea98868f857c3cad Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 10 Feb 2023 12:07:49 +1100
Subject: [PATCH 031/178] feat: track and delete configMessageHashes

---
 ts/data/configDump/configDump.ts              |   2 +-
 ts/models/conversation.ts                     |   2 +-
 ts/node/sql_calls/config_dump.ts              |  39 +++++++------
 ts/receiver/configMessage.ts                  |  11 ++--
 ts/session/apis/snode_api/retrieveRequest.ts  |   4 +-
 ts/session/apis/snode_api/swarmPolling.ts     |   4 +-
 ts/session/sending/MessageSender.ts           |  20 +++----
 ts/session/utils/job_runners/JobRunner.ts     |   1 +
 .../job_runners/jobs/AvatarDownloadJob.ts     |   2 +
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  20 +++----
 .../utils/libsession/libsession_utils.ts      |   9 ++-
 ts/shared/string_utils.ts                     |   8 +++
 ...ts => libsession_wrapper_contacts_test.ts} |  54 ++++++++++--------
 ...est_skip.ts => libsession_wrapper_test.ts} |   7 +--
 ts/types/sqlSharedTypes.ts                    |   4 +-
 .../291fe70add0aed9152dd65b009ea805d.node     | Bin 667336 -> 0 bytes
 .../4bd3aa7e66b8715da772e40d870b54a4.node     | Bin 671576 -> 0 bytes
 .../libsession.worker.js.LICENSE.txt          |   8 ---
 18 files changed, 105 insertions(+), 90 deletions(-)
 create mode 100644 ts/shared/string_utils.ts
 rename ts/test/session/unit/libsession_wrapper/{libsession_wrapper_contacts_test_skip.ts => libsession_wrapper_contacts_test.ts} (86%)
 rename ts/test/session/unit/libsession_wrapper/{libsession_wrapper_test_skip.ts => libsession_wrapper_test.ts} (97%)
 delete mode 100644 ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node
 delete mode 100644 ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node
 delete mode 100644 ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt

diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 8b4698655..9fcca3d63 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -16,7 +16,7 @@ export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
   },
   saveConfigDump: (dump: ConfigDumpRow) => {
     console.warn('saveConfigDump', dump);
-    if (dump.combinedMessageHashes.some(m => m && m.length < 5)) {
+    if (dump.combinedMessageHashes.some(m => Boolean(m && m.length < 5))) {
       throw new Error('saveConfigDump combinedMessageHashes have invalid size');
     }
     return channels.saveConfigDump(dump);
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1c6ad5df8..a5eca70a3 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1062,7 +1062,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     options: {
       fromSync?: boolean;
     } = {},
-    shouldCommit = true
+    shouldCommit = true,
   ): Promise<void> {
     let expireTimer = providedExpireTimer;
     let source = providedSource;
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index d6e2db1bf..604e12391 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -2,7 +2,8 @@
  * Config dumps sql calls
  */
 
-import { compact, flatten, isEmpty, uniq } from 'lodash';
+import { compact, isEmpty, uniq } from 'lodash';
+import { uniqFromListOfList } from '../../shared/string_utils';
 import {
   ConfigDumpDataNode,
   ConfigDumpRow,
@@ -36,10 +37,17 @@ function parseRowNoData(
   return toRet;
 }
 
+export function uniqCompacted<T extends string>(list: Array<T>): Array<T> {
+  if (!list || !list.length) {
+    return [];
+  }
+  return uniq(compact(list));
+}
+
 function parseRowMessageHashes(row: CombinedMessageHashes): Array<string> {
   if (!isEmpty(row.combinedMessageHashes) && row.combinedMessageHashes) {
     try {
-      return JSON.parse(row.combinedMessageHashes) || [];
+      return uniqCompacted(JSON.parse(row.combinedMessageHashes));
     } catch (e) {
       console.warn('parseRowMessageHashes row failed');
     }
@@ -65,7 +73,10 @@ export const configDumpData: ConfigDumpDataNode = {
     return compact(rows.map(parseRow));
   },
 
-  getMessageHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
+  getMessageHashesByVariantAndPubkey: (
+    variant: ConfigWrapperObjectTypes,
+    publicKey: string
+  ): Array<string> => {
     const rows = assertGlobalInstance()
       .prepare(
         'SELECT combinedMessageHashes from configDump WHERE variant = $variant AND publicKey = $publicKey;'
@@ -78,7 +89,10 @@ export const configDumpData: ConfigDumpDataNode = {
     if (!rows) {
       return [];
     }
-    return uniq(flatten(rows.map(parseRowMessageHashes)));
+    const parsedRows: Array<Array<string>> = rows.map(parseRowMessageHashes);
+
+    const unique: Array<string> = uniqFromListOfList(parsedRows);
+    return unique;
   },
 
   getAllDumpsWithData: () => {
@@ -123,7 +137,7 @@ export const configDumpData: ConfigDumpDataNode = {
       .run({
         publicKey,
         variant,
-        combinedMessageHashes: JSON.stringify(combinedMessageHashes || []),
+        combinedMessageHashes: JSON.stringify(uniqCompacted(combinedMessageHashes)),
         data,
       });
   },
@@ -141,7 +155,7 @@ export const configDumpData: ConfigDumpDataNode = {
       .run({
         publicKey,
         variant,
-        combinedMessageHashes: JSON.stringify(combinedMessageHashes || []),
+        combinedMessageHashes: JSON.stringify(uniqCompacted(combinedMessageHashes)),
       });
   },
 
@@ -156,17 +170,8 @@ export const configDumpData: ConfigDumpDataNode = {
       });
 
     if (!rows) {
-      return new Set();
+      return new Array<string>();
     }
-    const asArrays = compact(
-      rows.map(t => {
-        try {
-          return JSON.parse(t.combinedMessageHashes);
-        } catch {
-          return null;
-        }
-      })
-    );
-    return new Set(asArrays.flat(1));
+    return uniqFromListOfList(rows.map(parseRowMessageHashes));
   },
 };
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index d33ce0ea5..737bc3c1a 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -161,16 +161,17 @@ async function processMergingResults(
     const variant = LibSessionUtil.kindToVariant(kind);
     // We need to get the existing message hashes and combine them with the latest from the
     // service node to ensure the next push will properly clean up old messages
-    const oldMessagesHashesSet = await ConfigDumpData.getCombinedHashesByVariantAndPubkey(
+    const oldMessagesHashes = await ConfigDumpData.getCombinedHashesByVariantAndPubkey(
       variant,
       envelope.source
     );
-    const allMessageHashes = new Set([...oldMessagesHashesSet, ...finalResult.messageHashes]);
+
+    const allMessageHashes = [...oldMessagesHashes, ...finalResult.messageHashes];
 
     const finalResultsHashes = new Set(finalResult.messageHashes);
 
     // lodash does deep compare of Sets
-    const messageHashesChanged = !isEqual(oldMessagesHashesSet, finalResultsHashes);
+    const messageHashesChanged = !isEqual(oldMessagesHashes, finalResultsHashes);
 
     if (finalResult.needsDump) {
       // The config data had changes so regenerate the dump and save it
@@ -180,7 +181,7 @@ async function processMergingResults(
         data: dump,
         publicKey: pubkey,
         variant,
-        combinedMessageHashes: [...allMessageHashes],
+        combinedMessageHashes: allMessageHashes,
       });
     } else if (messageHashesChanged) {
       // The config data didn't change but there were different messages on the service node
@@ -188,7 +189,7 @@ async function processMergingResults(
       await ConfigDumpData.saveCombinedMessageHashesForMatching({
         publicKey: pubkey,
         variant,
-        combinedMessageHashes: [...allMessageHashes],
+        combinedMessageHashes: allMessageHashes,
       });
     }
 
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index f6e947c78..92409e594 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -1,3 +1,4 @@
+import { omit } from 'lodash';
 import { Snode } from '../../../data/data';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import { doSnodeBatchRequest } from './batchRequest';
@@ -38,7 +39,7 @@ async function buildRetrieveRequest(
         };
         const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = {
           method: 'retrieve',
-          params: { ...retrieveLegacyClosedGroup },
+          params: omit(retrieveLegacyClosedGroup, 'timestamp'), // if we give a timestamp, a signature will be required by the service node, and we don't want to provide one as this is an unauthenticated namespace
         };
 
         return retrieveParamsLegacy;
@@ -65,7 +66,6 @@ async function buildRetrieveRequest(
       return retrieve;
     })
   );
-
   return retrieveRequestsParams;
 }
 
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index a42b8e71d..5e44f051e 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -318,8 +318,8 @@ export class SwarmPolling {
     namespaces: Array<SnodeNamespaces>
   ): Promise<RetrieveMessagesResultsBatched | null> {
     const namespaceLength = namespaces.length;
-    if (namespaceLength > 3 || namespaceLength <= 0) {
-      throw new Error('pollNodeForKey needs  1 or 2 namespaces to be given at all times');
+    if (namespaceLength > 5 || namespaceLength <= 0) {
+      throw new Error(`invalid number of retrieve namespace provided: ${namespaceLength}`);
     }
     const edkey = node.pubkey_ed25519;
     const pkStr = pubkey.key;
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 445ca431b..f7a2857b7 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -183,7 +183,7 @@ async function send(
 async function sendMessagesDataToSnode(
   params: Array<StoreOnNodeParamsNoSig>,
   destination: string,
-  oldMessageHashes: Array<string> | null
+  oldMessageHashes: Set<string> | null
 ): Promise<NotEmptyArrayOfBatchResults> {
   const rightDestination = params.filter(m => m.pubkey === destination);
   const swarm = await getSwarmFor(destination);
@@ -211,14 +211,14 @@ async function sendMessagesDataToSnode(
     })
   );
 
-  debugger;
-  const signedDeleteOldHashesRequest = oldMessageHashes?.length
-    ? await SnodeSignature.getSnodeSignatureByHashesParams({
-        method: 'delete' as const,
-        messages: oldMessageHashes,
-        pubkey: destination,
-      })
-    : null;
+  const signedDeleteOldHashesRequest =
+    oldMessageHashes && oldMessageHashes.size
+      ? await SnodeSignature.getSnodeSignatureByHashesParams({
+          method: 'delete' as const,
+          messages: [...oldMessageHashes],
+          pubkey: destination,
+        })
+      : null;
 
   const snode = sample(swarm);
   if (!snode) {
@@ -351,7 +351,7 @@ async function encryptMessagesAndWrap(
 async function sendMessagesToSnode(
   params: Array<StoreOnNodeMessage>,
   destination: string,
-  oldMessageHashes: Array<string> | null
+  oldMessageHashes: Set<string> | null
 ): Promise<NotEmptyArrayOfBatchResults | null> {
   try {
     const recipient = PubKey.cast(destination);
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index edbb9ab40..58750542c 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -297,6 +297,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       this.deleteJobsByIdentifier([this.currentJob.persistedData.identifier]);
       await this.writeJobsToDB();
     } catch (e) {
+      window.log.warn(`JobRunner current ${this.jobRunnerType} failed with ${e.message}`);
       if (
         success === RunJobResult.PermanentFailure ||
         nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index 9c7f836ae..b91c70851 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -130,6 +130,8 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
       return RunJobResult.PermanentFailure;
     }
 
+    debugger;
+
     let conversation = getConversationController().get(convoId);
     if (!conversation) {
       // return true so we do not retry this task.
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index c0c06a0a1..1bcfabf3e 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -49,11 +49,10 @@ async function retrieveSingleDestinationChanges(): Promise<Array<SingleDestinati
   const singleDestChanges: Array<SingleDestinationChanges> = Object.keys(groupedByDestination).map(
     destination => {
       const messages = groupedByDestination[destination];
-      const uniqHashes = compact(
-        uniq(messages.filter(m => m.oldMessageHashes).map(m => m.oldMessageHashes)).flat()
-      );
+      // the delete hashes sub request can be done accross namespaces, so we can do a single one of it with all the hashes to remove (per pubkey)
+      const hashes = compact(messages.map(m => m.oldMessageHashes)).flat();
 
-      return { allOldHashes: uniqHashes, destination, messages };
+      return { allOldHashes: hashes, destination, messages };
     }
   );
 
@@ -78,7 +77,6 @@ function resultsToSuccessfulChange(
    * As it is a sequence, the delete might have failed but the new config message might still be posted.
    * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes
    */
-  debugger;
 
   try {
     for (let i = 0; i < allResults.length; i++) {
@@ -122,11 +120,12 @@ function resultsToSuccessfulChange(
             `messagePostedHashes for j:${j}; didDeleteOldConfigMessages:${didDeleteOldConfigMessages}: `,
             messagePostedHashes
           );
+          const updatedHashes: Array<string> = didDeleteOldConfigMessages
+            ? [messagePostedHashes]
+            : uniq(compact([...request.allOldHashes, messagePostedHashes]));
           successfulChanges.push({
             publicKey: request.destination,
-            updatedHash: didDeleteOldConfigMessages
-              ? [messagePostedHashes]
-              : [...request.allOldHashes, messagePostedHashes],
+            updatedHash: updatedHashes,
             message: request.messages?.[j].message,
           });
         }
@@ -134,7 +133,6 @@ function resultsToSuccessfulChange(
     }
   } catch (e) {
     console.warn('eeee', e);
-    debugger;
     throw e;
   }
 
@@ -232,7 +230,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
             message: item.message,
           };
         });
-        return MessageSender.sendMessagesToSnode(msgs, dest.destination, dest.allOldHashes);
+        const asSet = new Set(dest.allOldHashes);
+        return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
       })
     );
 
@@ -241,7 +240,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
     );
     // we do a sequence call here. If we do not have the right expected number of results, consider it
 
-    debugger;
     if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
       return RunJobResult.RetryJobIfPossible;
     }
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 71ea3c08e..d0ffae464 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -29,7 +29,7 @@ export type OutgoingConfResult = {
   message: SharedConfigMessage;
   namespace: SnodeNamespaces;
   destination: string;
-  oldMessageHashes?: Array<string>;
+  oldMessageHashes: Array<string>;
 };
 
 async function insertUserProfileIntoWrapperIfChanged() {
@@ -149,13 +149,18 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   if (pubkey === us) {
     LibSessionUtil.requiredUserDumpVariants.forEach(requiredVariant => {
       if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) {
-        dumps.push({ publicKey: us, variant: requiredVariant, combinedMessageHashes: [] });
+        dumps.push({
+          publicKey: us,
+          variant: requiredVariant,
+          combinedMessageHashes: [],
+        });
       }
     });
   }
 
   const results: Array<OutgoingConfResult> = [];
 
+  debugger;
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
     const variant = dump.variant;
diff --git a/ts/shared/string_utils.ts b/ts/shared/string_utils.ts
new file mode 100644
index 000000000..1faaac419
--- /dev/null
+++ b/ts/shared/string_utils.ts
@@ -0,0 +1,8 @@
+import { compact, uniq } from 'lodash';
+
+/**
+ * Returns a compact list of all the items present in all those arrays, once each only.
+ */
+export function uniqFromListOfList<T extends string>(list: Array<Array<T>>): Array<T> {
+  return uniq(compact(list.flat()));
+}
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
similarity index 86%
rename from ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts
rename to ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 09e28a1e3..ae747e37b 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test_skip.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -2,7 +2,8 @@ import { expect } from 'chai';
 
 import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
+// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
+import * as SessionUtilWrapper from 'session_util_wrapper';
 
 describe('libsession_wrapper_contacts  ', () => {
   // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
@@ -16,10 +17,10 @@ describe('libsession_wrapper_contacts  ', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
-    const SessionUtilWrapper = require('session_util_wrapper');
+    // const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
-    const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+    const contacts = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
 
     // We don't need to push anything, since this is an empty config
     expect(contacts.needsPush()).to.be.eql(false);
@@ -40,6 +41,8 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(created.approvedMe).to.be.eq(false);
     expect(created.blocked).to.be.eq(false);
     expect(created.id).to.be.eq(real_id);
+    expect(created.profilePicture?.url).to.be.eq(undefined);
+    expect(created.profilePicture?.key).to.be.eq(undefined);
 
     expect(contacts.needsPush()).to.be.eql(false);
     expect(contacts.needsDump()).to.be.eql(false);
@@ -62,14 +65,15 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(updated?.approved).to.be.true;
     expect(updated?.approvedMe).to.be.true;
     expect(updated?.blocked).to.be.false;
+
     expect(updated?.profilePicture).to.be.undefined;
 
     created.profilePicture = { key: new Uint8Array([1, 2, 3]), url: 'fakeUrl' };
     contacts.set(created);
-    updated = contacts.get(real_id);
+    const updated2 = contacts.get(real_id);
 
-    expect(updated?.profilePicture?.url).to.be.deep.eq('fakeUrl');
-    expect(updated?.profilePicture?.key).to.be.deep.eq(new Uint8Array([1, 2, 3]));
+    expect(updated2?.profilePicture?.url).to.be.deep.eq('fakeUrl');
+    expect(updated2?.profilePicture?.key).to.be.deep.eq(new Uint8Array([1, 2, 3]));
 
     expect(contacts.needsPush()).to.be.eql(true);
     expect(contacts.needsDump()).to.be.eql(true);
@@ -84,7 +88,7 @@ describe('libsession_wrapper_contacts  ', () => {
 
     const dump = contacts.dump();
 
-    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, dump);
+    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, dump);
 
     expect(contacts2.needsPush()).to.be.eql(false);
     expect(contacts2.needsDump()).to.be.eql(false);
@@ -101,10 +105,10 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(x?.approvedMe).to.be.true;
     expect(x?.blocked).to.be.false;
 
-    const another_id = '051111111111111111111111111111111111111111111111111111111111111111';
-    contacts2.getOrCreate(another_id);
+    const anotherId = '051111111111111111111111111111111111111111111111111111111111111111';
+    contacts2.getOrCreate(anotherId);
     contacts2.set({
-      id: another_id,
+      id: anotherId,
     });
     // We're not setting any fields, but we should still keep a record of the session id
     expect(contacts2.needsPush()).to.be.true;
@@ -125,7 +129,7 @@ describe('libsession_wrapper_contacts  ', () => {
     const nicknames = allContacts.map((m: any) => m.nickname || '(N/A)');
 
     expect(session_ids.length).to.be.eq(2);
-    expect(session_ids).to.be.deep.eq([real_id, another_id]);
+    expect(session_ids).to.be.deep.eq([real_id, anotherId]);
     expect(nicknames).to.be.deep.eq(['Joey', '(N/A)']);
 
     // Conflict! Oh no!
@@ -173,12 +177,12 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(contacts2.needsPush()).to.be.false;
 
     const allContacts2 = contacts.getAll();
-    const session_ids2 = allContacts2.map((m: any) => m.id);
+    const sessionIds2 = allContacts2.map((m: any) => m.id);
     const nicknames2 = allContacts2.map((m: any) => m.nickname || '(N/A)');
 
-    expect(session_ids2.length).to.be.eq(2);
+    expect(sessionIds2.length).to.be.eq(2);
     expect(nicknames2.length).to.be.eq(2);
-    expect(session_ids2).to.be.deep.eq([another_id, third_id]);
+    expect(sessionIds2).to.be.deep.eq([anotherId, third_id]);
     expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
   });
 
@@ -189,13 +193,13 @@ describe('libsession_wrapper_contacts  ', () => {
     const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
-    const contacts = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+    const contacts = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
 
-    const real_id = '050000000000000000000000000000000000000000000000000000000000000000';
+    const realId = '050000000000000000000000000000000000000000000000000000000000000000';
 
-    expect(contacts.get(real_id)).to.be.null;
-    const c = contacts.getOrCreate(real_id);
-    expect(c.id).to.be.eq(real_id);
+    expect(contacts.get(realId)).to.be.null;
+    const c = contacts.getOrCreate(realId);
+    expect(c.id).to.be.eq(realId);
     expect(c.name).to.be.null;
     expect(c.nickname).to.be.null;
     expect(c.approved).to.be.false;
@@ -214,7 +218,7 @@ describe('libsession_wrapper_contacts  ', () => {
     // contacts.setApproved(real_id, c.approved);
     // contacts.setApprovedMe(real_id, c.approvedMe);
 
-    const c2 = contacts.getOrCreate(real_id);
+    const c2 = contacts.getOrCreate(realId);
     expect(c2.name).to.be.eq('Joe');
     expect(c2.nickname).to.be.eq('Joey');
     expect(c2.approved).to.be.true;
@@ -229,14 +233,14 @@ describe('libsession_wrapper_contacts  ', () => {
     let push1 = contacts.push();
     expect(push1.seqno).to.be.equal(1);
 
-    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapper(edSecretKey, null);
+    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
 
     let accepted = contacts2.merge([push1.data]);
     expect(accepted).to.be.equal(1);
 
     contacts.confirmPushed(push1.seqno);
 
-    let c3 = contacts2.getOrCreate(real_id);
+    let c3 = contacts2.getOrCreate(realId);
     expect(c3.name).to.be.eq('Joe');
     expect(c3.nickname).to.be.eq('Joey');
     expect(c3.approved).to.be.true;
@@ -268,7 +272,7 @@ describe('libsession_wrapper_contacts  ', () => {
 
     expect(session_ids2.length).to.be.eq(2);
     expect(nicknames2.length).to.be.eq(2);
-    expect(session_ids2).to.be.deep.eq([real_id, another_id]);
+    expect(session_ids2).to.be.deep.eq([realId, another_id]);
     expect(nicknames2).to.be.deep.eq(['Joey', '(N/A)']);
 
     // Changing things while iterating:
@@ -278,7 +282,7 @@ describe('libsession_wrapper_contacts  ', () => {
     let deletions = 0;
     let non_deletions = 0;
     allContacts3.forEach((c: any) => {
-      if (c.id !== real_id) {
+      if (c.id !== realId) {
         contacts.erase(c.id);
         deletions++;
       } else {
@@ -288,7 +292,7 @@ describe('libsession_wrapper_contacts  ', () => {
 
     expect(deletions).to.be.eq(1);
     expect(non_deletions).to.be.eq(1);
-    expect(contacts.get(real_id)).to.exist;
+    expect(contacts.get(realId)).to.exist;
     expect(contacts.get(another_id)).to.be.null;
   });
 });
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
similarity index 97%
rename from ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
rename to ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index acbc3605c..59fe4c38e 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test_skip.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -21,7 +21,7 @@ describe('libsession_wrapper', () => {
     const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
-    const conf = new SessionUtilWrapper.UserConfigWrapper(edSecretKey, null);
+    const conf = new SessionUtilWrapper.UserConfigWrapperInsideWorker(edSecretKey, null);
 
     // We don't need to push anything, since this is an empty config
     expect(conf.needsPush()).to.be.eql(false);
@@ -116,9 +116,8 @@ describe('libsession_wrapper', () => {
     // Now we're going to set up a second, competing config object (in the real world this would be
     // another Session client somewhere).
 
-    // Start with an empty config, as above:
-
-    const conf2 = new SessionUtilWrapper.UserConfigWrapper(edSecretKey, null);
+    // Start with an empty config, as abo.setve:
+    const conf2 = new SessionUtilWrapper.UserConfigWrapperInsideWorker(edSecretKey, null);
 
     expect(conf2.needsDump()).to.be.false;
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 5b1712dd8..a494bb6a2 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -34,7 +34,7 @@ export type ConfigDumpRow = {
   variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
   publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
   data: Uint8Array; // the blob returned by libsession.dump() call
-  combinedMessageHashes: Array<string>; // array of lastHashes to keep track of
+  combinedMessageHashes: Array<string>; // set of lastHashes to keep track of
   // we might need to add a `seqno` field here.
 };
 
@@ -62,7 +62,7 @@ export type ConfigDumpDataNode = {
   getCombinedHashesByVariantAndPubkey: (
     variant: ConfigWrapperObjectTypes,
     pubkey: string
-  ) => Set<string>;
+  ) => Array<string>;
 };
 
 // ========== unprocessed
diff --git a/ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node b/ts/webworker/workers/node/libsession/291fe70add0aed9152dd65b009ea805d.node
deleted file mode 100644
index b9caaace83c258ccd9b7c638477c6c49a7bf4ef3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667336
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%0DOQOZ%2r=RuJeInm2drq!l8Tj7o!DbZ
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%0DwVCeju{8kr
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%0D984|$wz
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

diff --git a/ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node b/ts/webworker/workers/node/libsession/4bd3aa7e66b8715da772e40d870b54a4.node
deleted file mode 100644
index 9fb8f3fac26c9adadbd89895cbed50fed60a3bcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671576
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

diff --git a/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt b/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
deleted file mode 100644
index b1121f519..000000000
--- a/ts/webworker/workers/node/libsession/libsession.worker.js.LICENSE.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */

From f215535f75b5fc07045c0fbd3b692748c5fb888d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 10 Feb 2023 16:30:02 +1100
Subject: [PATCH 032/178] fix: set and get profile picture from libsession

---
 ts/receiver/configMessage.ts                  |  2 +-
 ts/session/profile_manager/ProfileManager.ts  |  7 ++--
 ts/session/utils/job_runners/JobRunner.ts     | 39 ++++++++++++++++---
 .../job_runners/jobs/AvatarDownloadJob.ts     | 20 ++++++++--
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 14 ++-----
 .../utils/libsession/libsession_utils.ts      |  1 -
 .../libsession_wrapper_contacts_test.ts       |  6 +--
 .../libsession_wrapper_test.ts                | 15 +++++--
 .../node/libsession/libsession.worker.ts      |  2 +-
 9 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 737bc3c1a..59547d623 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -37,6 +37,7 @@ async function mergeConfigsWithIncomingUpdates(
 
   const wrapperId = LibSessionUtil.kindToVariant(kind);
   await GenericWrapperActions.merge(wrapperId, toMerge);
+
   const needsPush = await GenericWrapperActions.needsPush(wrapperId);
   const needsDump = await GenericWrapperActions.needsDump(wrapperId);
   const messageHashes = [incomingConfig.messageHash];
@@ -59,7 +60,6 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
   }
 
   const updatedProfilePicture = await UserConfigWrapperActions.getProfilePicture();
-  debugger;
   const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
   await ProfileManager.updateOurProfileSync(
     updatedUserName,
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index 162fdd951..f036c1bff 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -42,14 +42,15 @@ async function updateProfileOfContact(
 
   // avoid setting the display name to an invalid value
   if (existingDisplayName !== displayName && !isEmpty(displayName)) {
+    console.warn(
+      `updateProfileOfContact overriding old "${existingDisplayName}: with "${displayName}"`
+    );
+
     conversation.set('displayNameInProfile', displayName || undefined);
     await conversation.commit();
   }
   // add an avatar download job only if needed
-
-  debugger;
   const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : toHex(profileKey);
-
   await AvatarDownload.addAvatarDownloadJobIfNeeded({
     profileKeyHex,
     profileUrl,
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 58750542c..1e014d890 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -21,6 +21,10 @@ export type StartProcessingResult = 'job_in_progress' | 'job_deferred' | 'job_st
 
 export type AddJobResult = 'job_deferred' | 'job_started';
 
+function jobToLogId<T extends TypeOfPersistedData>(jobRunner: JobRunnerType, job: PersistedJob<T>) {
+  return `id: "${job.persistedData.identifier}" (type: "${jobRunner}")`;
+}
+
 /**
  * This class is used to plan jobs and make sure they are retried until the success.
  * By having a specific type, we can find the logic to be run by that type of job.
@@ -79,7 +83,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
 
     if (this.jobsScheduled.find(j => j.persistedData.identifier === job.persistedData.identifier)) {
       window.log.info(
-        `job runner has already a job with id:"${job.persistedData.identifier}" planned so not adding another one`
+        `job runner (${this.jobRunnerType}) has already a job with id:"${job.persistedData.identifier}" planned so not adding another one`
       );
       return 'identifier_exists';
     }
@@ -168,7 +172,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
 
   private async writeJobsToDB() {
     const serialized = this.getSerializedJobs();
-    window.log.warn('writing to db', serialized);
+    window.log.warn(`writing to db for "${this.jobRunnerType}": `, serialized);
     await Data.createOrUpdateItem({
       id: this.getJobRunnerItemId(),
       value: JSON.stringify(serialized),
@@ -176,7 +180,6 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   }
 
   private async addJobUnchecked(job: PersistedJob<T>) {
-    console.warn('job', job);
     this.jobsScheduled.push(cloneDeep(job));
     this.sortJobsList();
     await this.writeJobsToDB();
@@ -254,7 +257,12 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private deleteJobsByIdentifier(identifiers: Array<string>) {
     identifiers.forEach(identifier => {
       const jobIndex = this.jobsScheduled.findIndex(f => f.persistedData.identifier === identifier);
-      window.log.info('deleteJobsByIdentifier job', identifier, ' index', jobIndex);
+      window.log.info(
+        `removing job ${jobToLogId(
+          this.jobRunnerType,
+          this.jobsScheduled[jobIndex]
+        )} at ${jobIndex}`
+      );
 
       if (jobIndex >= 0) {
         this.jobsScheduled.splice(jobIndex, 1);
@@ -290,21 +298,40 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       success = await timeout(this.currentJob.runJob(), this.currentJob.getJobTimeoutMs());
 
       if (success !== RunJobResult.Success) {
-        throw new Error(`job ${nextJob.persistedData.identifier} failed`);
+        throw new Error('return result was not "Success"');
       }
 
       // here the job did not throw and didn't return false. Consider it OK then and remove it from the list of jobs to run.
       this.deleteJobsByIdentifier([this.currentJob.persistedData.identifier]);
       await this.writeJobsToDB();
     } catch (e) {
-      window.log.warn(`JobRunner current ${this.jobRunnerType} failed with ${e.message}`);
+      window.log.info(`${jobToLogId(this.jobRunnerType, nextJob)} failed with "${e.message}"`);
       if (
         success === RunJobResult.PermanentFailure ||
         nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1
       ) {
+        if (success === RunJobResult.PermanentFailure) {
+          window.log.info(
+            `${jobToLogId(this.jobRunnerType, nextJob)}:${
+              nextJob.persistedData.currentRetry
+            } permament failure for job`
+          );
+        } else {
+          window.log.info(
+            `Too many failures for ${jobToLogId(
+              this.jobRunnerType,
+              nextJob
+            )} out of nextJob.persistedData.maxAttempts`
+          );
+        }
         // we cannot restart this job anymore. Remove the entry completely
         this.deleteJobsByIdentifier([nextJob.persistedData.identifier]);
       } else {
+        window.log.info(
+          `Rescheduling ${jobToLogId(this.jobRunnerType, nextJob)} in ${
+            nextJob.persistedData.delayBetweenRetries
+          }...`
+        );
         nextJob.persistedData.currentRetry = nextJob.persistedData.currentRetry + 1;
         // that job can be restarted. Plan a retry later with the already defined retry
         nextJob.persistedData.nextAttemptTimestamp =
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index b91c70851..b6f7c9d06 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -60,11 +60,11 @@ async function addAvatarDownloadJobIfNeeded({
   profileKeyHex: string | null | undefined;
 }) {
   if (profileKeyHex && shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
-    debugger;
     const avatarDownloadJob = new AvatarDownloadJob({
       conversationId: pubkey,
       profileKeyHex,
       profilePictureUrl: profileUrl || null,
+      nextAttemptTimestamp: Date.now(),
     });
     window.log.debug(
       `addAvatarDownloadJobIfNeeded: adding job download for ${pubkey}:${profileUrl}:${profileKeyHex} `
@@ -130,8 +130,6 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
       return RunJobResult.PermanentFailure;
     }
 
-    debugger;
-
     let conversation = getConversationController().get(convoId);
     if (!conversation) {
       // return true so we do not retry this task.
@@ -171,12 +169,26 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
           });
           conversation = getConversationController().getOrThrow(convoId);
 
+          if (!downloaded.data.byteLength) {
+            window.log.debug(`[profileupdate] downloaded data is empty for  ${conversation.id}`);
+            return RunJobResult.RetryJobIfPossible; // so we retry this job
+          }
+
           // null => use placeholder with color and first letter
           let path = null;
 
           try {
             const profileKeyArrayBuffer = fromHexToArray(this.persistedData.profileKeyHex);
-            const decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
+            let decryptedData: ArrayBuffer;
+            try {
+              decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
+            } catch (decryptError) {
+              window.log.info(
+                `[profileupdate] failed to decrypt downloaded data ${conversation.id} with provided profileKey`
+              );
+              // if we cannot decrypt the content, there is no need to keep retrying.
+              return RunJobResult.PermanentFailure;
+            }
 
             window.log.info(
               `[profileupdate] about to auto scale avatar for convo ${conversation.id}`
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 1bcfabf3e..05f3fbddd 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,4 +1,3 @@
-import { from_string } from 'libsodium-wrappers-sumo';
 import { compact, groupBy, isArray, isEmpty, isNumber, isString, uniq } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
@@ -12,6 +11,7 @@ import { getConversationController } from '../../../conversations';
 import { SharedConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { MessageSender } from '../../../sending/MessageSender';
 import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils';
+import { fromHexToArray } from '../../String';
 import { runners } from '../JobRunner';
 import {
   AddJobCheckReturn,
@@ -116,10 +116,6 @@ function resultsToSuccessfulChange(
           request.destination
         ) {
           // a message was posted. We need to add it to the tracked list of hashes
-          console.warn(
-            `messagePostedHashes for j:${j}; didDeleteOldConfigMessages:${didDeleteOldConfigMessages}: `,
-            messagePostedHashes
-          );
           const updatedHashes: Array<string> = didDeleteOldConfigMessages
             ? [messagePostedHashes]
             : uniq(compact([...request.allOldHashes, messagePostedHashes]));
@@ -132,7 +128,6 @@ function resultsToSuccessfulChange(
       }
     }
   } catch (e) {
-    console.warn('eeee', e);
     throw e;
   }
 
@@ -153,7 +148,6 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
       continue;
     }
     const dump = await GenericWrapperActions.dump(variant);
-    console.warn('change.updatedHash', change.updatedHash);
     await ConfigDumpData.saveConfigDump({
       data: dump,
       publicKey: change.publicKey,
@@ -205,7 +199,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
     await UserConfigWrapperActions.setName(name || '');
 
     if (profileKey && pointer) {
-      await UserConfigWrapperActions.setProfilePicture(pointer, from_string(profileKey));
+      const profileKeyArray = fromHexToArray(profileKey);
+      await UserConfigWrapperActions.setProfilePicture(pointer, profileKeyArray);
     } else {
       await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
     }
@@ -235,9 +230,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       })
     );
 
-    console.warn(
-      `ConfigurationSyncJob sendToPubKeyNonDurably ${this.persistedData.identifier} returned: "${allResults}"`
-    );
     // we do a sequence call here. If we do not have the right expected number of results, consider it
 
     if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index d0ffae464..4151ceb53 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -160,7 +160,6 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
 
   const results: Array<OutgoingConfResult> = [];
 
-  debugger;
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
     const variant = dump.variant;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index ae747e37b..f3811ca65 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -5,7 +5,7 @@ import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
 import * as SessionUtilWrapper from 'session_util_wrapper';
 
-describe('libsession_wrapper_contacts  ', () => {
+describe('libsession_contacts', () => {
   // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
   // To do this, you can cd to the node_module/libsession_wrapper folder and do
   // yarn configure && yarn build
@@ -13,7 +13,7 @@ describe('libsession_wrapper_contacts  ', () => {
 
   // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
 
-  it('[config][contacts]', () => {
+  it('libsession_contacts', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
@@ -186,7 +186,7 @@ describe('libsession_wrapper_contacts  ', () => {
     expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
   });
 
-  it('[config][contacts][c]', () => {
+  it('libsession_contacts_c', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index 59fe4c38e..47eec9493 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -7,7 +7,7 @@ import { concatUInt8Array } from '../../../../session/crypto';
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
 
 describe('libsession_wrapper', () => {
-  it('[config][user_profile][c]', () => {
+  it('libsession_user', () => {
     // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
     // To do this, you can cd to the node_module/libsession_wrapper folder and do
     // yarn configure && yarn build
@@ -46,7 +46,14 @@ describe('libsession_wrapper', () => {
     expect(picResult.key).to.be.null;
 
     // Now let's go set a profile name and picture:
-    conf.setProfilePicture('http://example.org/omg-pic-123.bmp', stringToUint8Array('secret'));
+    conf.setProfilePicture(
+      'http://example.org/omg-pic-123.bmp',
+      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
+    );
+    expect(conf.getProfilePicture().key).to.be.deep.eq(
+      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
+    );
+
     conf.setName('Kallie');
 
     // Retrieve them just to make sure they set properly:
@@ -58,7 +65,9 @@ describe('libsession_wrapper', () => {
     const picture = conf.getProfilePicture();
 
     expect(picture.url).to.be.eq('http://example.org/omg-pic-123.bmp');
-    expect(picture.key).to.be.deep.eq(stringToUint8Array('secret'));
+    expect(picture.key).to.be.deep.eq(
+      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
+    );
 
     // Since we've made changes, we should need to push new config to the swarm, *and* should need
     // to dump the updated state:
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 0a85469c8..5f904d80c 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -95,8 +95,8 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any]
     }
 
     const wrapper = await getCorrespondingWrapper(config);
-
     const fn = (wrapper as any)[action];
+
     if (!fn) {
       throw new Error(
         `Worker: job "${jobId}" did not find function "${action}" on config "${config}"`

From f870eff45bd691607a27a2a63683c8ba05d0524e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 13 Feb 2023 13:28:00 +1100
Subject: [PATCH 033/178] fix: make syncJob throttled every 3s and start right
 away if possible

also enable sig_timestamp on mainnet use as every node should have
upgraded now
---
 stylesheets/_modal.scss                       |   2 -
 ts/mains/main_node.ts                         |   2 +-
 ts/node/sql.ts                                |   1 -
 .../apis/snode_api/SnodeRequestTypes.ts       |  15 +-
 ts/session/apis/snode_api/configMessages.ts   |  82 ---------
 ts/session/apis/snode_api/snodeSignatures.ts  |   2 +
 ts/session/profile_manager/ProfileManager.ts  |   4 -
 ts/session/sending/MessageSender.ts           |   1 +
 ts/session/utils/job_runners/JobRunner.ts     |   7 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 168 +++++++++++-------
 10 files changed, 117 insertions(+), 167 deletions(-)
 delete mode 100644 ts/session/apis/snode_api/configMessages.ts

diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss
index 2f12235d6..8446da1a3 100644
--- a/stylesheets/_modal.scss
+++ b/stylesheets/_modal.scss
@@ -132,8 +132,6 @@
 
 .loki-dialog {
   & ~ .index.inbox {
-    // filter: blur(2px); // FIXME enable back once modals are moved to react
-    // currently it cause an issues with toast being on the foreground when a modal is shown
     transition: filter 0.1s;
   }
 
diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts
index a8929e289..0df1e3bc1 100644
--- a/ts/mains/main_node.ts
+++ b/ts/mains/main_node.ts
@@ -35,7 +35,7 @@ import electronLocalshortcut from 'electron-localshortcut';
 
 const getRealPath = pify(fs.realpath);
 
-// FIXME Hardcoding appId to prevent build failures on release.
+// Hardcoding appId to prevent build failures on release.
 // const appUserModelId = packageJson.build.appId;
 const appUserModelId = 'com.loki-project.messenger-desktop';
 console.log('Set Windows Application User Model ID (AUMID)', {
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 1adfe0c5b..fa0757ebb 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -445,7 +445,6 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     // identityPrivateKey,
   } = formatted;
 
-  //FIXME
   console.warn('FIXME omit(formatted, identityPrivateKey);');
   const omited = omit(formatted, 'identityPrivateKey', 'markedAsUnread');
   const keys = Object.keys(omited);
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index e0b14d0af..9900feee5 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -82,23 +82,22 @@ export type GetServiceNodesSubRequest = {
   };
 };
 
-export type StoreOnNodeParamsNoSig = {
-  pubkey: string;
-  ttl: number;
-  timestamp: number;
-  data64: string;
-  namespace: number;
-};
-
 export type StoreOnNodeParams = {
   pubkey: string;
   ttl: number;
   timestamp: number;
   data: string;
   namespace: number;
+  sig_timestamp?: number;
   signature?: string;
   pubkey_ed25519?: string;
 };
+
+export type StoreOnNodeParamsNoSig = Pick<
+  StoreOnNodeParams,
+  'pubkey' | 'ttl' | 'timestamp' | 'ttl' | 'namespace'
+> & { data64: string };
+
 export type DeleteFromNodeWithTimestampParams = {
   timestamp: string | number;
 } & DeleteSigParameters;
diff --git a/ts/session/apis/snode_api/configMessages.ts b/ts/session/apis/snode_api/configMessages.ts
deleted file mode 100644
index a1fc030ee..000000000
--- a/ts/session/apis/snode_api/configMessages.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// import { isEmpty, sample } from 'lodash';
-// import pRetry from 'p-retry';
-// import { Snode } from '../../../data/data';
-// import { ed25519Str } from '../../onions/onionPath';
-// import { SingleDestinationChanges } from '../../utils/job_runners/jobs/ConfigurationSyncJob';
-// import { doSnodeBatchRequest } from './batchRequest';
-// import { SnodeAPI } from './SNodeAPI';
-// import { getSwarmFor } from './snodePool';
-// import { StoreOnNodeSubRequest } from './SnodeRequestTypes';
-
-// function prepareRequest(singleDestChange: SingleDestinationChanges): Array<StoreOnNodeSubRequest> {
-//   if (isEmpty(singleDestChange) || isEmpty(singleDestChange.messages)) {
-//     return [];
-//   }
-
-//   return singleDestChange.messages.map(message => {
-//     return { method: 'store', params: {} };
-//   });
-// }
-
-/**
- * Locally deletes message and deletes message on the network (all nodes that contain the message)
- */
-// const sendConfigMessages = async (
-//     singleDestChange: SingleDestinationChanges
-// ): Promise<Array<string> | null> => {
-//     if (isEmpty(singleDestChange) || isEmpty(singleDestChange.messages)) {
-//         return true;
-//     }
-//     try {
-//       const result = await pRetry(
-//         async () => {
-//           const swarmToSendTo = await getSwarmFor(singleDestChange.destination);
-//           const snodeToMakeRequestTo: Snode | undefined = sample(swarmToSendTo);
-
-//           if (!snodeToMakeRequestTo) {
-//             window?.log?.warn('Cannot networkDeleteMessages, without a valid swarm node.');
-//             return null;
-//           }
-
-//           return pRetry(
-//             async () => {
-//               const ret = await doSnodeBatchRequest([{method: 'store', params: {}}]);
-//               if (!ret) {
-//                 throw new Error(
-//                   `Empty response got for delete on snode ${ed25519Str(
-//                     snodeToMakeRequestTo.pubkey_ed25519
-//                   )}`
-//                 );
-//               }
-
-//                 return results;
-//               }
-//             },
-//             {
-//               retries: 3,
-//               minTimeout: SnodeAPI.TEST_getMinTimeout(),
-//               onFailedAttempt: e => {
-//                 window?.log?.warn(
-//                   `delete INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
-//                 );
-//               },
-//             }
-//           );
-//         },
-//         {
-//           retries: 3,
-//           minTimeout: SnodeAPI.TEST_getMinTimeout(),
-//           onFailedAttempt: e => {
-//             window?.log?.warn(
-//               `delete OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
-//             );
-//           },
-//         }
-//       );
-
-//       return maliciousSnodes;
-//     } catch (e) {
-//       window?.log?.warn('failed to delete message on network:', e);
-//       return null;
-//     }
-//   };
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index 206feb0e0..dcc49af5a 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -5,6 +5,7 @@ import { GetNetworkTime } from './getNetworkTime';
 
 export type SnodeSignatureResult = {
   timestamp: number;
+  sig_timestamp: number;
   signature: string;
   pubkey_ed25519: string;
   pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually)
@@ -81,6 +82,7 @@ async function getSnodeSignatureParams(params: {
     const signatureBase64 = fromUInt8ArrayToBase64(signature);
 
     return {
+      sig_timestamp: signatureTimestamp,
       timestamp: signatureTimestamp,
       signature: signatureBase64,
       pubkey_ed25519: ourEd25519Key.pubKey,
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index f036c1bff..a7f2c0299 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -42,10 +42,6 @@ async function updateProfileOfContact(
 
   // avoid setting the display name to an invalid value
   if (existingDisplayName !== displayName && !isEmpty(displayName)) {
-    console.warn(
-      `updateProfileOfContact overriding old "${existingDisplayName}: with "${displayName}"`
-    );
-
     conversation.set('displayNameInProfile', displayName || undefined);
     await conversation.commit();
   }
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index f7a2857b7..1b79431d0 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -204,6 +204,7 @@ async function sendMessagesDataToSnode(
         namespace: item.namespace,
         pubkey: item.pubkey,
         timestamp: item.timestamp,
+        sig_timestamp: item.timestamp,
         ttl: item.ttl,
         ...signOpts,
       };
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 1e014d890..3e62b0c90 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -318,10 +318,9 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
           );
         } else {
           window.log.info(
-            `Too many failures for ${jobToLogId(
-              this.jobRunnerType,
-              nextJob
-            )} out of nextJob.persistedData.maxAttempts`
+            `Too many failures for ${jobToLogId(this.jobRunnerType, nextJob)}: ${
+              nextJob.persistedData.currentRetry
+            } out of ${nextJob.persistedData.maxAttempts}`
           );
         }
         // we cannot restart this job anymore. Remove the entry completely
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 05f3fbddd..b85295c70 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -23,6 +23,12 @@ import {
 const defaultMsBetweenRetries = 3000;
 const defaultMaxAttempts = 3;
 
+/**
+ * We want to run each of those jobs at least 3seconds apart.
+ * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it.
+ */
+let lastRunConfigSyncJobTimestamp: number | null = null;
+
 export type SingleDestinationChanges = {
   destination: string;
   messages: Array<OutgoingConfResult>;
@@ -175,76 +181,84 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       delayBetweenRetries: defaultMsBetweenRetries,
       maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts,
       currentRetry: isNumber(currentRetry) ? currentRetry : 0,
-      nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now(),
     });
   }
 
   public async run(): Promise<RunJobResult> {
-    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    try {
+      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+        return RunJobResult.Success;
+      }
+      window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
+
+      const us = UserUtils.getOurPubKeyStrFromCache();
+      const ed25519Key = await UserUtils.getUserED25519KeyPairBytes();
+      const conversation = getConversationController().get(us);
+      if (!us || !conversation || !ed25519Key) {
+        // we check for ed25519Key because it is needed for authenticated requests
+        window.log.warn('did not find our own conversation');
+        return RunJobResult.PermanentFailure;
+      }
+      const name = conversation.get('displayNameInProfile');
+      const pointer = conversation.get('avatarPointer');
+      const profileKey = conversation.get('profileKey');
+      await UserConfigWrapperActions.setName(name || '');
+
+      if (profileKey && pointer) {
+        const profileKeyArray = fromHexToArray(profileKey);
+        await UserConfigWrapperActions.setProfilePicture(pointer, profileKeyArray);
+      } else {
+        await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
+      }
+
+      const singleDestChanges = await retrieveSingleDestinationChanges();
+
+      // If there are no pending changes then the job can just complete (next time something
+      // is updated we want to try and run immediately so don't scuedule another run in this case)
+
+      if (isEmpty(singleDestChanges)) {
+        return RunJobResult.Success;
+      }
+
+      const allResults = await Promise.allSettled(
+        singleDestChanges.map(async dest => {
+          const msgs = dest.messages.map(item => {
+            return {
+              namespace: item.namespace,
+              pubkey: item.destination,
+              timestamp: item.message.timestamp,
+              ttl: item.message.ttl(),
+              message: item.message,
+            };
+          });
+          const asSet = new Set(dest.allOldHashes);
+          return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
+        })
+      );
+
+      // we do a sequence call here. If we do not have the right expected number of results, consider it
+
+      if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
+        return RunJobResult.RetryJobIfPossible;
+      }
+
+      const changes = resultsToSuccessfulChange(allResults, singleDestChanges);
+      if (isEmpty(changes)) {
+        return RunJobResult.RetryJobIfPossible;
+      }
+      // Now that we have the successful changes, we need to mark them as pushed and
+      // generate any config dumps which need to be stored
+
+      await buildAndSaveDumpsToDB(changes);
       return RunJobResult.Success;
+    } catch (e) {
+      throw e;
+    } finally {
+      // this is a simple way to make sure whatever happens here, we update the lastest timestamp.
+      // (a finally statement is always executed (no matter if exception or returns in other try/catch block)
+      this.updateLastTickTimestamp();
     }
-    window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
-
-    const us = UserUtils.getOurPubKeyStrFromCache();
-    const ed25519Key = await UserUtils.getUserED25519KeyPairBytes();
-    const conversation = getConversationController().get(us);
-    if (!us || !conversation || !ed25519Key) {
-      // we check for ed25519Key because it is needed for authenticated requests
-      window.log.warn('did not find our own conversation');
-      return RunJobResult.PermanentFailure;
-    }
-    const name = conversation.get('displayNameInProfile');
-    const pointer = conversation.get('avatarPointer');
-    const profileKey = conversation.get('profileKey');
-    await UserConfigWrapperActions.setName(name || '');
-
-    if (profileKey && pointer) {
-      const profileKeyArray = fromHexToArray(profileKey);
-      await UserConfigWrapperActions.setProfilePicture(pointer, profileKeyArray);
-    } else {
-      await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
-    }
-
-    const singleDestChanges = await retrieveSingleDestinationChanges();
-
-    // If there are no pending changes then the job can just complete (next time something
-    // is updated we want to try and run immediately so don't scuedule another run in this case)
-
-    if (isEmpty(singleDestChanges)) {
-      return RunJobResult.Success;
-    }
-
-    const allResults = await Promise.allSettled(
-      singleDestChanges.map(async dest => {
-        const msgs = dest.messages.map(item => {
-          return {
-            namespace: item.namespace,
-            pubkey: item.destination,
-            timestamp: item.message.timestamp,
-            ttl: item.message.ttl(),
-            message: item.message,
-          };
-        });
-        const asSet = new Set(dest.allOldHashes);
-        return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
-      })
-    );
-
-    // we do a sequence call here. If we do not have the right expected number of results, consider it
-
-    if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
-      return RunJobResult.RetryJobIfPossible;
-    }
-
-    const changes = resultsToSuccessfulChange(allResults, singleDestChanges);
-    if (isEmpty(changes)) {
-      return RunJobResult.RetryJobIfPossible;
-    }
-    // Now that we have the successful changes, we need to mark them as pushed and
-    // generate any config dumps which need to be stored
-
-    await buildAndSaveDumpsToDB(changes);
-    return RunJobResult.Success;
   }
 
   public serializeJob(): ConfigurationSyncPersistedData {
@@ -268,6 +282,10 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   public getJobTimeoutMs(): number {
     return 20000;
   }
+
+  private updateLastTickTimestamp() {
+    lastRunConfigSyncJobTimestamp = Date.now();
+  }
 }
 
 /**
@@ -275,7 +293,27 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
-  await runners.configurationSyncRunner.addJob(new ConfigurationSyncJob({}));
+  if (
+    !lastRunConfigSyncJobTimestamp ||
+    lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
+  ) {
+    window.log.debug('scheduling conf sync job in asap');
+
+    // this call will make sure that there is only one configuration sync job at all times
+    await runners.configurationSyncRunner.addJob(
+      new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() })
+    );
+  } else {
+    // if we did run at 100, and it is currently 110, diff is 10
+    const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
+    // but we want to run every 30, so what we need is actually `30-10` from now = 20
+    const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
+    window.log.debug(`scheduling conf sync job in ${leftBeforeNextTick} ms`);
+
+    await runners.configurationSyncRunner.addJob(
+      new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
+    );
+  }
 }
 
 export const ConfigurationSync = {

From 22329bc74561779be2b909f35b555497737f5e75 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 14 Feb 2023 11:05:51 +1100
Subject: [PATCH 034/178] chore: cleanup FIXMEs and remove sig_timestamp as we
 cannot rely on it

we use timestamp instead of sig_timestamp for store requests
---
 ts/models/conversation.ts                     |  2 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |  2 +-
 ts/session/apis/snode_api/snodeSignatures.ts  |  4 ++--
 ts/session/apis/snode_api/swarmPolling.ts     |  4 ++--
 .../DataExtractionNotificationMessage.ts      |  6 ++++-
 ts/session/sending/MessageSender.ts           |  4 +++-
 ts/session/utils/calling/CallManager.ts       |  2 +-
 .../utils/libsession/libsession_utils.ts      |  1 -
 ts/state/ducks/conversations.ts               |  4 ----
 .../libsession_wrapper_contacts_test.ts       | 22 ++++++++-----------
 .../libsession_wrapper_test.ts                |  2 +-
 .../node/libsession/libsession.worker.ts      |  2 +-
 12 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index a5eca70a3..1c6ad5df8 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1062,7 +1062,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     options: {
       fromSync?: boolean;
     } = {},
-    shouldCommit = true,
+    shouldCommit = true
   ): Promise<void> {
     let expireTimer = providedExpireTimer;
     let source = providedSource;
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 9900feee5..b5bfb21cf 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -88,7 +88,7 @@ export type StoreOnNodeParams = {
   timestamp: number;
   data: string;
   namespace: number;
-  sig_timestamp?: number;
+  // sig_timestamp?: number;
   signature?: string;
   pubkey_ed25519?: string;
 };
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index dcc49af5a..2a6b20a89 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -5,7 +5,7 @@ import { GetNetworkTime } from './getNetworkTime';
 
 export type SnodeSignatureResult = {
   timestamp: number;
-  sig_timestamp: number;
+  // sig_timestamp: number;
   signature: string;
   pubkey_ed25519: string;
   pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually)
@@ -82,7 +82,7 @@ async function getSnodeSignatureParams(params: {
     const signatureBase64 = fromUInt8ArrayToBase64(signature);
 
     return {
-      sig_timestamp: signatureTimestamp,
+      // sig_timestamp: signatureTimestamp,
       timestamp: signatureTimestamp,
       signature: signatureBase64,
       pubkey_ed25519: ourEd25519Key.pubKey,
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 5e44f051e..426de7c99 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -244,8 +244,8 @@ export class SwarmPolling {
       );
     }
 
-    console.info(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
-    console.info(
+    window.log.info(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
+    window.log.info(
       `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
     );
 
diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
index 1a9b8e955..562fb6ae1 100644
--- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
@@ -74,7 +74,11 @@ export const sendDataExtractionNotification = async (
   );
 
   try {
-    await getMessageQueue().sendToPubKey(pubkey, dataExtractionNotificationMessage, SnodeNamespaces.UserMessages);
+    await getMessageQueue().sendToPubKey(
+      pubkey,
+      dataExtractionNotificationMessage,
+      SnodeNamespaces.UserMessages
+    );
   } catch (e) {
     window.log.warn('failed to send data extraction notification', e);
   }
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 1b79431d0..372484749 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -204,7 +204,9 @@ async function sendMessagesDataToSnode(
         namespace: item.namespace,
         pubkey: item.pubkey,
         timestamp: item.timestamp,
-        sig_timestamp: item.timestamp,
+        // sig_timestamp: item.timestamp,
+        // sig_timestamp is currently not forwarded from the receiving snode to the other swarm members, and so their sig verify fail.
+        // This timestamp is not really needed so we just don't send it in the meantime (the timestamp value is used if the sig_timestamp is not present)
         ttl: item.ttl,
         ...signOpts,
       };
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index be04987af..dc0887f04 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -591,7 +591,7 @@ const findLastMessageTypeFromSender = (sender: string, msgType: SignalService.Ca
     return undefined;
   }
 
-  // FIXME this does not sort by timestamp as we do not have a timestamp stored in the SignalService.CallMessage object...
+  // this does not sort by timestamp as we do not have a timestamp stored in the SignalService.CallMessage object
   const allMsg = _.flattenDeep([...msgCacheFromSenderWithDevices.values()]);
   const allMsgFromType = allMsg.filter(m => m.type === msgType);
   const lastMessageOfType = _.last(allMsgFromType);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 4151ceb53..3bdb039e0 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -214,7 +214,6 @@ function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedC
  */
 async function markAsPushed(variant: ConfigWrapperObjectTypes, pubkey: string, seqno: number) {
   if (pubkey !== UserUtils.getOurPubKeyStrFromCache()) {
-    //FIXME libsession closed group
     throw new Error('FIXME, generic case is to be done');
   }
   await GenericWrapperActions.confirmPushed(variant, seqno);
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 12c3fb9f2..878154032 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -522,10 +522,6 @@ function handleMessageExpiredOrDeleted(
         ...state.messages.slice(messageInStoreIndex + 1),
       ];
 
-      // FIXME two other thing we have to do:
-      // * update the last message text if the message deleted was the last one
-      // * update the unread count of the convo if the message was the one counted as an unread
-
       return {
         ...state,
         messages: editedMessages,
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index f3811ca65..34449d954 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-import * as SessionUtilWrapper from 'session_util_wrapper';
+// import * as SessionUtilWrapper from 'session_util_wrapper';
 
 describe('libsession_contacts', () => {
   // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
@@ -17,7 +17,7 @@ describe('libsession_contacts', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
-    // const SessionUtilWrapper = require('session_util_wrapper');
+    const SessionUtilWrapper = require('session_util_wrapper');
 
     // Initialize a brand new, empty config because we have no dump data to deal with.
     const contacts = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
@@ -55,7 +55,7 @@ describe('libsession_contacts', () => {
     created.approvedMe = true;
     contacts.set(created);
 
-    let updated = contacts.get(real_id);
+    const updated = contacts.get(real_id);
     expect(updated).to.not.be.null;
     expect(updated).to.not.be.undefined;
 
@@ -212,11 +212,7 @@ describe('libsession_contacts', () => {
     c.nickname = 'Joey';
     c.approved = true;
     c.approvedMe = true;
-    contacts.set(c); // FIXME use .set when ready
-    // contacts.setName(real_id, c.name);
-    // contacts.setNickname(real_id, c.nickname);
-    // contacts.setApproved(real_id, c.approved);
-    // contacts.setApprovedMe(real_id, c.approvedMe);
+    contacts.set(c);
 
     const c2 = contacts.getOrCreate(realId);
     expect(c2.name).to.be.eq('Joe');
@@ -230,7 +226,7 @@ describe('libsession_contacts', () => {
     expect(contacts.needsDump()).to.be.true;
     expect(contacts.needsPush()).to.be.true;
 
-    let push1 = contacts.push();
+    const push1 = contacts.push();
     expect(push1.seqno).to.be.equal(1);
 
     const contacts2 = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
@@ -262,7 +258,7 @@ describe('libsession_contacts', () => {
 
     contacts2.set(c3);
 
-    let push2 = contacts2.push();
+    const push2 = contacts2.push();
     accepted = contacts.merge([push2.data]);
     expect(accepted).to.be.equal(1);
 
@@ -281,9 +277,9 @@ describe('libsession_contacts', () => {
     const allContacts3 = contacts.getAll();
     let deletions = 0;
     let non_deletions = 0;
-    allContacts3.forEach((c: any) => {
-      if (c.id !== realId) {
-        contacts.erase(c.id);
+    allContacts3.forEach((contact: any) => {
+      if (contact.id !== realId) {
+        contacts.erase(contact.id);
         deletions++;
       } else {
         non_deletions++;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index 47eec9493..54f7d4760 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -4,7 +4,7 @@ import { stringToUint8Array } from '../../../../session/utils/String';
 import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
 import { concatUInt8Array } from '../../../../session/crypto';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace
+// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
 
 describe('libsession_wrapper', () => {
   it('libsession_user', () => {
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 5f904d80c..6a0add291 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -94,7 +94,7 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any]
       return;
     }
 
-    const wrapper = await getCorrespondingWrapper(config);
+    const wrapper = getCorrespondingWrapper(config);
     const fn = (wrapper as any)[action];
 
     if (!fn) {

From b2237efe51a80daab8596214ebdb93c00d343421 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 15 Feb 2023 16:02:38 +1100
Subject: [PATCH 035/178] feat: insert all contacts into wrapper before syncing
 it

---
 ts/receiver/configMessage.ts                  |  63 +++++++---
 ts/receiver/contentMessage.ts                 |   2 +-
 .../conversations/ConversationController.ts   |   9 +-
 .../job_runners/jobs/AvatarDownloadJob.ts     |   6 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  19 +--
 .../utils/libsession/libsession_utils.ts      |  33 +-----
 .../libsession/libsession_utils_contacts.ts   |  97 ++++++++++++++++
 .../libsession_utils_user_profile.ts          |  29 +++++
 .../libsession_wrapper_contacts_test.ts       | 108 +++++++++++++++++-
 .../libsession_wrapper_test.ts                |  30 +++--
 .../unit/receiving/ClosedGroupUpdates_test.ts |   1 -
 .../receiving/ConfigurationMessage_test.ts    |   6 +-
 ts/types/attachments/VisualAttachment.ts      |   2 +-
 ts/webworker/worker_interface.ts              |   1 +
 14 files changed, 313 insertions(+), 93 deletions(-)
 create mode 100644 ts/session/utils/libsession/libsession_utils_contacts.ts
 create mode 100644 ts/session/utils/libsession/libsession_utils_user_profile.ts

diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 59547d623..71ba0ce89 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { isEmpty, isEqual } from 'lodash';
+import _, { isEmpty, isEqual, isNil } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -39,7 +39,10 @@ async function mergeConfigsWithIncomingUpdates(
   await GenericWrapperActions.merge(wrapperId, toMerge);
 
   const needsPush = await GenericWrapperActions.needsPush(wrapperId);
+  console.warn(`${wrapperId} needsPush? `, needsPush);
   const needsDump = await GenericWrapperActions.needsDump(wrapperId);
+  console.warn(`${wrapperId} needsDump? `, needsDump);
+
   const messageHashes = [incomingConfig.messageHash];
   const latestSentTimestamp = incomingConfig.envelopeTimestamp;
 
@@ -73,20 +76,29 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
   if (!result.needsDump) {
     return result;
   }
+  const us = UserUtils.getOurPubKeyStrFromCache();
 
   const allContacts = await ContactsWrapperActions.getAll();
 
   for (let index = 0; index < allContacts.length; index++) {
     const wrapperConvo = allContacts[index];
 
-    if (wrapperConvo.id && getConversationController().get(wrapperConvo.id)) {
-      const existingConvo = getConversationController().get(wrapperConvo.id);
+    if (wrapperConvo.id === us) {
+      // our profile update comes from our userProfile, not from the contacts wrapper.
+      continue;
+    }
+
+    const existingConvo = await getConversationController().getOrCreateAndWait(
+      wrapperConvo.id,
+      ConversationTypeEnum.PRIVATE
+    );
+    if (wrapperConvo.id && existingConvo) {
       let changes = false;
 
       // Note: the isApproved and didApproveMe flags are irreversible so they should only be updated when getting set to true
       if (
-        existingConvo.get('isApproved') !== undefined &&
-        wrapperConvo.approved !== undefined &&
+        !isNil(existingConvo.get('isApproved')) &&
+        !isNil(wrapperConvo.approved) &&
         existingConvo.get('isApproved') !== wrapperConvo.approved
       ) {
         await existingConvo.setIsApproved(wrapperConvo.approved, false);
@@ -94,8 +106,8 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       }
 
       if (
-        existingConvo.get('didApproveMe') !== undefined &&
-        wrapperConvo.approvedMe !== undefined &&
+        !isNil(existingConvo.get('didApproveMe')) &&
+        !isNil(wrapperConvo.approvedMe) &&
         existingConvo.get('didApproveMe') !== wrapperConvo.approvedMe
       ) {
         await existingConvo.setDidApproveMe(wrapperConvo.approvedMe, false);
@@ -201,7 +213,6 @@ async function processMergingResults(
     return;
   }
 
-  await removeFromCache(envelope);
   // Now that the local state has been updated, trigger a config sync (this will push any
   // pending updates and properly update the state)
   if (result.result.needsPush) {
@@ -233,7 +244,7 @@ async function handleConfigMessageViaLibSession(
   await processMergingResults(envelope, incomingMergeResult);
 }
 
-async function handleOurProfileUpdate(
+async function handleOurProfileUpdateLegacy(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
 ) {
@@ -260,10 +271,13 @@ async function handleOurProfileUpdate(
   }
 }
 
-async function handleGroupsAndContactsFromConfigMessage(
+async function handleGroupsAndContactsFromConfigMessageLegacy(
   envelope: EnvelopePlus,
   configMessage: SignalService.ConfigurationMessage
 ) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   const envelopeTimestamp = _.toNumber(envelope.timestamp);
   const lastConfigUpdate = await Data.getItemById(hasSyncedInitialConfigurationItem);
   const lastConfigTimestamp = lastConfigUpdate?.timestamp;
@@ -284,13 +298,15 @@ async function handleGroupsAndContactsFromConfigMessage(
   // we only want to apply changes to closed groups if we never got them
   // new opengroups get added when we get a new closed group message from someone, or a sync'ed message from outself creating the group
   if (!lastConfigTimestamp) {
-    await handleClosedGroupsFromConfig(configMessage.closedGroups, envelope);
+    await handleClosedGroupsFromConfigLegacy(configMessage.closedGroups, envelope);
   }
 
   handleOpenGroupsFromConfig(configMessage.openGroups);
 
   if (configMessage.contacts?.length) {
-    await Promise.all(configMessage.contacts.map(async c => handleContactFromConfig(c, envelope)));
+    await Promise.all(
+      configMessage.contacts.map(async c => handleContactFromConfigLegacy(c, envelope))
+    );
   }
 }
 
@@ -299,6 +315,9 @@ async function handleGroupsAndContactsFromConfigMessage(
  * @param openGroups string array of open group urls
  */
 const handleOpenGroupsFromConfig = (openGroups: Array<string>) => {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   const numberOpenGroup = openGroups?.length || 0;
   for (let i = 0; i < numberOpenGroup; i++) {
     const currentOpenGroupUrl = openGroups[i];
@@ -320,10 +339,13 @@ const handleOpenGroupsFromConfig = (openGroups: Array<string>) => {
  * Trigger a join for all closed groups which doesn't exist yet
  * @param openGroups string array of open group urls
  */
-const handleClosedGroupsFromConfig = async (
+const handleClosedGroupsFromConfigLegacy = async (
   closedGroups: Array<SignalService.ConfigurationMessage.IClosedGroup>,
   envelope: EnvelopePlus
 ) => {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   const numberClosedGroup = closedGroups?.length || 0;
 
   window?.log?.info(
@@ -354,10 +376,13 @@ const handleClosedGroupsFromConfig = async (
  * Handles adding of a contact and setting approval/block status
  * @param contactReceived Contact to sync
  */
-const handleContactFromConfig = async (
+const handleContactFromConfigLegacy = async (
   contactReceived: SignalService.ConfigurationMessage.IContact,
   envelope: EnvelopePlus
 ) => {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   try {
     if (!contactReceived.publicKey?.length) {
       return;
@@ -415,13 +440,13 @@ const handleContactFromConfig = async (
  * This is the legacy way of handling incoming configuration message.
  * Should not be used at all soon.
  */
-async function handleConfigurationMessage(
+async function handleConfigurationMessageLegacy(
   envelope: EnvelopePlus,
   configurationMessage: SignalService.ConfigurationMessage
 ): Promise<void> {
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     window?.log?.info(
-      'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessage()"'
+      'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
     await removeFromCache(envelope);
     return;
@@ -438,14 +463,14 @@ async function handleConfigurationMessage(
     return removeFromCache(envelope);
   }
 
-  await handleOurProfileUpdate(envelope.timestamp, configurationMessage);
+  await handleOurProfileUpdateLegacy(envelope.timestamp, configurationMessage);
 
-  await handleGroupsAndContactsFromConfigMessage(envelope, configurationMessage);
+  await handleGroupsAndContactsFromConfigMessageLegacy(envelope, configurationMessage);
 
   await removeFromCache(envelope);
 }
 
 export const ConfigMessageHandler = {
-  handleConfigurationMessage,
+  handleConfigurationMessageLegacy,
   handleConfigMessageViaLibSession,
 };
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 876890d5b..0e2d4fffa 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -428,7 +428,7 @@ export async function innerHandleSwarmContentMessage(
     if (content.configurationMessage) {
       // this one can be quite long (downloads profilePictures and everything),
       // so do not await it
-      void ConfigMessageHandler.handleConfigurationMessage(
+      void ConfigMessageHandler.handleConfigurationMessageLegacy(
         envelope,
         content.configurationMessage as SignalService.ConfigurationMessage
       );
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 279922655..060d9d410 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -264,8 +264,14 @@ export class ConversationController {
     }
   }
 
+  /**
+   *
+   * @returns the reference of the list of conversations stored.
+   * Warning: You should not not edit things directly from that list. This must only be used for reading things.
+   * If you need to make change, do the usual getConversationControler().get('the id you want to edit')
+   */
   public getConversations(): Array<ConversationModel> {
-    return Array.from(this.conversations.models);
+    return this.conversations.models;
   }
 
   public unsafeDelete(convo: ConversationModel) {
@@ -315,6 +321,7 @@ export class ConversationController {
   public loadPromise() {
     return this._initialPromise;
   }
+
   public reset() {
     this._initialPromise = Promise.resolve();
     this._initialFetchComplete = false;
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index b6f7c9d06..f67da9557 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -71,9 +71,9 @@ async function addAvatarDownloadJobIfNeeded({
     );
     await runners.avatarDownloadRunner.addJob(avatarDownloadJob);
   } else {
-    window.log.debug(
-      `addAvatarDownloadJobIfNeeded: no download required for ${pubkey}:${profileUrl}:${profileKeyHex} `
-    );
+    // window.log.debug(
+    //   `addAvatarDownloadJobIfNeeded: no download required for ${pubkey}:${profileUrl}:${profileKeyHex} `
+    // );
   }
 }
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index b85295c70..401ad71ab 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -2,16 +2,12 @@ import { compact, groupBy, isArray, isEmpty, isNumber, isString, uniq } from 'lo
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
-import {
-  GenericWrapperActions,
-  UserConfigWrapperActions,
-} from '../../../../webworker/workers/browser/libsession_worker_interface';
+import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes';
 import { getConversationController } from '../../../conversations';
 import { SharedConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { MessageSender } from '../../../sending/MessageSender';
 import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils';
-import { fromHexToArray } from '../../String';
 import { runners } from '../JobRunner';
 import {
   AddJobCheckReturn,
@@ -200,17 +196,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         window.log.warn('did not find our own conversation');
         return RunJobResult.PermanentFailure;
       }
-      const name = conversation.get('displayNameInProfile');
-      const pointer = conversation.get('avatarPointer');
-      const profileKey = conversation.get('profileKey');
-      await UserConfigWrapperActions.setName(name || '');
-
-      if (profileKey && pointer) {
-        const profileKeyArray = fromHexToArray(profileKey);
-        await UserConfigWrapperActions.setProfilePicture(pointer, profileKeyArray);
-      } else {
-        await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
-      }
+      await LibSessionUtil.insertUserProfileIntoWrapper();
+      await LibSessionUtil.insertAllContactsIntoContactsWrapper();
 
       const singleDestChanges = await retrieveSingleDestinationChanges();
 
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 3bdb039e0..df8706839 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -1,5 +1,4 @@
-import { from_hex } from 'libsodium-wrappers-sumo';
-import { difference, isEqual, omit } from 'lodash';
+import { difference, omit } from 'lodash';
 import Long from 'long';
 import { UserUtils } from '..';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
@@ -11,9 +10,10 @@ import {
 } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
-import { getConversationController } from '../../conversations';
 import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
+import { SessionUtilContact } from './libsession_utils_contacts';
+import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 // TODO complete this list
 const requiredUserDumpVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
@@ -32,29 +32,6 @@ export type OutgoingConfResult = {
   oldMessageHashes: Array<string>;
 };
 
-async function insertUserProfileIntoWrapperIfChanged() {
-  const us = UserUtils.getOurPubKeyStrFromCache();
-  const ourConvo = getConversationController().get(us);
-
-  if (!ourConvo) {
-    throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist');
-  }
-  const wrapperName = await UserConfigWrapperActions.getName();
-  const wrapperProfilePicture = await UserConfigWrapperActions.getProfilePicture();
-  const wrapperProfileUrl = wrapperProfilePicture.url || '';
-  const wrapperProfileKey = wrapperProfilePicture.key || '';
-
-  const dbName = ourConvo.get('displayNameInProfile') || '';
-  const dbProfileUrl = ourConvo.get('avatarPointer') || '';
-  const dbProfileKey = from_hex(ourConvo.get('profileKey') || '');
-  if (!isEqual(dbName, wrapperName)) {
-    await UserConfigWrapperActions.setName(dbName);
-  }
-  if (!isEqual(dbProfileUrl, wrapperProfileUrl) || !isEqual(dbProfileKey, wrapperProfileKey)) {
-    await UserConfigWrapperActions.setProfilePicture(wrapperProfileUrl, dbProfileKey);
-  }
-}
-
 /**
  * Right after we migrated, we won't have any dumps in DB. We must create them from our database state,
  */
@@ -67,7 +44,7 @@ async function createConfigDumpsFromDbFirstStart(
 
     // build the userconfig
     await UserConfigWrapperActions.init(privateKeyEd25519, null);
-    await insertUserProfileIntoWrapperIfChanged();
+    await SessionUtilUserProfile.insertUserProfileIntoWrapper();
     const data = await UserConfigWrapperActions.dump();
     // save it to the DB
     await ConfigDumpData.saveConfigDump({
@@ -224,6 +201,8 @@ export const LibSessionUtil = {
   initializeLibSessionUtilWrappers,
   requiredUserDumpVariants,
   pendingChangesForPubkey,
+  insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
+  insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
   kindToVariant,
   markAsPushed,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
new file mode 100644
index 000000000..a6f0389e6
--- /dev/null
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -0,0 +1,97 @@
+import { isEmpty, isEqual } from 'lodash';
+import { UserUtils } from '..';
+import { ConversationModel } from '../../../models/conversation';
+import { BlockedNumberController } from '../../../util';
+import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
+import { getConversationController } from '../../conversations';
+import { PubKey } from '../../types';
+import { fromHexToArray } from '../String';
+
+/**
+ * Update the ContactWrapper with all the data is cares about from the database.
+ */
+async function insertAllContactsIntoContactsWrapper() {
+  console.error(
+    'we need to find a way to keep track of what was changed as ids and only insert those in the wrapper'
+  );
+  const idsToInsert = getConversationController()
+    .getConversations()
+    .filter(filterContactsToStoreInContactsWrapper)
+    .map(m => m.id);
+
+  window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts`);
+
+  for (let index = 0; index < idsToInsert.length; index++) {
+    const id = idsToInsert[index];
+    console.warn(`inserting into wrapper ${id}`);
+    await insertContactFromDBIntoWrapper(id);
+  }
+}
+
+/**
+ * Returns true if that conversation is not us, is private, is not blinded and has either the
+ * `isApproved` or `didApproveMe` field set.
+ * So that would be all the private conversations we either sent or receive a message from, not blinded
+ */
+function filterContactsToStoreInContactsWrapper(convo: ConversationModel): boolean {
+  return (
+    !convo.isMe() &&
+    convo.isPrivate() &&
+    !PubKey.hasBlindedPrefix(convo.id) &&
+    (convo.isApproved() || convo.didApproveMe())
+  );
+}
+
+/**
+ * Fetches the specified convo and updates the required field in the wrapper.
+ * If that contact does not exist in the wrapper, it is created before being updated.
+ */
+async function insertContactFromDBIntoWrapper(id: string): Promise<void> {
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  if (id === us) {
+    window.log.info(
+      "The contact config wrapper does not handle the current user config, just his contacts'"
+    );
+    return;
+  }
+
+  const foundConvo = getConversationController().get(id);
+  if (!foundConvo) {
+    return;
+  }
+
+  const dbName = foundConvo.get('displayNameInProfile') || undefined;
+  const dbNickname = foundConvo.get('nickname') || undefined;
+  const dbProfileUrl = foundConvo.get('avatarPointer') || undefined;
+  const dbProfileKey = foundConvo.get('profileKey') || undefined;
+  const dbApproved = foundConvo.get('isApproved') || false;
+  const dbApprovedMe = foundConvo.get('didApproveMe') || false;
+  const dbBlocked = BlockedNumberController.isBlocked(id) || false;
+
+  const wrapperContact = await ContactsWrapperActions.getOrCreate(id);
+
+  // override the values with what we have in the DB. the library will do the diff
+  wrapperContact.approved = dbApproved;
+  wrapperContact.approvedMe = dbApprovedMe;
+  wrapperContact.blocked = dbBlocked;
+  wrapperContact.name = dbName;
+  wrapperContact.nickname = dbNickname;
+
+  if (
+    wrapperContact.profilePicture?.url !== dbProfileUrl ||
+    !isEqual(wrapperContact.profilePicture?.key, dbProfileKey)
+  ) {
+    wrapperContact.profilePicture = {
+      url: dbProfileUrl || null,
+      key: dbProfileKey && !isEmpty(dbProfileKey) ? fromHexToArray(dbProfileKey) : null,
+    };
+  }
+  console.time('ContactsWrapperActions.set');
+  await ContactsWrapperActions.set(wrapperContact);
+  console.timeEnd('ContactsWrapperActions.set');
+}
+
+export const SessionUtilContact = {
+  filterContactsToStoreInContactsWrapper,
+  insertAllContactsIntoContactsWrapper,
+};
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
new file mode 100644
index 000000000..d24e7ffea
--- /dev/null
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -0,0 +1,29 @@
+import { isEmpty } from 'lodash';
+import { UserUtils } from '..';
+import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
+import { getConversationController } from '../../conversations';
+import { fromHexToArray } from '../String';
+
+async function insertUserProfileIntoWrapper() {
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  const ourConvo = getConversationController().get(us);
+
+  if (!ourConvo) {
+    throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist');
+  }
+
+  const dbName = ourConvo.get('displayNameInProfile') || '';
+  const dbProfileUrl = ourConvo.get('avatarPointer') || '';
+  const dbProfileKey = fromHexToArray(ourConvo.get('profileKey') || '');
+  await UserConfigWrapperActions.setName(dbName);
+
+  if (dbProfileUrl && !isEmpty(dbProfileKey)) {
+    await UserConfigWrapperActions.setProfilePicture(dbProfileUrl, dbProfileKey);
+  } else {
+    await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
+  }
+}
+
+export const SessionUtilUserProfile = {
+  insertUserProfileIntoWrapper,
+};
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 34449d954..04dcae4cb 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -1,10 +1,16 @@
 import { expect } from 'chai';
 
 import { from_hex, from_string } from 'libsodium-wrappers-sumo';
+import Sinon from 'sinon';
+import { ConversationModel } from '../../../../models/conversation';
+import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import { UserUtils } from '../../../../session/utils';
+import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
 // import * as SessionUtilWrapper from 'session_util_wrapper';
 
+// tslint:disable-next-line: max-func-body-length
 describe('libsession_contacts', () => {
   // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
   // To do this, you can cd to the node_module/libsession_wrapper folder and do
@@ -13,7 +19,7 @@ describe('libsession_contacts', () => {
 
   // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
 
-  it('libsession_contacts', () => {
+  it('libsession_contacts1', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
@@ -68,12 +74,13 @@ describe('libsession_contacts', () => {
 
     expect(updated?.profilePicture).to.be.undefined;
 
-    created.profilePicture = { key: new Uint8Array([1, 2, 3]), url: 'fakeUrl' };
+    const plop = new Uint8Array(32).fill(6);
+    created.profilePicture = { key: plop, url: 'fakeUrl' };
     contacts.set(created);
     const updated2 = contacts.get(real_id);
 
     expect(updated2?.profilePicture?.url).to.be.deep.eq('fakeUrl');
-    expect(updated2?.profilePicture?.key).to.be.deep.eq(new Uint8Array([1, 2, 3]));
+    expect(updated2?.profilePicture?.key).to.be.deep.eq(plop);
 
     expect(contacts.needsPush()).to.be.eql(true);
     expect(contacts.needsDump()).to.be.eql(true);
@@ -144,7 +151,11 @@ describe('libsession_contacts', () => {
     contacts2.setNickname(third_id, 'Nickname 3');
     contacts2.setApproved(third_id, true);
     contacts2.setBlocked(third_id, true);
-    contacts2.setProfilePicture(third_id, 'http://example.com/huge.bmp', from_string('qwerty'));
+    contacts2.setProfilePicture(
+      third_id,
+      'http://example.com/huge.bmp',
+      from_string('qwert\0yuio1234567890123456789012')
+    );
 
     expect(contacts.needsPush()).to.be.true;
     expect(contacts2.needsPush()).to.be.true;
@@ -186,7 +197,7 @@ describe('libsession_contacts', () => {
     expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
   });
 
-  it('libsession_contacts_c', () => {
+  it('libsession_contacts2_c', () => {
     const edSecretKey = from_hex(
       '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
     );
@@ -291,4 +302,91 @@ describe('libsession_contacts', () => {
     expect(contacts.get(realId)).to.exist;
     expect(contacts.get(another_id)).to.be.null;
   });
+
+  describe('filter contacts for wrapper', () => {
+    const ourNumber = '051234567890acbdef';
+    const validArgs = {
+      id: '051111567890acbdef',
+      type: ConversationTypeEnum.PRIVATE,
+      isApproved: true,
+      didApproveMe: true,
+    };
+    beforeEach(() => {
+      Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
+    });
+    afterEach(() => {
+      Sinon.restore();
+    });
+
+    it('excludes ourselves', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({ ...validArgs, id: ourNumber } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('excludes non private', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({ ...validArgs, type: ConversationTypeEnum.GROUP } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('includes private', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({ ...validArgs, type: ConversationTypeEnum.PRIVATE } as any)
+        )
+      ).to.be.eq(true);
+    });
+
+    it('excludes blinded', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            type: ConversationTypeEnum.PRIVATE,
+            id: '1511111111111',
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('excludes non approved by us nor did approveme', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            didApproveMe: false,
+            isApproved: false,
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('includes approved only by us ', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            didApproveMe: false,
+            isApproved: true,
+          } as any)
+        )
+      ).to.be.eq(true);
+    });
+    it('includes approved only by them ', () => {
+      expect(
+        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            didApproveMe: true,
+            isApproved: false,
+          } as any)
+        )
+      ).to.be.eq(true);
+    });
+  });
 });
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index 54f7d4760..a43d2317a 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -1,11 +1,13 @@
 import { expect } from 'chai';
 
 import { stringToUint8Array } from '../../../../session/utils/String';
-import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
+import { from_hex, from_string, to_hex } from 'libsodium-wrappers-sumo';
 import { concatUInt8Array } from '../../../../session/crypto';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
 
+const fakeKey32 = from_string('secret78901234567890123456789012');
+
 describe('libsession_wrapper', () => {
   it('libsession_user', () => {
     // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
@@ -46,13 +48,8 @@ describe('libsession_wrapper', () => {
     expect(picResult.key).to.be.null;
 
     // Now let's go set a profile name and picture:
-    conf.setProfilePicture(
-      'http://example.org/omg-pic-123.bmp',
-      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
-    );
-    expect(conf.getProfilePicture().key).to.be.deep.eq(
-      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
-    );
+    conf.setProfilePicture('http://example.org/omg-pic-123.bmp', new Uint8Array(fakeKey32));
+    expect(conf.getProfilePicture().key).to.be.deep.eq(new Uint8Array(fakeKey32));
 
     conf.setName('Kallie');
 
@@ -65,9 +62,7 @@ describe('libsession_wrapper', () => {
     const picture = conf.getProfilePicture();
 
     expect(picture.url).to.be.eq('http://example.org/omg-pic-123.bmp');
-    expect(picture.key).to.be.deep.eq(
-      new Uint8Array([115, 101, 99, 114, 101, 116]) // 'secret' in ascii
-    );
+    expect(picture.key).to.be.deep.eq(new Uint8Array(fakeKey32));
 
     // Since we've made changes, we should need to push new config to the swarm, *and* should need
     // to dump the updated state:
@@ -83,7 +78,7 @@ describe('libsession_wrapper', () => {
     const expHash0 = from_hex('ea173b57beca8af18c3519a7bbf69c3e7a05d1c049fa9558341d8ebb48b0c965');
 
     const expPush1Start =
-      'd1:#i1e1:&d1:n6:Kallie1:p34:http://example.org/omg-pic-123.bmp1:q6:secrete1:<lli0e32:';
+      'd1:#i1e1:&d1:n6:Kallie1:p34:http://example.org/omg-pic-123.bmp1:q32:secret78901234567890123456789012e1:<lli0e32:';
     const expPush1End = 'deee1:=d1:n0:1:p0:1:q0:ee';
 
     // The data to be actually pushed, expanded like this to make it somewhat human-readable:
@@ -93,7 +88,7 @@ describe('libsession_wrapper', () => {
       stringToUint8Array(expPush1End)
     );
     const expPush1Encrypted = from_hex(
-      'a2952190dcb9797bc48e48f6dc7b3254d004bde9091cfc9ec3433cbc5939a3726deb04f58a546d7d79e6f80ea185d43bf93278398556304998ae882304075c77f15c67f9914c4d10005a661f29ff7a79e0a9de7f21725ba3b5a6c19eaa3797671b8fa4008d62e9af2744629cbb46664c4d8048e2867f66ed9254120371bdb24e95b2d92341fa3b1f695046113a768ceb7522269f937ead5591bfa8a5eeee3010474002f2db9de043f0f0d1cfb1066a03e7b5d6cfb70a8f84a20cd2df5a510cd3d175708015a52dd4a105886d916db0005dbea5706e5a5dc37ffd0a0ca2824b524da2e2ad181a48bb38e21ed9abe136014a4ee1e472cb2f53102db2a46afa9d68'
+      '877c8e0f5d33f5fffa5a4e162785a9a89918e95de1c4b925201f1f5c29d9ee4f8c36e2b278fce1e6b9d999689dd86ff8e79e0a04004fa54d24da89bc2604cb1df8c1356da8f14710543ecec44f2d57fc56ea8b7e73d119c69d755f4d513d5d069f02396b8ec0cbed894169836f57ca4b782ce705895c593b4230d50c175d44a08045388d3f4160bacb617b9ae8de3ebc8d9024245cd09ce102627cab2acf1b9126159211359606611ca5814de320d1a7099a65c99b0eebbefb92a115f5efa6b9132809300ac010c6857cfbd62af71b0fa97eccec75cb95e67edf40b35fdb9cad125a6976693ab085c6bba96a2e51826e81e16b9ec1232af5680f2ced55310486'
     );
 
     expect(to_hex(pushResult.data)).to.be.deep.eq(to_hex(expPush1Encrypted));
@@ -150,7 +145,10 @@ describe('libsession_wrapper', () => {
     conf2.setName('Raz');
 
     // And, on conf2, we're also going to change the profile pic:
-    conf2.setProfilePicture('http://new.example.com/pic', stringToUint8Array('qwert\0yuio'));
+    conf2.setProfilePicture(
+      'http://new.example.com/pic',
+      stringToUint8Array('qwert\0yuio1234567890123456789012')
+    );
 
     // Both have changes, so push need a push
     expect(conf.needsPush()).to.be.true;
@@ -201,8 +199,8 @@ describe('libsession_wrapper', () => {
     expect(pic.url).to.be.eq('http://new.example.com/pic');
     expect(pic2.url).to.be.eq('http://new.example.com/pic');
 
-    expect(pic.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio'));
-    expect(pic2.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio'));
+    expect(pic.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio1234567890123456789012'));
+    expect(pic2.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio1234567890123456789012'));
 
     conf.confirmPushed(pushResult.seqno);
     conf2.confirmPushed(pushResult2.seqno);
diff --git a/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts b/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
index efc96bcd5..26140e9d4 100644
--- a/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
+++ b/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
@@ -8,7 +8,6 @@ chai.use(chaiAsPromised as any);
 
 // tslint:disable-next-line: max-func-body-length
 describe('ClosedGroupUpdates', () => {
-  //FIXME AUDRIC TODO
   // const ourDevice = TestUtils.generateFakePubKey();
   // const ourNumber = ourDevice.key;
   // const groupId = TestUtils.generateFakePubKey().key;
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index ee4669f34..95cdb25b6 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -51,7 +51,7 @@ describe('ConfigurationMessage_receiving', () => {
     const proto = config.contentProto();
     createOrUpdateStub = stubData('createOrUpdateItem').resolves();
     getItemByIdStub = stubData('getItemById').resolves();
-    await ConfigMessageHandler.handleConfigurationMessage(
+    await ConfigMessageHandler.handleConfigurationMessageLegacy(
       envelope,
       proto.configurationMessage as SignalService.ConfigurationMessage
     );
@@ -73,7 +73,7 @@ describe('ConfigurationMessage_receiving', () => {
 
       createOrUpdateStub = stubData('createOrUpdateItem').resolves();
       getItemByIdStub = stubData('getItemById').resolves();
-      await ConfigMessageHandler.handleConfigurationMessage(
+      await ConfigMessageHandler.handleConfigurationMessageLegacy(
         envelope,
         proto.configurationMessage as SignalService.ConfigurationMessage
       );
@@ -87,7 +87,7 @@ describe('ConfigurationMessage_receiving', () => {
 
     //     createOrUpdateStub = sandbox.stub(data, 'createOrUpdateItem').resolves();
     //     getItemByIdStub = sandbox.stub(data, 'getItemById').resolves();
-    //     await handleConfigurationMessage(envelope, proto.configurationMessage as SignalService.ConfigurationMessage);
+    //     await handleConfigurationMessageLegacy(envelope, proto.configurationMessage as SignalService.ConfigurationMessage);
     //     expect(getItemByIdStub.callCount).to.equal(1);
     // });
   });
diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts
index 65d8cc6ca..9a940b589 100644
--- a/ts/types/attachments/VisualAttachment.ts
+++ b/ts/types/attachments/VisualAttachment.ts
@@ -37,7 +37,7 @@ export const getImageDimensions = async ({
       window.log.error('getImageDimensions error', toLogFormat(error));
       reject(error);
     });
-    // TODO image/jpeg is hard coded, but it does not look to cause any issues
+    // TODO image/jpg is hard coded, but it does not look to cause any issues
     const decryptedUrl = await getDecryptedMediaUrl(objectUrl, 'image/jpg', false);
     image.src = decryptedUrl;
   });
diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts
index c5989ef1b..935e53e8d 100644
--- a/ts/webworker/worker_interface.ts
+++ b/ts/webworker/worker_interface.ts
@@ -43,6 +43,7 @@ export class WorkerInterface {
       const { resolve, reject, fnName } = job;
 
       if (errorForDisplay) {
+        console.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
         return reject(
           new Error(`Error received from worker job ${jobId} (${fnName}): ${errorForDisplay}`)
         );

From f88acdb567ad37e32c228234edca9d0095ccfd37 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 17 Feb 2023 11:43:21 +1100
Subject: [PATCH 036/178] feat: remove blocked group tracking separately from
 the pubkeys

---
 ts/interactions/conversationInteractions.ts   | 10 +--
 ts/receiver/closedGroups.ts                   |  2 +-
 ts/receiver/configMessage.ts                  |  7 +-
 ts/session/group/closed-group.ts              |  2 +-
 .../utils/job_runners/JobDeserialization.ts   |  2 +-
 ts/state/selectors/conversations.ts           |  4 +-
 .../receiving/ConfigurationMessage_test.ts    |  1 +
 .../unit/sending/MessageSender_test.ts        | 36 +++++----
 .../unit/swarm_polling/SwarmPolling_test.ts   |  2 +-
 ts/test/session/unit/utils/Messages_test.ts   |  3 +-
 ts/test/test-utils/utils/stubbing.ts          |  4 +
 ts/test/util/blockedNumberController_test.ts  | 74 -------------------
 ts/util/blockedNumberController.ts            | 43 +----------
 13 files changed, 37 insertions(+), 153 deletions(-)

diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 47c64a070..affa7429b 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -91,10 +91,7 @@ export async function blockConvoById(conversationId: string) {
     return;
   }
 
-  const promise = conversation.isPrivate()
-    ? BlockedNumberController.block(conversation.id)
-    : BlockedNumberController.blockGroup(conversation.id);
-  await promise;
+  await BlockedNumberController.block(conversation.id);
   await conversation.commit();
   ToastUtils.pushToastSuccess('blocked', window.i18n('blocked'));
 }
@@ -112,10 +109,7 @@ export async function unblockConvoById(conversationId: string) {
   if (!conversation.id || conversation.isPublic()) {
     return;
   }
-  const promise = conversation.isPrivate()
-    ? BlockedNumberController.unblock(conversationId)
-    : BlockedNumberController.unblockGroup(conversationId);
-  await promise;
+  await BlockedNumberController.unblock(conversationId);
   ToastUtils.pushToastSuccess('unblocked', window.i18n('unblocked'));
   await conversation.commit();
 }
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 64695f86b..92e58ea18 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -89,7 +89,7 @@ export async function handleClosedGroupControlMessage(
     return;
   }
 
-  if (BlockedNumberController.isGroupBlocked(PubKey.cast(envelope.source))) {
+  if (BlockedNumberController.isBlocked(PubKey.cast(envelope.source))) {
     window?.log?.warn('Message ignored; destined for blocked group');
     await removeFromCache(envelope);
     return;
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 71ba0ce89..dd3e67346 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -72,6 +72,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
   return result;
 }
 
+// tslint:disable-next-line: cyclomatic-complexity
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   if (!result.needsDump) {
     return result;
@@ -116,11 +117,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
 
       const convoBlocked = wrapperConvo.blocked || false;
       if (convoBlocked !== existingConvo.isBlocked()) {
-        if (existingConvo.isPrivate()) {
-          await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
-        } else {
-          await BlockedNumberController.setGroupBlocked(wrapperConvo.id, convoBlocked);
-        }
+        await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
       }
 
       if (wrapperConvo.nickname !== existingConvo.getNickname()) {
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index a484e2db2..47c1d0fd0 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -268,7 +268,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
 
   const isBlocked = details.blocked || false;
   if (conversation.isClosedGroup() || conversation.isMediumGroup()) {
-    await BlockedNumberController.setGroupBlocked(conversation.id as string, isBlocked);
+    await BlockedNumberController.setBlocked(conversation.id as string, isBlocked);
   }
 
   if (details.admins?.length) {
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index 4c70a9ac9..0d960aa5a 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -25,7 +25,7 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
     case 'FakeSleepForJobMultiType':
       return (new FakeSleepForMultiJob(data) as unknown) as PersistedJob<T>;
     default:
-      console.warn('unknown persisted job type:', (data as any).jobType);
+      console.error('unknown persisted job type:', (data as any).jobType);
       return null;
   }
 }
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 2b8930474..0127b3c03 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -405,9 +405,7 @@ export const _getSortedConversations = (
       };
     }
 
-    const isBlocked =
-      BlockedNumberController.isBlocked(conversation.id) ||
-      BlockedNumberController.isGroupBlocked(conversation.id);
+    const isBlocked = BlockedNumberController.isBlocked(conversation.id);
 
     if (isBlocked) {
       conversation = {
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index 95cdb25b6..b462971fc 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -28,6 +28,7 @@ describe('ConfigurationMessage_receiving', () => {
   let config: ConfigurationMessage;
 
   beforeEach(() => {
+    TestUtils.stubWindowFeatureFlags();
     Sinon.stub(cache, 'removeFromCache').resolves();
     sender = TestUtils.generateFakePubKey().key;
     config = new ConfigurationMessage({
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index dda6de8b5..237e56b61 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -1,23 +1,24 @@
 import { expect } from 'chai';
 import * as crypto from 'crypto';
-import Sinon, * as sinon from 'sinon';
-import { MessageSender } from '../../../../session/sending';
-import { TestUtils } from '../../../test-utils';
-import { MessageEncrypter } from '../../../../session/crypto';
-import { SignalService } from '../../../../protobuf';
-import { PubKey, RawMessage } from '../../../../session/types';
-import { MessageUtils, UserUtils } from '../../../../session/utils';
 import _ from 'lodash';
-import { OpenGroupPollingUtils } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils';
-import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test';
-import { stubCreateObjectUrl, stubData, stubUtilWorker } from '../../../test-utils/utils';
-import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
-import { Onions } from '../../../../session/apis/snode_api/onions';
-import { OnionV4 } from '../../../../session/onions/onionv4';
-import { OnionSending } from '../../../../session/onions/onionSend';
+import Sinon, * as sinon from 'sinon';
+import { SignalService } from '../../../../protobuf';
 import { OpenGroupMessageV2 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2';
+import { OpenGroupPollingUtils } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils';
+import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
 import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
+import { Onions } from '../../../../session/apis/snode_api/onions';
+import { getConversationController } from '../../../../session/conversations/ConversationController';
+import { MessageEncrypter } from '../../../../session/crypto';
+import { OnionSending } from '../../../../session/onions/onionSend';
+import { OnionV4 } from '../../../../session/onions/onionv4';
+import { MessageSender } from '../../../../session/sending';
+import { PubKey, RawMessage } from '../../../../session/types';
+import { MessageUtils, UserUtils } from '../../../../session/utils';
+import { TestUtils } from '../../../test-utils';
+import { stubCreateObjectUrl, stubData, stubUtilWorker } from '../../../test-utils/utils';
+import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test';
 
 describe('MessageSender', () => {
   afterEach(() => {
@@ -26,6 +27,7 @@ describe('MessageSender', () => {
 
   beforeEach(() => {
     TestUtils.stubWindowLog();
+    TestUtils.stubWindowFeatureFlags();
   });
 
   // tslint:disable-next-line: max-func-body-length
@@ -35,7 +37,7 @@ describe('MessageSender', () => {
     let encryptStub: sinon.SinonStub<[PubKey, Uint8Array, SignalService.Envelope.Type]>;
 
     beforeEach(() => {
-      sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessagesToSnode').resolves();
+      sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessagesDataToSnode').resolves();
 
       stubData('getMessageById').resolves();
 
@@ -101,6 +103,7 @@ describe('MessageSender', () => {
       it('should pass the correct values to lokiMessageAPI', async () => {
         const device = TestUtils.generateFakePubKey();
         const visibleMessage = TestUtils.generateVisibleMessage();
+        Sinon.stub(getConversationController(), 'get').returns(undefined as any);
 
         const rawMessage = await MessageUtils.toRawMessage(
           device,
@@ -121,7 +124,7 @@ describe('MessageSender', () => {
 
         // This test assumes the encryption stub returns the plainText passed into it.
         const device = TestUtils.generateFakePubKey();
-
+        Sinon.stub(getConversationController(), 'get').returns(undefined as any);
         const visibleMessage = TestUtils.generateVisibleMessage();
         const rawMessage = await MessageUtils.toRawMessage(
           device,
@@ -171,6 +174,7 @@ describe('MessageSender', () => {
       describe('SESSION_MESSAGE', () => {
         it('should set the envelope source to be empty', async () => {
           messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE;
+          Sinon.stub(getConversationController(), 'get').returns(undefined as any);
 
           // This test assumes the encryption stub returns the plainText passed into it.
           const device = TestUtils.generateFakePubKey();
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 374a477f7..1896addb8 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -40,7 +40,7 @@ describe('SwarmPolling', () => {
   let clock: Sinon.SinonFakeTimers;
   beforeEach(async () => {
     getConversationController().reset();
-
+    TestUtils.stubWindowFeatureFlags();
     // Utils Stubs
     Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
 
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index f33a7b26f..ccc99d969 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -46,11 +46,12 @@ describe('Message Utils', () => {
         SnodeNamespaces.UserContacts
       );
 
-      expect(Object.keys(rawMessage)).to.have.length(5);
+      expect(Object.keys(rawMessage)).to.have.length(6);
 
       // do not believe tslint. those calls to.exist are actually correct here
       // tslint:disable: no-unused-expression
       expect(rawMessage.identifier).to.exist;
+      expect(rawMessage.namespace).to.exist;
       expect(rawMessage.device).to.exist;
       expect(rawMessage.encryption).to.exist;
       expect(rawMessage.plainTextBuffer).to.exist;
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 5cbd02810..362060e15 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -86,6 +86,10 @@ export const stubWindowLog = () => {
   });
 };
 
+export const stubWindowFeatureFlags = () => {
+  stubWindow('sessionFeatureFlags', { debug: {} } as any);
+};
+
 export async function expectAsyncToThrow(toAwait: () => Promise<any>, errorMessageToCatch: string) {
   try {
     await toAwait();
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index 9842bffa2..ad22af144 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -38,27 +38,19 @@ describe('BlockedNumberController', () => {
   describe('load', () => {
     it('should load data from the database', async () => {
       const normal = TestUtils.generateFakePubKey();
-      const group = TestUtils.generateFakePubKey();
       memoryDB.blocked = [normal.key];
-      memoryDB['blocked-groups'] = [group.key];
       await BlockedNumberController.load();
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      const blockedGroups = BlockedNumberController.getBlockedGroups();
 
       expect(blockedNumbers).to.have.lengthOf(1);
       expect(blockedNumbers).to.include(normal.key);
-      expect(blockedGroups).to.have.lengthOf(1);
-      expect(blockedGroups).to.include(group.key);
     });
 
     it('should return empty if nothing in the db exists', async () => {
       await BlockedNumberController.load();
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      const blockedGroups = BlockedNumberController.getBlockedGroups();
-
       expect(blockedNumbers).to.be.empty;
-      expect(blockedGroups).to.be.empty;
     });
   });
 
@@ -72,7 +64,6 @@ describe('BlockedNumberController', () => {
       expect(blockedNumbers).to.have.lengthOf(1);
       expect(blockedNumbers).to.include(other.key);
       expect(memoryDB.blocked).to.include(other.key);
-      expect(BlockedNumberController.getBlockedGroups()).to.be.empty;
     });
   });
 
@@ -103,52 +94,15 @@ describe('BlockedNumberController', () => {
     });
   });
 
-  describe('blockGroup', () => {
-    it('should block a group', async () => {
-      const group = TestUtils.generateFakePubKey();
-
-      await BlockedNumberController.blockGroup(group);
-
-      const blockedGroups = BlockedNumberController.getBlockedGroups();
-      expect(blockedGroups).to.have.lengthOf(1);
-      expect(blockedGroups).to.include(group.key);
-      expect(memoryDB['blocked-groups']).to.have.lengthOf(1);
-      expect(memoryDB['blocked-groups']).to.include(group.key);
-      expect(BlockedNumberController.getBlockedNumbers()).to.be.empty;
-    });
-  });
-
-  describe('unblockGroup', () => {
-    it('should unblock a group', async () => {
-      const group = TestUtils.generateFakePubKey();
-      const another = TestUtils.generateFakePubKey();
-      memoryDB['blocked-groups'] = [group.key, another.key];
-
-      await BlockedNumberController.unblockGroup(group);
-
-      const blockedGroups = BlockedNumberController.getBlockedGroups();
-      expect(blockedGroups).to.have.lengthOf(1);
-      expect(blockedGroups).to.include(another.key);
-      expect(memoryDB['blocked-groups']).to.have.lengthOf(1);
-      expect(memoryDB['blocked-groups']).to.include(another.key);
-    });
-  });
-
   describe('isBlocked', () => {
     it('should return true if number is blocked', async () => {
       const pubKey = TestUtils.generateFakePubKey();
-      const groupPubKey = TestUtils.generateFakePubKey();
       memoryDB.blocked = [pubKey.key];
-      memoryDB['blocked-groups'] = [groupPubKey.key];
       await BlockedNumberController.load();
       expect(BlockedNumberController.isBlocked(pubKey.key)).to.equal(
         true,
         'Expected isBlocked to return true for user pubkey'
       );
-      expect(BlockedNumberController.isBlocked(groupPubKey.key)).to.equal(
-        false,
-        'Expected isBlocked to return false for a group pubkey'
-      );
     });
 
     it('should return false if number is not blocked', async () => {
@@ -189,32 +143,4 @@ describe('BlockedNumberController', () => {
       expect(isBlocked).to.equal(false, 'Expected isBlockedAsync to return false.');
     });
   });
-
-  describe('isGroupBlocked', () => {
-    it('should return true if group is blocked', async () => {
-      const pubKey = TestUtils.generateFakePubKey();
-      const groupPubKey = TestUtils.generateFakePubKey();
-      memoryDB.blocked = [pubKey.key];
-      memoryDB['blocked-groups'] = [groupPubKey.key];
-      await BlockedNumberController.load();
-      expect(BlockedNumberController.isGroupBlocked(pubKey.key)).to.equal(
-        false,
-        'Expected isGroupBlocked to return false for user pubkey'
-      );
-      expect(BlockedNumberController.isGroupBlocked(groupPubKey.key)).to.equal(
-        true,
-        'Expected isGroupBlocked to return true for a group pubkey'
-      );
-    });
-
-    it('should return false if group is not blocked', async () => {
-      const groupPubKey = TestUtils.generateFakePubKey();
-      memoryDB['blocked-groups'] = [];
-      await BlockedNumberController.load();
-      expect(BlockedNumberController.isGroupBlocked(groupPubKey.key)).to.equal(
-        false,
-        'Expected isGroupBlocked to return false'
-      );
-    });
-  });
 });
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index cc25c66a0..4e9932a25 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -4,13 +4,11 @@ import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
 
 const BLOCKED_NUMBERS_ID = 'blocked';
-const BLOCKED_GROUPS_ID = 'blocked-groups';
 
 // tslint:disable-next-line: no-unnecessary-class
 export class BlockedNumberController {
   private static loaded: boolean = false;
   private static blockedNumbers: Set<string> = new Set();
-  private static blockedGroups: Set<string> = new Set();
 
   /**
    * Check if a device is blocked.
@@ -44,19 +42,7 @@ export class BlockedNumberController {
   }
 
   /**
-   * Check if a group id is blocked.
-   * Make sure `load()` has been called before this function so that the correct blocked state is returned.
-   *
-   * @param groupId The group id.
-   */
-  public static isGroupBlocked(groupId: string | PubKey): boolean {
-    const stringValue = groupId instanceof PubKey ? groupId.key : groupId.toLowerCase();
-    return this.blockedGroups.has(stringValue);
-  }
-
-  /**
-   * Block a user.
-   * This will only block the primary device of the user.
+   * Block a user or group, by pubkey
    *
    * @param user The user to block.
    */
@@ -125,41 +111,15 @@ export class BlockedNumberController {
     return BlockedNumberController.unblock(user);
   }
 
-  public static async setGroupBlocked(groupId: string | PubKey, blocked: boolean): Promise<void> {
-    if (blocked) {
-      return BlockedNumberController.blockGroup(groupId);
-    }
-    return BlockedNumberController.unblockGroup(groupId);
-  }
-
-  public static async blockGroup(groupId: string | PubKey): Promise<void> {
-    await this.load();
-    const id = PubKey.cast(groupId);
-    this.blockedGroups.add(id.key);
-    await this.saveToDB(BLOCKED_GROUPS_ID, this.blockedGroups);
-  }
-
-  public static async unblockGroup(groupId: string | PubKey): Promise<void> {
-    await this.load();
-    const id = PubKey.cast(groupId);
-    this.blockedGroups.delete(id.key);
-    await this.saveToDB(BLOCKED_GROUPS_ID, this.blockedGroups);
-  }
-
   public static getBlockedNumbers(): Array<string> {
     return [...this.blockedNumbers];
   }
 
-  public static getBlockedGroups(): Array<string> {
-    return [...this.blockedGroups];
-  }
-
   // ---- DB
 
   public static async load() {
     if (!this.loaded) {
       this.blockedNumbers = await this.getNumbersFromDB(BLOCKED_NUMBERS_ID);
-      this.blockedGroups = await this.getNumbersFromDB(BLOCKED_GROUPS_ID);
       this.loaded = true;
     }
   }
@@ -167,7 +127,6 @@ export class BlockedNumberController {
   public static reset() {
     this.loaded = false;
     this.blockedNumbers = new Set();
-    this.blockedGroups = new Set();
   }
 
   private static async getNumbersFromDB(id: string): Promise<Set<string>> {

From c4217cb5645977034bced1e1b658aa27f3478986 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 20 Feb 2023 15:11:04 +1100
Subject: [PATCH 037/178] feat: sync nickname, blocked and approved status for
 contacts

---
 ts/components/dialog/EditProfileDialog.tsx    |   1 -
 ts/components/leftpane/ActionsPanel.tsx       |  10 -
 ts/data/configDump/configDump.ts              |  13 +-
 ts/data/data.ts                               |  66 +-----
 ts/data/dataUtils.ts                          |  53 +++++
 ts/mains/main_renderer.tsx                    |  18 ++
 ts/models/conversation.ts                     | 214 ++++++++++--------
 ts/node/sql.ts                                |  20 +-
 ts/node/sql_calls/config_dump.ts              |  36 ++-
 ts/receiver/configMessage.ts                  | 100 ++++----
 ts/receiver/contentMessage.ts                 |  44 ++--
 ts/session/apis/snode_api/batchRequest.ts     |  10 +-
 .../conversations/ConversationController.ts   |  21 +-
 .../utils/job_runners/JobDeserialization.ts   |   5 +
 ts/session/utils/job_runners/JobRunner.ts     |  10 +-
 ts/session/utils/job_runners/PersistedJob.ts  |  10 +-
 .../jobs/ConfigurationSyncDumpJob.ts          | 175 ++++++++++++++
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   5 +-
 .../utils/job_runners/jobs/JobRunnerType.ts   |   1 +
 .../utils/libsession/libsession_utils.ts      |   2 +-
 .../libsession/libsession_utils_contacts.ts   |  87 ++++++-
 .../unit/utils/job_runner/JobRunner_test.ts   |   2 +-
 ts/test/util/blockedNumberController_test.ts  |  32 +--
 ts/types/sqlSharedTypes.ts                    |   5 +
 ts/util/accountManager.ts                     |   7 +
 ts/util/blockedNumberController.ts            |  35 +--
 26 files changed, 651 insertions(+), 331 deletions(-)
 create mode 100644 ts/data/dataUtils.ts
 create mode 100644 ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 1cccdc3c8..673f07211 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -347,7 +347,6 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
     await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
-
     await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
   }
 }
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 5922ad299..397e4073e 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -44,11 +44,9 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
 import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
-import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
-import { runners } from '../../session/utils/job_runners/JobRunner';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -193,21 +191,13 @@ const triggerAvatarReUploadIfNeeded = async () => {
  * This function is called only once: on app startup with a logged in user
  */
 const doAppStartUp = async () => {
-  await LibSessionUtil.initializeLibSessionUtilWrappers();
-
   void setupTheme();
   // this generates the key to encrypt attachments locally
   await Data.generateAttachmentKeyIfEmpty();
 
-  await runners.avatarDownloadRunner.loadJobsFromDb();
-  runners.avatarDownloadRunner.startProcessing();
-  await runners.configurationSyncRunner.loadJobsFromDb();
-  runners.configurationSyncRunner.startProcessing();
-
   // trigger a sync message if needed for our other devices
   void triggerSyncIfNeeded();
   void getSwarmPollingInstance().start();
-
   void loadDefaultRooms();
 
   // TODO make this a job of the JobRunner
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 9fcca3d63..d62a81fb6 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -3,9 +3,11 @@ import {
   ConfigDumpDataNode,
   ConfigDumpRow,
   ConfigDumpRowWithoutData,
+  ConfigDumpRowWithoutHashes,
 } from '../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
+import { cleanData } from '../dataUtils';
 
 export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
   getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
@@ -15,15 +17,18 @@ export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
     return channels.getMessageHashesByVariantAndPubkey(variant, pubkey);
   },
   saveConfigDump: (dump: ConfigDumpRow) => {
-    console.warn('saveConfigDump', dump);
+    console.warn('saveConfigDump', dump.variant);
     if (dump.combinedMessageHashes.some(m => Boolean(m && m.length < 5))) {
       throw new Error('saveConfigDump combinedMessageHashes have invalid size');
     }
-    return channels.saveConfigDump(dump);
+    return channels.saveConfigDump(cleanData(dump));
   },
+  saveConfigDumpNoHashes: (dump: ConfigDumpRowWithoutHashes) => {
+    return channels.saveConfigDumpNoHashes(cleanData(dump));
+  },
+
   saveCombinedMessageHashesForMatching: (dump: ConfigDumpRowWithoutData) => {
-    console.warn('saveCombinedMessageHashesForMatching', dump);
-    return channels.saveCombinedMessageHashesForMatching(dump);
+    return channels.saveCombinedMessageHashesForMatching(cleanData(dump));
   },
   getAllDumpsWithData: () => {
     return channels.getAllDumpsWithData();
diff --git a/ts/data/data.ts b/ts/data/data.ts
index 18a0ae855..da761fe80 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -22,6 +22,7 @@ import { channels } from './channels';
 import * as dataInit from './dataInit';
 import { StorageItem } from '../node/storage_item';
 import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/utils/String';
+import { cleanData } from './dataUtils';
 
 const ERASE_SQL_KEY = 'erase-sql-key';
 const ERASE_ATTACHMENTS_KEY = 'erase-attachments';
@@ -54,57 +55,6 @@ export const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationI
 export const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
 export const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
 
-/**
- * When IPC arguments are prepared for the cross-process send, they are JSON.stringified.
- * We can't send ArrayBuffers or BigNumbers (what we get from proto library for dates).
- * @param data - data to be cleaned
- */
-function _cleanData(data: any): any {
-  const keys = Object.keys(data);
-
-  for (let index = 0, max = keys.length; index < max; index += 1) {
-    const key = keys[index];
-    const value = data[key];
-
-    if (value === null || value === undefined) {
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-    // eslint-disable no-param-reassign
-
-    if (_.isFunction(value.toNumber)) {
-      // eslint-disable-next-line no-param-reassign
-      data[key] = value.toNumber();
-    } else if (_.isFunction(value)) {
-      // just skip a function which has not a toNumber function. We don't want to save a function to the db.
-      // an attachment comes with a toJson() function
-      // tslint:disable-next-line: no-dynamic-delete
-      delete data[key];
-    } else if (Array.isArray(value)) {
-      data[key] = value.map(_cleanData);
-    } else if (_.isObject(value) && value instanceof File) {
-      data[key] = { name: value.name, path: value.path, size: value.size, type: value.type };
-    } else if (_.isObject(value) && value instanceof ArrayBuffer) {
-      window.log.error(
-        'Trying to save an ArrayBuffer to the db is most likely an error. This specific field should be removed before the cleanData call'
-      );
-      /// just skip it
-      continue;
-    } else if (_.isObject(value)) {
-      data[key] = _cleanData(value);
-    } else if (_.isBoolean(value)) {
-      data[key] = value ? 1 : 0;
-    } else if (
-      typeof value !== 'string' &&
-      typeof value !== 'number' &&
-      typeof value !== 'boolean'
-    ) {
-      window?.log?.info(`_cleanData: key ${key} had type ${typeof value}`);
-    }
-  }
-  return data;
-}
-
 // Basic
 async function shutdown(): Promise<void> {
   // Stop accepting new SQL jobs, flush outstanding queue
@@ -192,7 +142,7 @@ async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: string): P
 
 // Conversation
 async function saveConversation(data: ConversationAttributes): Promise<void> {
-  const cleaned = _cleanData(data);
+  const cleaned = cleanData(data);
   /**
    * Merging two conversations in `handleMessageRequestResponse` introduced a bug where we would mark conversation active_at to be -Infinity.
    * The root issue has been fixed, but just to make sure those INVALID DATE does not show up, update those -Infinity active_at conversations to be now(), once.,
@@ -281,22 +231,22 @@ async function saveSeenMessageHashes(
     hash: string;
   }>
 ): Promise<void> {
-  await channels.saveSeenMessageHashes(_cleanData(data));
+  await channels.saveSeenMessageHashes(cleanData(data));
 }
 
 async function updateLastHash(data: UpdateLastHashType): Promise<void> {
-  await channels.updateLastHash(_cleanData(data));
+  await channels.updateLastHash(cleanData(data));
 }
 
 async function saveMessage(data: MessageAttributes): Promise<string> {
-  const cleanedData = _cleanData(data);
+  const cleanedData = cleanData(data);
   const id = await channels.saveMessage(cleanedData);
   ExpirationTimerOptions.updateExpiringMessagesCheck();
   return id;
 }
 
 async function saveMessages(arrayOfMessages: Array<MessageAttributes>): Promise<void> {
-  await channels.saveMessages(_cleanData(arrayOfMessages));
+  await channels.saveMessages(cleanData(arrayOfMessages));
 }
 
 async function removeMessage(id: string): Promise<void> {
@@ -601,7 +551,7 @@ const getUnprocessedById: AsyncWrapper<UnprocessedDataNode['getUnprocessedById']
 };
 
 const saveUnprocessed: AsyncWrapper<UnprocessedDataNode['saveUnprocessed']> = data => {
-  return channels.saveUnprocessed(_cleanData(data));
+  return channels.saveUnprocessed(cleanData(data));
 };
 
 const updateUnprocessedAttempts: AsyncWrapper<UnprocessedDataNode['updateUnprocessedAttempts']> = (
@@ -614,7 +564,7 @@ const updateUnprocessedWithData: AsyncWrapper<UnprocessedDataNode['updateUnproce
   id,
   data
 ) => {
-  return channels.updateUnprocessedWithData(id, _cleanData(data));
+  return channels.updateUnprocessedWithData(id, cleanData(data));
 };
 
 const removeUnprocessed: AsyncWrapper<UnprocessedDataNode['removeUnprocessed']> = id => {
diff --git a/ts/data/dataUtils.ts b/ts/data/dataUtils.ts
new file mode 100644
index 000000000..08093d517
--- /dev/null
+++ b/ts/data/dataUtils.ts
@@ -0,0 +1,53 @@
+import _ from 'lodash';
+
+/**
+ * When IPC arguments are prepared for the cross-process send, they are JSON.stringified.
+ * We can't send ArrayBuffers or BigNumbers (what we get from proto library for dates).
+ * @param data - data to be cleaned
+ */
+export function cleanData(data: any): any {
+  const keys = Object.keys(data);
+
+  // tslint:disable: one-variable-per-declaration
+  for (let index = 0, max = keys.length; index < max; index += 1) {
+    const key = keys[index];
+    const value = data[key];
+
+    if (value === null || value === undefined) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+    // eslint-disable no-param-reassign
+
+    if (_.isFunction(value.toNumber)) {
+      // eslint-disable-next-line no-param-reassign
+      data[key] = value.toNumber();
+    } else if (_.isFunction(value)) {
+      // just skip a function which has not a toNumber function. We don't want to save a function to the db.
+      // an attachment comes with a toJson() function
+      // tslint:disable-next-line: no-dynamic-delete
+      delete data[key];
+    } else if (Array.isArray(value)) {
+      data[key] = value.map(cleanData);
+    } else if (_.isObject(value) && value instanceof File) {
+      data[key] = { name: value.name, path: value.path, size: value.size, type: value.type };
+    } else if (_.isObject(value) && value instanceof ArrayBuffer) {
+      window.log.error(
+        'Trying to save an ArrayBuffer to the db is most likely an error. This specific field should be removed before the cleanData call'
+      );
+      /// just skip it
+      continue;
+    } else if (_.isObject(value)) {
+      data[key] = cleanData(value);
+    } else if (_.isBoolean(value)) {
+      data[key] = value ? 1 : 0;
+    } else if (
+      typeof value !== 'string' &&
+      typeof value !== 'number' &&
+      typeof value !== 'boolean'
+    ) {
+      window?.log?.info(`cleanData: key ${key} had type ${typeof value}`);
+    }
+  }
+  return data;
+}
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index d57cf8655..95e96faa0 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -22,6 +22,8 @@ import { loadKnownBlindedKeys } from '../session/apis/open_group_api/sogsv3/know
 import nativeEmojiData from '@emoji-mart/data';
 import { initialiseEmojiData } from '../util/emoji';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
+import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
+import { runners } from '../session/utils/job_runners/JobRunner';
 // tslint:disable: max-classes-per-file
 
 // Globally disable drag and drop
@@ -107,6 +109,16 @@ function mapOldThemeToNew(theme: string) {
   }
 }
 
+async function startJobRunners() {
+  // start the job runners
+  await runners.avatarDownloadRunner.loadJobsFromDb();
+  runners.avatarDownloadRunner.startProcessing();
+  await runners.configurationSyncRunner.loadJobsFromDb();
+  runners.configurationSyncRunner.startProcessing();
+  await runners.configurationSyncDumpRunner.loadJobsFromDb();
+  runners.configurationSyncDumpRunner.startProcessing();
+}
+
 // We need this 'first' check because we don't want to start the app up any other time
 //   than the first time. And storage.fetch() will cause onready() to fire.
 let first = true;
@@ -176,8 +188,14 @@ Storage.onready(async () => {
   await window.Events.setThemeSetting(newThemeSetting);
 
   try {
+    try {
+      await LibSessionUtil.initializeLibSessionUtilWrappers();
+    } catch (e) {
+      window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
+    }
     await initialiseEmojiData(nativeEmojiData);
     await AttachmentDownloads.initAttachmentPaths();
+    await startJobRunners();
 
     await Promise.all([
       getConversationController().load(),
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1c6ad5df8..42b68a99d 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1,3 +1,4 @@
+import autoBind from 'auto-bind';
 import Backbone from 'backbone';
 import {
   debounce,
@@ -14,20 +15,33 @@ import {
   throttle,
   uniq,
 } from 'lodash';
+import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
+import { leaveClosedGroup } from '../session/group/closed-group';
 import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { PubKey } from '../session/types';
 import { ToastUtils, UserUtils } from '../session/utils';
 import { BlockedNumberController } from '../util';
-import { leaveClosedGroup } from '../session/group/closed-group';
-import { SignalService } from '../protobuf';
 import { MessageModel, sliceQuoteText } from './message';
 import { MessageAttributesOptionals, MessageDirection } from './messageType';
-import autoBind from 'auto-bind';
 
 import { Data } from '../../ts/data/data';
+import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
+import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
+import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
+import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
+import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
+import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage';
+import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage';
+import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
+import {
+  VisibleMessage,
+  VisibleMessageParams,
+} from '../session/messages/outgoing/visibleMessage/VisibleMessage';
+import { perfEnd, perfStart } from '../session/utils/Performance';
 import { toHex } from '../session/utils/String';
+import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import {
   actions as conversationActions,
   conversationChanged,
@@ -36,42 +50,49 @@ import {
   MessageModelPropsWithoutConvoProps,
   ReduxConversationType,
 } from '../state/ducks/conversations';
-import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
-import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage';
-import {
-  VisibleMessage,
-  VisibleMessageParams,
-} from '../session/messages/outgoing/visibleMessage/VisibleMessage';
-import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage';
-import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
-import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
-import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
-import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
-import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
-import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
-import { perfEnd, perfStart } from '../session/utils/Performance';
 
-import { ed25519Str } from '../session/onions/onionPath';
-import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
-import { IMAGE_JPEG } from '../types/MIME';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
-import { createLastMessageUpdate } from '../types/Conversation';
+import { from_hex } from 'libsodium-wrappers-sumo';
 import {
   ReplyingToMessageProps,
   SendMessageType,
 } from '../components/conversation/composition/CompositionBox';
+import { OpenGroupData } from '../data/opengroups';
 import { SettingsKey } from '../data/settings-key';
+import {
+  findCachedOurBlindedPubkeyOrLookItUp,
+  isUsAnySogsFromCache,
+} from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding';
+import {
+  roomHasBlindEnabled,
+  roomHasReactionsEnabled,
+} from '../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
+import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
+import { getSodiumRenderer } from '../session/crypto';
+import { addMessagePadding } from '../session/crypto/BufferPadding';
+import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
+import {
+  MessageRequestResponse,
+  MessageRequestResponseParams,
+} from '../session/messages/outgoing/controlMessage/MessageRequestResponse';
+import { ed25519Str } from '../session/onions/onionPath';
+import { ConfigurationDumpSync } from '../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
+import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
+import { getOurProfile } from '../session/utils/User';
+import { createLastMessageUpdate } from '../types/Conversation';
 import {
   deleteExternalFilesOfConversation,
   getAbsoluteAttachmentPath,
   loadAttachmentData,
 } from '../types/MessageAttachment';
-import { getOurProfile } from '../session/utils/User';
-import {
-  MessageRequestResponse,
-  MessageRequestResponseParams,
-} from '../session/messages/outgoing/controlMessage/MessageRequestResponse';
+import { IMAGE_JPEG } from '../types/MIME';
+import { Reaction } from '../types/Reaction';
 import { Notifications } from '../util/notifications';
+import { Reactions } from '../util/reactions';
 import { Storage } from '../util/storage';
 import {
   ConversationAttributes,
@@ -81,24 +102,6 @@ import {
   isDirectConversation,
   isOpenOrClosedGroup,
 } from './conversationAttributes';
-import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding';
-import { from_hex } from 'libsodium-wrappers-sumo';
-import { OpenGroupData } from '../data/opengroups';
-import {
-  roomHasBlindEnabled,
-  roomHasReactionsEnabled,
-} from '../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
-import { addMessagePadding } from '../session/crypto/BufferPadding';
-import { getSodiumRenderer } from '../session/crypto';
-import {
-  findCachedOurBlindedPubkeyOrLookItUp,
-  isUsAnySogsFromCache,
-} from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
-import { Reaction } from '../types/Reaction';
-import { Reactions } from '../util/reactions';
-import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
-import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -234,11 +237,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return false;
     }
 
-    if (this.isClosedGroup()) {
-      return BlockedNumberController.isGroupBlocked(this.id);
-    }
-
-    if (this.isPrivate()) {
+    if (this.isPrivate() || this.isClosedGroup() || this.isMediumGroup()) {
       return BlockedNumberController.isBlocked(this.id);
     }
 
@@ -285,7 +284,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public getConversationModelProps(): ReduxConversationType {
     const groupAdmins = this.getGroupAdmins();
     const groupModerators = this.getGroupModerators();
-    // tslint:disable-next-line: cyclomatic-complexity
     const isPublic = this.isPublic();
 
     const members = this.isClosedGroup() ? this.get('members') : [];
@@ -300,18 +298,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const isTyping = !!this.typingTimer;
     const unreadCount = this.get('unreadCount') || undefined;
     const mentionedUs = this.get('mentionedUs') || undefined;
-    const isBlocked = this.isBlocked();
     const subscriberCount = this.get('subscriberCount');
-    const isPinned = this.isPinned();
-    const isApproved = this.isApproved();
-    const didApproveMe = this.didApproveMe();
-    const hasNickname = !!this.getNickname();
     const isKickedFromGroup = !!this.get('isKickedFromGroup');
     const left = !!this.get('left');
     const expireTimer = this.get('expireTimer');
     const currentNotificationSetting = this.get('triggerNotificationsFor');
-    const displayNameInProfile = this.get('displayNameInProfile');
-    const nickname = this.get('nickname');
 
     // To reduce the redux store size, only set fields which cannot be undefined.
     // For instance, a boolean can usually be not set if false, etc
@@ -355,12 +346,37 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.avatarPath = avatarPath;
     }
 
-    if (displayNameInProfile) {
-      toRet.displayNameInProfile = displayNameInProfile;
-    }
+    const foundWrapperValue = SessionUtilContact.getMappedValue(this.id);
 
-    if (nickname) {
-      toRet.nickname = nickname;
+    if (foundWrapperValue) {
+      if (foundWrapperValue.name) {
+        toRet.displayNameInProfile = foundWrapperValue.name;
+      }
+
+      if (foundWrapperValue.nickname) {
+        toRet.nickname = foundWrapperValue.nickname;
+        toRet.hasNickname = !!toRet.nickname;
+      }
+
+      if (foundWrapperValue.blocked) {
+        toRet.isBlocked = foundWrapperValue.blocked;
+      }
+
+      if (foundWrapperValue.approvedMe) {
+        toRet.didApproveMe = foundWrapperValue.approvedMe;
+      }
+
+      if (foundWrapperValue.approved) {
+        toRet.isApproved = foundWrapperValue.approved;
+      }
+
+      if (foundWrapperValue.hidden) {
+        toRet.activeAt = undefined;
+      }
+
+      if (foundWrapperValue.priority > 0) {
+        toRet.isPinned = true; // TODO priority also handles sorting
+      }
     }
 
     if (unreadCount) {
@@ -371,29 +387,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.mentionedUs = mentionedUs;
     }
 
-    if (isBlocked) {
-      toRet.isBlocked = isBlocked;
-    }
-    if (hasNickname) {
-      toRet.hasNickname = hasNickname;
-    }
-
     if (isKickedFromGroup) {
       toRet.isKickedFromGroup = isKickedFromGroup;
     }
     if (left) {
       toRet.left = left;
     }
-    if (isPinned) {
-      toRet.isPinned = isPinned;
-    }
-    if (didApproveMe) {
-      toRet.didApproveMe = didApproveMe;
-    }
-
-    if (isApproved) {
-      toRet.isApproved = isApproved;
-    }
 
     if (subscriberCount) {
       toRet.subscriberCount = subscriberCount;
@@ -1177,9 +1176,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
   public async commit() {
     perfStart(`conversationCommit-${this.attributes.id}`);
-    // write to DB
-    await Data.saveConversation(this.attributes);
-    this.triggerUIRefresh();
+    await commitConversationAndRefreshWrapper(this.id);
     perfEnd(`conversationCommit-${this.attributes.id}`, 'conversationCommit');
   }
 
@@ -1538,20 +1535,27 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return Array.isArray(groupModerators) && groupModerators.includes(pubKey);
   }
 
-  public async setIsPinned(value: boolean) {
-    if (value !== this.isPinned()) {
+  public async setIsPinned(value: boolean, shouldCommit: boolean = true) {
+    const valueForced = Boolean(value);
+
+    if (valueForced !== Boolean(this.isPinned())) {
       this.set({
-        isPinned: value,
+        isPinned: valueForced,
       });
-      await this.commit();
+
+      if (shouldCommit) {
+        await this.commit();
+      }
     }
   }
 
   public async setIsApproved(value: boolean, shouldCommit: boolean = true) {
-    if (value !== this.isApproved()) {
+    const valueForced = Boolean(value);
+
+    if (valueForced !== Boolean(this.isApproved())) {
       window?.log?.info(`Setting ${ed25519Str(this.id)} isApproved to: ${value}`);
       this.set({
-        isApproved: value,
+        isApproved: valueForced,
       });
 
       if (shouldCommit) {
@@ -1561,10 +1565,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async setDidApproveMe(value: boolean, shouldCommit: boolean = true) {
-    if (value !== this.didApproveMe()) {
+    const valueForced = Boolean(value);
+    if (valueForced !== Boolean(this.didApproveMe())) {
       window?.log?.info(`Setting ${ed25519Str(this.id)} didApproveMe to: ${value}`);
       this.set({
-        didApproveMe: value,
+        didApproveMe: valueForced,
       });
 
       if (shouldCommit) {
@@ -2186,6 +2191,33 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 }
 
+export async function commitConversationAndRefreshWrapper(id: string) {
+  const convo = getConversationController().get(id);
+  if (!convo) {
+    return;
+  }
+  // write to DB
+  // TODO remove duplicates between db and wrapper (except nickname&name as we need them for search)
+  await Data.saveConversation(convo.attributes);
+
+  const shouldBeSavedToWrapper = SessionUtilContact.filterContactsToStoreInContactsWrapper(convo);
+
+  console.warn(`should be saved to wrapper ${id}: ${shouldBeSavedToWrapper}`);
+  if (shouldBeSavedToWrapper) {
+    await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
+
+    // save the new dump if needed to the DB asap
+    // this call throttled so we do not run this too often (and not for every .commit())
+    await ConfigurationDumpSync.queueNewJobIfNeeded();
+
+    // if we need to sync the dump, also send add a job for syncing
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      await ConfigurationSync.queueNewJobIfNeeded();
+    }
+  }
+  convo.triggerUIRefresh();
+}
+
 const throttledAllConversationsDispatch = debounce(
   () => {
     if (updatesToDispatch.size === 0) {
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index fa0757ebb..925a0678d 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1,8 +1,8 @@
-import path from 'path';
-import fs from 'fs';
-import rimraf from 'rimraf';
 import * as BetterSqlite3 from 'better-sqlite3';
 import { app, clipboard, dialog, Notification } from 'electron';
+import fs from 'fs';
+import path from 'path';
+import rimraf from 'rimraf';
 
 import {
   chunk,
@@ -19,11 +19,9 @@ import {
   map,
   omit,
 } from 'lodash';
-import { redactAll } from '../util/privacy'; // checked - only node
-import { LocaleMessagesType } from './locale'; // checked - only node
-import { PubKey } from '../session/types/PubKey'; // checked - only node
-import { StorageItem } from './storage_item'; // checked - only node
 import { ConversationAttributes } from '../models/conversationAttributes';
+import { PubKey } from '../session/types/PubKey'; // checked - only node
+import { redactAll } from '../util/privacy'; // checked - only node
 import {
   arrayStrToJson,
   assertValidConversationAttributes,
@@ -46,21 +44,24 @@ import {
   rebuildFtsTable,
   toSqliteBoolean,
 } from './database_utility';
+import { LocaleMessagesType } from './locale'; // checked - only node
+import { StorageItem } from './storage_item'; // checked - only node
 
+import { OpenGroupV2Room } from '../data/opengroups';
 import {
+  CONFIG_DUMP_TABLE,
   MsgDuplicateSearchOpenGroup,
   UnprocessedDataNode,
   UnprocessedParameter,
   UpdateLastHashType,
 } from '../types/sqlSharedTypes';
-import { OpenGroupV2Room } from '../data/opengroups';
 
+import { SettingsKey } from '../data/settings-key';
 import {
   getSQLCipherIntegrityCheck,
   openAndMigrateDatabase,
   updateSchema,
 } from './migration/signalMigrations';
-import { SettingsKey } from '../data/settings-key';
 import {
   assertGlobalInstance,
   assertGlobalInstanceOrInstance,
@@ -1620,6 +1621,7 @@ function removeAll() {
     DELETE FROM ${MESSAGES_TABLE};
     DELETE FROM ${ATTACHMENT_DOWNLOADS_TABLE};
     DELETE FROM ${MESSAGES_FTS_TABLE};
+    DELETE FROM ${CONFIG_DUMP_TABLE};
 `);
 }
 
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index 604e12391..14e3898cd 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -8,6 +8,8 @@ import {
   ConfigDumpDataNode,
   ConfigDumpRow,
   ConfigDumpRowWithoutData,
+  ConfigDumpRowWithoutHashes,
+  CONFIG_DUMP_TABLE,
 } from '../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { assertGlobalInstance } from '../sqlInstance';
@@ -59,7 +61,7 @@ export const configDumpData: ConfigDumpDataNode = {
   getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
     const rows = assertGlobalInstance()
       .prepare(
-        'SELECT publicKey, variant, combinedMessageHashes, data from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+        `SELECT publicKey, variant, combinedMessageHashes, data from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
       )
       .all({
         publicKey,
@@ -79,7 +81,7 @@ export const configDumpData: ConfigDumpDataNode = {
   ): Array<string> => {
     const rows = assertGlobalInstance()
       .prepare(
-        'SELECT combinedMessageHashes from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+        `SELECT combinedMessageHashes from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
       )
       .all({
         publicKey,
@@ -97,7 +99,7 @@ export const configDumpData: ConfigDumpDataNode = {
 
   getAllDumpsWithData: () => {
     const rows = assertGlobalInstance()
-      .prepare('SELECT variant, publicKey, combinedMessageHashes, data from configDump;')
+      .prepare(`SELECT variant, publicKey, combinedMessageHashes, data from ${CONFIG_DUMP_TABLE};`)
       .all();
 
     if (!rows) {
@@ -109,7 +111,7 @@ export const configDumpData: ConfigDumpDataNode = {
 
   getAllDumpsWithoutData: () => {
     const rows = assertGlobalInstance()
-      .prepare('SELECT variant, publicKey, combinedMessageHashes from configDump;')
+      .prepare(`SELECT variant, publicKey, combinedMessageHashes from ${CONFIG_DUMP_TABLE};`)
       .all();
 
     if (!rows) {
@@ -122,7 +124,7 @@ export const configDumpData: ConfigDumpDataNode = {
   saveConfigDump: ({ data, publicKey, variant, combinedMessageHashes }: ConfigDumpRow) => {
     assertGlobalInstance()
       .prepare(
-        `INSERT OR REPLACE INTO configDump (
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
               publicKey,
               variant,
               combinedMessageHashes,
@@ -141,6 +143,26 @@ export const configDumpData: ConfigDumpDataNode = {
         data,
       });
   },
+  saveConfigDumpNoHashes: ({ data, publicKey, variant }: ConfigDumpRowWithoutHashes) => {
+    assertGlobalInstance()
+      .prepare(
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
+            publicKey,
+            variant,
+            data
+        ) values (
+          $publicKey,
+          $variant,
+          $data
+        );`
+      )
+      .run({
+        publicKey,
+        variant,
+        data,
+      });
+  },
+
   saveCombinedMessageHashesForMatching: ({
     publicKey,
     variant,
@@ -148,7 +170,7 @@ export const configDumpData: ConfigDumpDataNode = {
   }: ConfigDumpRowWithoutData) => {
     assertGlobalInstance()
       .prepare(
-        `UPDATE configDump SET
+        `UPDATE ${CONFIG_DUMP_TABLE} SET
          combinedMessageHashes = $combinedMessageHashes
          WHERE publicKey=$publicKey AND variant=$variant;`
       )
@@ -162,7 +184,7 @@ export const configDumpData: ConfigDumpDataNode = {
   getCombinedHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
     const rows = assertGlobalInstance()
       .prepare(
-        'SELECT combinedMessageHashes from configDump WHERE variant = $variant AND publicKey = $publicKey;'
+        `SELECT combinedMessageHashes from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
       )
       .all({
         publicKey,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index dd3e67346..3cc5f32bc 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { isEmpty, isEqual, isNil } from 'lodash';
+import _, { isEmpty, isEqual } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -34,26 +34,28 @@ async function mergeConfigsWithIncomingUpdates(
   const { kind } = incomingConfig.message;
 
   const toMerge = [incomingConfig.message.data];
-
   const wrapperId = LibSessionUtil.kindToVariant(kind);
-  await GenericWrapperActions.merge(wrapperId, toMerge);
+  try {
+    await GenericWrapperActions.merge(wrapperId, toMerge);
+    const needsPush = await GenericWrapperActions.needsPush(wrapperId);
+    const needsDump = await GenericWrapperActions.needsDump(wrapperId);
+    console.info(`${wrapperId} needsPush:${needsPush} needsDump:${needsDump} `);
 
-  const needsPush = await GenericWrapperActions.needsPush(wrapperId);
-  console.warn(`${wrapperId} needsPush? `, needsPush);
-  const needsDump = await GenericWrapperActions.needsDump(wrapperId);
-  console.warn(`${wrapperId} needsDump? `, needsDump);
+    const messageHashes = [incomingConfig.messageHash];
+    const latestSentTimestamp = incomingConfig.envelopeTimestamp;
 
-  const messageHashes = [incomingConfig.messageHash];
-  const latestSentTimestamp = incomingConfig.envelopeTimestamp;
+    const incomingConfResult: IncomingConfResult = {
+      latestSentTimestamp,
+      messageHashes,
+      needsDump,
+      needsPush,
+    };
 
-  const incomingConfResult: IncomingConfResult = {
-    latestSentTimestamp,
-    messageHashes,
-    needsDump,
-    needsPush,
-  };
-
-  return { kind, result: incomingConfResult };
+    return { kind, result: incomingConfResult };
+  } catch (e) {
+    window.log.error('mergeConfigsWithIncomingUpdates failed with', e);
+    throw e;
+  }
 }
 
 async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
@@ -96,40 +98,50 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
     if (wrapperConvo.id && existingConvo) {
       let changes = false;
 
-      // Note: the isApproved and didApproveMe flags are irreversible so they should only be updated when getting set to true
-      if (
-        !isNil(existingConvo.get('isApproved')) &&
-        !isNil(wrapperConvo.approved) &&
-        existingConvo.get('isApproved') !== wrapperConvo.approved
-      ) {
-        await existingConvo.setIsApproved(wrapperConvo.approved, false);
-        changes = true;
-      }
-
-      if (
-        !isNil(existingConvo.get('didApproveMe')) &&
-        !isNil(wrapperConvo.approvedMe) &&
-        existingConvo.get('didApproveMe') !== wrapperConvo.approvedMe
-      ) {
-        await existingConvo.setDidApproveMe(wrapperConvo.approvedMe, false);
-        changes = true;
-      }
-
-      const convoBlocked = wrapperConvo.blocked || false;
-      if (convoBlocked !== existingConvo.isBlocked()) {
-        await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
-      }
+      // the display name set is handled in `updateProfileOfContact`
 
       if (wrapperConvo.nickname !== existingConvo.getNickname()) {
         await existingConvo.setNickname(wrapperConvo.nickname || null, false);
         changes = true;
       }
+
+      if (!wrapperConvo.hidden && !existingConvo.isActive()) {
+        // FIXME we need a field hidden rather than overriding the active_at here.
+        existingConvo.set('active_at', Date.now());
+        changes = true;
+      }
+
+      if (Boolean(wrapperConvo.approved) !== Boolean(existingConvo.isApproved())) {
+        await existingConvo.setIsApproved(Boolean(wrapperConvo.approved), false);
+        changes = true;
+      }
+
+      if (Boolean(wrapperConvo.approvedMe) !== Boolean(existingConvo.didApproveMe())) {
+        await existingConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
+        changes = true;
+      }
+
+      if (Boolean(wrapperConvo.approvedMe) !== Boolean(existingConvo.didApproveMe())) {
+        await existingConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
+        changes = true;
+      }
+
+      //TODO priority means more than just isPinned but has an order logic in it too
+      const shouldBePinned = wrapperConvo.priority > 0;
+      if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
+        await existingConvo.setIsPinned(shouldBePinned, false);
+        changes = true;
+      }
+
+      const convoBlocked = wrapperConvo.blocked || false;
+      await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
+
       // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
       if (changes) {
         await existingConvo.commit();
       }
 
-      // we still need to handle the the `name` (synchronous) and the `profilePicture` (asynchronous)
+      // we still need to handle the `name` (synchronous) and the `profilePicture` (asynchronous)
       await ProfileManager.updateProfileOfContact(
         existingConvo.id,
         wrapperConvo.name,
@@ -202,7 +214,6 @@ async function processMergingResults(
       });
     }
 
-    console.warn('all dumps in DB: ', await ConfigDumpData.getAllDumpsWithoutData());
     await removeFromCache(envelope);
   } catch (e) {
     window.log.error(`processMergingResults failed with ${e.message}`);
@@ -213,7 +224,6 @@ async function processMergingResults(
   // Now that the local state has been updated, trigger a config sync (this will push any
   // pending updates and properly update the state)
   if (result.result.needsPush) {
-    console.warn(`processMergingResults  ${LibSessionUtil.kindToVariant(result.kind)} needs push`);
     await ConfigurationSync.queueNewJobIfNeeded();
   }
 }
@@ -222,7 +232,7 @@ async function handleConfigMessageViaLibSession(
   envelope: EnvelopePlus,
   configMessage: IncomingMessage<SignalService.ISharedConfigMessage>
 ) {
-  // FIXME: Remove this once `useSharedUtilForUserConfig` is permanent
+  // TODO: Remove this once `useSharedUtilForUserConfig` is permanent
   if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     await removeFromCache(envelope);
     return;
@@ -234,7 +244,7 @@ async function handleConfigMessageViaLibSession(
     return;
   }
 
-  window?.log?.info('Handling our profileUdpates via libsession_util.');
+  window?.log?.info('Handling our sharedConfig message via libsession_util.');
 
   const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessage);
 
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 0e2d4fffa..2c8928d40 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -1,34 +1,34 @@
-import { EnvelopePlus } from './types';
 import { handleSwarmDataMessage } from './dataMessage';
+import { EnvelopePlus } from './types';
 
-import { removeFromCache, updateCacheWithDecryptedContent } from './cache';
-import { SignalService } from '../protobuf';
 import { compact, flatten, identity, isEmpty, pickBy, toNumber } from 'lodash';
+import { SignalService } from '../protobuf';
 import { KeyPrefixType, PubKey } from '../session/types';
+import { removeFromCache, updateCacheWithDecryptedContent } from './cache';
 
-import { BlockedNumberController } from '../util/blockedNumberController';
-import { GroupUtils, UserUtils } from '../session/utils';
-import { fromHexToArray, toHex } from '../session/utils/String';
-import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
-import { getConversationController } from '../session/conversations';
-import { ECKeyPair } from './keypairs';
-import { ConfigMessageHandler } from './configMessage';
-import { removeMessagePadding } from '../session/crypto/BufferPadding';
-import { perfEnd, perfStart } from '../session/utils/Performance';
-import { getAllCachedECKeyPair } from './closedGroups';
-import { handleCallMessage } from './callMessage';
-import { SettingsKey } from '../data/settings-key';
-import { ReadReceipts } from '../util/readReceipts';
-import { Storage } from '../util/storage';
 import { Data } from '../data/data';
+import { SettingsKey } from '../data/settings-key';
 import {
   deleteMessagesFromSwarmAndCompletelyLocally,
   deleteMessagesFromSwarmAndMarkAsDeletedLocally,
 } from '../interactions/conversations/unsendingInteractions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { getConversationController } from '../session/conversations';
+import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
+import { removeMessagePadding } from '../session/crypto/BufferPadding';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
+import { GroupUtils, UserUtils } from '../session/utils';
+import { perfEnd, perfStart } from '../session/utils/Performance';
+import { fromHexToArray, toHex } from '../session/utils/String';
+import { ReadReceipts } from '../util/readReceipts';
+import { Storage } from '../util/storage';
+import { handleCallMessage } from './callMessage';
+import { getAllCachedECKeyPair } from './closedGroups';
+import { ConfigMessageHandler } from './configMessage';
+import { ECKeyPair } from './keypairs';
+import { BlockedNumberController } from '../util';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
@@ -205,10 +205,6 @@ export async function decryptWithSessionProtocol(
   return plaintext;
 }
 
-export async function isBlocked(number: string) {
-  return BlockedNumberController.isBlockedAsync(number);
-}
-
 async function decryptUnidentifiedSender(
   envelope: EnvelopePlus,
   ciphertext: ArrayBuffer
@@ -356,7 +352,7 @@ export async function innerHandleSwarmContentMessage(
      * a control message through (if the associated closed group is not blocked)
      */
 
-    const blocked = await isBlocked(envelope.senderIdentity || envelope.source);
+    const blocked = BlockedNumberController.isBlocked(envelope.senderIdentity || envelope.source);
     perfEnd(`isBlocked-${envelope.id}`, 'isBlocked');
     if (blocked) {
       const envelopeSource = envelope.source;
@@ -444,6 +440,10 @@ export async function innerHandleSwarmContentMessage(
           authorInGroup: envelope.senderIdentity,
         };
         await ConfigMessageHandler.handleConfigMessageViaLibSession(envelope, asIncomingMsg);
+        return;
+      } else {
+        await removeFromCache(envelope);
+        return;
       }
     }
     if (content.dataExtractionNotification) {
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index ee541f300..baba864af 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -21,11 +21,11 @@ export async function doSnodeBatchRequest(
   associatedWith?: string,
   method: 'batch' | 'sequence' = 'batch'
 ): Promise<NotEmptyArrayOfBatchResults> {
-  console.warn(
-    `doSnodeBatchRequest "${method}":`,
-    subRequests.map(m => m.method),
-    subRequests
-  );
+  // console.warn(
+  //   `doSnodeBatchRequest "${method}":`,
+  //   subRequests.map(m => m.method),
+  //   subRequests
+  // );
   const result = await snodeRpc({
     method,
     params: { requests: subRequests },
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 060d9d410..180a1edce 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -10,6 +10,7 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou
 
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 
 let instance: ConversationController | null;
 
@@ -244,10 +245,12 @@ export class ConversationController {
         isApproved: false,
       });
       await conversation.commit();
+      // the call above will mark it as hidden in the wrapper already
     } else {
       window.log.info(`deleteContact !isPrivate, removing convo from DB: ${id}`);
-
+      // not a private conversation, so not a contact for the ContactWrapper
       await Data.removeConversation(id);
+
       window.log.info(`deleteContact !isPrivate, convo removed from DB: ${id}`);
 
       this.conversations.remove(conversation);
@@ -290,16 +293,22 @@ export class ConversationController {
 
         this.conversations.add(collection.models);
 
+        console.time('refreshAllWrapperContactsData');
+        for (let index = 0; index < collection.models.length; index++) {
+          const convo = collection.models[index];
+          if (convo.isPrivate()) {
+            await SessionUtilContact.refreshMappedValue(convo.id, true);
+          }
+        }
+        console.timeEnd('refreshAllWrapperContactsData');
+
         this._initialFetchComplete = true;
-        const promises: any = [];
         this.conversations.forEach((conversation: ConversationModel) => {
-          if (!conversation.get('lastMessage')) {
-            // tslint:disable-next-line: no-void-expression
-            promises.push(conversation.updateLastMessage());
+          if (conversation.isActive() && !conversation.get('lastMessage')) {
+            conversation.updateLastMessage();
           }
         });
 
-        await Promise.all(promises);
         window?.log?.info(
           `ConversationController: done with initial fetch in ${Date.now() - start}ms.`
         );
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index 0d960aa5a..a3d9d4dc9 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -4,6 +4,7 @@ import {
   FakeSleepForMultiJob,
 } from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
 import { AvatarDownload } from './jobs/AvatarDownloadJob';
+import { ConfigurationDumpSync } from './jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from './jobs/ConfigurationSyncJob';
 import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
 
@@ -17,6 +18,10 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
   switch (data.jobType) {
     case 'ConfigurationSyncJobType':
       return (new ConfigurationSync.ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
+    case 'ConfigurationSyncDumpJobType':
+      return (new ConfigurationDumpSync.ConfigurationSyncDumpJob(data) as unknown) as PersistedJob<
+        T
+      >;
 
     case 'AvatarDownloadJobType':
       return (new AvatarDownload.AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 3e62b0c90..0a36f39fc 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -5,6 +5,7 @@ import { persistedJobFromData } from './JobDeserialization';
 import { JobRunnerType } from './jobs/JobRunnerType';
 import {
   AvatarDownloadPersistedData,
+  ConfigurationSyncDumpPersistedData,
   ConfigurationSyncPersistedData,
   PersistedJob,
   RunJobResult,
@@ -172,7 +173,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
 
   private async writeJobsToDB() {
     const serialized = this.getSerializedJobs();
-    window.log.warn(`writing to db for "${this.jobRunnerType}": `, serialized);
+    window.log.debug(`writing to db for "${this.jobRunnerType}": `, serialized);
     await Data.createOrUpdateItem({
       id: this.getJobRunnerItemId(),
       value: JSON.stringify(serialized),
@@ -361,12 +362,19 @@ const configurationSyncRunner = new PersistedJobRunner<ConfigurationSyncPersiste
   'ConfigurationSyncJob',
   null
 );
+
 const avatarDownloadRunner = new PersistedJobRunner<AvatarDownloadPersistedData>(
   'AvatarDownloadJob',
   null
 );
 
+const configurationSyncDumpRunner = new PersistedJobRunner<ConfigurationSyncDumpPersistedData>(
+  'ConfigurationSyncDumpJob',
+  null
+);
+
 export const runners = {
   configurationSyncRunner,
+  configurationSyncDumpRunner,
   avatarDownloadRunner,
 };
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index a21495289..0812ad673 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -4,7 +4,8 @@ export type PersistedJobType =
   | 'ConfigurationSyncJobType'
   | 'AvatarDownloadJobType'
   | 'FakeSleepForJobType'
-  | 'FakeSleepForJobMultiType';
+  | 'FakeSleepForJobMultiType'
+  | 'ConfigurationSyncDumpJobType';
 
 interface PersistedJobData {
   jobType: PersistedJobType;
@@ -37,11 +38,16 @@ export interface ConfigurationSyncPersistedData extends PersistedJobData {
   jobType: 'ConfigurationSyncJobType';
 }
 
+export interface ConfigurationSyncDumpPersistedData extends PersistedJobData {
+  jobType: 'ConfigurationSyncDumpJobType';
+}
+
 export type TypeOfPersistedData =
   | ConfigurationSyncPersistedData
   | AvatarDownloadPersistedData
   | FakeSleepJobData
-  | FakeSleepForMultiJobData;
+  | FakeSleepForMultiJobData
+  | ConfigurationSyncDumpPersistedData;
 
 export type AddJobCheckReturn =
   | 'skipAddSameJobPresent'
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
new file mode 100644
index 000000000..851b24dac
--- /dev/null
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -0,0 +1,175 @@
+import { isNumber } from 'lodash';
+import { v4 } from 'uuid';
+import { UserUtils } from '../..';
+import { ConfigDumpData } from '../../../../data/configDump/configDump';
+import { ConfigWrapperObjectTypes } from '../../../../webworker/workers/browser/libsession_worker_functions';
+import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
+import { DURATION } from '../../../constants';
+import { getConversationController } from '../../../conversations';
+import { LibSessionUtil } from '../../libsession/libsession_utils';
+import { runners } from '../JobRunner';
+import {
+  AddJobCheckReturn,
+  ConfigurationSyncDumpPersistedData,
+  ConfigurationSyncPersistedData,
+  PersistedJob,
+  RunJobResult,
+} from '../PersistedJob';
+
+const defaultMsBetweenRetries = DURATION.SECONDS * 5;
+const defaultMaxAttempts = 2;
+
+/**
+ * We want to run each of those jobs at least 3seconds apart.
+ * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it.
+ */
+let lastRunConfigSyncJobDumpTimestamp: number | null = null;
+
+const variantsToSaveRegularly: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig'];
+
+async function saveDumpsNeededToDB(): Promise<boolean> {
+  let savedAtLeastOne = false;
+  for (let i = 0; i < variantsToSaveRegularly.length; i++) {
+    const variant = variantsToSaveRegularly[i];
+    const needsDump = await GenericWrapperActions.needsDump(variant);
+    console.info('saveDumpsNeededToDB()', variant, needsDump);
+
+    if (!needsDump) {
+      continue;
+    }
+    const dump = await GenericWrapperActions.dump(variant);
+    await ConfigDumpData.saveConfigDumpNoHashes({
+      data: dump,
+      publicKey: UserUtils.getOurPubKeyStrFromCache(),
+      variant,
+    });
+    savedAtLeastOne = true;
+  }
+  return savedAtLeastOne;
+}
+
+/**
+ * We have the `ConfigurationSyncDumpJob` and the `ConfigurationSyncJob`.
+ * The `ConfigurationSyncDumpJob` involves network request which is slow and might not be available at all, hence it can run only from time to time.
+ * But when we do changes to the wrapper, we need to dump it to the database in the event of an app crash or whatever.
+ * To it less likely to loose data, we have a lightweight job which can be run a lot more frequently, the `ConfigurationSyncDumpJob`.
+ * It just grabs all the wrappers which needs to be stored in the DB, override the data in the wrapper with what is in the database and save the result (if `needsDump` is true) to the corresponding database wrapper.
+ *
+ */
+class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersistedData> {
+  constructor({
+    identifier,
+    nextAttemptTimestamp,
+    maxAttempts,
+    currentRetry,
+  }: Partial<
+    Pick<
+      ConfigurationSyncPersistedData,
+      'identifier' | 'nextAttemptTimestamp' | 'currentRetry' | 'maxAttempts'
+    >
+  >) {
+    super({
+      jobType: 'ConfigurationSyncDumpJobType',
+      identifier: identifier || v4(),
+      delayBetweenRetries: defaultMsBetweenRetries,
+      maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts,
+      currentRetry: isNumber(currentRetry) ? currentRetry : 0,
+      nextAttemptTimestamp: nextAttemptTimestamp || Date.now(),
+    });
+  }
+
+  public async run(): Promise<RunJobResult> {
+    const start = Date.now();
+    try {
+      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+        return RunJobResult.Success;
+      }
+      window.log.debug(`ConfigurationSyncDumpJob starting ${this.persistedData.identifier}`);
+
+      const us = UserUtils.getOurPubKeyStrFromCache();
+      const ed25519Key = await UserUtils.getUserED25519KeyPairBytes();
+      const conversation = getConversationController().get(us);
+      if (!us || !conversation || !ed25519Key) {
+        // we check for ed25519Key because it is needed for authenticated requests
+        window.log.warn('did not find our own conversation');
+        return RunJobResult.PermanentFailure;
+      }
+      // refresh all the data stored by the wrappers we need to store.
+      // so when we call needsDump(), we know for sure that we are up to date
+      console.time('insertAll');
+      await LibSessionUtil.insertUserProfileIntoWrapper();
+      await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+      console.timeEnd('insertAll');
+      console.time('saveDumpsNeededToDB');
+      await saveDumpsNeededToDB();
+      console.timeEnd('saveDumpsNeededToDB');
+      return RunJobResult.Success;
+    } catch (e) {
+      throw e;
+    } finally {
+      // this is a simple way to make sure whatever happens here, we update the lastest timestamp.
+      // (a finally statement is always executed (no matter if exception or returns in other try/catch block)
+      this.updateLastTickTimestamp();
+      window.log.debug(`ConfigurationSyncDumpJob run() took ${Date.now() - start}ms`);
+    }
+  }
+
+  public serializeJob(): ConfigurationSyncDumpPersistedData {
+    const fromParent = super.serializeBase();
+    return fromParent;
+  }
+
+  public addJobCheck(jobs: Array<ConfigurationSyncDumpPersistedData>): AddJobCheckReturn {
+    return this.addJobCheckSameTypePresent(jobs);
+  }
+
+  /**
+   * For the SharedConfig job, we do not care about the jobs already in the list.
+   * We never want to add a new sync configuration job if there is already one in the queue.
+   * This is done by the `addJobCheck` method above
+   */
+  public nonRunningJobsToRemove(_jobs: Array<ConfigurationSyncDumpPersistedData>) {
+    return [];
+  }
+
+  public getJobTimeoutMs(): number {
+    return DURATION.SECONDS * 2;
+  }
+
+  private updateLastTickTimestamp() {
+    lastRunConfigSyncJobDumpTimestamp = Date.now();
+  }
+}
+
+/**
+ * Queue a new Sync Configuration if needed job.
+ * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
+ */
+async function queueNewJobIfNeeded() {
+  if (
+    !lastRunConfigSyncJobDumpTimestamp ||
+    lastRunConfigSyncJobDumpTimestamp < Date.now() - defaultMsBetweenRetries
+  ) {
+    window.log.debug('scheduling conf sync dump job in asap');
+
+    // this call will make sure that there is only one configuration sync job at all times
+    await runners.configurationSyncDumpRunner.addJob(
+      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() })
+    );
+  } else {
+    // if we did run at 100, and it is currently 110, diff is 10
+    const diff = Math.max(Date.now() - lastRunConfigSyncJobDumpTimestamp, 0);
+    // but we want to run every 30, so what we need is actually `30-10` from now = 20
+    const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
+    window.log.debug(`scheduling conf sync dump job in ${leftBeforeNextTick} ms`);
+
+    await runners.configurationSyncDumpRunner.addJob(
+      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
+    );
+  }
+}
+
+export const ConfigurationDumpSync = {
+  ConfigurationSyncDumpJob,
+  queueNewJobIfNeeded,
+};
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 401ad71ab..43527311c 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -284,19 +284,20 @@ async function queueNewJobIfNeeded() {
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
   ) {
-    window.log.debug('scheduling conf sync job in asap');
+    window.log.debug('scheduling conf sync job ASAP');
 
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() })
     );
   } else {
-    // if we did run at 100, and it is currently 110, diff is 10
+    // if we did run at t=100, and it is currently t=110, diff is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
     window.log.debug(`scheduling conf sync job in ${leftBeforeNextTick} ms`);
 
+    // TODO we need to make the addJob wait for the previous addJob to be done before it can be called.
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
     );
diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
index d24a2dc78..c88f9a4ba 100644
--- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts
+++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
@@ -1,5 +1,6 @@
 export type JobRunnerType =
   | 'ConfigurationSyncJob'
+  | 'ConfigurationSyncDumpJob'
   | 'FakeSleepForJob'
   | 'FakeSleepForMultiJob'
   | 'AvatarDownloadJob';
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index df8706839..490f6986b 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -88,7 +88,7 @@ async function initializeLibSessionUtilWrappers() {
 
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
-    console.warn('forl oop init', dump.variant);
+    console.warn('for loop init', dump.variant);
     try {
       if (!createdDuringFirstStart.includes(dump.variant)) {
         await GenericWrapperActions.init(
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index a6f0389e6..35b5ceb49 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -1,19 +1,36 @@
 import { isEmpty, isEqual } from 'lodash';
 import { UserUtils } from '..';
 import { ConversationModel } from '../../../models/conversation';
-import { BlockedNumberController } from '../../../util';
 import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { getConversationController } from '../../conversations';
 import { PubKey } from '../../types';
 import { fromHexToArray } from '../String';
+import { ContactInfo } from 'session_util_wrapper';
+
+/**
+ * This file is centralizing the management of data from the Contacts Wrapper of libsession.
+ * It allows to make changes to the wrapper and keeps track of the decoded values of those in the in-memory cache named `mappedContactWrapperValues`.
+ *
+ * The wrapper content is just a blob which has no structure.
+ * Rather than having to fetch the required data from it everytime we need it (during each rerendering), we keep a decoded cache here.
+ * Essentially, on app start we load all the content from the wrapper with `SessionUtilContact.refreshMappedValue` during the ConversationController initial load.
+ * Then, everytime we do a change to the contacts wrapper, we do it through `insertContactFromDBIntoWrapperAndRefresh`.
+ * This applies the change from the in-memory conversationModel to the ContactsWrapper, refetch the data from it and update the decoded cache `mappedContactWrapperValues` with the up to date data.
+ * It then triggers a UI refresh of that specific conversation with `triggerUIRefresh` to make sure whatever is displayed on screen is still up to date with the wrapper content.
+ *
+ * Also, to make sure that our wrapper is up to date, we schedule jobs to be run and fetch all contacts and update all the wrappers entries.
+ * This is done in the
+ *    - `ConfigurationSyncJob` (sending data to the network) and the
+ *    - `ConfigurationSyncDumpJob` (just dumping locally the data)
+ * with `insertAllContactsIntoContactsWrapper()`
+ *
+ */
+const mappedContactWrapperValues = new Map<string, ContactInfo>();
 
 /**
  * Update the ContactWrapper with all the data is cares about from the database.
  */
 async function insertAllContactsIntoContactsWrapper() {
-  console.error(
-    'we need to find a way to keep track of what was changed as ids and only insert those in the wrapper'
-  );
   const idsToInsert = getConversationController()
     .getConversations()
     .filter(filterContactsToStoreInContactsWrapper)
@@ -23,8 +40,10 @@ async function insertAllContactsIntoContactsWrapper() {
 
   for (let index = 0; index < idsToInsert.length; index++) {
     const id = idsToInsert[index];
-    console.warn(`inserting into wrapper ${id}`);
-    await insertContactFromDBIntoWrapper(id);
+    console.warn(
+      `inserting into wrapper ${id}: ${getConversationController().get(id)?.attributes.nickname}`
+    );
+    await insertContactFromDBIntoWrapperAndRefresh(id);
   }
 }
 
@@ -37,6 +56,7 @@ function filterContactsToStoreInContactsWrapper(convo: ConversationModel): boole
   return (
     !convo.isMe() &&
     convo.isPrivate() &&
+    convo.isActive() &&
     !PubKey.hasBlindedPrefix(convo.id) &&
     (convo.isApproved() || convo.didApproveMe())
   );
@@ -46,7 +66,8 @@ function filterContactsToStoreInContactsWrapper(convo: ConversationModel): boole
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that contact does not exist in the wrapper, it is created before being updated.
  */
-async function insertContactFromDBIntoWrapper(id: string): Promise<void> {
+// tslint:disable-next-line: cyclomatic-complexity
+async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
   const us = UserUtils.getOurPubKeyStrFromCache();
   if (id === us) {
     window.log.info(
@@ -60,15 +81,24 @@ async function insertContactFromDBIntoWrapper(id: string): Promise<void> {
     return;
   }
 
+  if (!filterContactsToStoreInContactsWrapper(foundConvo)) {
+    window.log.info(`insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved`);
+    return;
+  }
+
+  console.time(`ContactsWrapperActions.set ${id}`);
+
   const dbName = foundConvo.get('displayNameInProfile') || undefined;
   const dbNickname = foundConvo.get('nickname') || undefined;
   const dbProfileUrl = foundConvo.get('avatarPointer') || undefined;
   const dbProfileKey = foundConvo.get('profileKey') || undefined;
-  const dbApproved = foundConvo.get('isApproved') || false;
-  const dbApprovedMe = foundConvo.get('didApproveMe') || false;
-  const dbBlocked = BlockedNumberController.isBlocked(id) || false;
+  const dbApproved = !!foundConvo.get('isApproved') || false;
+  const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
+  const dbBlocked = !!foundConvo.isBlocked() || false;
 
   const wrapperContact = await ContactsWrapperActions.getOrCreate(id);
+  const activeAt = foundConvo.get('active_at');
+  const isPinned = foundConvo.get('isPinned');
 
   // override the values with what we have in the DB. the library will do the diff
   wrapperContact.approved = dbApproved;
@@ -76,6 +106,8 @@ async function insertContactFromDBIntoWrapper(id: string): Promise<void> {
   wrapperContact.blocked = dbBlocked;
   wrapperContact.name = dbName;
   wrapperContact.nickname = dbNickname;
+  wrapperContact.hidden = !activeAt || activeAt <= 0;
+  wrapperContact.priority = !!isPinned ? 1 : 0; // TODO the priority handling is not that simple
 
   if (
     wrapperContact.profilePicture?.url !== dbProfileUrl ||
@@ -86,12 +118,43 @@ async function insertContactFromDBIntoWrapper(id: string): Promise<void> {
       key: dbProfileKey && !isEmpty(dbProfileKey) ? fromHexToArray(dbProfileKey) : null,
     };
   }
-  console.time('ContactsWrapperActions.set');
   await ContactsWrapperActions.set(wrapperContact);
-  console.timeEnd('ContactsWrapperActions.set');
+
+  await refreshMappedValue(id);
+
+  console.timeEnd(`ContactsWrapperActions.set ${id}`);
+}
+
+async function refreshMappedValue(id: string, duringAppStart = false) {
+  const fromWrapper = await ContactsWrapperActions.get(id);
+  if (fromWrapper) {
+    SessionUtilContact.setMappedValue(fromWrapper);
+    if (!duringAppStart) {
+      getConversationController()
+        .get(id)
+        ?.triggerUIRefresh();
+    }
+  }
+}
+
+function setMappedValue(info: ContactInfo) {
+  mappedContactWrapperValues.set(info.id, info);
+}
+
+function getMappedValue(id: string) {
+  return mappedContactWrapperValues.get(id);
+}
+
+function removeMappedValue(id: string) {
+  mappedContactWrapperValues.delete(id);
 }
 
 export const SessionUtilContact = {
   filterContactsToStoreInContactsWrapper,
   insertAllContactsIntoContactsWrapper,
+  insertContactFromDBIntoWrapperAndRefresh,
+  setMappedValue,
+  getMappedValue,
+  removeMappedValue,
+  refreshMappedValue,
 };
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 9060e0639..6d7004020 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -331,7 +331,7 @@ describe('JobRunner', () => {
     });
   });
 
-  describe('retriesFailing Jobns', () => {
+  describe('retriesFailing Jobs', () => {
     it('does not await if no job at all ', async () => {
       await runner.loadJobsFromDb();
       runner.startProcessing();
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index ad22af144..02c6a7f74 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -1,11 +1,9 @@
 // tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
 
 import { expect } from 'chai';
+import Sinon from 'sinon';
 import { BlockedNumberController } from '../../util/blockedNumberController';
 import { TestUtils } from '../test-utils';
-import { PubKey } from '../../session/types';
-import { UserUtils } from '../../session/utils';
-import Sinon from 'sinon';
 
 // tslint:disable-next-line: max-func-body-length
 describe('BlockedNumberController', () => {
@@ -115,32 +113,4 @@ describe('BlockedNumberController', () => {
       );
     });
   });
-
-  describe('isBlockedAsync', () => {
-    let ourDevice: PubKey;
-    beforeEach(() => {
-      ourDevice = TestUtils.generateFakePubKey();
-      Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourDevice.key);
-    });
-    it('should return false for our device', async () => {
-      const isBlocked = await BlockedNumberController.isBlockedAsync(ourDevice);
-      expect(isBlocked).to.equal(false, 'Expected our device to return false');
-    });
-
-    it('should return true if the device is blocked', async () => {
-      const other = TestUtils.generateFakePubKey();
-      memoryDB.blocked = [other.key];
-
-      const isBlocked = await BlockedNumberController.isBlockedAsync(other);
-      expect(isBlocked).to.equal(true, 'Expected isBlockedAsync to return true.');
-    });
-
-    it('should return false if device is not blocked', async () => {
-      const other = TestUtils.generateFakePubKey();
-      memoryDB.blocked = [];
-
-      const isBlocked = await BlockedNumberController.isBlockedAsync(other);
-      expect(isBlocked).to.equal(false, 'Expected isBlockedAsync to return false.');
-    });
-  });
 });
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index a494bb6a2..9c5a9a270 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -43,6 +43,10 @@ export type ConfigDumpRowWithoutData = Pick<
   'publicKey' | 'combinedMessageHashes' | 'variant'
 >;
 
+export type ConfigDumpRowWithoutHashes = Pick<ConfigDumpRow, 'publicKey' | 'variant' | 'data'>;
+
+export const CONFIG_DUMP_TABLE = 'configDump';
+
 // ========== configdump
 
 export type ConfigDumpDataNode = {
@@ -55,6 +59,7 @@ export type ConfigDumpDataNode = {
     publicKey: string
   ) => Array<string>;
   saveConfigDump: (dump: ConfigDumpRow) => void;
+  saveConfigDumpNoHashes: (dump: ConfigDumpRowWithoutHashes) => void;
   saveCombinedMessageHashesForMatching: (row: ConfigDumpRowWithoutData) => void;
 
   getAllDumpsWithData: () => Array<ConfigDumpRow>;
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 2e0a31c18..e1d35b959 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -17,6 +17,7 @@ import {
 import { Registration } from './registration';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { SessionKeyPair } from '../receiver/keypairs';
+import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 
 /**
  * Might throw
@@ -196,7 +197,13 @@ async function registrationDone(ourPubkey: string, displayName: string) {
     ourPrimary: ourPubkey,
   };
   window.inboxStore?.dispatch(userActions.userChanged(user));
+
   await Registration.markDone();
+  try {
+    await LibSessionUtil.initializeLibSessionUtilWrappers();
+  } catch (e) {
+    window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
+  }
   window?.log?.info('dispatching registration event');
   trigger('registration_done');
 }
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index 4e9932a25..af1553558 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -1,7 +1,6 @@
 import { Data } from '../data/data';
-import { getConversationController } from '../session/conversations';
+import { commitConversationAndRefreshWrapper } from '../models/conversation';
 import { PubKey } from '../session/types';
-import { UserUtils } from '../session/utils';
 
 const BLOCKED_NUMBERS_ID = 'blocked';
 
@@ -10,22 +9,6 @@ export class BlockedNumberController {
   private static loaded: boolean = false;
   private static blockedNumbers: Set<string> = new Set();
 
-  /**
-   * Check if a device is blocked.
-   *
-   * @param user The user.
-   */
-  public static async isBlockedAsync(user: string | PubKey): Promise<boolean> {
-    await this.load();
-    const isOurDevice = UserUtils.isUsFromCache(user);
-    if (isOurDevice) {
-      return false;
-    }
-
-    const pubkey = PubKey.cast(user);
-    return this.blockedNumbers.has(pubkey.key);
-  }
-
   /**
    * Check if a device is blocked synchronously.
    * This will only check against the memory cache on if a device is blocked, it is reccomended to pass in the primary device pub key.
@@ -55,6 +38,7 @@ export class BlockedNumberController {
     if (!this.blockedNumbers.has(toBlock.key)) {
       this.blockedNumbers.add(toBlock.key);
       await this.saveToDB(BLOCKED_NUMBERS_ID, this.blockedNumbers);
+      await commitConversationAndRefreshWrapper(toBlock.key);
     }
   }
 
@@ -92,12 +76,17 @@ export class BlockedNumberController {
       }
     });
 
-    users.map(user => {
-      const found = getConversationController().get(user);
-      if (found) {
-        found.triggerUIRefresh();
+    for (let index = 0; index < users.length; index++) {
+      const user = users[index];
+      try {
+        await commitConversationAndRefreshWrapper(user);
+      } catch (e) {
+        window.log.warn(
+          'failed to SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh with: ',
+          user
+        );
       }
-    });
+    }
 
     if (changes) {
       await this.saveToDB(BLOCKED_NUMBERS_ID, this.blockedNumbers);

From 3c58f9c1e494fbe8e9f0c4f27ea15e74102359c3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Feb 2023 17:09:08 +1100
Subject: [PATCH 038/178] feat: add a hidden flag for convos and use it with
 the contactswrapper

---
 ts/components/leftpane/ActionsPanel.tsx       |   5 +-
 .../leftpane/overlay/OverlayMessage.tsx       |   8 +-
 ts/data/data.ts                               |   7 +-
 ts/interactions/conversationInteractions.ts   |   4 +-
 ts/models/conversation.ts                     |  17 +-
 ts/models/conversationAttributes.ts           |   3 +
 ts/node/database_utility.ts                   |   3 +
 ts/node/migration/sessionMigrations.ts        | 254 +++++++++++++++++-
 ts/node/sql.ts                                |  16 +-
 ts/receiver/configMessage.ts                  |  12 +-
 ts/receiver/contentMessage.ts                 |  22 +-
 ts/receiver/queuedJob.ts                      |   7 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   1 +
 .../conversations/ConversationController.ts   |  29 +-
 ts/session/group/closed-group.ts              |   2 +
 ts/session/utils/calling/CallManager.ts       |   5 +-
 .../job_runners/jobs/AvatarDownloadJob.ts     |   8 +-
 .../utils/libsession/libsession_utils.ts      |   8 +-
 .../libsession/libsession_utils_contacts.ts   |  64 ++---
 ts/session/utils/sync/syncUtils.ts            |  53 ++--
 ts/state/ducks/conversations.ts               |   1 +
 ts/state/ducks/search.ts                      |  20 +-
 ts/state/selectors/conversations.ts           |   3 +-
 .../unit/selectors/conversations_test.ts      |  10 +
 ts/test/session/unit/utils/SyncUtils_test.ts  |   2 +-
 ts/test/util/blockedNumberController_test.ts  |   4 +-
 ts/types/sqlSharedTypes.ts                    |  54 ++++
 ts/util/blockedNumberController.ts            |  18 +-
 28 files changed, 492 insertions(+), 148 deletions(-)

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 397e4073e..470f8c668 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -164,11 +164,12 @@ const setupTheme = async () => {
 
 // Do this only if we created a new Session ID, or if we already received the initial configuration message
 const triggerSyncIfNeeded = async () => {
+  const us = UserUtils.getOurPubKeyStrFromCache();
   await getConversationController()
-    .get(UserUtils.getOurPubKeyStrFromCache())
+    .get(us)
     .setDidApproveMe(true, true);
   await getConversationController()
-    .get(UserUtils.getOurPubKeyStrFromCache())
+    .get(us)
     .setIsApproved(true, true);
   const didWeHandleAConfigurationMessageAlready =
     (await Data.getItemById(hasSyncedInitialConfigurationItem))?.value || false;
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 724d260b0..8583ab6ac 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -63,8 +63,12 @@ export const OverlayMessage = () => {
     );
 
     // we now want to show a conversation we just started on the leftpane, even if we did not send a message to it yet
-    if (!convo.isActive() || !convo.isApproved()) {
-      convo.set({ active_at: Date.now(), isApproved: true });
+    if (!convo.isActive() || !convo.isApproved() || convo.isHidden()) {
+      // bump the timestamp only if we were not active before
+      if (!convo.isActive()) {
+        convo.set({ active_at: Date.now(), isApproved: true, hidden: false });
+      }
+      convo.set({ isApproved: true, hidden: false });
       await convo.commit();
     }
 
diff --git a/ts/data/data.ts b/ts/data/data.ts
index da761fe80..b2b2458cf 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -7,9 +7,11 @@ import { ConversationCollection, ConversationModel } from '../models/conversatio
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { MessageCollection, MessageModel } from '../models/message';
 import { MessageAttributes, MessageDirection } from '../models/messageType';
+import { StorageItem } from '../node/storage_item';
 import { HexKeyPair } from '../receiver/keypairs';
 import { getSodiumRenderer } from '../session/crypto';
 import { PubKey } from '../session/types';
+import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/utils/String';
 import {
   AsyncWrapper,
   MsgDuplicateSearchOpenGroup,
@@ -20,8 +22,6 @@ import { ExpirationTimerOptions } from '../util/expiringMessages';
 import { Storage } from '../util/storage';
 import { channels } from './channels';
 import * as dataInit from './dataInit';
-import { StorageItem } from '../node/storage_item';
-import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/utils/String';
 import { cleanData } from './dataUtils';
 
 const ERASE_SQL_KEY = 'erase-sql-key';
@@ -142,7 +142,7 @@ async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: string): P
 
 // Conversation
 async function saveConversation(data: ConversationAttributes): Promise<void> {
-  const cleaned = cleanData(data);
+  const cleaned = cleanData(data) as ConversationAttributes;
   /**
    * Merging two conversations in `handleMessageRequestResponse` introduced a bug where we would mark conversation active_at to be -Infinity.
    * The root issue has been fixed, but just to make sure those INVALID DATE does not show up, update those -Infinity active_at conversations to be now(), once.,
@@ -150,6 +150,7 @@ async function saveConversation(data: ConversationAttributes): Promise<void> {
   if (cleaned.active_at === -Infinity) {
     cleaned.active_at = Date.now();
   }
+
   await channels.saveConversation(cleaned);
 }
 
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index affa7429b..7190f7418 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -102,14 +102,14 @@ export async function unblockConvoById(conversationId: string) {
   if (!conversation) {
     // we assume it's a block contact and not group.
     // this is to be able to unlock a contact we don't have a conversation with.
-    await BlockedNumberController.unblock(conversationId);
+    await BlockedNumberController.unblockAll([conversationId]);
     ToastUtils.pushToastSuccess('unblocked', window.i18n('unblocked'));
     return;
   }
   if (!conversation.id || conversation.isPublic()) {
     return;
   }
-  await BlockedNumberController.unblock(conversationId);
+  await BlockedNumberController.unblockAll([conversationId]);
   ToastUtils.pushToastSuccess('unblocked', window.i18n('unblocked'));
   await conversation.commit();
 }
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 42b68a99d..0b9d5e622 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -258,6 +258,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return Boolean(this.get('active_at'));
   }
 
+  public isHidden() {
+    return Boolean(this.get('hidden'));
+  }
+
   public async cleanup() {
     await deleteExternalFilesOfConversation(this.attributes);
   }
@@ -310,6 +314,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       id: this.id as string,
       activeAt: this.get('active_at'),
       type: this.get('type'),
+      isHidden: !!this.get('hidden'),
     };
 
     if (isPrivate) {
@@ -562,6 +567,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (this.isPublic() && !this.isOpenGroupV2()) {
         throw new Error('Only opengroupv2 are supported now');
       }
+
+      // we are trying to send a message to someone. If that convo is hidden in the list, make sure it is not
+      if (this.isHidden()) {
+        this.set({ hidden: false });
+        await this.commit();
+      }
       // an OpenGroupV2 message is just a visible message
       const chatMessageParams: VisibleMessageParams = {
         body,
@@ -1682,7 +1693,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * profileKey MUST be a hex string
    * @param profileKey MUST be a hex string
    */
-  public async setProfileKey(profileKey?: Uint8Array, autoCommit = true) {
+  public async setProfileKey(profileKey?: Uint8Array, shouldCommit = true) {
     if (!profileKey) {
       return;
     }
@@ -1695,7 +1706,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         profileKey: profileKeyHex,
       });
 
-      if (autoCommit) {
+      if (shouldCommit) {
         await this.commit();
       }
     }
@@ -2198,6 +2209,8 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   }
   // write to DB
   // TODO remove duplicates between db and wrapper (except nickname&name as we need them for search)
+
+  // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
   await Data.saveConversation(convo.attributes);
 
   const shouldBeSavedToWrapper = SessionUtilContact.filterContactsToStoreInContactsWrapper(convo);
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 11b3fa958..70964d624 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -94,6 +94,8 @@ export interface ConversationAttributes {
    * When we create a closed group v3 or get promoted to admim, we need to save the private key of that closed group.
    */
   // identityPrivateKey?: string;
+
+  hidden: boolean;
 }
 
 /**
@@ -129,5 +131,6 @@ export const fillConvoAttributesWithDefaults = (
     mentionedUs: false,
     isKickedFromGroup: false,
     left: false,
+    hidden: true,
   });
 };
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 69a68ad85..0339029da 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -78,6 +78,7 @@ const allowedKeysFormatRowOfConversation = [
   'conversationIdOrigin',
   'identityPrivateKey',
   'markedAsUnread',
+  'hidden',
 ];
 // tslint:disable: cyclomatic-complexity
 export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
@@ -134,6 +135,7 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
   convo.writeCapability = Boolean(convo.writeCapability);
   convo.uploadCapability = Boolean(convo.uploadCapability);
   convo.markedAsUnread = Boolean(convo.markedAsUnread);
+  convo.hidden = Boolean(convo.hidden);
 
   if (!convo.conversationIdOrigin) {
     convo.conversationIdOrigin = undefined;
@@ -214,6 +216,7 @@ const allowedKeysOfConversationAttributes = [
   'conversationIdOrigin',
   'identityPrivateKey',
   'markedAsUnread',
+  'hidden',
 ];
 
 /**
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 6b6695b54..14d581f5f 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,11 +1,19 @@
 import * as BetterSqlite3 from 'better-sqlite3';
-import { compact, map, pick } from 'lodash';
+import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
+import { compact, isArray, isEmpty, map, pick } from 'lodash';
+import {
+  ContactsConfigWrapperInsideWorker,
+  UserConfigWrapperInsideWorker,
+} from 'session_util_wrapper';
 import { ConversationAttributes } from '../../models/conversationAttributes';
+import { fromHexToArray } from '../../session/utils/String';
+import { CONFIG_DUMP_TABLE, getContactInfoFromDBValues } from '../../types/sqlSharedTypes';
 import {
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
   CONVERSATIONS_TABLE,
   dropFtsAndTriggers,
   GUARD_NODE_TABLE,
+  ITEMS_TABLE,
   jsonToObject,
   LAST_HASHES_TABLE,
   MESSAGES_TABLE,
@@ -13,6 +21,7 @@ import {
   objectToJSON,
   OPEN_GROUP_ROOMS_V2_TABLE,
   rebuildFtsTable,
+  toSqliteBoolean,
 } from '../database_utility';
 
 import { sqlNode } from '../sql';
@@ -1224,6 +1233,118 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
+function getIdentityKeysDuringMigration(db: BetterSqlite3.Database) {
+  const row = db.prepare(`SELECT * FROM ${ITEMS_TABLE} WHERE id = $id;`).get({
+    id: 'identityKey',
+  });
+
+  if (!row) {
+    return null;
+  }
+  try {
+    const parsedIdentityKey = jsonToObject(row.json);
+    if (
+      !parsedIdentityKey?.value?.pubKey ||
+      !parsedIdentityKey?.value?.ed25519KeyPair?.privateKey
+    ) {
+      return null;
+    }
+    const publicKeyBase64 = parsedIdentityKey?.value?.pubKey;
+    const publicKeyHex = to_hex(from_base64(publicKeyBase64, base64_variants.ORIGINAL));
+
+    const ed25519PrivateKeyUintArray = parsedIdentityKey?.value?.ed25519KeyPair?.privateKey;
+
+    // TODO migrate the ed25519KeyPair for all the users already logged in to a base64 representation
+    const privateEd25519 = new Uint8Array(Object.values(ed25519PrivateKeyUintArray));
+
+    if (!privateEd25519 || isEmpty(privateEd25519)) {
+      return null;
+    }
+
+    return {
+      publicKeyHex,
+      privateEd25519,
+    };
+  } catch (e) {
+    return null;
+  }
+}
+
+function insertContactIntoWrapper(
+  contact: any,
+  blockedNumbers: Array<string>,
+  contactsConfigWrapper: ContactsConfigWrapperInsideWorker
+) {
+  const dbApproved = !!contact.isApproved || false;
+  const dbApprovedMe = !!contact.didApproveMe || false;
+  const dbBlocked = blockedNumbers.includes(contact.id);
+  const hidden = contact.hidden || false;
+  const isPinned = contact.isPinned;
+
+  const wrapperContact = getContactInfoFromDBValues({
+    id: contact.id,
+    dbApproved,
+    dbApprovedMe,
+    dbBlocked,
+    dbName: contact.displayNameInProfile || undefined,
+    dbNickname: contact.nickname || undefined,
+    dbProfileKey: contact.profileKey || undefined,
+    dbProfileUrl: contact.avatarPointer || undefined,
+    isPinned,
+    hidden,
+  });
+
+  try {
+    console.info('Inserting contact into wrapper: ', wrapperContact);
+    contactsConfigWrapper.set(wrapperContact);
+  } catch (e) {
+    console.error(
+      `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}`
+    );
+    // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
+    try {
+      console.info('Inserting edited contact into wrapper: ', contact.id);
+      contactsConfigWrapper.set(
+        getContactInfoFromDBValues({
+          id: contact.id,
+          dbApproved,
+          dbApprovedMe,
+          dbBlocked,
+          dbName: undefined,
+          dbNickname: undefined,
+          dbProfileKey: undefined,
+          dbProfileUrl: undefined,
+          isPinned: false,
+          hidden,
+        })
+      );
+    } catch (e) {
+      // there is nothing else we can do here
+      console.error(
+        `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}. Skipping contact entirely`
+      );
+    }
+  }
+}
+
+function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
+  try {
+    const blockedItem = sqlNode.getItemById('blocked', db);
+    if (!blockedItem) {
+      throw new Error('no blocked contacts at all');
+    }
+    const foundBlocked = blockedItem?.value;
+    console.warn('foundBlockedNumbers during migration', foundBlocked);
+    if (isArray(foundBlocked)) {
+      return foundBlocked;
+    }
+    return [];
+  } catch (e) {
+    console.warn('failed to read blocked numbers. Considering no blocked numbers', e.stack);
+    return [];
+  }
+}
+
 function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite3.Database) {
   const targetVersion = 31;
   if (currentVersion >= targetVersion) {
@@ -1235,6 +1356,27 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
    * Create a table to store our sharedConfigMessage dumps
    */
   db.transaction(() => {
+    // when deleting a contact we now mark it as 'hidden' rather than overriding the `active_at` field.
+    // by default, conversation are hidden
+    db.exec(
+      `ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN hidden INTEGER NOT NULL DEFAULT ${toSqliteBoolean(
+        true
+      )} ;`
+    );
+    // mark every "active" private chats as not hidden
+    db.prepare(
+      `UPDATE ${CONVERSATIONS_TABLE} SET
+        hidden = ${toSqliteBoolean(false)}
+        WHERE type = 'private' AND active_at > 0 AND (didApproveMe OR isApproved);`
+    ).run({});
+
+    // mark every not private chats (groups or communities) as not hidden (even if a group was left or we were kicked, we want it visible in the app)
+    db.prepare(
+      `UPDATE ${CONVERSATIONS_TABLE} SET
+        hidden = ${toSqliteBoolean(false)}
+        WHERE type <> 'private' AND active_at > 0;`
+    ).run({});
+
     db.exec(`CREATE TABLE configDump(
       variant TEXT NOT NULL,
       publicKey TEXT NOT NULL,
@@ -1244,6 +1386,116 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       );
       `);
 
+    try {
+      const keys = getIdentityKeysDuringMigration(db);
+
+      if (!keys || !keys.privateEd25519 || isEmpty(keys.privateEd25519)) {
+        throw new Error('privateEd25519 was empty. Considering no users are logged in');
+      }
+      const { privateEd25519, publicKeyHex } = keys;
+      const userProfileWrapper = new UserConfigWrapperInsideWorker(privateEd25519, null);
+      const contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(privateEd25519, null);
+
+      /**
+       * Setup up the User profile wrapper with what is stored in our own conversation
+       */
+
+      const ourConversation = sqlNode.getConversationById(publicKeyHex, db);
+      if (!ourConversation) {
+        throw new Error('Failed to find our logged in conversation while migrating');
+      }
+
+      // Insert the user profile into the userWrappoer
+      const ourDbName = ourConversation.displayNameInProfile || '';
+      const ourDbProfileUrl = ourConversation.avatarPointer || '';
+      const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
+      userProfileWrapper.setName(ourDbName);
+
+      if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
+        userProfileWrapper.setProfilePicture(ourDbProfileUrl, ourDbProfileKey);
+      } else {
+        userProfileWrapper.setProfilePicture('', new Uint8Array());
+      }
+
+      // dump the user wrapper content and save it to the DB
+      const userDump = userProfileWrapper.dump();
+
+      db.prepare(
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
+              publicKey,
+              variant,
+              combinedMessageHashes,
+              data
+          ) values (
+            $publicKey,
+            $variant,
+            $combinedMessageHashes,
+            $data
+          );`
+      ).run({
+        publicKey: publicKeyHex,
+        variant: 'UserConfig',
+        combinedMessageHashes: JSON.stringify([]),
+        data: userDump,
+      });
+
+      /**
+       * Setup up the Contacts Wrapper with all the contact details which needs to be stored in it.
+       */
+      const blockedNumbers = getBlockedNumbersDuringMigration(db);
+
+      // this filter is based on the `filterContactsToStoreInContactsWrapper` function.
+      const contactsToWriteInWrapper = db
+        .prepare(
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> $us AND id NOT LIKE '15%' ;`
+        )
+        .all({
+          us: publicKeyHex,
+        });
+
+      if (isArray(contactsToWriteInWrapper) && contactsToWriteInWrapper.length) {
+        console.warn(
+          '===================== Starting contact inserting into wrapper ======================='
+        );
+
+        console.info(
+          'Writing contacts to wrapper during migration. length: ',
+          contactsToWriteInWrapper?.length
+        );
+
+        contactsToWriteInWrapper.forEach(contact => {
+          insertContactIntoWrapper(contact, blockedNumbers, contactsConfigWrapper);
+        });
+
+        console.warn('===================== Done with contact inserting =======================');
+      }
+      const contactsDump = contactsConfigWrapper.dump();
+
+      db.prepare(
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
+              publicKey,
+              variant,
+              combinedMessageHashes,
+              data
+          ) values (
+            $publicKey,
+            $variant,
+            $combinedMessageHashes,
+            $data
+          );`
+      ).run({
+        publicKey: publicKeyHex,
+        variant: 'ContactsConfig',
+        combinedMessageHashes: JSON.stringify([]),
+        data: contactsDump,
+      });
+
+      // TODO we've just created the initial dumps. We have to add an initial SyncJob to the database so it is run on the next app start/
+      // or find another way of adding one on the next start (store an another item in the DB and check for it on app start?)
+    } catch (e) {
+      console.error(`failed to create initial wrapper: `, e.stack);
+    }
+
     // db.exec(`ALTER TABLE conversations
     //   ADD COLUMN lastReadTimestampMs INTEGER;
     //   ;
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 925a0678d..0815c6e5b 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -292,8 +292,8 @@ function updateGuardNodes(nodes: Array<string>) {
 function createOrUpdateItem(data: StorageItem, instance?: BetterSqlite3.Database) {
   createOrUpdate(ITEMS_TABLE, data, instance);
 }
-function getItemById(id: string) {
-  return getById(ITEMS_TABLE, id);
+function getItemById(id: string, instance?: BetterSqlite3.Database) {
+  return getById(ITEMS_TABLE, id, instance);
 }
 function getAllItems() {
   const rows = assertGlobalInstance()
@@ -443,6 +443,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     avatarInProfile,
     displayNameInProfile,
     conversationIdOrigin,
+    hidden,
     // identityPrivateKey,
   } = formatted;
 
@@ -504,6 +505,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       displayNameInProfile,
       conversationIdOrigin,
       // identityPrivateKey,
+      hidden,
     });
 }
 
@@ -527,8 +529,8 @@ function removeConversation(id: string | Array<string>) {
     .run(id);
 }
 
-function getConversationById(id: string) {
-  const row = assertGlobalInstance()
+function getConversationById(id: string, instance?: BetterSqlite3.Database) {
+  const row = assertGlobalInstanceOrInstance(instance)
     .prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`)
     .get({
       id,
@@ -610,7 +612,7 @@ function searchConversations(query: string) {
       (
         displayNameInProfile LIKE $displayNameInProfile OR
         nickname LIKE $nickname
-      ) AND active_at IS NOT NULL AND active_at > 0
+      ) AND active_at > 0
      ORDER BY active_at DESC
      LIMIT $limit`
     )
@@ -654,6 +656,10 @@ function searchMessages(query: string, limit: number) {
   }));
 }
 
+/**
+ * Search for matching messages in a specific conversation.
+ * Currently unused but kept as we want to add it back at some point.
+ */
 function searchMessagesInConversation(query: string, conversationId: string, limit: number) {
   const rows = assertGlobalInstance()
     .prepare(
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 3cc5f32bc..2c7dd0a2e 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -36,10 +36,12 @@ async function mergeConfigsWithIncomingUpdates(
   const toMerge = [incomingConfig.message.data];
   const wrapperId = LibSessionUtil.kindToVariant(kind);
   try {
+    window.log.warn(`${wrapperId} right before merge of ${toMerge.length} arrays`);
     await GenericWrapperActions.merge(wrapperId, toMerge);
+    window.log.warn(`${wrapperId} right after merge.`);
     const needsPush = await GenericWrapperActions.needsPush(wrapperId);
     const needsDump = await GenericWrapperActions.needsDump(wrapperId);
-    console.info(`${wrapperId} needsPush:${needsPush} needsDump:${needsDump} `);
+    window.log.info(`${wrapperId} needsPush:${needsPush} needsDump:${needsDump} `);
 
     const messageHashes = [incomingConfig.messageHash];
     const latestSentTimestamp = incomingConfig.envelopeTimestamp;
@@ -99,15 +101,13 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       let changes = false;
 
       // the display name set is handled in `updateProfileOfContact`
-
       if (wrapperConvo.nickname !== existingConvo.getNickname()) {
         await existingConvo.setNickname(wrapperConvo.nickname || null, false);
         changes = true;
       }
 
-      if (!wrapperConvo.hidden && !existingConvo.isActive()) {
-        // FIXME we need a field hidden rather than overriding the active_at here.
-        existingConvo.set('active_at', Date.now());
+      if (!wrapperConvo.hidden && !existingConvo.isHidden()) {
+        existingConvo.set({ hidden: false });
         changes = true;
       }
 
@@ -429,7 +429,7 @@ const handleContactFromConfigLegacy = async (
       }
       await BlockedNumberController.block(contactConvo.id);
     } else if (contactReceived.isBlocked === false) {
-      await BlockedNumberController.unblock(contactConvo.id);
+      await BlockedNumberController.unblockAll([contactConvo.id]);
     }
 
     await ProfileManager.updateProfileOfContact(
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 2c8928d40..3676ab3f1 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -621,7 +621,6 @@ async function handleMessageRequestResponse(
 ) {
   const { isApproved } = messageRequestResponse;
   if (!isApproved) {
-    window?.log?.error('handleMessageRequestResponse: isApproved is false -- dropping message.');
     await removeFromCache(envelope);
     return;
   }
@@ -649,6 +648,7 @@ async function handleMessageRequestResponse(
 
   conversationToApprove.set({
     active_at: mostRecentActiveAt,
+    hidden: false,
     isApproved: true,
     didApproveMe: true,
   });
@@ -708,10 +708,8 @@ async function handleMessageRequestResponse(
     );
   }
 
-  if (!conversationToApprove || conversationToApprove.didApproveMe() === isApproved) {
-    if (conversationToApprove) {
-      await conversationToApprove.commit();
-    }
+  if (!conversationToApprove || conversationToApprove.didApproveMe()) {
+    await conversationToApprove?.commit();
     window?.log?.info(
       'Conversation already contains the correct value for the didApproveMe field.'
     );
@@ -720,14 +718,12 @@ async function handleMessageRequestResponse(
     return;
   }
 
-  await conversationToApprove.setDidApproveMe(isApproved, true);
-  if (isApproved === true) {
-    // Conversation was not approved before so a sync is needed
-    await conversationToApprove.addIncomingApprovalMessage(
-      toNumber(envelope.timestamp),
-      unblindedConvoId
-    );
-  }
+  await conversationToApprove.setDidApproveMe(true, true);
+  // Conversation was not approved before so a sync is needed
+  await conversationToApprove.addIncomingApprovalMessage(
+    toNumber(envelope.timestamp),
+    unblindedConvoId
+  );
 
   await removeFromCache(envelope);
 }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 39aebf1ab..0010e7e1e 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -284,9 +284,14 @@ async function handleRegularMessage(
   }
 
   const conversationActiveAt = conversation.get('active_at');
-  if (!conversationActiveAt || (message.get('sent_at') || 0) > conversationActiveAt) {
+  if (
+    !conversationActiveAt ||
+    conversation.get('hidden') ||
+    (message.get('sent_at') || 0) > conversationActiveAt
+  ) {
     conversation.set({
       active_at: message.get('sent_at'),
+      hidden: false, // a new message was received for that conversation. If it was not it should not be hidden anymore
       lastMessage: message.getNotificationText(),
     });
   }
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index e003a6b2b..658e8a589 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -208,6 +208,7 @@ export class OpenGroupManagerV2 {
         displayNameInProfile: updatedRoom.roomName,
         isApproved: true,
         didApproveMe: true,
+        hidden: false,
         isTrustedForAttachmentDownload: true, // we always trust attachments when sent to an opengroup
       });
       await conversation.commit();
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 180a1edce..026b7fc06 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -192,7 +192,8 @@ export class ConversationController {
     // we remove the messages left in this convo. The caller has to merge them if needed
     await deleteAllMessagesByConvoIdNoConfirmation(conversation.id);
 
-    conversation.set({ didApproveMe: false, isApproved: false });
+    await conversation.setIsApproved(false, false);
+    await conversation.setDidApproveMe(false, false);
     await conversation.commit();
   }
 
@@ -241,11 +242,12 @@ export class ConversationController {
       window.log.info(`deleteContact isPrivate, marking as inactive: ${id}`);
 
       conversation.set({
-        active_at: undefined,
-        isApproved: false,
+        hidden: true,
       });
+      // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
+      // await conversation.setIsApproved(false, false);
       await conversation.commit();
-      // the call above will mark it as hidden in the wrapper already
+      // TODO the call above won't mark the conversation as hidden in the wrapper, it will just stop being updated (which is a bad thing)
     } else {
       window.log.info(`deleteContact !isPrivate, removing convo from DB: ${id}`);
       // not a private conversation, so not a contact for the ContactWrapper
@@ -253,16 +255,17 @@ export class ConversationController {
 
       window.log.info(`deleteContact !isPrivate, convo removed from DB: ${id}`);
 
+      // TODO remove group related entries from their corresponding wrappers here
       this.conversations.remove(conversation);
-      if (window?.inboxStore) {
-        window.inboxStore?.dispatch(
-          conversationActions.conversationChanged({
-            id: conversation.id,
-            data: conversation.getConversationModelProps(),
-          })
-        );
-        window.inboxStore?.dispatch(conversationActions.conversationRemoved(conversation.id));
-      }
+
+      window?.inboxStore?.dispatch(
+        conversationActions.conversationChanged({
+          id: conversation.id,
+          data: conversation.getConversationModelProps(),
+        })
+      );
+      window.inboxStore?.dispatch(conversationActions.conversationRemoved(conversation.id));
+
       window.log.info(`deleteContact !isPrivate, convo removed from store: ${id}`);
     }
   }
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 47c1d0fd0..b55ff43a9 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -252,6 +252,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
     | 'active_at'
     | 'left'
     | 'lastJoinedTimestamp'
+    | 'hidden'
   > = {
     displayNameInProfile: details.name,
     members: details.members,
@@ -260,6 +261,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
+    hidden: false,
     // identityPrivateKey: isV3(details) ? details.identityPrivateKey : undefined,
   };
   console.warn('updates', updates);
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index dc0887f04..92e6643b4 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -503,6 +503,7 @@ export async function USER_callRecipient(recipient: string) {
   window.log.info('Sending preOffer message to ', ed25519Str(recipient));
   const calledConvo = getConversationController().get(recipient);
   calledConvo.set('active_at', Date.now()); // addSingleOutgoingMessage does the commit for us on the convo
+  calledConvo.set('hidden', false);
   weAreCallerOnCurrentCall = true;
 
   await calledConvo?.addSingleOutgoingMessage({
@@ -851,6 +852,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
   const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
   const callerConvo = getConversationController().get(fromSender);
   callerConvo.set('active_at', networkTimestamp);
+  callerConvo.set('hidden', false);
   await callerConvo?.addSingleIncomingMessage({
     source: UserUtils.getOurPubKeyStrFromCache(),
     sent_at: networkTimestamp,
@@ -1185,8 +1187,9 @@ export async function handleMissedCall(
 async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
   const incomingCallConversation = getConversationController().get(callerPubkey);
 
-  if (incomingCallConversation.isActive()) {
+  if (incomingCallConversation.isActive() || incomingCallConversation.isHidden()) {
     incomingCallConversation.set('active_at', GetNetworkTime.getNowWithNetworkOffset());
+    incomingCallConversation.set('hidden', false);
   }
 
   await incomingCallConversation?.addSingleIncomingMessage({
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index f67da9557..de7398fa2 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -246,14 +246,14 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
       // make sure the settings which should already set to `true` are
       if (
         !conversation.get('isTrustedForAttachmentDownload') ||
-        !conversation.get('isApproved') ||
-        !conversation.get('didApproveMe')
+        !conversation.isApproved() ||
+        !conversation.didApproveMe()
       ) {
         conversation.set({
           isTrustedForAttachmentDownload: true,
-          isApproved: true,
-          didApproveMe: true,
         });
+        await conversation.setDidApproveMe(true, false);
+        await conversation.setIsApproved(true, false);
         changes = true;
       }
     }
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 490f6986b..5364afec5 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -40,7 +40,9 @@ async function createConfigDumpsFromDbFirstStart(
 ): Promise<Array<ConfigWrapperObjectTypes>> {
   const justCreated: Array<ConfigWrapperObjectTypes> = [];
   try {
-    console.warn('createConfigDumpsFromDbFirstStart');
+    console.error(
+      'createConfigDumpsFromDbFirstStart should be removed as this would done in a migration'
+    );
 
     // build the userconfig
     await UserConfigWrapperActions.init(privateKeyEd25519, null);
@@ -111,6 +113,10 @@ async function initializeLibSessionUtilWrappers() {
     [...userVariantsBuildWithoutErrors.values()]
   );
 
+  if (missingRequiredVariants.length) {
+    throw new Error(`missingRequiredVariants: ${JSON.stringify(missingRequiredVariants)}`);
+  }
+
   for (let index = 0; index < missingRequiredVariants.length; index++) {
     const missingVariant = missingRequiredVariants[index];
     await GenericWrapperActions.init(missingVariant, privateKeyEd25519, null);
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 35b5ceb49..f1668148f 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -1,11 +1,9 @@
-import { isEmpty, isEqual } from 'lodash';
-import { UserUtils } from '..';
+import { ContactInfo } from 'session_util_wrapper';
 import { ConversationModel } from '../../../models/conversation';
+import { getContactInfoFromDBValues } from '../../../types/sqlSharedTypes';
 import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { getConversationController } from '../../conversations';
 import { PubKey } from '../../types';
-import { fromHexToArray } from '../String';
-import { ContactInfo } from 'session_util_wrapper';
 
 /**
  * This file is centralizing the management of data from the Contacts Wrapper of libsession.
@@ -40,9 +38,7 @@ async function insertAllContactsIntoContactsWrapper() {
 
   for (let index = 0; index < idsToInsert.length; index++) {
     const id = idsToInsert[index];
-    console.warn(
-      `inserting into wrapper ${id}: ${getConversationController().get(id)?.attributes.nickname}`
-    );
+
     await insertContactFromDBIntoWrapperAndRefresh(id);
   }
 }
@@ -68,21 +64,13 @@ function filterContactsToStoreInContactsWrapper(convo: ConversationModel): boole
  */
 // tslint:disable-next-line: cyclomatic-complexity
 async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
-  const us = UserUtils.getOurPubKeyStrFromCache();
-  if (id === us) {
-    window.log.info(
-      "The contact config wrapper does not handle the current user config, just his contacts'"
-    );
-    return;
-  }
-
   const foundConvo = getConversationController().get(id);
   if (!foundConvo) {
     return;
   }
 
   if (!filterContactsToStoreInContactsWrapper(foundConvo)) {
-    window.log.info(`insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved`);
+    // window.log.info(`insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved. Skipping`);
     return;
   }
 
@@ -95,36 +83,40 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbApproved = !!foundConvo.get('isApproved') || false;
   const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
   const dbBlocked = !!foundConvo.isBlocked() || false;
-
-  const wrapperContact = await ContactsWrapperActions.getOrCreate(id);
-  const activeAt = foundConvo.get('active_at');
+  const hidden = foundConvo.get('hidden') || false;
   const isPinned = foundConvo.get('isPinned');
 
-  // override the values with what we have in the DB. the library will do the diff
-  wrapperContact.approved = dbApproved;
-  wrapperContact.approvedMe = dbApprovedMe;
-  wrapperContact.blocked = dbBlocked;
-  wrapperContact.name = dbName;
-  wrapperContact.nickname = dbNickname;
-  wrapperContact.hidden = !activeAt || activeAt <= 0;
-  wrapperContact.priority = !!isPinned ? 1 : 0; // TODO the priority handling is not that simple
+  const wrapperContact = getContactInfoFromDBValues({
+    id,
+    dbApproved,
+    dbApprovedMe,
+    dbBlocked,
+    dbName,
+    dbNickname,
+    dbProfileKey,
+    dbProfileUrl,
+    isPinned,
+    hidden,
+  });
 
-  if (
-    wrapperContact.profilePicture?.url !== dbProfileUrl ||
-    !isEqual(wrapperContact.profilePicture?.key, dbProfileKey)
-  ) {
-    wrapperContact.profilePicture = {
-      url: dbProfileUrl || null,
-      key: dbProfileKey && !isEmpty(dbProfileKey) ? fromHexToArray(dbProfileKey) : null,
-    };
+  try {
+    console.warn(`inserting into wrapper ${id}: `, wrapperContact);
+    await ContactsWrapperActions.set(wrapperContact);
+  } catch (e) {
+    window.log.warn(`ContactsWrapperActions.set of ${id} failed with ${e.message}`);
+    // we still let this go through
   }
-  await ContactsWrapperActions.set(wrapperContact);
 
   await refreshMappedValue(id);
 
   console.timeEnd(`ContactsWrapperActions.set ${id}`);
 }
 
+/**
+ * refreshMappedValue is used to query the Contacts Wrapper for the details of that contact and update the cached in-memory entry representing its content.
+ * @param id the pubkey to re fresh the cached value from
+ * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
+ */
 async function refreshMappedValue(id: string, duringAppStart = false) {
   const fromWrapper = await ContactsWrapperActions.get(id);
   if (fromWrapper) {
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index db057265f..4171dbb40 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -28,6 +28,8 @@ import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/M
 import { PubKey } from '../../types';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
+import { ConfigurationDumpSync } from '../job_runners/jobs/ConfigurationSyncDumpJob';
+import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -41,31 +43,36 @@ const writeLastSyncTimestampToDb = async (timestamp: number) =>
  * Conditionally Syncs user configuration with other devices linked.
  */
 export const syncConfigurationIfNeeded = async () => {
-  const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
-  const now = Date.now();
+  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
+    const now = Date.now();
 
-  // if the last sync was less than 2 days before, return early.
-  if (Math.abs(now - lastSyncedTimestamp) < DURATION.DAYS * 2) {
-    return;
+    // if the last sync was less than 2 days before, return early.
+    if (Math.abs(now - lastSyncedTimestamp) < DURATION.DAYS * 2) {
+      return;
+    }
+
+    const allConvos = getConversationController().getConversations();
+
+    const configMessage = await getCurrentConfigurationMessage(allConvos);
+    try {
+      // window?.log?.info('syncConfigurationIfNeeded with', configMessage);
+
+      await getMessageQueue().sendSyncMessage({
+        namespace: SnodeNamespaces.UserMessages,
+        message: configMessage,
+      });
+    } catch (e) {
+      window?.log?.warn('Caught an error while sending our ConfigurationMessage:', e);
+      // we do return early so that next time we use the old timestamp again
+      // and so try again to trigger a sync
+      return;
+    }
+    await writeLastSyncTimestampToDb(now);
+  } else {
+    await ConfigurationDumpSync.queueNewJobIfNeeded();
+    await ConfigurationSync.queueNewJobIfNeeded();
   }
-
-  const allConvos = getConversationController().getConversations();
-
-  const configMessage = await getCurrentConfigurationMessage(allConvos);
-  try {
-    // window?.log?.info('syncConfigurationIfNeeded with', configMessage);
-
-    await getMessageQueue().sendSyncMessage({
-      namespace: SnodeNamespaces.UserMessages,
-      message: configMessage,
-    });
-  } catch (e) {
-    window?.log?.warn('Caught an error while sending our ConfigurationMessage:', e);
-    // we do return early so that next time we use the old timestamp again
-    // and so try again to trigger a sync
-    return;
-  }
-  await writeLastSyncTimestampToDb(now);
 };
 
 export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) =>
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 878154032..faea4d895 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -249,6 +249,7 @@ export interface ReduxConversationType {
 
   isTyping?: boolean;
   isBlocked?: boolean;
+  isHidden: boolean;
   isKickedFromGroup?: boolean;
   subscriberCount?: number;
   left?: boolean;
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index 9b85b8389..3aa337335 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -1,14 +1,13 @@
+import { Data } from '../../../ts/data/data';
 import { AdvancedSearchOptions, SearchOptions } from '../../types/Search';
 import { cleanSearchTerm } from '../../util/cleanSearchTerm';
-import { Data } from '../../../ts/data/data';
 
-import { ReduxConversationType } from './conversations';
-import { PubKey } from '../../session/types';
 import _ from 'lodash';
-import { getConversationController } from '../../session/conversations';
 import { MessageResultProps } from '../../components/search/MessageSearchResults';
-import { UserUtils } from '../../session/utils';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { PubKey } from '../../session/types';
+import { UserUtils } from '../../session/utils';
+import { ReduxConversationType } from './conversations';
 
 // State
 
@@ -236,14 +235,11 @@ async function queryConversationsAndContacts(providedQuery: string, options: Sea
   }
   // Inject synthetic Note to Self entry if query matches localized 'Note to Self'
   if (noteToSelf.indexOf(providedQuery.toLowerCase()) !== -1) {
-    const ourConvo = getConversationController().get(ourNumber);
-    if (ourConvo && ourConvo.isActive()) {
-      // ensure that we don't have duplicates in our results
-      contacts = contacts.filter(id => id !== ourNumber);
-      conversations = conversations.filter(id => id !== ourNumber);
+    // ensure that we don't have duplicates in our results
+    contacts = contacts.filter(id => id !== ourNumber);
+    conversations = conversations.filter(id => id !== ourNumber);
 
-      contacts.unshift(ourNumber);
-    }
+    contacts.unshift(ourNumber);
   }
 
   return { conversations, contacts };
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 0127b3c03..3a5175369 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -354,7 +354,8 @@ export const _getLeftPaneLists = (
       conversation.activeAt !== undefined &&
       conversation.type === ConversationTypeEnum.PRIVATE &&
       conversation.isApproved &&
-      !conversation.isBlocked
+      !conversation.isBlocked &&
+      !conversation.isHidden
     ) {
       directConversations.push(conversation);
     }
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 2dbe145cf..34a4c9549 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -41,6 +41,7 @@ describe('state/selectors/conversations', () => {
           members: [],
           expireTimer: 0,
           isPinned: false,
+          isHidden: false,
         },
         id2: {
           id: 'id2',
@@ -70,6 +71,7 @@ describe('state/selectors/conversations', () => {
           members: [],
           expireTimer: 0,
           isPinned: false,
+          isHidden: false,
         },
         id3: {
           id: 'id3',
@@ -99,6 +101,7 @@ describe('state/selectors/conversations', () => {
           members: [],
           expireTimer: 0,
           isPinned: false,
+          isHidden: false,
         },
         id4: {
           id: 'id4',
@@ -128,6 +131,7 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: false,
+          isHidden: false,
         },
         id5: {
           id: 'id5',
@@ -157,6 +161,7 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: false,
+          isHidden: false,
         },
       };
       const comparator = _getConversationComparator(i18n);
@@ -203,6 +208,7 @@ describe('state/selectors/conversations', () => {
           isPinned: false,
           hasNickname: false,
           isPublic: false,
+          isHidden: false,
         },
         id2: {
           id: 'id2',
@@ -233,6 +239,7 @@ describe('state/selectors/conversations', () => {
           isPinned: false,
           hasNickname: false,
           isPublic: false,
+          isHidden: false,
         },
         id3: {
           id: 'id3',
@@ -263,6 +270,7 @@ describe('state/selectors/conversations', () => {
           isPinned: true,
           hasNickname: false,
           isPublic: false,
+          isHidden: false,
         },
         id4: {
           id: 'id4',
@@ -292,6 +300,7 @@ describe('state/selectors/conversations', () => {
           isPinned: true,
           hasNickname: false,
           isPublic: false,
+          isHidden: false,
         },
         id5: {
           id: 'id5',
@@ -322,6 +331,7 @@ describe('state/selectors/conversations', () => {
           isPinned: false,
           hasNickname: false,
           isPublic: false,
+          isHidden: false,
         },
       };
       const comparator = _getConversationComparator(i18n);
diff --git a/ts/test/session/unit/utils/SyncUtils_test.ts b/ts/test/session/unit/utils/SyncUtils_test.ts
index df306ba92..76fecfc9b 100644
--- a/ts/test/session/unit/utils/SyncUtils_test.ts
+++ b/ts/test/session/unit/utils/SyncUtils_test.ts
@@ -11,7 +11,7 @@ describe('SyncUtils', () => {
   });
 
   describe('syncConfigurationIfNeeded', () => {
-    it('sync if last sync undefined', () => {
+    it.skip('sync if last sync undefined', () => {
       // TestUtils.stubData('getItemById').resolves(undefined);
       // sandbox.stub(ConversationController, 'getConversations').returns([]);
       // const getCurrentConfigurationMessageSpy = sandbox.spy(MessageUtils, 'getCurrentConfigurationMessage');
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index 02c6a7f74..601bd897e 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -70,7 +70,7 @@ describe('BlockedNumberController', () => {
       const primary = TestUtils.generateFakePubKey();
       memoryDB.blocked = [primary.key];
 
-      await BlockedNumberController.unblock(primary);
+      await BlockedNumberController.unblockAll([primary.key]);
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
       expect(blockedNumbers).to.be.empty;
@@ -82,7 +82,7 @@ describe('BlockedNumberController', () => {
       const another = TestUtils.generateFakePubKey();
       memoryDB.blocked = [pubKey.key, another.key];
 
-      await BlockedNumberController.unblock(pubKey);
+      await BlockedNumberController.unblockAll([pubKey.key]);
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
       expect(blockedNumbers).to.have.lengthOf(1);
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 9c5a9a270..f4aec6f7b 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,4 +1,7 @@
+import { isEmpty, isEqual } from 'lodash';
+import { ContactInfo } from 'session_util_wrapper';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
+import { fromHexToArray } from '../session/utils/String';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 
 /**
@@ -105,3 +108,54 @@ export type AttachmentDownloadMessageDetails = {
   isOpenGroupV2: boolean;
   openGroupV2Details: OpenGroupRequestCommonType | undefined;
 };
+
+/**
+ * This function returns a contactInfo for the wrapper to understand from the DB values.
+ * Created in this file so we can reuse it during the migration (node side), and from the renderer side
+ */
+export function getContactInfoFromDBValues({
+  id,
+  dbApproved,
+  dbApprovedMe,
+  dbBlocked,
+  dbName,
+  dbNickname,
+  hidden,
+  isPinned,
+  dbProfileUrl,
+  dbProfileKey,
+}: {
+  id: string;
+  dbApproved: boolean;
+  dbApprovedMe: boolean;
+  dbBlocked: boolean;
+  hidden: boolean;
+  dbNickname: string | undefined;
+  dbName: string | undefined;
+  isPinned: boolean;
+  dbProfileUrl: string | undefined;
+  dbProfileKey: string | undefined;
+}): ContactInfo {
+  const wrapperContact: ContactInfo = {
+    id,
+    approved: !!dbApproved,
+    approvedMe: !!dbApprovedMe,
+    blocked: !!dbBlocked,
+    hidden: !!hidden,
+    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+    nickname: dbNickname,
+    name: dbName,
+  };
+
+  if (
+    wrapperContact.profilePicture?.url !== dbProfileUrl ||
+    !isEqual(wrapperContact.profilePicture?.key, dbProfileKey)
+  ) {
+    wrapperContact.profilePicture = {
+      url: dbProfileUrl || null,
+      key: dbProfileKey && !isEmpty(dbProfileKey) ? fromHexToArray(dbProfileKey) : null,
+    };
+  }
+
+  return wrapperContact;
+}
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index af1553558..861e64cdc 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -42,22 +42,6 @@ export class BlockedNumberController {
     }
   }
 
-  /**
-   * Unblock a user.
-   * This will only unblock the primary device of the user.
-   *
-   * @param user The user to unblock.
-   */
-  public static async unblock(user: string | PubKey): Promise<void> {
-    await this.load();
-    const toUnblock = PubKey.cast(user);
-
-    if (this.blockedNumbers.has(toUnblock.key)) {
-      this.blockedNumbers.delete(toUnblock.key);
-      await this.saveToDB(BLOCKED_NUMBERS_ID, this.blockedNumbers);
-    }
-  }
-
   /**
    * Unblock all these users.
    * This will only unblock the primary device of the user.
@@ -97,7 +81,7 @@ export class BlockedNumberController {
     if (blocked) {
       return BlockedNumberController.block(user);
     }
-    return BlockedNumberController.unblock(user);
+    return BlockedNumberController.unblockAll([PubKey.cast(user).key]);
   }
 
   public static getBlockedNumbers(): Array<string> {

From 37e335097e24dada52556c6e8cf694182dd86b29 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Feb 2023 17:10:30 +1100
Subject: [PATCH 039/178] chore: remove unused bdecode logic as it is now in
 libsession util

---
 ts/session/utils/Bencoding.ts               | 268 --------------------
 ts/test/session/unit/utils/Bencoded_test.ts | 246 ------------------
 2 files changed, 514 deletions(-)
 delete mode 100644 ts/session/utils/Bencoding.ts
 delete mode 100644 ts/test/session/unit/utils/Bencoded_test.ts

diff --git a/ts/session/utils/Bencoding.ts b/ts/session/utils/Bencoding.ts
deleted file mode 100644
index ea8b73bd2..000000000
--- a/ts/session/utils/Bencoding.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import { from_string, to_string } from 'libsodium-wrappers-sumo';
-import { isArray, isEmpty, isNumber, isPlainObject, isString, toNumber } from 'lodash';
-import { StringUtils } from '.';
-
-const e = 'e'; // end of whatever was before
-const l = 'l'; // list of values
-const i = 'i'; // start of integer
-const d = 'd'; // start of dictionary
-const colon = ':';
-
-const eCode = e.charCodeAt(0); // end of whatever was before
-const lCode = l.charCodeAt(0); // list of values
-const iCode = i.charCodeAt(0); // start of integer
-const dCode = d.charCodeAt(0); // start of dictionary
-const colonCode = colon.charCodeAt(0);
-
-interface BencodeDictType {
-  [key: string]: BencodeElementType;
-}
-
-type BencodeArrayType = Array<BencodeElementType>;
-
-type BencodeElementType = number | string | BencodeDictType | BencodeArrayType;
-const NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-
-export class BDecode {
-  private readonly content: Uint8Array;
-  private currentParsingIndex = 0;
-  private readonly parsedContent: BencodeElementType;
-
-  constructor(content: Uint8Array | string) {
-    this.content = isString(content) ? from_string(content) : content;
-    this.parsedContent = this.parseContent();
-  }
-
-  public getParsedContent() {
-    return this.parsedContent;
-  }
-
-  /**
-   * Decode an int from a byte array starting with charCode of `i` and ending with charCode `e`
-   */
-  private parseInt(): number {
-    if (this.currentParsingIndex >= this.content.length) {
-      throw new Error('parseInt: out of bounds');
-    }
-    if (this.content[this.currentParsingIndex] !== iCode) {
-      throw new Error('parseInt: not the start of an int');
-    }
-
-    this.currentParsingIndex++; // drop `i`
-    const startIntStr = this.currentParsingIndex; // save the start of the int
-    const nextEndSeparator = this.content.indexOf(eCode, this.currentParsingIndex);
-    if (nextEndSeparator === -1) {
-      throw new Error('parseInt: not an int to be parsed here: no end separator');
-    }
-
-    const parsed = toNumber(to_string(this.content.slice(startIntStr, nextEndSeparator)));
-
-    if (!isFinite(parsed)) {
-      throw new Error(`parseInt: could not parse number ${parsed}`);
-    }
-    this.currentParsingIndex = nextEndSeparator;
-    this.currentParsingIndex++; // drop the 'e'
-
-    return parsed;
-  }
-
-  private parseList(): BencodeArrayType {
-    const parsed: BencodeArrayType = [];
-
-    if (this.currentParsingIndex >= this.content.length) {
-      throw new Error('parseList: out of bounds');
-    }
-    if (this.content[this.currentParsingIndex] !== lCode) {
-      throw new Error('parseList: not the start of a list');
-    }
-
-    this.currentParsingIndex++; // drop `l`
-
-    while (
-      this.currentParsingIndex < this.content.length &&
-      this.content[this.currentParsingIndex] !== eCode
-    ) {
-      parsed.push(this.parseBlock());
-    }
-    this.currentParsingIndex++; // drop the 'e'
-
-    return parsed;
-  }
-
-  private parseDict() {
-    const parsed: BencodeDictType = {};
-
-    if (this.currentParsingIndex >= this.content.length) {
-      throw new Error('parseDict: out of bounds');
-    }
-    if (this.content[this.currentParsingIndex] !== dCode) {
-      throw new Error('parseDict: not the start of a dict');
-    }
-
-    this.currentParsingIndex++; // drop `d`
-
-    while (
-      this.currentParsingIndex < this.content.length &&
-      this.content[this.currentParsingIndex] !== eCode
-    ) {
-      const key = this.parseString();
-      const value = this.parseBlock();
-      parsed[key] = value;
-    }
-    this.currentParsingIndex++; // drop the 'e'
-
-    return parsed;
-  }
-
-  /**
-   * Decode a string element from iterator assumed to have structure `length:data`
-   */
-  private parseString(): string {
-    if (this.currentParsingIndex >= this.content.length) {
-      throw new Error('parseString: out of bounds');
-    }
-
-    // this.currentParsingIndex++;
-    const separatorIndex = this.content.indexOf(colonCode, this.currentParsingIndex);
-    if (separatorIndex === -1) {
-      throw new Error('parseString: cannot parse string without separator');
-    }
-    const strLength = toNumber(
-      to_string(this.content.slice(this.currentParsingIndex, separatorIndex))
-    );
-    if (!isFinite(strLength)) {
-      throw new Error('parseString: cannot parse string without length');
-    }
-
-    if (strLength === 0) {
-      return '';
-    }
-
-    if (strLength > this.content.length - separatorIndex - 1) {
-      throw new Error(
-        'parseString: length is too long considering what we have left on this string'
-      );
-    }
-    const strContent = this.content.slice(separatorIndex + 1, separatorIndex + 1 + strLength);
-    this.currentParsingIndex = separatorIndex + 1 + strLength;
-    return StringUtils.decode(strContent, 'utf8');
-  }
-
-  private parseContent() {
-    return this.parseBlock();
-  }
-
-  private parseBlock() {
-    let parsed: BencodeElementType;
-    if (this.content.length < this.currentParsingIndex) {
-      throw new Error('Out of bounds');
-    }
-    if (this.content[this.currentParsingIndex] === lCode) {
-      parsed = this.parseList();
-    } else if (this.content[this.currentParsingIndex] === dCode) {
-      parsed = this.parseDict();
-    } else if (this.content[this.currentParsingIndex] === iCode) {
-      parsed = this.parseInt();
-    } else if (NUMBERS.some(num => this.content[this.currentParsingIndex] === num.charCodeAt(0))) {
-      parsed = this.parseString();
-    } else {
-      throw new Error(
-        `parseBlock: Could not parse charCode at ${this.currentParsingIndex}: ${
-          this.content[this.currentParsingIndex]
-        }. Length: ${this.content.length}`
-      );
-    }
-
-    return parsed;
-  }
-}
-
-export class BEncode {
-  private readonly input: BencodeElementType;
-
-  private readonly bencodedContent: Uint8Array;
-
-  constructor(content: BencodeElementType) {
-    this.input = content;
-    this.bencodedContent = this.encodeContent();
-  }
-
-  public getBencodedContent() {
-    return this.bencodedContent;
-  }
-
-  private encodeItem(item: BencodeElementType): Uint8Array {
-    if (isNumber(item) && isFinite(item)) {
-      return from_string(`i${item}e`);
-    }
-
-    if (isNumber(item)) {
-      throw new Error('encodeItem not finite number');
-    }
-
-    if (isString(item)) {
-      const content = new Uint8Array(StringUtils.encode(item, 'utf8'));
-
-      const contentLengthLength = `${content.length}`.length;
-      const toReturn = new Uint8Array(content.length + 1 + contentLengthLength);
-
-      toReturn.set(from_string(`${content.length}`));
-      toReturn.set([colonCode], contentLengthLength);
-      toReturn.set(content, contentLengthLength + 1);
-      return toReturn;
-    }
-
-    if (isArray(item)) {
-      let content = new Uint8Array();
-      for (let index = 0; index < item.length; index++) {
-        const encodedItem = this.encodeItem(item[index]);
-        const encodedItemLength = encodedItem.length;
-        const existingContentLength = content.length;
-        const newContent = new Uint8Array(existingContentLength + encodedItemLength);
-        newContent.set(content);
-        newContent.set(encodedItem, content.length);
-        content = newContent;
-      }
-      const toReturn = new Uint8Array(content.length + 2);
-      toReturn.set([lCode]);
-      toReturn.set(content, 1);
-      toReturn.set([eCode], content.length + 1);
-
-      return toReturn;
-    }
-
-    if (isPlainObject(item)) {
-      // bencoded objects keys must be sorted lexicographically
-      const sortedKeys = Object.keys(item).sort();
-      let content = new Uint8Array();
-
-      sortedKeys.forEach(key => {
-        const value = item[key];
-
-        const encodedKey = this.encodeItem(key);
-        const encodedValue = this.encodeItem(value);
-        const newContent = new Uint8Array(content.length + encodedKey.length + encodedValue.length);
-        newContent.set(content);
-        newContent.set(encodedKey, content.length);
-        newContent.set(encodedValue, content.length + encodedKey.length);
-        content = newContent;
-      });
-      const toReturn = new Uint8Array(content.length + 2);
-      toReturn.set([dCode]);
-      toReturn.set(content, 1);
-      toReturn.set([eCode], content.length + 1);
-
-      return toReturn;
-    }
-
-    throw new Error(`encodeItem: unknown type to encode ${typeof item}`);
-  }
-
-  private encodeContent(): Uint8Array {
-    if (!this.input || (isEmpty(this.input) && !isNumber(this.input))) {
-      return new Uint8Array();
-    }
-
-    return this.encodeItem(this.input);
-  }
-}
diff --git a/ts/test/session/unit/utils/Bencoded_test.ts b/ts/test/session/unit/utils/Bencoded_test.ts
deleted file mode 100644
index 57092ab35..000000000
--- a/ts/test/session/unit/utils/Bencoded_test.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-import chai from 'chai';
-
-import chaiAsPromised from 'chai-as-promised';
-import { from_string } from 'libsodium-wrappers-sumo';
-import { StringUtils } from '../../../../session/utils';
-import { BDecode, BEncode } from '../../../../session/utils/Bencoding';
-chai.use(chaiAsPromised as any);
-
-const { expect } = chai;
-
-describe('Bencoding: BDecode Utils', () => {
-  describe('From a string', () => {
-    describe('parseInt', () => {
-      it('parse 12', () => {
-        expect(new BDecode('i12e').getParsedContent()).to.equal(12);
-      });
-
-      it('parse 0', () => {
-        expect(new BDecode('ie').getParsedContent()).to.equal(0);
-      });
-
-      it('parse 12232332', () => {
-        expect(new BDecode('i12232332e').getParsedContent()).to.equal(12232332);
-      });
-
-      it('parse 12232332 even if extra characters', () => {
-        expect(new BDecode('i12232332eoverflow.d').getParsedContent()).to.equal(12232332);
-      });
-
-      it('throws invalid start', () => {
-        expect(() => new BDecode('d12232332e').getParsedContent()).to.throw();
-      });
-
-      it('throws invalid end', () => {
-        expect(() => new BDecode('i12232332d').getParsedContent()).to.throw();
-      });
-
-      it('throws invalid integer', () => {
-        expect(() => new BDecode('i1223233qw2e').getParsedContent()).to.throw();
-      });
-    });
-
-    describe('parseString', () => {
-      it('parse short string ', () => {
-        expect(new BDecode('1:a').getParsedContent()).to.equal('a');
-      });
-
-      it('parse string with emojis ', () => {
-        expect(new BDecode('8:🎃🥸').getParsedContent()).to.equal('🎃🥸');
-        expect(new BDecode('26:❤️‍🔥❤️‍🔥').getParsedContent()).to.equal('❤️‍🔥❤️‍🔥');
-      });
-
-      it('parse non ascii string', () => {
-        expect(new BDecode('48:転キハ連月ざれ地周りを報最こもろ').getParsedContent()).to.equal(
-          '転キハ連月ざれ地周りを報最こもろ'
-        );
-      });
-
-      it('parse longer string', () => {
-        expect(
-          new BDecode(
-            "320:Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic"
-          ).getParsedContent()
-        ).to.equal(
-          "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic"
-        );
-      });
-
-      it('throw if no separator ', () => {
-        expect(() => new BDecode('1aa').getParsedContent()).to.throw();
-      });
-
-      it('throw if first part is not a number ', () => {
-        expect(() => new BDecode('1a1:aa').getParsedContent()).to.throw();
-      });
-
-      it('throw if length brings us way out of range ', () => {
-        expect(() => new BDecode('322:aa').getParsedContent()).to.throw();
-      });
-
-      it('throw if length brings us just out of range ', () => {
-        expect(() => new BDecode('3:aa').getParsedContent()).to.throw();
-      });
-    });
-  });
-
-  describe('parseDict', () => {
-    it('parse single entry dict with string `d3:bar4:spame`', () => {
-      expect(new BDecode('d3:bar4:spame').getParsedContent()).to.deep.equal({ bar: 'spam' });
-    });
-
-    it('parse single entry dict with multiple strings `d3:bar4:spam5:barre2:twe`', () => {
-      expect(new BDecode('d3:bar4:spam5:barre2:twe').getParsedContent()).to.deep.equal({
-        bar: 'spam',
-        barre: 'tw',
-      });
-    });
-
-    it('parse multiple entries dict and int', () => {
-      expect(new BDecode('d3:bar4:spam3:fooi42ee').getParsedContent()).to.deep.equal({
-        bar: 'spam',
-        foo: 42,
-      });
-    });
-
-    it('parse multiple entries with ints', () => {
-      expect(new BDecode('d3:bari999e3:fooi42ee').getParsedContent()).to.deep.equal({
-        bar: 999,
-        foo: 42,
-      });
-    });
-
-    it('parse single entry with emoji', () => {
-      expect(new BDecode('d3:bar8:🎃🥸e').getParsedContent()).to.deep.equal({
-        bar: '🎃🥸',
-      });
-    });
-  });
-
-  describe('parseList', () => {
-    it('parse single entry', () => {
-      expect(new BDecode('l4:spame').getParsedContent()).to.deep.equal(['spam']);
-    });
-
-    it('parse multiple entries ', () => {
-      expect(new BDecode('l4:spam2:spe').getParsedContent()).to.deep.equal(['spam', 'sp']);
-    });
-
-    it('parse multiple entries witrh int and strings ', () => {
-      expect(new BDecode('l4:spam2:spi42e2:42e').getParsedContent()).to.deep.equal([
-        'spam',
-        'sp',
-        42,
-        '42',
-      ]);
-    });
-
-    it('parse list with dict included ', () => {
-      expect(new BDecode('ld3:bari999e3:fooi42eee').getParsedContent()).to.deep.equal([
-        {
-          bar: 999,
-          foo: 42,
-        },
-      ]);
-    });
-
-    it('parse list with mulitple dict included ', () => {
-      expect(
-        new BDecode('ld3:bari999e3:fooi42eed3:rabi111e3:offi2312eee').getParsedContent()
-      ).to.deep.equal([
-        {
-          bar: 999,
-          foo: 42,
-        },
-        {
-          rab: 111,
-          off: 2312,
-        },
-      ]);
-    });
-
-    it('parse dict with list included ', () => {
-      expect(new BDecode('d2:dili42ei24e4:key7ee').getParsedContent()).to.deep.equal({
-        di: [42, 24, 'key7'],
-      });
-    });
-
-    it('parse dict with multiple lists included ', () => {
-      expect(new BDecode('d2:dili42ei24e4:key7e4:secol4:key7ee').getParsedContent()).to.deep.equal({
-        di: [42, 24, 'key7'],
-        seco: ['key7'],
-      });
-    });
-  });
-});
-
-describe('Bencoding: BEncode Utils', () => {
-  it('encode single string', () => {
-    expect(new BEncode('abcdef').getBencodedContent()).to.deep.equal(
-      new Uint8Array(StringUtils.encode('6:abcdef', 'utf8'))
-    );
-  });
-
-  it('encode single string emoji', () => {
-    expect(new BEncode('🎃🥸').getBencodedContent()).to.deep.equal(
-      new Uint8Array(StringUtils.encode('8:🎃🥸', 'utf8'))
-    );
-  });
-
-  it('encode single int', () => {
-    expect(new BEncode(12).getBencodedContent()).to.deep.equal(from_string('i12e'));
-  });
-
-  it('encode array with one int', () => {
-    expect(new BEncode([12]).getBencodedContent()).to.deep.equal(from_string('li12ee'));
-  });
-
-  it('encode array with multiple int', () => {
-    expect(new BEncode([12, 34, 5678]).getBencodedContent()).to.deep.equal(
-      from_string('li12ei34ei5678ee')
-    );
-  });
-
-  it('encode array with different types', () => {
-    expect(new BEncode([12, '34', 5678]).getBencodedContent()).to.deep.equal(
-      from_string('li12e2:34i5678ee')
-    );
-  });
-
-  it('encode dict with one item', () => {
-    expect(new BEncode({ dict: '123' }).getBencodedContent()).to.deep.equal(
-      from_string('d4:dict3:123e')
-    );
-  });
-
-  it('encode dict with several items', () => {
-    expect(new BEncode({ dict: '123', dict2: '1234' }).getBencodedContent()).to.deep.equal(
-      from_string('d4:dict3:1235:dict24:1234e')
-    );
-  });
-
-  it('encode dict with several items with arrays', () => {
-    expect(new BEncode({ dict1: [1, 2, 3], dict2: [4, 5, 6] }).getBencodedContent()).to.deep.equal(
-      from_string('d5:dict1li1ei2ei3ee5:dict2li4ei5ei6eee')
-    );
-  });
-
-  it('encode dict with several items but sort them', () => {
-    expect(new BEncode({ dict2: 'second', dict1: 'first' }).getBencodedContent()).to.deep.equal(
-      from_string('d5:dict15:first5:dict26:seconde')
-    );
-  });
-
-  it('encode dict with array with dict', () => {
-    expect(new BEncode({ dict: [{ a: 'b', c: 'd' }] }).getBencodedContent()).to.deep.equal(
-      from_string('d4:dictld1:a1:b1:c1:deee')
-    );
-  });
-
-  it('encode dict with array with dict with emojis', () => {
-    expect(new BEncode({ dict: [{ a: 'b', c: '🎃🥸' }] }).getBencodedContent()).to.deep.equal(
-      from_string('d4:dictld1:a1:b1:c8:🎃🥸eee')
-    );
-  });
-});

From bc905bdba15d209cc1fa776664085d34b6d1f5a9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 24 Feb 2023 15:44:29 +1100
Subject: [PATCH 040/178] feat: start of community handling in libsession util

also remove tracking of hashes for config namespaces
---
 protos/SignalService.proto                    |   4 +-
 ts/components/dialog/InviteContactsDialog.tsx |  75 +++---
 ts/components/menu/Menu.tsx                   |  10 +-
 ts/data/configDump/configDump.ts              |  25 +-
 ts/data/data.ts                               |   2 -
 ts/data/dataInit.ts                           |   1 -
 ts/data/opengroups.ts                         |  16 +-
 ts/interactions/conversationInteractions.ts   |  87 +++----
 .../conversations/unsendingInteractions.ts    |   4 -
 ts/models/conversation.ts                     |  98 ++++---
 ts/models/conversationAttributes.ts           |   2 +-
 ts/node/migration/sessionMigrations.ts        | 246 +++++++++++++-----
 ts/node/sql.ts                                |  58 ++---
 ts/node/sql_calls/config_dump.ts              | 111 +-------
 ts/receiver/configMessage.ts                  | 137 ++++++++--
 .../open_group_api/opengroupV2/ApiUtil.ts     |  39 +--
 .../opengroupV2/OpenGroupManagerV2.ts         |  59 +++--
 .../opengroupV2/SogsFilterDuplicate.ts        |  35 ---
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |   2 -
 .../open_group_api/utils/OpenGroupUtils.ts    |  50 ++--
 ts/session/apis/snode_api/namespaces.ts       |  20 +-
 ts/session/apis/snode_api/retrieveRequest.ts  |   3 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  15 +-
 .../conversations/ConversationController.ts   |  34 ++-
 ts/session/sending/MessageSender.ts           |   1 +
 ts/session/utils/job_runners/JobRunner.ts     |   2 +-
 .../jobs/ConfigurationSyncDumpJob.ts          |  16 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  32 +--
 .../utils/libsession/libsession_utils.ts      | 102 +++-----
 .../libsession/libsession_utils_contacts.ts   |  13 +-
 .../libsession_utils_user_groups.ts           | 180 +++++++++++++
 ts/session/utils/sync/syncUtils.ts            |  35 ++-
 .../libsession_wrapper_usergroups_test.ts     |  80 ++++++
 .../receiver/opengroup/deduplicate_test.ts    |  72 ++---
 .../unit/swarm_polling/SwarmPolling_test.ts   |  19 ++
 .../session/unit/utils/OpenGroupUtils_test.ts |  21 +-
 ts/test/test-utils/utils/message.ts           |  11 +
 ts/types/sqlSharedTypes.ts                    |  37 +--
 ts/util/attachmentsUtil.ts                    |  46 ++--
 ts/util/reactions.ts                          |   6 +-
 .../browser/libsession_worker_functions.d.ts  |  13 +-
 .../browser/libsession_worker_interface.ts    |  83 +++++-
 .../node/libsession/libsession.worker.ts      |  16 +-
 43 files changed, 1167 insertions(+), 751 deletions(-)
 create mode 100644 ts/session/utils/libsession/libsession_utils_user_groups.ts
 create mode 100644 ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index d913fbef0..ff4850069 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -42,8 +42,8 @@ message SharedConfigMessage {
   enum Kind {
     USER_PROFILE            = 1;
     CONTACTS                = 2;
-   // CONVERSATION_INFO       = 3;
-   // LEGACY_CLOSED_GROUPS    = 4;
+   // CONVO_INFO_VOLATILE       = 3;
+    USER_GROUPS    = 4;
    // CLOSED_GROUP_INFO       = 5;
    // CLOSED_GROUP_MEMBERS    = 6;
    // ENCRYPTION_KEYS         = 7;
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index 7d7160e12..b3002b0b6 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -1,55 +1,62 @@
 import React from 'react';
 
+import _ from 'lodash';
+import { useDispatch, useSelector } from 'react-redux';
+import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { VALIDATION } from '../../session/constants';
 import { getConversationController } from '../../session/conversations';
 import { ToastUtils, UserUtils } from '../../session/utils';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { getCompleteUrlForV2ConvoId } from '../../interactions/conversationInteractions';
-import _ from 'lodash';
-import { VALIDATION } from '../../session/constants';
-import { SpacerLG } from '../basic/Text';
-import { useDispatch, useSelector } from 'react-redux';
 import { updateInviteContactModal } from '../../state/ducks/modalDialog';
+import { SpacerLG } from '../basic/Text';
 // tslint:disable-next-line: no-submodule-imports
 import useKey from 'react-use/lib/useKey';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { MemberListItem } from '../MemberListItem';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { getPrivateContactsPubkeys } from '../../state/selectors/conversations';
 import { useConversationPropsById } from '../../hooks/useParamSelector';
 import { useSet } from '../../hooks/useSet';
 import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
+import { getPrivateContactsPubkeys } from '../../state/selectors/conversations';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { MemberListItem } from '../MemberListItem';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups';
 
 type Props = {
   conversationId: string;
 };
 
-const submitForOpenGroup = async (conversationId: string, pubkeys: Array<string>) => {
-  const completeUrl = await getCompleteUrlForV2ConvoId(conversationId);
-  const convo = getConversationController().get(conversationId);
+function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
+  const convo = getConversationController().get(convoId);
   if (!convo || !convo.isPublic()) {
     throw new Error('submitForOpenGroup group not found');
   }
-  const groupInvitation = {
-    url: completeUrl,
-    name: convo.getNicknameOrRealUsernameOrPlaceholder(),
-  };
-  pubkeys.forEach(async pubkeyStr => {
-    const privateConvo = await getConversationController().getOrCreateAndWait(
-      pubkeyStr,
-      ConversationTypeEnum.PRIVATE
-    );
-
-    if (privateConvo) {
-      void privateConvo.sendMessage({
-        body: '',
-        attachments: undefined,
-        groupInvitation,
-        preview: undefined,
-        quote: undefined,
-      });
+  try {
+    const roomDetails = SessionUtilUserGroups.getCommunityMappedValueByConvoId(convo.id);
+    if (!roomDetails) {
+      throw new Error(`getCommunityByFullUrl returned no result for ${convo.id}`);
     }
-  });
-};
+    const groupInvitation = {
+      url: roomDetails?.fullUrl,
+      name: convo.getNicknameOrRealUsernameOrPlaceholder(),
+    };
+    pubkeys.forEach(async pubkeyStr => {
+      const privateConvo = await getConversationController().getOrCreateAndWait(
+        pubkeyStr,
+        ConversationTypeEnum.PRIVATE
+      );
+
+      if (privateConvo) {
+        void privateConvo.sendMessage({
+          body: '',
+          attachments: undefined,
+          groupInvitation,
+          preview: undefined,
+          quote: undefined,
+        });
+      }
+    });
+  } catch (e) {
+    window.log.warn('submitForOpenGroup failed with:', e.message);
+  }
+}
 
 const submitForClosedGroup = async (convoId: string, pubkeys: Array<string>) => {
   const convo = getConversationController().get(convoId);
@@ -126,7 +133,7 @@ const InviteContactsDialogInner = (props: Props) => {
   const onClickOK = () => {
     if (selectedContacts.length > 0) {
       if (isPublicConvo) {
-        void submitForOpenGroup(conversationId, selectedContacts);
+        submitForOpenGroup(conversationId, selectedContacts);
       } else {
         void submitForClosedGroup(conversationId, selectedContacts);
       }
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 6c0fc05cc..62f846460 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -395,7 +395,15 @@ export const CopyMenuItem = (): JSX.Element | null => {
 
   if (showCopyId(isPublic, isPrivate, isBlinded)) {
     const copyIdLabel = isPublic ? window.i18n('copyOpenGroupURL') : window.i18n('copySessionID');
-    return <Item onClick={() => copyPublicKeyByConvoId(convoId)}>{copyIdLabel}</Item>;
+    return (
+      <Item
+        onClick={() => {
+          copyPublicKeyByConvoId(convoId);
+        }}
+      >
+        {copyIdLabel}
+      </Item>
+    );
   }
   return null;
 };
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index d62a81fb6..2ce49e478 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncObjectWrapper,
-  ConfigDumpDataNode,
-  ConfigDumpRow,
-  ConfigDumpRowWithoutData,
-  ConfigDumpRowWithoutHashes,
-} from '../../types/sqlSharedTypes';
+import { AsyncObjectWrapper, ConfigDumpDataNode, ConfigDumpRow } from '../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
 import { cleanData } from '../dataUtils';
@@ -13,30 +7,13 @@ export const ConfigDumpData: AsyncObjectWrapper<ConfigDumpDataNode> = {
   getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
     return channels.getByVariantAndPubkey(variant, pubkey);
   },
-  getMessageHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
-    return channels.getMessageHashesByVariantAndPubkey(variant, pubkey);
-  },
   saveConfigDump: (dump: ConfigDumpRow) => {
-    console.warn('saveConfigDump', dump.variant);
-    if (dump.combinedMessageHashes.some(m => Boolean(m && m.length < 5))) {
-      throw new Error('saveConfigDump combinedMessageHashes have invalid size');
-    }
     return channels.saveConfigDump(cleanData(dump));
   },
-  saveConfigDumpNoHashes: (dump: ConfigDumpRowWithoutHashes) => {
-    return channels.saveConfigDumpNoHashes(cleanData(dump));
-  },
-
-  saveCombinedMessageHashesForMatching: (dump: ConfigDumpRowWithoutData) => {
-    return channels.saveCombinedMessageHashesForMatching(cleanData(dump));
-  },
   getAllDumpsWithData: () => {
     return channels.getAllDumpsWithData();
   },
   getAllDumpsWithoutData: () => {
     return channels.getAllDumpsWithoutData();
   },
-  getCombinedHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => {
-    return channels.getCombinedHashesByVariantAndPubkey(variant, pubkey);
-  },
 };
diff --git a/ts/data/data.ts b/ts/data/data.ts
index b2b2458cf..d6467b315 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -366,13 +366,11 @@ async function markAllAsReadByConversationNoExpiration(
   returnMessagesUpdated: boolean // for performance reason we do not return them because usually they are not needed
 ): Promise<Array<number>> {
   // tslint:disable-next-line: no-console
-  console.time('markAllAsReadByConversationNoExpiration');
   const messagesIds = await channels.markAllAsReadByConversationNoExpiration(
     conversationId,
     returnMessagesUpdated
   );
   // tslint:disable-next-line: no-console
-  console.timeEnd('markAllAsReadByConversationNoExpiration');
   return messagesIds;
 }
 
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index 7638f1b57..fc3646fb8 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -8,7 +8,6 @@ const channelsToMakeForOpengroupV2 = [
   'getV2OpenGroupRoom',
   'saveV2OpenGroupRoom',
   'removeV2OpenGroupRoom',
-  'getAllOpenGroupV2Conversations',
 ];
 
 const channelsToMakeForConfigDumps = [...Object.keys(ConfigDumpData)];
diff --git a/ts/data/opengroups.ts b/ts/data/opengroups.ts
index 798460a7e..d14c7952a 100644
--- a/ts/data/opengroups.ts
+++ b/ts/data/opengroups.ts
@@ -1,5 +1,4 @@
 import { cloneDeep, isNumber, uniq } from 'lodash';
-import { ConversationCollection } from '../models/conversation';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { isOpenGroupV2 } from '../session/apis/open_group_api/utils/OpenGroupUtils';
 import { channels } from './channels';
@@ -54,7 +53,6 @@ export const OpenGroupData = {
   saveV2OpenGroupRooms,
   getV2OpenGroupRoomByRoomId,
   removeV2OpenGroupRoom,
-  getAllOpenGroupV2Conversations,
   getAllOpengroupsServerPubkeys,
   getAllV2OpenGroupRooms,
 };
@@ -76,7 +74,7 @@ function getAllV2OpenGroupRoomsMap(): Map<string, OpenGroupV2Room> | undefined {
 }
 
 // this is just to make testing and stubbing easier
-async function getAllV2OpenGroupRooms() {
+async function getAllV2OpenGroupRooms(): Promise<Array<OpenGroupV2Room> | undefined> {
   return channels.getAllV2OpenGroupRooms();
 }
 
@@ -87,9 +85,7 @@ async function opengroupRoomsLoad() {
   if (cachedRooms !== null) {
     return;
   }
-  const loadedFromDB = (await OpenGroupData.getAllV2OpenGroupRooms()) as
-    | Array<OpenGroupV2Room>
-    | undefined;
+  const loadedFromDB = await OpenGroupData.getAllV2OpenGroupRooms();
 
   if (loadedFromDB) {
     cachedRooms = new Array();
@@ -176,14 +172,6 @@ async function removeV2OpenGroupRoom(conversationId: string): Promise<void> {
   }
 }
 
-async function getAllOpenGroupV2Conversations(): Promise<ConversationCollection> {
-  const conversations = await channels.getAllOpenGroupV2Conversations();
-
-  const collection = new ConversationCollection();
-  collection.add(conversations);
-  return collection;
-}
-
 function getAllOpengroupsServerPubkeys(): Array<string> {
   return uniq(throwIfNotLoaded().map(room => room.serverPublicKey)) || [];
 }
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 7190f7418..153452356 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -1,18 +1,21 @@
-import {
-  getCompleteUrlFromRoom,
-  openGroupPrefixRegex,
-  openGroupV2ConversationIdRegex,
-} from '../session/apis/open_group_api/utils/OpenGroupUtils';
-import { OpenGroupData } from '../data/opengroups';
-import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils';
 import {
   ConversationNotificationSettingType,
   ConversationTypeEnum,
 } from '../models/conversationAttributes';
+import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils';
 
-import _ from 'lodash';
+import { SessionButtonColor } from '../components/basic/SessionButton';
+import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
+import { Data, hasLinkPreviewPopupBeenDisplayed, lastAvatarUploadTimestamp } from '../data/data';
+import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi';
 import { getConversationController } from '../session/conversations';
-import { BlockedNumberController } from '../util/blockedNumberController';
+import { getSodiumRenderer } from '../session/crypto';
+import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { perfEnd, perfStart } from '../session/utils/Performance';
+import { fromHexToArray, toHex } from '../session/utils/String';
+import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
+import { quoteMessage, resetConversationExternal } from '../state/ducks/conversations';
 import {
   adminLeaveClosedGroup,
   changeNickNameModal,
@@ -24,62 +27,30 @@ import {
   updateInviteContactModal,
   updateRemoveModeratorsModal,
 } from '../state/ducks/modalDialog';
-import { Data, hasLinkPreviewPopupBeenDisplayed, lastAvatarUploadTimestamp } from '../data/data';
-import { quoteMessage, resetConversationExternal } from '../state/ducks/conversations';
-import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
-import { IMAGE_JPEG } from '../types/MIME';
-import { fromHexToArray, toHex } from '../session/utils/String';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
-import { SessionButtonColor } from '../components/basic/SessionButton';
-import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
-import { perfEnd, perfStart } from '../session/utils/Performance';
-import { processNewAttachment } from '../types/MessageAttachment';
-import { urlToBlob } from '../types/attachments/VisualAttachment';
 import { MIME } from '../types';
-import { setLastProfileUpdateTimestamp } from '../util/storage';
-import { getSodiumRenderer } from '../session/crypto';
+import { urlToBlob } from '../types/attachments/VisualAttachment';
+import { processNewAttachment } from '../types/MessageAttachment';
+import { IMAGE_JPEG } from '../types/MIME';
+import { BlockedNumberController } from '../util/blockedNumberController';
 import { encryptProfile } from '../util/crypto/profileEncrypter';
-import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi';
-import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { setLastProfileUpdateTimestamp } from '../util/storage';
+import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
+import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 
-export const getCompleteUrlForV2ConvoId = async (convoId: string) => {
-  if (convoId.match(openGroupV2ConversationIdRegex)) {
-    // this is a v2 group, just build the url
-    const roomInfos = OpenGroupData.getV2OpenGroupRoom(convoId);
-    if (roomInfos) {
-      const fullUrl = getCompleteUrlFromRoom(roomInfos);
+export function copyPublicKeyByConvoId(convoId: string) {
+  if (OpenGroupUtils.isOpenGroupV2(convoId)) {
+    const fromWrapper = SessionUtilUserGroups.getCommunityMappedValueByConvoId(convoId);
 
-      return fullUrl;
-    }
-  }
-  return undefined;
-};
-
-export async function copyPublicKeyByConvoId(convoId: string) {
-  if (convoId.match(openGroupPrefixRegex)) {
-    // open group v1 or v2
-    if (convoId.match(openGroupV2ConversationIdRegex)) {
-      // this is a v2 group, just build the url
-      const completeUrl = await getCompleteUrlForV2ConvoId(convoId);
-      if (completeUrl) {
-        window.clipboard.writeText(completeUrl);
-
-        ToastUtils.pushCopiedToClipBoard();
-        return;
-      }
-      window?.log?.warn('copy to pubkey no roomInfo');
-      return;
+    if (!fromWrapper) {
+      throw new Error('opengroup to copy was not found in the UserGroupsWrapper');
     }
 
-    // this is a v1
-    const atIndex = convoId.indexOf('@');
-    const openGroupUrl = convoId.substr(atIndex + 1);
-    window.clipboard.writeText(openGroupUrl);
-
-    ToastUtils.pushCopiedToClipBoard();
-    return;
+    if (fromWrapper.fullUrl) {
+      window.clipboard.writeText(fromWrapper.fullUrl);
+    }
+  } else {
+    window.clipboard.writeText(convoId);
   }
-  window.clipboard.writeText(convoId);
 
   ToastUtils.pushCopiedToClipBoard();
 }
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 97997fe00..887a8a67e 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -408,10 +408,6 @@ async function deleteOpenGroupMessages(
     throw new Error('cannot delete public message on a non public groups');
   }
 
-  if (!convo.isOpenGroupV2()) {
-    throw new Error('Opengroupv1 are not supported anymore');
-  }
-
   const roomInfos = convo.toOpenGroupV2();
   // on v2 servers we can only remove a single message per request..
   // so logic here is to delete each messages and get which one where not removed
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 0b9d5e622..14c1e2c6d 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -102,6 +102,7 @@ import {
   isDirectConversation,
   isOpenOrClosedGroup,
 } from './conversationAttributes';
+import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -201,8 +202,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     if (this.isPublic()) {
-      const opengroup = this.toOpenGroupV2();
-      return `${opengroup.serverUrl}/${opengroup.roomId}`;
+      return this.id;
     }
 
     return `group(${ed25519Str(this.id)})`;
@@ -212,7 +212,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return UserUtils.isUsFromCache(this.id);
   }
   public isPublic(): boolean {
-    return Boolean(this.id && this.id.match(OpenGroupUtils.openGroupPrefixRegex));
+    return this.isOpenGroupV2();
   }
   public isOpenGroupV2(): boolean {
     return OpenGroupUtils.isOpenGroupV2(this.id);
@@ -351,35 +351,68 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.avatarPath = avatarPath;
     }
 
-    const foundWrapperValue = SessionUtilContact.getMappedValue(this.id);
+    const foundContact = SessionUtilContact.getMappedValue(this.id);
+    const foundCommunity = SessionUtilUserGroups.getCommunityMappedValueByConvoId(this.id);
 
-    if (foundWrapperValue) {
-      if (foundWrapperValue.name) {
-        toRet.displayNameInProfile = foundWrapperValue.name;
+    if (foundContact) {
+      if (foundContact.name) {
+        toRet.displayNameInProfile = foundContact.name;
       }
 
-      if (foundWrapperValue.nickname) {
-        toRet.nickname = foundWrapperValue.nickname;
+      if (foundContact.nickname) {
+        toRet.nickname = foundContact.nickname;
         toRet.hasNickname = !!toRet.nickname;
       }
 
-      if (foundWrapperValue.blocked) {
-        toRet.isBlocked = foundWrapperValue.blocked;
+      if (foundContact.blocked) {
+        toRet.isBlocked = foundContact.blocked;
       }
 
-      if (foundWrapperValue.approvedMe) {
-        toRet.didApproveMe = foundWrapperValue.approvedMe;
+      if (foundContact.approvedMe) {
+        toRet.didApproveMe = foundContact.approvedMe;
       }
 
-      if (foundWrapperValue.approved) {
-        toRet.isApproved = foundWrapperValue.approved;
+      if (foundContact.approved) {
+        toRet.isApproved = foundContact.approved;
       }
 
-      if (foundWrapperValue.hidden) {
-        toRet.activeAt = undefined;
+      toRet.isHidden = foundContact.hidden;
+
+      if (foundContact.priority > 0) {
+        toRet.isPinned = true; // TODO priority also handles sorting
+      }
+    } else {
+      if (this.get('displayNameInProfile')) {
+        toRet.displayNameInProfile = this.get('displayNameInProfile');
       }
 
-      if (foundWrapperValue.priority > 0) {
+      if (this.get('nickname')) {
+        toRet.nickname = this.get('nickname');
+        toRet.hasNickname = !!toRet.nickname;
+      }
+
+      if (BlockedNumberController.isBlocked(this.id)) {
+        toRet.isBlocked = true;
+      }
+
+      if (this.get('didApproveMe')) {
+        toRet.didApproveMe = this.get('didApproveMe');
+      }
+
+      if (this.get('isApproved')) {
+        toRet.isApproved = this.get('isApproved');
+      }
+      if (!this.get('active_at')) {
+        toRet.isHidden = true;
+      }
+
+      if (this.get('isPinned')) {
+        toRet.isPinned = true;
+      }
+    }
+
+    if (foundCommunity) {
+      if (foundCommunity.priority > 0) {
         toRet.isPinned = true; // TODO priority also handles sorting
       }
     }
@@ -1250,7 +1283,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.isMediumGroup()) {
       await leaveClosedGroup(this.id);
     } else {
-      window?.log?.error('Cannot leave a non-medium group conversation');
       throw new Error(
         'Legacy group are not supported anymore. You need to create this group again.'
       );
@@ -2213,20 +2245,28 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
   await Data.saveConversation(convo.attributes);
 
-  const shouldBeSavedToWrapper = SessionUtilContact.filterContactsToStoreInContactsWrapper(convo);
+  const shouldBeSavedToContactsWrapper = SessionUtilContact.filterContactsToStoreInContactsWrapper(
+    convo
+  );
+  const shouldBeSavedToUserGroupsWrapper = SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+    convo
+  );
 
-  console.warn(`should be saved to wrapper ${id}: ${shouldBeSavedToWrapper}`);
-  if (shouldBeSavedToWrapper) {
+  console.warn(`should be saved to contacts wrapper ${id}: ${shouldBeSavedToContactsWrapper}`);
+  console.warn(`should be saved to usergroups wrapper ${id}: ${shouldBeSavedToUserGroupsWrapper}`);
+  if (shouldBeSavedToContactsWrapper) {
     await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
+  } else if (shouldBeSavedToUserGroupsWrapper) {
+    await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
+  }
 
-    // save the new dump if needed to the DB asap
-    // this call throttled so we do not run this too often (and not for every .commit())
-    await ConfigurationDumpSync.queueNewJobIfNeeded();
+  // save the new dump if needed to the DB asap
+  // this call throttled so we do not run this too often (and not for every .commit())
+  await ConfigurationDumpSync.queueNewJobIfNeeded();
 
-    // if we need to sync the dump, also send add a job for syncing
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      await ConfigurationSync.queueNewJobIfNeeded();
-    }
+  // if we need to sync the dump, also send add a job for syncing
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    await ConfigurationSync.queueNewJobIfNeeded();
   }
   convo.triggerUIRefresh();
 }
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 70964d624..aa04cd3ee 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -5,7 +5,7 @@ import { LastMessageStatusType } from '../state/ducks/conversations';
  * Private chats have always the type `Private`
  * Open groups have always the type `Group`
  * Closed group have the type `Group` when they are not v3 and the type `CLOSED_GROUP` when they v3.
- * To identity between an open or closed group before v3, we need to rely on the prefix (05 is closed groups, publicChat is opengroup)
+ * To identity between an open or closed group before v3, we need to rely on the prefix (05 is closed groups, 'http%' is opengroup)
  *
  *
  * We will need to support existing closed groups foir now, but we will be able to get rid of existing closed groups at some point.
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 14d581f5f..649308747 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,13 +1,18 @@
 import * as BetterSqlite3 from 'better-sqlite3';
 import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
-import { compact, isArray, isEmpty, map, pick } from 'lodash';
+import { compact, isArray, isEmpty, isString, map, pick } from 'lodash';
 import {
   ContactsConfigWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
+  UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
 import { ConversationAttributes } from '../../models/conversationAttributes';
 import { fromHexToArray } from '../../session/utils/String';
-import { CONFIG_DUMP_TABLE, getContactInfoFromDBValues } from '../../types/sqlSharedTypes';
+import {
+  CONFIG_DUMP_TABLE,
+  getCommunityInfoFromDBValues,
+  getContactInfoFromDBValues,
+} from '../../types/sqlSharedTypes';
 import {
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
   CONVERSATIONS_TABLE,
@@ -890,22 +895,6 @@ function updateToSessionSchemaVersion26(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-function getRoomIdFromConversationAttributes(attributes?: ConversationAttributes | null) {
-  if (!attributes) {
-    return null;
-  }
-  const indexSemiColon = attributes.id.indexOf(':');
-  const indexAt = attributes.id.indexOf('@');
-  if (indexSemiColon < 0 || indexAt < 0 || indexSemiColon >= indexAt) {
-    return null;
-  }
-  const roomId = attributes.id.substring(indexSemiColon, indexAt);
-  if (roomId.length <= 0) {
-    return null;
-  }
-  return roomId;
-}
-
 function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite3.Database) {
   const targetVersion = 27;
   if (currentVersion >= targetVersion) {
@@ -917,7 +906,7 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
 
   const ipToRemove = '116.203.70.33';
 
-  // defining this function here as this is very specific to this migration and used in a few places
+  // defining these functions here as this is very specific to this migration and used in a few places
   function getNewConvoId(oldConvoId?: string) {
     if (!oldConvoId) {
       return null;
@@ -931,7 +920,37 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
     );
   }
 
-  getNewConvoId('test');
+  function getAllOpenGroupV2Conversations(instance: BetterSqlite3.Database) {
+    // first _ matches all opengroupv1 (they are completely removed in a migration now),
+    // second _ force a second char to be there, so it can only be opengroupv2 convos
+
+    const rows = instance
+      .prepare(
+        `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE
+        type = 'group' AND
+        id LIKE 'publicChat:__%@%'
+       ORDER BY id ASC;`
+      )
+      .all();
+
+    return rows || [];
+  }
+
+  function getRoomIdFromConversationAttributes(attributes?: ConversationAttributes | null) {
+    if (!attributes) {
+      return null;
+    }
+    const indexSemiColon = attributes.id.indexOf(':');
+    const indexAt = attributes.id.indexOf('@');
+    if (indexSemiColon < 0 || indexAt < 0 || indexSemiColon >= indexAt) {
+      return null;
+    }
+    const roomId = attributes.id.substring(indexSemiColon, indexAt);
+    if (roomId.length <= 0) {
+      return null;
+    }
+    return roomId;
+  }
 
   // tslint:disable-next-line: max-func-body-length
   db.transaction(() => {
@@ -1026,21 +1045,12 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
      * Then, update the conversations table by doing the same thing
      */
     const allSessionV2ConvosIp = compact(
-      sqlNode.getAllOpenGroupV2Conversations(db).filter(m => m?.id.includes(ipToRemove))
+      getAllOpenGroupV2Conversations(db).filter(m => m?.id.includes(ipToRemove))
     );
     const allSessionV2ConvosDns = compact(
-      sqlNode.getAllOpenGroupV2Conversations(db).filter(m => m?.id.includes(domainNameToUse))
+      getAllOpenGroupV2Conversations(db).filter(m => m?.id.includes(domainNameToUse))
     );
 
-    const duplicatesConvosIpAndDns = allSessionV2ConvosIp.filter(ip => {
-      const roomId = getRoomIdFromConversationAttributes(ip);
-      if (!roomId) {
-        return false;
-      }
-      return allSessionV2ConvosDns.some(dns => {
-        return getRoomIdFromConversationAttributes(dns) === roomId;
-      });
-    });
     const withIpButNotDuplicateConvo = allSessionV2ConvosIp.filter(ip => {
       const roomId = getRoomIdFromConversationAttributes(ip);
       if (!roomId) {
@@ -1051,23 +1061,7 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
         return getRoomIdFromConversationAttributes(dns) === roomId;
       });
     });
-    console.info('========================================');
-    console.info(
-      'allSessionV2ConvosIp',
-      allSessionV2ConvosIp.map(m => m?.id)
-    );
-    console.info(
-      'allSessionV2ConvosDns',
-      allSessionV2ConvosDns.map(m => m?.id)
-    );
-    console.info(
-      'duplicatesConvosIpAndDns',
-      duplicatesConvosIpAndDns.map(m => m?.id)
-    );
-    console.info(
-      'withIpButNotDuplicateConvo',
-      withIpButNotDuplicateConvo.map(m => m?.id)
-    );
+
     // for those with duplicates, delete the one with the IP as we want to rely on the one with the DNS only now
     // remove the ip ones completely which are duplicated.
     // Note: this also removes the ones not duplicated, but we are recreating them just below with `saveConversation`
@@ -1096,14 +1090,6 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
       );
     });
 
-    console.info(
-      'after convos update:',
-      sqlNode
-        .getAllOpenGroupV2Conversations(db)
-        .filter(m => m?.id.includes(domainNameToUse) || m?.id.includes(ipToRemove))
-        .map(m => m?.id)
-    );
-
     /**
      * Lastly, we need to take care of messages.
      * For duplicated rooms, we drop all the messages from the IP one. (Otherwise we would need to compare each message id to not break the PRIMARY_KEY on the messageID and those are just sogs messages).
@@ -1327,6 +1313,54 @@ function insertContactIntoWrapper(
   }
 }
 
+function insertCommunityIntoWrapper(
+  community: { id: string; isPinned: boolean },
+  userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
+  db: BetterSqlite3.Database
+) {
+  const isPinned = community.isPinned;
+  const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
+
+  const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
+
+  if (
+    !roomDetails ||
+    isEmpty(roomDetails) ||
+    isEmpty(roomDetails.serverUrl) ||
+    isEmpty(roomDetails.roomId) ||
+    isEmpty(roomDetails.serverPublicKey)
+  ) {
+    console.info(
+      'insertCommunityIntoWrapper did not find corresponding room details',
+      convoId,
+      roomDetails
+    );
+    return;
+  }
+  console.info(
+    `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"`
+  );
+
+  const fullUrl = userGroupConfigWrapper.buildFullUrlFromDetails(
+    roomDetails.serverUrl,
+    roomDetails.roomId,
+    roomDetails.serverPublicKey
+  );
+  const wrapperComm = getCommunityInfoFromDBValues({
+    fullUrl,
+    isPinned,
+  });
+
+  try {
+    console.info('Inserting community into wrapper: ', wrapperComm);
+    userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority);
+  } catch (e) {
+    console.error(
+      `userGroupConfigWrapper.set during migration failed with ${e.message} for fullUrl: "${wrapperComm.fullUrl}". Skipping community entirely`
+    );
+  }
+}
+
 function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
   try {
     const blockedItem = sqlNode.getItemById('blocked', db);
@@ -1381,7 +1415,6 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       variant TEXT NOT NULL,
       publicKey TEXT NOT NULL,
       data BLOB,
-      combinedMessageHashes TEXT,
       PRIMARY KEY (publicKey, variant)
       );
       `);
@@ -1395,6 +1428,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       const { privateEd25519, publicKeyHex } = keys;
       const userProfileWrapper = new UserConfigWrapperInsideWorker(privateEd25519, null);
       const contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(privateEd25519, null);
+      const userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(privateEd25519, null);
 
       /**
        * Setup up the User profile wrapper with what is stored in our own conversation
@@ -1424,18 +1458,15 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
               publicKey,
               variant,
-              combinedMessageHashes,
               data
           ) values (
             $publicKey,
             $variant,
-            $combinedMessageHashes,
             $data
           );`
       ).run({
         publicKey: publicKeyHex,
         variant: 'UserConfig',
-        combinedMessageHashes: JSON.stringify([]),
         data: userDump,
       });
 
@@ -1475,21 +1506,110 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
               publicKey,
               variant,
-              combinedMessageHashes,
               data
           ) values (
             $publicKey,
             $variant,
-            $combinedMessageHashes,
             $data
           );`
       ).run({
         publicKey: publicKeyHex,
         variant: 'ContactsConfig',
-        combinedMessageHashes: JSON.stringify([]),
         data: contactsDump,
       });
 
+      const allOpengroupsConvo = db
+        .prepare(
+          `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
+        type = 'group' AND
+        id LIKE 'publicChat:%'
+       ORDER BY id ASC;`
+        )
+        .all();
+
+      const allValidOpengroupsDetails = allOpengroupsConvo
+        .filter(m => isString(m.id) && m.id.indexOf('@') > 0)
+        .map(row => {
+          const roomNameStart = (row.id.indexOf(':') as number) + 1;
+          const roomNameEnd = row.id.indexOf('@');
+          const roomName = row.id.substring(roomNameStart, roomNameEnd);
+          const baseUrl = row.id.substring((roomNameEnd as number) + 1);
+
+          return { roomName, baseUrl, oldConvoId: row.id };
+        });
+
+      allValidOpengroupsDetails.forEach(convoDetails => {
+        const newId = `${convoDetails.baseUrl}/${convoDetails.roomName}`;
+        db.prepare(
+          `UPDATE ${CONVERSATIONS_TABLE} SET
+            id = $newId
+            WHERE id = $oldId;`
+        ).run({
+          newId,
+          oldId: convoDetails.oldConvoId,
+        });
+        // do the same for messages and where else?
+
+        db.prepare(
+          `UPDATE ${MESSAGES_TABLE} SET
+            conversationId = $newId,
+            json = json_set(json,'$.conversationId', $newId)
+            WHERE conversationId = $oldConvoId;`
+        ).run({ oldConvoId: convoDetails.oldConvoId, newId });
+
+        db.prepare(
+          `UPDATE ${OPEN_GROUP_ROOMS_V2_TABLE} SET
+            conversationId = $newId,
+            json = json_set(json, '$.conversationId', $newId);`
+        ).run({ newId });
+      });
+
+      // this filter is based on the `filterUserGroupsToStoreInWrapper` function.
+      const communitiesToWriteInWrapper = db
+        .prepare(
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'group' AND active_at > 0 AND id LIKE 'http%' ;`
+        )
+        .all({});
+
+      if (isArray(communitiesToWriteInWrapper) && communitiesToWriteInWrapper.length) {
+        console.warn(
+          '===================== Starting communities inserting into wrapper ======================='
+        );
+
+        console.info(
+          'Writing communities to wrapper during migration. length: ',
+          communitiesToWriteInWrapper?.length
+        );
+
+        communitiesToWriteInWrapper.forEach(community => {
+          insertCommunityIntoWrapper(community, userGroupsConfigWrapper, db);
+
+          console.info('Writing community: ', JSON.stringify(community));
+        });
+
+        console.warn(
+          '===================== Done with communinities inserting ======================='
+        );
+        // TODO we need to do the same for closed groups
+      }
+      const userGroupsDump = userGroupsConfigWrapper.dump();
+
+      db.prepare(
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
+              publicKey,
+              variant,
+              data
+          ) values (
+            $publicKey,
+            $variant,
+            $data
+          );`
+      ).run({
+        publicKey: publicKeyHex,
+        variant: 'UserGroupsConfig',
+        data: userGroupsDump,
+      });
+
       // TODO we've just created the initial dumps. We have to add an initial SyncJob to the database so it is run on the next app start/
       // or find another way of adding one on the next start (store an another item in the DB and check for it on app start?)
     } catch (e) {
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 0815c6e5b..18ec179ce 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -546,38 +546,6 @@ function getAllConversations() {
   return (rows || []).map(formatRowOfConversation);
 }
 
-function getAllOpenGroupV2Conversations(instance?: BetterSqlite3.Database) {
-  // first _ matches all opengroupv1 (they are completely removed in a migration now),
-  // second _ force a second char to be there, so it can only be opengroupv2 convos
-
-  const rows = assertGlobalInstanceOrInstance(instance)
-    .prepare(
-      `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE
-      type = 'group' AND
-      id LIKE 'publicChat:__%@%'
-     ORDER BY id ASC;`
-    )
-    .all();
-
-  return (rows || []).map(formatRowOfConversation);
-}
-
-function getAllOpenGroupV2ConversationsIds(): Array<string> {
-  // first _ matches all opengroupv1 (they are completely removed in a migration now),
-  // second _ force a second char to be there, so it can only be opengroupv2 convos
-
-  const rows = assertGlobalInstance()
-    .prepare(
-      `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
-      type = 'group' AND
-      id LIKE 'publicChat:__%@%'
-     ORDER BY id ASC;`
-    )
-    .all();
-
-  return map(rows, row => row.id);
-}
-
 function getPubkeysInPublicConversation(conversationId: string) {
   const conversation = getV2OpenGroupRoom(conversationId);
   if (!conversation) {
@@ -1921,8 +1889,8 @@ function getAllV2OpenGroupRooms(instance?: BetterSqlite3.Database): Array<OpenGr
   return rows.map(r => jsonToObject(r.json)) as Array<OpenGroupV2Room>;
 }
 
-function getV2OpenGroupRoom(conversationId: string) {
-  const row = assertGlobalInstance()
+function getV2OpenGroupRoom(conversationId: string, db?: BetterSqlite3.Database) {
+  const row = assertGlobalInstanceOrInstance(db)
     .prepare(
       `SELECT json FROM ${OPEN_GROUP_ROOMS_V2_TABLE} WHERE conversationId = $conversationId;`
     )
@@ -1930,6 +1898,13 @@ function getV2OpenGroupRoom(conversationId: string) {
       conversationId,
     });
 
+  console.warn(
+    '=================',
+    assertGlobalInstanceOrInstance(db)
+      .prepare(`SELECT json FROM ${OPEN_GROUP_ROOMS_V2_TABLE};`)
+      .all()
+  );
+
   if (!row) {
     return null;
   }
@@ -2023,7 +1998,7 @@ function cleanUpUnusedNodeForKeyEntriesOnStart() {
   const allIdsToKeep =
     assertGlobalInstance()
       .prepare(
-        `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE id NOT LIKE 'publicChat:%'
+        `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE id NOT LIKE 'http%'
     `
       )
       .all()
@@ -2085,7 +2060,17 @@ function cleanUpOldOpengroupsOnStart() {
     return;
   }
 
-  const v2ConvosIds = getAllOpenGroupV2ConversationsIds();
+  const rows = assertGlobalInstance()
+    .prepare(
+      `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
+      type = 'group' AND
+      id LIKE 'http%'
+     ORDER BY id ASC;`
+    )
+    .all();
+
+  const v2ConvosIds = map(rows, row => row.id);
+
   if (!v2ConvosIds || !v2ConvosIds.length) {
     console.info('cleanUpOldOpengroups: v2Convos is empty');
     return;
@@ -2227,7 +2212,6 @@ export const sqlNode = {
   getConversationById,
   removeConversation,
   getAllConversations,
-  getAllOpenGroupV2Conversations,
   getPubkeysInPublicConversation,
   removeAllConversations,
 
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index 14e3898cd..b16b6e4ab 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -2,22 +2,18 @@
  * Config dumps sql calls
  */
 
-import { compact, isEmpty, uniq } from 'lodash';
-import { uniqFromListOfList } from '../../shared/string_utils';
+import { compact, uniq } from 'lodash';
 import {
+  CONFIG_DUMP_TABLE,
   ConfigDumpDataNode,
   ConfigDumpRow,
   ConfigDumpRowWithoutData,
-  ConfigDumpRowWithoutHashes,
-  CONFIG_DUMP_TABLE,
 } from '../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { assertGlobalInstance } from '../sqlInstance';
 
-type CombinedMessageHashes = { combinedMessageHashes?: string };
-
 function parseRow(
-  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'> & CombinedMessageHashes
+  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'>
 ): ConfigDumpRow | null {
   const parsedNoData = parseRowNoData(row);
   if (!parsedNoData) {
@@ -27,14 +23,12 @@ function parseRow(
 }
 
 function parseRowNoData(
-  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'> & CombinedMessageHashes
+  row: Pick<ConfigDumpRow, 'data' | 'publicKey' | 'variant'>
 ): ConfigDumpRowWithoutData | null {
   const toRet: ConfigDumpRowWithoutData = {
     publicKey: row.publicKey,
     variant: row.variant,
-    combinedMessageHashes: [],
   };
-  toRet.combinedMessageHashes = parseRowMessageHashes(row);
 
   return toRet;
 }
@@ -46,22 +40,11 @@ export function uniqCompacted<T extends string>(list: Array<T>): Array<T> {
   return uniq(compact(list));
 }
 
-function parseRowMessageHashes(row: CombinedMessageHashes): Array<string> {
-  if (!isEmpty(row.combinedMessageHashes) && row.combinedMessageHashes) {
-    try {
-      return uniqCompacted(JSON.parse(row.combinedMessageHashes));
-    } catch (e) {
-      console.warn('parseRowMessageHashes row failed');
-    }
-  }
-  return [];
-}
-
 export const configDumpData: ConfigDumpDataNode = {
   getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
     const rows = assertGlobalInstance()
       .prepare(
-        `SELECT publicKey, variant, combinedMessageHashes, data from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
+        `SELECT publicKey, variant, data from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
       )
       .all({
         publicKey,
@@ -75,31 +58,9 @@ export const configDumpData: ConfigDumpDataNode = {
     return compact(rows.map(parseRow));
   },
 
-  getMessageHashesByVariantAndPubkey: (
-    variant: ConfigWrapperObjectTypes,
-    publicKey: string
-  ): Array<string> => {
-    const rows = assertGlobalInstance()
-      .prepare(
-        `SELECT combinedMessageHashes from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
-      )
-      .all({
-        publicKey,
-        variant,
-      });
-
-    if (!rows) {
-      return [];
-    }
-    const parsedRows: Array<Array<string>> = rows.map(parseRowMessageHashes);
-
-    const unique: Array<string> = uniqFromListOfList(parsedRows);
-    return unique;
-  },
-
   getAllDumpsWithData: () => {
     const rows = assertGlobalInstance()
-      .prepare(`SELECT variant, publicKey, combinedMessageHashes, data from ${CONFIG_DUMP_TABLE};`)
+      .prepare(`SELECT variant, publicKey, data from ${CONFIG_DUMP_TABLE};`)
       .all();
 
     if (!rows) {
@@ -111,7 +72,7 @@ export const configDumpData: ConfigDumpDataNode = {
 
   getAllDumpsWithoutData: () => {
     const rows = assertGlobalInstance()
-      .prepare(`SELECT variant, publicKey, combinedMessageHashes from ${CONFIG_DUMP_TABLE};`)
+      .prepare(`SELECT variant, publicKey from ${CONFIG_DUMP_TABLE};`)
       .all();
 
     if (!rows) {
@@ -121,79 +82,23 @@ export const configDumpData: ConfigDumpDataNode = {
     return compact(rows.map(parseRowNoData));
   },
 
-  saveConfigDump: ({ data, publicKey, variant, combinedMessageHashes }: ConfigDumpRow) => {
+  saveConfigDump: ({ data, publicKey, variant }: ConfigDumpRow) => {
     assertGlobalInstance()
       .prepare(
         `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
               publicKey,
               variant,
-              combinedMessageHashes,
               data
           ) values (
             $publicKey,
             $variant,
-            $combinedMessageHashes,
             $data
           );`
       )
       .run({
         publicKey,
         variant,
-        combinedMessageHashes: JSON.stringify(uniqCompacted(combinedMessageHashes)),
         data,
       });
   },
-  saveConfigDumpNoHashes: ({ data, publicKey, variant }: ConfigDumpRowWithoutHashes) => {
-    assertGlobalInstance()
-      .prepare(
-        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
-            publicKey,
-            variant,
-            data
-        ) values (
-          $publicKey,
-          $variant,
-          $data
-        );`
-      )
-      .run({
-        publicKey,
-        variant,
-        data,
-      });
-  },
-
-  saveCombinedMessageHashesForMatching: ({
-    publicKey,
-    variant,
-    combinedMessageHashes,
-  }: ConfigDumpRowWithoutData) => {
-    assertGlobalInstance()
-      .prepare(
-        `UPDATE ${CONFIG_DUMP_TABLE} SET
-         combinedMessageHashes = $combinedMessageHashes
-         WHERE publicKey=$publicKey AND variant=$variant;`
-      )
-      .run({
-        publicKey,
-        variant,
-        combinedMessageHashes: JSON.stringify(uniqCompacted(combinedMessageHashes)),
-      });
-  },
-
-  getCombinedHashesByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => {
-    const rows = assertGlobalInstance()
-      .prepare(
-        `SELECT combinedMessageHashes from ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;`
-      )
-      .all({
-        publicKey,
-        variant,
-      });
-
-    if (!rows) {
-      return new Array<string>();
-    }
-    return uniqFromListOfList(rows.map(parseRowMessageHashes));
-  },
 };
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 2c7dd0a2e..4f6c692c8 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { isEmpty, isEqual } from 'lodash';
+import _, { compact, isEmpty } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -8,6 +8,8 @@ import {
   joinOpenGroupV2WithUIEvents,
   parseOpenGroupV2,
 } from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
+import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
+import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
 import { getConversationController } from '../session/conversations';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
@@ -15,6 +17,7 @@ import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { UserUtils } from '../session/utils';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
+import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { BlockedNumberController } from '../util';
@@ -23,6 +26,7 @@ import {
   ContactsWrapperActions,
   GenericWrapperActions,
   UserConfigWrapperActions,
+  UserGroupsWrapperActions,
 } from '../webworker/workers/browser/libsession_worker_interface';
 import { removeFromCache } from './cache';
 import { handleNewClosedGroup } from './closedGroups';
@@ -33,12 +37,10 @@ async function mergeConfigsWithIncomingUpdates(
 ): Promise<{ kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }> {
   const { kind } = incomingConfig.message;
 
-  const toMerge = [incomingConfig.message.data];
+  const toMerge = [{ data: incomingConfig.message.data, hash: incomingConfig.messageHash }];
   const wrapperId = LibSessionUtil.kindToVariant(kind);
   try {
-    window.log.warn(`${wrapperId} right before merge of ${toMerge.length} arrays`);
     await GenericWrapperActions.merge(wrapperId, toMerge);
-    window.log.warn(`${wrapperId} right after merge.`);
     const needsPush = await GenericWrapperActions.needsPush(wrapperId);
     const needsDump = await GenericWrapperActions.needsDump(wrapperId);
     window.log.info(`${wrapperId} needsPush:${needsPush} needsDump:${needsDump} `);
@@ -153,6 +155,108 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
   return result;
 }
 
+async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
+  if (!result.needsDump) {
+    return result;
+  }
+
+  // first let's check which communities needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB
+  const allCommunitiesInWrapper = await UserGroupsWrapperActions.getAllCommunities();
+  const allCommunitiesConversation = getConversationController()
+    .getConversations()
+    .filter(SessionUtilUserGroups.filterUserCommunitiesToStoreInWrapper);
+
+  const allCommunitiesIdsInDB = allCommunitiesConversation.map(m => m.id as string);
+
+  const communitiesIdsInWrapper = compact(
+    allCommunitiesInWrapper.map(m => {
+      try {
+        const builtConvoId = OpenGroupUtils.getOpenGroupV2ConversationId(
+          m.baseUrl,
+          m.roomCasePreserved
+        );
+        return builtConvoId;
+      } catch (e) {
+        return null;
+      }
+    })
+  );
+
+  const communitiesToJoinInDB = compact(
+    allCommunitiesInWrapper.map(m => {
+      try {
+        const builtConvoId = OpenGroupUtils.getOpenGroupV2ConversationId(
+          m.baseUrl,
+          m.roomCasePreserved
+        );
+        if (allCommunitiesIdsInDB.includes(builtConvoId)) {
+          return null;
+        }
+        console.warn('builtConvoId', builtConvoId, allCommunitiesIdsInDB);
+        return m;
+      } catch (e) {
+        return null;
+      }
+    })
+  );
+
+  const communitiesToLeaveInDB = compact(
+    allCommunitiesConversation.map(m => {
+      return communitiesIdsInWrapper.includes(m.id) ? null : m;
+    })
+  );
+
+  console.warn(
+    'communitiesToJoinInDB',
+    communitiesToJoinInDB.map(m => `${m.fullUrl}`)
+  );
+
+  for (let index = 0; index < communitiesToLeaveInDB.length; index++) {
+    const toLeave = communitiesToLeaveInDB[index];
+    console.warn('leaving community with convoId ', toLeave.id);
+    await getConversationController().deleteContact(toLeave.id);
+  }
+
+  // this call can take quite a long time and should not cause issues to not be awaited
+  void Promise.all(
+    communitiesToJoinInDB.map(async toJoin => {
+      console.warn('joining community with convoId ', toJoin.fullUrl);
+      return getOpenGroupManager().attemptConnectionV2OneAtATime(
+        toJoin.baseUrl,
+        toJoin.roomCasePreserved,
+        toJoin.pubkeyHex
+      );
+    })
+  );
+
+  // if the convos already exists, make sure to update the fields if needed
+  for (let index = 0; index < allCommunitiesInWrapper.length; index++) {
+    const fromWrapper = allCommunitiesInWrapper[index];
+    const convoId = OpenGroupUtils.getOpenGroupV2ConversationId(
+      fromWrapper.baseUrl,
+      fromWrapper.roomCasePreserved
+    );
+
+    const existingConvo = getConversationController().get(convoId);
+    if (fromWrapper && existingConvo) {
+      let changes = false;
+
+      //TODO priority means more than just isPinned but has an order logic in it too
+      const shouldBePinned = fromWrapper.priority > 0;
+      if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
+        await existingConvo.setIsPinned(shouldBePinned, false);
+        changes = true;
+      }
+
+      // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
+      if (changes) {
+        await existingConvo.commit();
+      }
+    }
+  }
+  return result;
+}
+
 async function processMergingResults(
   envelope: EnvelopePlus,
   result: { kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }
@@ -176,23 +280,13 @@ async function processMergingResults(
       case SignalService.SharedConfigMessage.Kind.CONTACTS:
         finalResult = await handleContactsUpdate(incomingResult);
         break;
+      case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
+        finalResult = await handleUserGroupsUpdate(incomingResult);
+        break;
       default:
         throw new Error(`processMergingResults unknown kind of contact : ${kind}`);
     }
     const variant = LibSessionUtil.kindToVariant(kind);
-    // We need to get the existing message hashes and combine them with the latest from the
-    // service node to ensure the next push will properly clean up old messages
-    const oldMessagesHashes = await ConfigDumpData.getCombinedHashesByVariantAndPubkey(
-      variant,
-      envelope.source
-    );
-
-    const allMessageHashes = [...oldMessagesHashes, ...finalResult.messageHashes];
-
-    const finalResultsHashes = new Set(finalResult.messageHashes);
-
-    // lodash does deep compare of Sets
-    const messageHashesChanged = !isEqual(oldMessagesHashes, finalResultsHashes);
 
     if (finalResult.needsDump) {
       // The config data had changes so regenerate the dump and save it
@@ -202,15 +296,6 @@ async function processMergingResults(
         data: dump,
         publicKey: pubkey,
         variant,
-        combinedMessageHashes: allMessageHashes,
-      });
-    } else if (messageHashesChanged) {
-      // The config data didn't change but there were different messages on the service node
-      // so just update the message hashes so the next sync can properly remove any old ones
-      await ConfigDumpData.saveCombinedMessageHashesForMatching({
-        publicKey: pubkey,
-        variant,
-        combinedMessageHashes: allMessageHashes,
       });
     }
 
diff --git a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
index e1aedf677..2a9d5be9b 100644
--- a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
@@ -1,14 +1,14 @@
-import _, { clone, compact, flatten, isString } from 'lodash';
-import { allowOnlyOneAtATime } from '../../../utils/Promise';
+import { clone, compact, flatten, isString } from 'lodash';
+import { OpenGroupData } from '../../../../data/opengroups';
 import {
   updateDefaultRooms,
   updateDefaultRoomsInProgress,
 } from '../../../../state/ducks/defaultRooms';
-import { getCompleteUrlFromRoom } from '../utils/OpenGroupUtils';
-import { parseOpenGroupV2 } from './JoinOpenGroupV2';
-import { getAllRoomInfos } from '../sogsv3/sogsV3RoomInfos';
-import { OpenGroupData } from '../../../../data/opengroups';
+import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { getConversationController } from '../../../conversations';
+import { allowOnlyOneAtATime } from '../../../utils/Promise';
+import { getAllRoomInfos } from '../sogsv3/sogsV3RoomInfos';
+import { parseOpenGroupV2 } from './JoinOpenGroupV2';
 
 export type OpenGroupRequestCommonType = {
   serverUrl: string;
@@ -141,7 +141,7 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
 const defaultServerPublicKey = 'a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238';
 const defaultRoom = `${defaultServer}/main?public_key=${defaultServerPublicKey}`;
 
-const loadDefaultRoomsSingle = () =>
+const loadDefaultRoomsSingle = (): Promise<Array<OpenGroupV2InfoJoinable>> =>
   allowOnlyOneAtATime('loadDefaultRoomsSingle', async () => {
     const roomInfos = parseOpenGroupV2(defaultRoom);
     if (roomInfos) {
@@ -152,16 +152,21 @@ const loadDefaultRoomsSingle = () =>
           return [];
         }
 
-        return roomsGot.map(room => {
-          return {
-            ...room,
-            completeUrl: getCompleteUrlFromRoom({
-              serverUrl: roomInfos.serverUrl,
-              serverPublicKey: roomInfos.serverPublicKey,
-              roomId: room.id,
-            }),
-          };
-        });
+        return Promise.all(
+          roomsGot.map(async room => {
+            // would be nice to get this returned by the API directly but we won't https://github.com/oxen-io/session-pysogs/issues/179
+            const completeUrl = await UserGroupsWrapperActions.buildFullUrlFromDetails(
+              roomInfos.serverUrl,
+              room.id,
+              roomInfos.serverPublicKey
+            );
+
+            return {
+              ...room,
+              completeUrl,
+            };
+          })
+        );
       } catch (e) {
         window?.log?.warn('loadDefaultRoomloadDefaultRoomssIfNeeded failed', e);
       }
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 658e8a589..0c254db83 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -6,10 +6,12 @@ import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils';
 import { OpenGroupRequestCommonType } from './ApiUtil';
 import { OpenGroupServerPoller } from './OpenGroupServerPoller';
 
-import _, { clone, isEqual } from 'lodash';
 import autoBind from 'auto-bind';
+import _, { clone, isEqual } from 'lodash';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import { SessionUtilUserGroups } from '../../../utils/libsession/libsession_utils_user_groups';
 import { openGroupV2GetRoomInfoViaOnionV4 } from '../sogsv3/sogsV3RoomInfos';
+import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 
 let instance: OpenGroupManagerV2 | undefined;
 
@@ -111,33 +113,38 @@ export class OpenGroupManagerV2 {
     if (this.isPolling) {
       return;
     }
-    const allConvos = await OpenGroupData.getAllOpenGroupV2Conversations();
+
+    const inWrapperCommunities = SessionUtilUserGroups.getAllCommunities();
+    const inWrapperIds = inWrapperCommunities.map(m =>
+      getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)
+    );
 
     let allRoomInfos = OpenGroupData.getAllV2OpenGroupRoomsMap();
 
     // this is time for some cleanup!
-    // We consider the conversations are our source-of-truth,
-    // so if there is a roomInfo without an associated convo, we remove it
-    if (allRoomInfos) {
-      await Promise.all(
-        [...allRoomInfos.values()].map(async infos => {
-          try {
-            const roomConvoId = getOpenGroupV2ConversationId(infos.serverUrl, infos.roomId);
-            if (!allConvos.get(roomConvoId)) {
-              // remove the roomInfos locally for this open group room
-              await OpenGroupData.removeV2OpenGroupRoom(roomConvoId);
-              getOpenGroupManager().removeRoomFromPolledRooms(infos);
-              // no need to remove it from the ConversationController, the convo is already not there
-            }
-          } catch (e) {
-            window?.log?.warn('cleanup roomInfos error', e);
+    // We consider the wrapper is our source-of-truth,
+    // so if there is a roomInfos without an associated entry in the wrapper, we remove it from the map of opengroups rooms
+    if (allRoomInfos?.size) {
+      const roomInfosAsArray = [...allRoomInfos.values()];
+      for (let index = 0; index < roomInfosAsArray.length; index++) {
+        const infos = roomInfosAsArray[index];
+        try {
+          const roomConvoId = getOpenGroupV2ConversationId(infos.serverUrl, infos.roomId);
+          if (!inWrapperIds.includes(roomConvoId)) {
+            // remove the roomInfos locally for this open group room.
+
+            await OpenGroupData.removeV2OpenGroupRoom(roomConvoId);
+            getOpenGroupManager().removeRoomFromPolledRooms(infos);
+            await getConversationController().deleteContact(roomConvoId);
           }
-        })
-      );
+        } catch (e) {
+          window?.log?.warn('cleanup roomInfos error', e);
+        }
+      }
     }
     // refresh our roomInfos list
     allRoomInfos = OpenGroupData.getAllV2OpenGroupRoomsMap();
-    if (allRoomInfos) {
+    if (allRoomInfos?.size) {
       this.addRoomToPolledRooms([...allRoomInfos.values()]);
     }
 
@@ -160,10 +167,16 @@ export class OpenGroupManagerV2 {
       throw new Error(window.i18n('publicChatExists'));
     }
 
-    // here, the convo does not exist. Make sure the db is clean too
-    await OpenGroupData.removeV2OpenGroupRoom(conversationId);
-
     try {
+      const fullUrl = await UserGroupsWrapperActions.buildFullUrlFromDetails(
+        serverUrl,
+        roomId,
+        serverPublicKey
+      );
+      // here, the convo does not exist. Make sure the db is clean too
+      await OpenGroupData.removeV2OpenGroupRoom(conversationId);
+
+      await SessionUtilUserGroups.removeCommunityFromWrapper(conversationId, fullUrl);
       const room: OpenGroupV2Room = {
         serverUrl,
         roomId,
diff --git a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
index 2252e0770..709bcb68f 100644
--- a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
@@ -1,42 +1,7 @@
 import _ from 'lodash';
 import { Data } from '../../../../data/data';
-import { OpenGroupMessageV2 } from './OpenGroupMessageV2';
 import { OpenGroupMessageV4 } from './OpenGroupServerPoller';
 
-export const filterDuplicatesFromDbAndIncoming = async (
-  newMessages: Array<OpenGroupMessageV2>
-): Promise<Array<OpenGroupMessageV2>> => {
-  const start = Date.now();
-  // open group messages are deduplicated by sender and serverTimestamp only.
-  // first make sure that the incoming messages have no duplicates:
-  const filtered = _.uniqWith(newMessages, (a, b) => {
-    return (
-      Boolean(a.sender) &&
-      Boolean(a.sentTimestamp) &&
-      a.sender === b.sender &&
-      a.sentTimestamp === b.sentTimestamp
-    );
-    // make sure a sender is set, as we cast it just below
-  }).filter(m => Boolean(m.sender));
-
-  // now, check database to make sure those messages are not already fetched
-  const filteredInDb = await Data.filterAlreadyFetchedOpengroupMessage(
-    filtered.map(m => {
-      return { sender: m.sender as string, serverTimestamp: m.sentTimestamp };
-    })
-  );
-
-  window.log.debug(
-    `[perf] filterDuplicatesFromDbAndIncoming took ${Date.now() - start}ms for ${
-      newMessages.length
-    } messages`
-  );
-  const opengroupMessagesFiltered = filteredInDb?.map(f => {
-    return newMessages.find(m => m.sender === f.sender && m.sentTimestamp === f.serverTimestamp);
-  });
-  return _.compact(opengroupMessagesFiltered) || [];
-};
-
 export const filterDuplicatesFromDbAndIncomingV4 = async (
   newMessages: Array<OpenGroupMessageV4>
 ): Promise<Array<OpenGroupMessageV4>> => {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 65339b3f5..29fbaa735 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -141,7 +141,6 @@ async function filterOutMessagesInvalidSignature(
       base64EncodedData: m.data,
     };
   });
-  const startVerify = Date.now();
   const signatureValidEncodedData = (await callUtilsWorker(
     'verifyAllSignatures',
     sentToWorker
@@ -151,7 +150,6 @@ async function filterOutMessagesInvalidSignature(
       messagesFilteredBlindedIds.find(m => m.data === validData)
     )
   );
-  window.log.info(`[perf] verifyAllSignatures took ${Date.now() - startVerify}ms.`);
 
   return signaturesValidMessages;
 }
diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
index 661a36134..5c110fe12 100644
--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@@ -11,10 +11,10 @@ const hostnameRegex = new RegExp(`(?:${hostSegment}${dot})+${hostSegment}`);
 const portRegex = ':[1-9][0-9]{0,4}';
 
 // roomIds allow up to 64 ascii numbers, letters, '_', or '-' chars
-export const roomIdV2Regex = '[0-9a-zA-Z_-]{1,64}';
-export const publicKeyRegex = '[0-9a-fA-F]{64}';
+const roomIdV2Regex = '[0-9a-zA-Z_-]{1,64}';
+const publicKeyRegex = '[0-9a-fA-F]{64}';
 export const publicKeyParam = 'public_key=';
-export const openGroupV2ServerUrlRegex = new RegExp(
+const openGroupV2ServerUrlRegex = new RegExp(
   `(?:${protocolRegex.source})?${hostnameRegex.source}(?:${portRegex})?`
 );
 
@@ -29,20 +29,11 @@ export const openGroupV2CompleteURLRegex = new RegExp(
 );
 
 /**
- * Just a constant to have less `publicChat:` everywhere.
+ * Just a constant to have less 'http' everywhere.
  * This is the prefix used to identify our open groups in the conversation database (v1 or v2)
- * Note: It does already have the ':' included
  */
-export const openGroupPrefix = 'publicChat:';
-
-/**
- * Just a regex to match a public chat (i.e. a string starting with publicChat:)
- */
-export const openGroupPrefixRegex = new RegExp(`^${openGroupPrefix}`);
-
-export const openGroupV2ConversationIdRegex = new RegExp(
-  `${openGroupPrefix}${roomIdV2Regex}@${openGroupV2ServerUrlRegex.source}`
-);
+// tslint:disable-next-line: no-http-string
+export const openGroupPrefix = 'http'; // can be http:// or https://
 
 /**
  * This function returns a full url on an open group v2 room used for sync messages for instance.
@@ -64,13 +55,14 @@ export function getCompleteUrlFromRoom(roomInfos: OpenGroupV2Room) {
 /**
  * Prefix server with https:// if it's not already prefixed with http or https.
  */
-export function prefixify(server: string, hasSSL: boolean = true): string {
+export function prefixify(server: string): string {
   const hasPrefix = server.match('^https?://');
   if (hasPrefix) {
     return server;
   }
 
-  return `http${hasSSL ? 's' : ''}://${server}`;
+  // tslint:disable-next-line: no-http-string
+  return `http://${server}`;
 }
 
 /**
@@ -85,7 +77,7 @@ export function getOpenGroupV2ConversationId(serverUrl: string, roomId: string)
   if (!serverUrl.match(openGroupV2ServerUrlRegex)) {
     throw new Error('getOpenGroupV2ConversationId: Invalid serverUrl');
   }
-  return `${openGroupPrefix}${roomId}@${serverUrl}`;
+  return `${serverUrl}/${roomId}`;
 }
 
 /**
@@ -95,11 +87,20 @@ export function getOpenGroupV2FromConversationId(
   conversationId: string
 ): OpenGroupRequestCommonType {
   if (isOpenGroupV2(conversationId)) {
-    const atIndex = conversationId.indexOf('@');
-    const roomId = conversationId.slice(openGroupPrefix.length, atIndex);
-    const serverUrl = conversationId.slice(atIndex + 1);
+    const endProtocolStr = '://';
+    const startOfDoubleSlashes = conversationId.indexOf(endProtocolStr); // works for both http or https
+    if (startOfDoubleSlashes < 0) {
+      throw new Error('We need :// to be present in an opengroup URL');
+    }
+    const firstSlashAfterProtocol = conversationId.indexOf(
+      '/',
+      startOfDoubleSlashes + endProtocolStr.length + 1
+    );
+    const baseUrlWithProtocol = conversationId.substring(0, firstSlashAfterProtocol);
+    const lastSlash = conversationId.lastIndexOf('/');
+    const roomId = conversationId.slice(lastSlash + 1);
     return {
-      serverUrl,
+      serverUrl: baseUrlWithProtocol,
       roomId,
     };
   }
@@ -108,10 +109,7 @@ export function getOpenGroupV2FromConversationId(
 
 /**
  * Check if this conversation id corresponds to an OpenGroupV2 conversation.
- * No access to database are made. Only regex matches
- * @param conversationId the convo id to evaluate
- * @returns true if this conversation id matches the Opengroupv2 conversation id regex
  */
 export function isOpenGroupV2(conversationId: string) {
-  return openGroupV2ConversationIdRegex.test(conversationId);
+  return Boolean(conversationId.startsWith(openGroupPrefix));
 }
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 4b5234ed1..bd08f5eb3 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -13,6 +13,11 @@ export enum SnodeNamespaces {
    */
   UserContacts = 3,
 
+  /**
+   *  This is the namespace used to sync our user groups and communities
+   */
+  UserGroups = 5,
+
   /**
    * The messages sent to a closed group are sent and polled from this namespace
    */
@@ -42,7 +47,11 @@ export type SnodeNamespacesUser = PickEnum<
  * Returns true if that namespace is associated with the config of a user (not his messages, only configs)
  */
 function isUserConfigNamespace(namespace: SnodeNamespaces) {
-  return namespace === SnodeNamespaces.UserContacts || namespace === SnodeNamespaces.UserProfile;
+  return (
+    namespace === SnodeNamespaces.UserContacts ||
+    namespace === SnodeNamespaces.UserProfile ||
+    namespace === SnodeNamespaces.UserGroups
+  );
 }
 
 /**
@@ -52,7 +61,16 @@ function isGroupConfigNamespace(namespace: SnodeNamespaces) {
   return namespace === SnodeNamespaces.ClosedGroupInfo;
 }
 
+/**
+ * Returns true if that specific namespace hashes should be tracked.
+ * We do not care about hash tracking for any of the config namespaces as we poll for all of them each poll event.
+ */
+function isNamespaceAlwaysPolled(namespace: SnodeNamespaces) {
+  return !isUserConfigNamespace(namespace) && !isGroupConfigNamespace(namespace);
+}
+
 export const SnodeNamespace = {
   isUserConfigNamespace,
   isGroupConfigNamespace,
+  isNamespaceAlwaysPolled,
 };
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 92409e594..0022ad553 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -50,7 +50,8 @@ async function buildRetrieveRequest(
       if (
         namespace !== SnodeNamespaces.UserMessages &&
         namespace !== SnodeNamespaces.UserContacts &&
-        namespace !== SnodeNamespaces.UserProfile
+        namespace !== SnodeNamespaces.UserProfile &&
+        namespace !== SnodeNamespaces.UserGroups
       ) {
         throw new Error('not a legacy closed group. namespace can only be 0');
       }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 426de7c99..6a5bd3138 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -318,7 +318,7 @@ export class SwarmPolling {
     namespaces: Array<SnodeNamespaces>
   ): Promise<RetrieveMessagesResultsBatched | null> {
     const namespaceLength = namespaces.length;
-    if (namespaceLength > 5 || namespaceLength <= 0) {
+    if (namespaceLength <= 0) {
       throw new Error(`invalid number of retrieve namespace provided: ${namespaceLength}`);
     }
     const edkey = node.pubkey_ed25519;
@@ -436,7 +436,12 @@ export class SwarmPolling {
 
   private getUserNamespacesPolled() {
     return window.sessionFeatureFlags.useSharedUtilForUserConfig
-      ? [SnodeNamespaces.UserMessages, SnodeNamespaces.UserProfile, SnodeNamespaces.UserContacts]
+      ? [
+          SnodeNamespaces.UserMessages,
+          SnodeNamespaces.UserProfile,
+          SnodeNamespaces.UserContacts,
+          SnodeNamespaces.UserGroups,
+        ]
       : [SnodeNamespaces.UserMessages];
   }
 
@@ -453,6 +458,9 @@ export class SwarmPolling {
     hash: string;
     expiration: number;
   }): Promise<void> {
+    if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
+      return;
+    }
     const pkStr = pubkey.key;
     const cached = await this.getLastHash(edkey, pubkey.key, namespace);
 
@@ -476,6 +484,9 @@ export class SwarmPolling {
   }
 
   private async getLastHash(nodeEdKey: string, pubkey: string, namespace: number): Promise<string> {
+    if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
+      return '';
+    }
     if (!this.lastHashes[nodeEdKey]?.[pubkey]?.[namespace]) {
       const lastHash = await Data.getLastHashBySnode(pubkey, nodeEdKey, namespace);
 
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 026b7fc06..b800ecad1 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -1,16 +1,16 @@
 import { Data } from '../../data/data';
+import { OpenGroupData } from '../../data/opengroups';
 import { ConversationCollection, ConversationModel } from '../../models/conversation';
+import { actions as conversationActions } from '../../state/ducks/conversations';
 import { BlockedNumberController } from '../../util';
+import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { PubKey } from '../types';
-import { actions as conversationActions } from '../../state/ducks/conversations';
-import { OpenGroupData } from '../../data/opengroups';
-import _ from 'lodash';
-import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
+import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 
 let instance: ConversationController | null;
 
@@ -220,13 +220,20 @@ export class ConversationController {
       const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
       if (roomInfos) {
         getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
+      }
 
-        // remove the roomInfos locally for this open group room
-        try {
-          await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
-        } catch (e) {
-          window?.log?.info('removeV2OpenGroupRoom failed:', e);
-        }
+      // remove the roomInfos locally for this open group room
+      try {
+        await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
+      } catch (e) {
+        window?.log?.info('removeV2OpenGroupRoom failed:', e);
+      }
+      try {
+        console.error(' plop1', SessionUtilUserGroups.getAllCommunities());
+        await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
+        console.error(' plop2', SessionUtilUserGroups.getAllCommunities());
+      } catch (e) {
+        window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
       }
     }
 
@@ -234,7 +241,7 @@ export class ConversationController {
     window.log.info(`deleteContact destroyingMessages: ${id}`);
 
     await deleteAllMessagesByConvoIdNoConfirmation(conversation.id);
-    window.log.info(`deleteContact message destroyed: ${id}`);
+    window.log.info(`deleteContact messages destroyed: ${id}`);
     // if this conversation is a private conversation it's in fact a `contact` for desktop.
     // we just want to remove everything related to it, set the active_at to undefined
     // so conversation still exists (useful for medium groups members or opengroups) but is not shown on the UI
@@ -299,9 +306,12 @@ export class ConversationController {
         console.time('refreshAllWrapperContactsData');
         for (let index = 0; index < collection.models.length; index++) {
           const convo = collection.models[index];
-          if (convo.isPrivate()) {
+          if (SessionUtilContact.filterContactsToStoreInContactsWrapper(convo)) {
             await SessionUtilContact.refreshMappedValue(convo.id, true);
           }
+          if (SessionUtilUserGroups.filterUserCommunitiesToStoreInWrapper(convo)) {
+            await SessionUtilUserGroups.refreshCommunityMappedValue(convo.id, true);
+          }
         }
         console.timeEnd('refreshAllWrapperContactsData');
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 372484749..977eff96e 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -223,6 +223,7 @@ async function sendMessagesDataToSnode(
         })
       : null;
 
+  console.error('oldMessageHashes', oldMessageHashes);
   const snode = sample(swarm);
   if (!snode) {
     throw new EmptySwarmError(destination, 'Ran out of swarm nodes to query');
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 0a36f39fc..1fc76e348 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -95,7 +95,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
 
     const addJobChecks = job.addJobCheck(serializedNonRunningJobs);
     if (addJobChecks === 'skipAddSameJobPresent') {
-      window.log.warn(`addjobCheck returned "${addJobChecks}" so not adding it`);
+      // window.log.warn(`addjobCheck returned "${addJobChecks}" so not adding it`);
       return 'type_exists';
     }
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index 851b24dac..91b309bff 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -25,20 +25,23 @@ const defaultMaxAttempts = 2;
  */
 let lastRunConfigSyncJobDumpTimestamp: number | null = null;
 
-const variantsToSaveRegularly: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig'];
+const variantsToSaveRegularly: Array<ConfigWrapperObjectTypes> = [
+  'UserConfig',
+  'ContactsConfig',
+  'UserGroupsConfig',
+];
 
 async function saveDumpsNeededToDB(): Promise<boolean> {
   let savedAtLeastOne = false;
   for (let i = 0; i < variantsToSaveRegularly.length; i++) {
     const variant = variantsToSaveRegularly[i];
     const needsDump = await GenericWrapperActions.needsDump(variant);
-    console.info('saveDumpsNeededToDB()', variant, needsDump);
 
     if (!needsDump) {
       continue;
     }
     const dump = await GenericWrapperActions.dump(variant);
-    await ConfigDumpData.saveConfigDumpNoHashes({
+    await ConfigDumpData.saveConfigDump({
       data: dump,
       publicKey: UserUtils.getOurPubKeyStrFromCache(),
       variant,
@@ -96,13 +99,12 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       }
       // refresh all the data stored by the wrappers we need to store.
       // so when we call needsDump(), we know for sure that we are up to date
-      console.time('insertAll');
+      console.time('ConfigurationSyncDumpJob insertAll');
       await LibSessionUtil.insertUserProfileIntoWrapper();
       await LibSessionUtil.insertAllContactsIntoContactsWrapper();
-      console.timeEnd('insertAll');
-      console.time('saveDumpsNeededToDB');
+      await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+      console.timeEnd('ConfigurationSyncDumpJob insertAll');
       await saveDumpsNeededToDB();
-      console.timeEnd('saveDumpsNeededToDB');
       return RunJobResult.Success;
     } catch (e) {
       throw e;
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 43527311c..307a1b69d 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,4 +1,4 @@
-import { compact, groupBy, isArray, isEmpty, isNumber, isString, uniq } from 'lodash';
+import { compact, groupBy, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
@@ -34,7 +34,7 @@ export type SingleDestinationChanges = {
 type SuccessfulChange = {
   message: SharedConfigMessage;
   publicKey: string;
-  updatedHash: Array<string>;
+  updatedHash: string;
 };
 
 /**
@@ -99,14 +99,6 @@ function resultsToSuccessfulChange(
         continue;
       }
 
-      const didDeleteOldConfigMessages = Boolean(
-        !isEmpty(request.allOldHashes) &&
-          resultValue &&
-          resultValue?.length &&
-          request &&
-          resultValue[resultValue.length - 1].code === 200
-      );
-
       for (let j = 0; j < resultValue.length; j++) {
         const batchResult = resultValue[j];
         const messagePostedHashes = batchResult?.body?.hash;
@@ -117,13 +109,10 @@ function resultsToSuccessfulChange(
           request.messages?.[j].message &&
           request.destination
         ) {
-          // a message was posted. We need to add it to the tracked list of hashes
-          const updatedHashes: Array<string> = didDeleteOldConfigMessages
-            ? [messagePostedHashes]
-            : uniq(compact([...request.allOldHashes, messagePostedHashes]));
+          // the library keeps track of the hashes to push and pushed using the hashes now
           successfulChanges.push({
             publicKey: request.destination,
-            updatedHash: updatedHashes,
+            updatedHash: messagePostedHashes,
             message: request.messages?.[j].message,
           });
         }
@@ -140,10 +129,12 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
   for (let i = 0; i < changes.length; i++) {
     const change = changes[i];
     const variant = LibSessionUtil.kindToVariant(change.message.kind);
+    console.warn('buildAndSaveDumpsToDB: change.updatedHash: ', change.updatedHash);
     const needsDump = await LibSessionUtil.markAsPushed(
       variant,
       change.publicKey,
-      change.message.seqno.toNumber()
+      change.message.seqno.toNumber(),
+      change.updatedHash
     );
 
     if (!needsDump) {
@@ -154,7 +145,6 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
       data: dump,
       publicKey: change.publicKey,
       variant,
-      combinedMessageHashes: change.updatedHash,
     });
   }
 }
@@ -198,6 +188,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       }
       await LibSessionUtil.insertUserProfileIntoWrapper();
       await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+      await LibSessionUtil.insertAllUserGroupsIntoWrapper();
 
       const singleDestChanges = await retrieveSingleDestinationChanges();
 
@@ -220,12 +211,12 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
             };
           });
           const asSet = new Set(dest.allOldHashes);
+          console.warn('asSet', [...asSet]);
           return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
         })
       );
 
-      // we do a sequence call here. If we do not have the right expected number of results, consider it
-
+      // we do a sequence call here. If we do not have the right expected number of results, consider it a failure
       if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
         return RunJobResult.RetryJobIfPossible;
       }
@@ -284,8 +275,6 @@ async function queueNewJobIfNeeded() {
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
   ) {
-    window.log.debug('scheduling conf sync job ASAP');
-
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() })
@@ -295,7 +284,6 @@ async function queueNewJobIfNeeded() {
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
-    window.log.debug(`scheduling conf sync job in ${leftBeforeNextTick} ms`);
 
     // TODO we need to make the addJob wait for the previous addJob to be done before it can be called.
     await runners.configurationSyncRunner.addJob(
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 5364afec5..8294750c6 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -4,19 +4,21 @@ import { UserUtils } from '..';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 import { SignalService } from '../../../protobuf';
 import { ConfigWrapperObjectTypes } from '../../../webworker/workers/browser/libsession_worker_functions';
-import {
-  GenericWrapperActions,
-  UserConfigWrapperActions,
-} from '../../../webworker/workers/browser/libsession_worker_interface';
+import { GenericWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { SessionUtilContact } from './libsession_utils_contacts';
+import { SessionUtilUserGroups } from './libsession_utils_user_groups';
 import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 // TODO complete this list
-const requiredUserDumpVariants: Array<ConfigWrapperObjectTypes> = ['UserConfig', 'ContactsConfig']; // 'conversations'
+const requiredUserDumpVariants: Array<ConfigWrapperObjectTypes> = [
+  'UserConfig',
+  'ContactsConfig',
+  'UserGroupsConfig',
+];
 
 export type IncomingConfResult = {
   needsPush: boolean;
@@ -32,73 +34,36 @@ export type OutgoingConfResult = {
   oldMessageHashes: Array<string>;
 };
 
-/**
- * Right after we migrated, we won't have any dumps in DB. We must create them from our database state,
- */
-async function createConfigDumpsFromDbFirstStart(
-  privateKeyEd25519: Uint8Array
-): Promise<Array<ConfigWrapperObjectTypes>> {
-  const justCreated: Array<ConfigWrapperObjectTypes> = [];
-  try {
-    console.error(
-      'createConfigDumpsFromDbFirstStart should be removed as this would done in a migration'
-    );
-
-    // build the userconfig
-    await UserConfigWrapperActions.init(privateKeyEd25519, null);
-    await SessionUtilUserProfile.insertUserProfileIntoWrapper();
-    const data = await UserConfigWrapperActions.dump();
-    // save it to the DB
-    await ConfigDumpData.saveConfigDump({
-      combinedMessageHashes: [],
-      data,
-      publicKey: UserUtils.getOurPubKeyStrFromCache(),
-      variant: 'UserConfig',
-    });
-    justCreated.push('UserConfig');
-  } catch (e) {
-    window.log.warn('Failed to init the UserConfig with createConfigDumpsFromDbFirstStart');
-  }
-
-  if (justCreated.length > 0) {
-    setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 3000);
-  }
-  return justCreated;
-}
-
 async function initializeLibSessionUtilWrappers() {
   const keypair = await UserUtils.getUserED25519KeyPairBytes();
   if (!keypair || !keypair.privKeyBytes) {
     throw new Error('edkeypair not found for current user');
   }
   const privateKeyEd25519 = keypair.privKeyBytes;
-  let dumps = await ConfigDumpData.getAllDumpsWithData();
+  // let's plan a sync on start for now
+  // TODO is this causing any issues?
+  setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 3000);
 
-  let createdDuringFirstStart: Array<ConfigWrapperObjectTypes> = [];
-  if (!dumps?.length) {
-    createdDuringFirstStart = await createConfigDumpsFromDbFirstStart(privateKeyEd25519);
-  }
-
-  // refetch them as the createConfigDumpsFromDb might have created them
-  dumps = await ConfigDumpData.getAllDumpsWithData();
+  // fetch the dumps we already have from the database
+  const dumps = await ConfigDumpData.getAllDumpsWithData();
   console.warn(
-    'dumps',
+    'initializeLibSessionUtilWrappers alldumpsInDB already: ',
     dumps.map(m => omit(m, 'data'))
   );
 
   const userVariantsBuildWithoutErrors = new Set<ConfigWrapperObjectTypes>();
 
+  // load the dumps retrieved from the database into their corresponding wrappers
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
-    console.warn('for loop init', dump.variant);
+    console.warn('initializeLibSessionUtilWrappers initing from dump', dump.variant);
     try {
-      if (!createdDuringFirstStart.includes(dump.variant)) {
-        await GenericWrapperActions.init(
-          dump.variant,
-          privateKeyEd25519,
-          dump.data.length ? dump.data : null
-        );
-      }
+      await GenericWrapperActions.init(
+        dump.variant,
+        privateKeyEd25519,
+        dump.data.length ? dump.data : null
+      );
+
       userVariantsBuildWithoutErrors.add(dump.variant);
     } catch (e) {
       window.log.warn(`init of UserConfig failed with ${e.message} `);
@@ -106,6 +71,7 @@ async function initializeLibSessionUtilWrappers() {
     }
   }
 
+  // TODO
   console.warn('requiredVariants: FIXME add conversation volatile wrapper as required ');
 
   const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(
@@ -114,6 +80,7 @@ async function initializeLibSessionUtilWrappers() {
   );
 
   if (missingRequiredVariants.length) {
+    // TODO this is only needed for debugging. Should be removed as we force them created right below with an empty dump
     throw new Error(`missingRequiredVariants: ${JSON.stringify(missingRequiredVariants)}`);
   }
 
@@ -135,7 +102,6 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
         dumps.push({
           publicKey: us,
           variant: requiredVariant,
-          combinedMessageHashes: [],
         });
       }
     });
@@ -151,7 +117,8 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
       continue;
     }
 
-    const { data, seqno } = await GenericWrapperActions.push(variant);
+    const { data, seqno, hashes } = await GenericWrapperActions.push(variant);
+
     const kind = variantToKind(variant);
     const namespace = await GenericWrapperActions.storageNamespace(variant);
     results.push({
@@ -162,7 +129,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
         seqno: Long.fromNumber(seqno),
         timestamp: GetNetworkTime.getNowWithNetworkOffset(),
       }),
-      oldMessageHashes: dump.combinedMessageHashes,
+      oldMessageHashes: hashes,
       namespace,
     });
   }
@@ -176,6 +143,8 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap
       return 'UserConfig';
     case SignalService.SharedConfigMessage.Kind.CONTACTS:
       return 'ContactsConfig';
+    case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
+      return 'UserGroupsConfig';
     default:
       throw new Error(`kindToVariant: Unsupported variant: "${kind}"`);
   }
@@ -187,19 +156,26 @@ function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedC
       return SignalService.SharedConfigMessage.Kind.USER_PROFILE;
     case 'ContactsConfig':
       return SignalService.SharedConfigMessage.Kind.CONTACTS;
+    case 'UserGroupsConfig':
+      return SignalService.SharedConfigMessage.Kind.USER_GROUPS;
     default:
-      throw new Error(`variantToKind: Unsupported variant: "${variant}"`);
+      throw new Error(`variantToKind: Unsupported kind: "${variant}"`);
   }
 }
 
 /**
  * Returns true if the config needs to be dumped afterwards
  */
-async function markAsPushed(variant: ConfigWrapperObjectTypes, pubkey: string, seqno: number) {
+async function markAsPushed(
+  variant: ConfigWrapperObjectTypes,
+  pubkey: string,
+  seqno: number,
+  hash: string
+) {
   if (pubkey !== UserUtils.getOurPubKeyStrFromCache()) {
     throw new Error('FIXME, generic case is to be done');
   }
-  await GenericWrapperActions.confirmPushed(variant, seqno);
+  await GenericWrapperActions.confirmPushed(variant, seqno, hash);
   return GenericWrapperActions.needsDump(variant);
 }
 
@@ -209,6 +185,8 @@ export const LibSessionUtil = {
   pendingChangesForPubkey,
   insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
   insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
+  insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
+  removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
   kindToVariant,
   markAsPushed,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index f1668148f..dea1b494a 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -74,8 +74,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     return;
   }
 
-  console.time(`ContactsWrapperActions.set ${id}`);
-
   const dbName = foundConvo.get('displayNameInProfile') || undefined;
   const dbNickname = foundConvo.get('nickname') || undefined;
   const dbProfileUrl = foundConvo.get('avatarPointer') || undefined;
@@ -100,7 +98,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   });
 
   try {
-    console.warn(`inserting into wrapper ${id}: `, wrapperContact);
     await ContactsWrapperActions.set(wrapperContact);
   } catch (e) {
     window.log.warn(`ContactsWrapperActions.set of ${id} failed with ${e.message}`);
@@ -108,8 +105,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   }
 
   await refreshMappedValue(id);
-
-  console.timeEnd(`ContactsWrapperActions.set ${id}`);
 }
 
 /**
@@ -120,7 +115,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
 async function refreshMappedValue(id: string, duringAppStart = false) {
   const fromWrapper = await ContactsWrapperActions.get(id);
   if (fromWrapper) {
-    SessionUtilContact.setMappedValue(fromWrapper);
+    setMappedValue(fromWrapper);
     if (!duringAppStart) {
       getConversationController()
         .get(id)
@@ -137,16 +132,10 @@ function getMappedValue(id: string) {
   return mappedContactWrapperValues.get(id);
 }
 
-function removeMappedValue(id: string) {
-  mappedContactWrapperValues.delete(id);
-}
-
 export const SessionUtilContact = {
   filterContactsToStoreInContactsWrapper,
   insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
-  setMappedValue,
   getMappedValue,
-  removeMappedValue,
   refreshMappedValue,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
new file mode 100644
index 000000000..ea6496609
--- /dev/null
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -0,0 +1,180 @@
+import { isEmpty, uniq } from 'lodash';
+import { CommunityInfo } from 'session_util_wrapper';
+import { OpenGroupData } from '../../../data/opengroups';
+import { ConversationModel } from '../../../models/conversation';
+import { getCommunityInfoFromDBValues } from '../../../types/sqlSharedTypes';
+import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
+import { OpenGroupUtils } from '../../apis/open_group_api/utils';
+import { getConversationController } from '../../conversations';
+
+/**
+ * The key of this map is the convoId as stored in the database.
+ * Note: the wrapper clean
+ */
+const mappedCommunityWrapperValues = new Map<string, CommunityInfo>();
+
+/**
+ * Update the UserGroupsWrapper with all the data is cares about from the database.
+ */
+async function insertAllUserGroupsIntoWrapper() {
+  const convoIdsToInsert = uniq(
+    getConversationController()
+      .getConversations()
+      .filter(filterUserGroupsToStoreInWrapper)
+      .map(m => m.id)
+  );
+
+  const communitiesIdsToInsert = uniq(
+    getConversationController()
+      .getConversations()
+      .filter(filterUserCommunitiesToStoreInWrapper)
+      .map(m => m.id)
+  );
+
+  window.log.debug(
+    `UserGroupsWrapper keep tracks of ${convoIdsToInsert.length} usergroups of which ${communitiesIdsToInsert.length} are communities`
+  );
+
+  for (let index = 0; index < convoIdsToInsert.length; index++) {
+    const id = convoIdsToInsert[index];
+
+    await insertGroupsFromDBIntoWrapperAndRefresh(id);
+  }
+}
+
+/**
+ * Returns true if that conversation is an active group
+ */
+function filterUserGroupsToStoreInWrapper(convo: ConversationModel): boolean {
+  return convo.isGroup() && convo.isActive();
+}
+
+function filterUserCommunitiesToStoreInWrapper(convo: ConversationModel): boolean {
+  return convo.isPublic() && convo.isActive();
+}
+
+/**
+ * Fetches the specified convo and updates the required field in the wrapper.
+ * If that community does not exist in the wrapper, it is created before being updated.
+ */
+async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise<void> {
+  const foundConvo = getConversationController().get(convoId);
+  if (!foundConvo) {
+    return;
+  }
+
+  if (!filterUserGroupsToStoreInWrapper(foundConvo)) {
+    return;
+  }
+
+  if (foundConvo.isOpenGroupV2()) {
+    const asOpengroup = foundConvo.toOpenGroupV2();
+    const isPinned = !!foundConvo.get('isPinned');
+
+    const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
+    if (!roomDetails) {
+      return;
+    }
+
+    // we need to build the full URL with the pubkey so we can add it to the wrapper. Let's reuse the exposed method from the wrapper for that
+    const fullUrl = await UserGroupsWrapperActions.buildFullUrlFromDetails(
+      roomDetails.serverUrl,
+      roomDetails.roomId,
+      roomDetails.serverPublicKey
+    );
+
+    const wrapperComm = getCommunityInfoFromDBValues({
+      isPinned,
+      fullUrl,
+    });
+
+    try {
+      console.info(`inserting into usergroup wrapper ${convoId}...`);
+      // this does the create or the update of the matching existing community
+      await UserGroupsWrapperActions.setCommunityByFullUrl(
+        wrapperComm.fullUrl,
+        wrapperComm.priority
+      );
+    } catch (e) {
+      window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
+      // we still let this go through
+    }
+
+    await refreshCommunityMappedValue(convoId);
+  } else {
+    // TODO
+    // throw new Error('insertGroupsFromDBIntoWrapperAndRefresh group and legacy todo');
+  }
+}
+
+/**
+ * refreshMappedValue is used to query the UserGroups Wrapper for the details of that group and update the cached in-memory entry representing its content.
+ * @param id the pubkey to re fresh the cached value from
+ * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
+ */
+async function refreshCommunityMappedValue(convoId: string, duringAppStart = false) {
+  try {
+    if (!OpenGroupUtils.isOpenGroupV2(convoId)) {
+      throw new Error(`Not an opengroupv2: "${convoId}"`);
+    }
+    const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
+    if (fromWrapper) {
+      SessionUtilUserGroups.setCommunityMappedValue(convoId, fromWrapper);
+      if (!duringAppStart) {
+        getConversationController()
+          .get(convoId)
+          ?.triggerUIRefresh();
+      }
+    }
+    return;
+  } catch (e) {
+    window.log.info(`refreshCommunityMappedValue: not an opengroup convoID: ${convoId}`, e);
+  }
+
+  // TODO
+  // throw new Error('refreshMappedValue group and legacy todo');
+}
+
+function setCommunityMappedValue(convoId: string, info: CommunityInfo) {
+  if (isEmpty(info.fullUrl)) {
+    throw new Error(`setCommunityMappedValue needs a valid info.fullUrl ${info.fullUrl}`);
+  }
+
+  // this has the pubkey associated with it
+  mappedCommunityWrapperValues.set(convoId, info);
+}
+
+function getCommunityMappedValueByConvoId(convoId: string) {
+  return mappedCommunityWrapperValues.get(convoId);
+}
+
+function getAllCommunities(): Array<CommunityInfo> {
+  return [...mappedCommunityWrapperValues.values()];
+}
+
+/**
+ * Remove the matching community from the wrapper and from the cached list of communities
+ */
+async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutPubkey: string) {
+  const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(
+    fullUrlWithOrWithoutPubkey
+  );
+
+  if (fromWrapper) {
+    await UserGroupsWrapperActions.eraseCommunityByFullUrl(fromWrapper.fullUrl);
+  }
+  // might not be there but better make sure
+  mappedCommunityWrapperValues.delete(convoId);
+}
+
+export const SessionUtilUserGroups = {
+  filterUserGroupsToStoreInWrapper,
+  filterUserCommunitiesToStoreInWrapper,
+  getAllCommunities,
+  insertAllUserGroupsIntoWrapper,
+  insertGroupsFromDBIntoWrapperAndRefresh,
+  setCommunityMappedValue,
+  getCommunityMappedValueByConvoId,
+  refreshCommunityMappedValue,
+  removeCommunityFromWrapper,
+};
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 4171dbb40..c28fc5b48 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -1,35 +1,34 @@
-import { Data } from '../../../data/data';
-import { getMessageQueue } from '../..';
-import { getConversationController } from '../../conversations';
+import _ from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { UserUtils } from '..';
+import { getMessageQueue } from '../..';
+import { Data } from '../../../data/data';
+import { OpenGroupData } from '../../../data/opengroups';
+import { ConversationModel } from '../../../models/conversation';
+import { SignalService } from '../../../protobuf';
 import { ECKeyPair } from '../../../receiver/keypairs';
+import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
+import { DURATION } from '../../constants';
+import { getConversationController } from '../../conversations';
 import {
   ConfigurationMessage,
   ConfigurationMessageClosedGroup,
   ConfigurationMessageContact,
 } from '../../messages/outgoing/controlMessage/ConfigurationMessage';
-import { ConversationModel } from '../../../models/conversation';
-import { fromBase64ToArray, fromHexToArray } from '../String';
-import { SignalService } from '../../../protobuf';
-import _ from 'lodash';
+import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
+import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse';
+import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
+import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage';
 import {
   AttachmentPointerWithUrl,
   PreviewWithAttachmentUrl,
   Quote,
   VisibleMessage,
 } from '../../messages/outgoing/visibleMessage/VisibleMessage';
-import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
-import { OpenGroupData } from '../../../data/opengroups';
-import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
-import { DURATION } from '../../constants';
-import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage';
-import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse';
 import { PubKey } from '../../types';
-import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
-import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationDumpSync } from '../job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
+import { fromBase64ToArray, fromHexToArray } from '../String';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -119,10 +118,10 @@ const getActiveOpenGroupV2CompleteUrls = async (
     .map(c => c.id) as Array<string>;
 
   const urls = await Promise.all(
-    openGroupsV2ConvoIds.map(async opengroup => {
-      const roomInfos = OpenGroupData.getV2OpenGroupRoom(opengroup);
+    openGroupsV2ConvoIds.map(async opengroupConvoId => {
+      const roomInfos = OpenGroupData.getV2OpenGroupRoom(opengroupConvoId);
       if (roomInfos) {
-        return getCompleteUrlFromRoom(roomInfos);
+        return opengroupConvoId;
       }
       return null;
     })
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
new file mode 100644
index 000000000..cd42140b8
--- /dev/null
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -0,0 +1,80 @@
+import { expect } from 'chai';
+
+import Sinon from 'sinon';
+import { ConversationModel } from '../../../../models/conversation';
+import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import { UserUtils } from '../../../../session/utils';
+import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
+
+// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
+// import * as SessionUtilWrapper from 'session_util_wrapper';
+
+// tslint:disable-next-line: max-func-body-length
+describe('libsession_groups', () => {
+  describe('filter user groups for wrapper', () => {
+    const ourNumber = '051234567890acbdef';
+    const validArgs = {
+      id: 'http://example.org/roomId1234',
+      type: ConversationTypeEnum.GROUP,
+      active_at: 1234,
+    };
+    beforeEach(() => {
+      Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
+    });
+    afterEach(() => {
+      Sinon.restore();
+    });
+
+    it('includes public group/community', () => {
+      expect(
+        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+          new ConversationModel({ ...validArgs } as any)
+        )
+      ).to.be.eq(true);
+    });
+
+    it('excludes public group/community inactive', () => {
+      expect(
+        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+          new ConversationModel({ ...validArgs, active_at: undefined } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('includes closed group', () => {
+      expect(
+        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            type: ConversationTypeEnum.GROUP,
+            id: '05123456564',
+          } as any)
+        )
+      ).to.be.eq(true);
+    });
+
+    it('includes closed group v3', () => {
+      expect(
+        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            type: ConversationTypeEnum.GROUPV3,
+            id: '03123456564',
+          } as any)
+        )
+      ).to.be.eq(true);
+    });
+
+    it('excludes private', () => {
+      expect(
+        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            id: '0511111',
+            type: ConversationTypeEnum.PRIVATE,
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+  });
+});
diff --git a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
index 0d73db702..44977ddc5 100644
--- a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
+++ b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
@@ -3,13 +3,13 @@
 import chai from 'chai';
 import { describe } from 'mocha';
 import Sinon from 'sinon';
-import { filterDuplicatesFromDbAndIncoming } from '../../../../../session/apis/open_group_api/opengroupV2/SogsFilterDuplicate';
+import { filterDuplicatesFromDbAndIncomingV4 } from '../../../../../session/apis/open_group_api/opengroupV2/SogsFilterDuplicate';
 import { TestUtils } from '../../../../test-utils';
 
 const { expect } = chai;
 
 // tslint:disable-next-line: max-func-body-length
-describe('filterDuplicatesFromDbAndIncoming', () => {
+describe('filterDuplicatesFromDbAndIncomingV4', () => {
   describe('filters already duplicated message in the same incoming batch', () => {
     beforeEach(() => {
       TestUtils.stubData('filterAlreadyFetchedOpengroupMessage').returnsArg(0);
@@ -21,10 +21,10 @@ describe('filterDuplicatesFromDbAndIncoming', () => {
     });
 
     it('no duplicates', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(3);
       expect(filtered[0]).to.be.deep.eq(msg1);
       expect(filtered[1]).to.be.deep.eq(msg2);
@@ -32,12 +32,12 @@ describe('filterDuplicatesFromDbAndIncoming', () => {
     });
 
     it('two duplicate sender but not the same timestamp', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
-      msg2.sender = msg1.sender;
-      msg2.sentTimestamp = Date.now() + 2;
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
+      msg2.session_id = msg1.session_id;
+      msg2.posted = Date.now() + 2;
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(3);
       expect(filtered[0]).to.be.deep.eq(msg1);
       expect(filtered[1]).to.be.deep.eq(msg2);
@@ -45,11 +45,11 @@ describe('filterDuplicatesFromDbAndIncoming', () => {
     });
 
     it('two duplicate timestamp but not the same sender', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
-      msg2.sentTimestamp = msg1.sentTimestamp;
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
+      msg2.posted = msg1.posted;
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(3);
       expect(filtered[0]).to.be.deep.eq(msg1);
       expect(filtered[1]).to.be.deep.eq(msg2);
@@ -57,11 +57,11 @@ describe('filterDuplicatesFromDbAndIncoming', () => {
     });
 
     it('two duplicate timestamp but not the same sender', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
-      msg2.sentTimestamp = msg1.sentTimestamp;
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
+      msg2.posted = msg1.posted;
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(3);
       expect(filtered[0]).to.be.deep.eq(msg1);
       expect(filtered[1]).to.be.deep.eq(msg2);
@@ -69,27 +69,27 @@ describe('filterDuplicatesFromDbAndIncoming', () => {
     });
 
     it('two duplicates in the same poll ', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
-      msg2.sentTimestamp = msg1.sentTimestamp;
-      msg2.sender = msg1.sender;
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
+      msg2.posted = msg1.posted;
+      msg2.session_id = msg1.session_id;
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(2);
       expect(filtered[0]).to.be.deep.eq(msg1);
       expect(filtered[1]).to.be.deep.eq(msg3);
     });
 
     it('three duplicates in the same poll', async () => {
-      const msg1 = TestUtils.generateOpenGroupMessageV2();
-      const msg2 = TestUtils.generateOpenGroupMessageV2();
+      const msg1 = TestUtils.generateOpenGroupMessageV4();
+      const msg2 = TestUtils.generateOpenGroupMessageV4();
 
-      const msg3 = TestUtils.generateOpenGroupMessageV2();
-      msg2.sentTimestamp = msg1.sentTimestamp;
-      msg2.sender = msg1.sender;
-      msg3.sentTimestamp = msg1.sentTimestamp;
-      msg3.sender = msg1.sender;
-      const filtered = await filterDuplicatesFromDbAndIncoming([msg1, msg2, msg3]);
+      const msg3 = TestUtils.generateOpenGroupMessageV4();
+      msg2.posted = msg1.posted;
+      msg2.session_id = msg1.session_id;
+      msg3.posted = msg1.posted;
+      msg3.session_id = msg1.session_id;
+      const filtered = await filterDuplicatesFromDbAndIncomingV4([msg1, msg2, msg3]);
       expect(filtered.length).to.be.eq(1);
       expect(filtered[0]).to.be.deep.eq(msg1);
     });
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 1896addb8..6e90ea4b3 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -18,6 +18,7 @@ import { ConversationTypeEnum } from '../../../../models/conversationAttributes'
 import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling';
 import { sleepFor } from '../../../../session/utils/Promise';
 import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest';
+import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces';
 // tslint:disable: chai-vague-errors
 
 chai.use(chaiAsPromised as any);
@@ -677,4 +678,22 @@ describe('SwarmPolling', () => {
       });
     });
   });
+
+  describe('isNamespaceAlwaysPolled', () => {
+    it('cares only for non config hashes', () => {
+      for (let namespace = -20; namespace < 20; namespace++) {
+        if (namespace === 2 || namespace === 3 || namespace === 5 || namespace === 1) {
+          expect(SnodeNamespace.isNamespaceAlwaysPolled(namespace)).to.be.eq(
+            false,
+            `should be false for any non "message" namespace ${namespace}`
+          );
+        } else {
+          expect(SnodeNamespace.isNamespaceAlwaysPolled(namespace)).to.be.eq(
+            true,
+            `should be true for the "message" namespaces ${namespace}`
+          );
+        }
+      }
+    });
+  });
 });
diff --git a/ts/test/session/unit/utils/OpenGroupUtils_test.ts b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
index c96db8198..a424cc4c8 100644
--- a/ts/test/session/unit/utils/OpenGroupUtils_test.ts
+++ b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
@@ -20,26 +20,15 @@ describe('OpenGroupUtils', () => {
       expect(prefixify('https://plop.com')).to.be.equal('https://plop.com');
     });
 
-    it('should just return if http:// is as prefix even with hasSSL = true', () => {
-      expect(prefixify('http://plop.com', true)).to.be.equal('http://plop.com');
+    it('should just return if http:// is as prefix ', () => {
+      expect(prefixify('http://plop.com')).to.be.equal('http://plop.com');
     });
-    it('should just return if https:// is as prefix even with hasSSL = true', () => {
-      expect(prefixify('https://plop.com', true)).to.be.equal('https://plop.com');
-    });
-
-    it('should just return if http:// is as prefix even with hasSSL = false', () => {
-      expect(prefixify('http://plop.com', false)).to.be.equal('http://plop.com');
-    });
-    it('should just return if https:// is as prefix even with hasSSL = false', () => {
-      expect(prefixify('https://plop.com', false)).to.be.equal('https://plop.com');
+    it('should just return if https:// is as prefix', () => {
+      expect(prefixify('https://plop.com')).to.be.equal('https://plop.com');
     });
 
     it('should prefix with http if ssl is false and no prefix', () => {
-      expect(prefixify('plop.com', false)).to.be.equal('http://plop.com');
-    });
-
-    it('should prefix with https if ssl is true and no prefix', () => {
-      expect(prefixify('plop.com', true)).to.be.equal('https://plop.com');
+      expect(prefixify('plop.com')).to.be.equal('http://plop.com');
     });
   });
 
diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts
index 1f511a8fc..3afba778d 100644
--- a/ts/test/test-utils/utils/message.ts
+++ b/ts/test/test-utils/utils/message.ts
@@ -39,6 +39,17 @@ export function generateOpenGroupMessageV2(): OpenGroupMessageV2 {
     base64EncodedData: 'whatever',
   });
 }
+export function generateOpenGroupMessageV4(): OpenGroupMessageV4 {
+  return {
+    posted: Date.now(),
+    reactions: {},
+    seqno: 0,
+    session_id: TestUtils.generateFakePubKey().key,
+    // tslint:disable-next-line: insecure-random
+    id: Math.floor(Math.random() * 100000),
+    data: 'whatever',
+  };
+}
 
 // this is for test purposes only
 type OpenGroupMessageV2WithServerId = Omit<OpenGroupMessageV2, 'sender' | 'serverId'> & {
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index f4aec6f7b..d084689e8 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -37,16 +37,10 @@ export type ConfigDumpRow = {
   variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
   publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
   data: Uint8Array; // the blob returned by libsession.dump() call
-  combinedMessageHashes: Array<string>; // set of lastHashes to keep track of
   // we might need to add a `seqno` field here.
 };
 
-export type ConfigDumpRowWithoutData = Pick<
-  ConfigDumpRow,
-  'publicKey' | 'combinedMessageHashes' | 'variant'
->;
-
-export type ConfigDumpRowWithoutHashes = Pick<ConfigDumpRow, 'publicKey' | 'variant' | 'data'>;
+export type ConfigDumpRowWithoutData = Pick<ConfigDumpRow, 'publicKey' | 'variant'>;
 
 export const CONFIG_DUMP_TABLE = 'configDump';
 
@@ -57,20 +51,10 @@ export type ConfigDumpDataNode = {
     variant: ConfigWrapperObjectTypes,
     publicKey: string
   ) => Array<ConfigDumpRow>;
-  getMessageHashesByVariantAndPubkey: (
-    variant: ConfigWrapperObjectTypes,
-    publicKey: string
-  ) => Array<string>;
   saveConfigDump: (dump: ConfigDumpRow) => void;
-  saveConfigDumpNoHashes: (dump: ConfigDumpRowWithoutHashes) => void;
-  saveCombinedMessageHashesForMatching: (row: ConfigDumpRowWithoutData) => void;
 
   getAllDumpsWithData: () => Array<ConfigDumpRow>;
   getAllDumpsWithoutData: () => Array<ConfigDumpRowWithoutData>;
-  getCombinedHashesByVariantAndPubkey: (
-    variant: ConfigWrapperObjectTypes,
-    pubkey: string
-  ) => Array<string>;
 };
 
 // ========== unprocessed
@@ -159,3 +143,22 @@ export function getContactInfoFromDBValues({
 
   return wrapperContact;
 }
+
+/**
+ * This function returns a CommunityInfo for the wrapper to understand from the DB values.
+ * It is created in this file so we can reuse it during the migration (node side), and from the renderer side
+ */
+export function getCommunityInfoFromDBValues({
+  isPinned,
+  fullUrl,
+}: {
+  isPinned: boolean;
+  fullUrl: string;
+}) {
+  const community = {
+    fullUrl,
+    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+  };
+
+  return community;
+}
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index 8637a09a1..ff3fe7a35 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -31,7 +31,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance';
  *
  * 10. We use the grabbed data for upload of the attachments, get an url for each of them and send the url with the attachments details to the user/opengroup/closed group
  */
-
+const DEBUG_ATTACHMENTS_SCALE = false;
 export interface MaxScaleSize {
   maxSize?: number;
   maxHeight?: number;
@@ -65,7 +65,9 @@ export async function autoScaleForAvatar<T extends { contentType: string; blob:
     throw new Error('Cannot autoScaleForAvatar another file than PNG,GIF or JPEG.');
   }
 
-  window.log.info('autoscale for avatar', maxMeasurements);
+  if (DEBUG_ATTACHMENTS_SCALE) {
+    window.log.info('autoscale for avatar', maxMeasurements);
+  }
   return autoScale(attachment, maxMeasurements);
 }
 
@@ -90,7 +92,10 @@ export async function autoScaleForIncomingAvatar(incomingAvatar: ArrayBuffer) {
       blob,
     };
   }
-  window.log.info('autoscale for incoming avatar', maxMeasurements);
+
+  if (DEBUG_ATTACHMENTS_SCALE) {
+    window.log.info('autoscale for incoming avatar', maxMeasurements);
+  }
 
   return autoScale(
     {
@@ -113,7 +118,9 @@ export async function autoScaleForThumbnail<T extends { contentType: string; blo
     maxSize: 200 * 1000, // 200 ko
   };
 
-  window.log.info('autoScaleForThumbnail', maxMeasurements);
+  if (DEBUG_ATTACHMENTS_SCALE) {
+    window.log.info('autoScaleForThumbnail', maxMeasurements);
+  }
 
   return autoScale(attachment, maxMeasurements);
 }
@@ -217,30 +224,27 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
       blob,
     };
   }
-  window.log.debug('canvas.originalWidth', {
-    canvasOriginalWidth: canvas.originalWidth,
-    canvasOriginalHeight: canvas.originalHeight,
-    maxWidth,
-    maxHeight,
-    blobsize: blob.size,
-    maxSize,
-    makeSquare,
-  });
-
+  if (DEBUG_ATTACHMENTS_SCALE) {
+    window.log.debug('canvas.originalWidth', {
+      canvasOriginalWidth: canvas.originalWidth,
+      canvasOriginalHeight: canvas.originalHeight,
+      maxWidth,
+      maxHeight,
+      blobsize: blob.size,
+      maxSize,
+      makeSquare,
+    });
+  }
   let quality = 0.95;
   const startI = 4;
   let i = startI;
   const start = Date.now();
   do {
     i -= 1;
-    window.log.info(`autoscale iteration: [${i}] for:`, attachment);
-
-    perfStart(`autoscale-canvasToBlob-${attachment.blob.size}`);
+    if (DEBUG_ATTACHMENTS_SCALE) {
+      window.log.info(`autoscale iteration: [${i}] for:`, attachment);
+    }
     const tempBlob = await canvasToBlob(canvas.image as HTMLCanvasElement, 'image/jpeg', quality);
-    perfEnd(
-      `autoscale-canvasToBlob-${attachment.blob.size}`,
-      `autoscale-canvasToBlob-${attachment.blob.size}`
-    );
 
     if (!tempBlob) {
       throw new Error('Failed to get blob during canvasToBlob.');
diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts
index 0659c5224..a0445b24a 100644
--- a/ts/util/reactions.ts
+++ b/ts/util/reactions.ts
@@ -131,11 +131,7 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
       emoji,
       'reaction for message',
       id,
-      found.get('isPublic')
-        ? `on ${conversationModel.toOpenGroupV2().serverUrl}/${
-            conversationModel.toOpenGroupV2().roomId
-          }`
-        : ''
+      found.get('isPublic') ? `on ${conversationModel.id}` : ''
     );
     return reaction;
   } else {
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index 81b18e5e0..3f7908713 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -2,15 +2,17 @@ import {
   BaseConfigActions,
   ContactsConfigActionsType,
   UserConfigActionsType,
+  UserGroupsConfigActionsType,
 } from 'session_util_wrapper';
 
 type UserConfig = 'UserConfig'; // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
 type ContactsConfig = 'ContactsConfig';
+type UserGroupsConfig = 'UserGroupsConfig';
 
 // type ClosedGroupConfigPrefix = 'ClosedGroupConfig-03'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
 // type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
 // | ClosedGroupConfig;
-export type ConfigWrapperObjectTypes = UserConfig | ContactsConfig;
+export type ConfigWrapperObjectTypes = UserConfig | ContactsConfig | UserGroupsConfig;
 
 type UserConfigFunctions =
   | [UserConfig, ...BaseConfigActions]
@@ -19,4 +21,11 @@ type ContactsConfigFunctions =
   | [ContactsConfig, ...BaseConfigActions]
   | [ContactsConfig, ...ContactsConfigActionsType];
 
-export type LibSessionWorkerFunctions = UserConfigFunctions | ContactsConfigFunctions;
+type UserGroupsConfigFunctions =
+  | [UserGroupsConfig, ...BaseConfigActions]
+  | [UserGroupsConfig, ...UserGroupsConfigActionsType];
+
+export type LibSessionWorkerFunctions =
+  | UserConfigFunctions
+  | ContactsConfigFunctions
+  | UserGroupsConfigFunctions;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 49b8c4304..77c0f9dd5 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -1,6 +1,6 @@
-import { WorkerInterface } from '../../worker_interface';
 import { join } from 'path';
 import { getAppRootPath } from '../../../node/getRootPath';
+import { WorkerInterface } from '../../worker_interface';
 import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
 
 import {
@@ -8,6 +8,7 @@ import {
   ContactInfo,
   ContactsWrapperActionsCalls,
   UserConfigWrapperActionsCalls,
+  UserGroupsWrapperActionsCalls,
 } from 'session_util_wrapper';
 
 let libsessionWorkerInterface: WorkerInterface | undefined;
@@ -41,15 +42,18 @@ export const GenericWrapperActions = {
   ) =>
     /** base wrapper generic actions */
     callLibSessionWorker([wrapperId, 'init', ed25519Key, dump]) as Promise<void>,
-  confirmPushed: async (wrapperId: ConfigWrapperObjectTypes, seqno: number) =>
-    callLibSessionWorker([wrapperId, 'confirmPushed', seqno]) as ReturnType<
+  confirmPushed: async (wrapperId: ConfigWrapperObjectTypes, seqno: number, hash: string) =>
+    callLibSessionWorker([wrapperId, 'confirmPushed', seqno, hash]) as ReturnType<
       BaseWrapperActionsCalls['confirmPushed']
     >,
   dump: async (wrapperId: ConfigWrapperObjectTypes) =>
     callLibSessionWorker([wrapperId, 'dump']) as Promise<
       ReturnType<BaseWrapperActionsCalls['dump']>
     >,
-  merge: async (wrapperId: ConfigWrapperObjectTypes, toMerge: Array<Uint8Array>) =>
+  merge: async (
+    wrapperId: ConfigWrapperObjectTypes,
+    toMerge: Array<{ hash: string; data: Uint8Array }>
+  ) =>
     callLibSessionWorker([wrapperId, 'merge', toMerge]) as Promise<
       ReturnType<BaseWrapperActionsCalls['merge']>
     >,
@@ -75,9 +79,11 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   /* Reuse the GenericWrapperActions with the UserConfig argument */
   init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
     GenericWrapperActions.init('UserConfig', ed25519Key, dump),
-  confirmPushed: async (seqno: number) => GenericWrapperActions.confirmPushed('UserConfig', seqno),
+  confirmPushed: async (seqno: number, hash: string) =>
+    GenericWrapperActions.confirmPushed('UserConfig', seqno, hash),
   dump: async () => GenericWrapperActions.dump('UserConfig'),
-  merge: async (toMerge: Array<Uint8Array>) => GenericWrapperActions.merge('UserConfig', toMerge),
+  merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) =>
+    GenericWrapperActions.merge('UserConfig', toMerge),
   needsDump: async () => GenericWrapperActions.needsDump('UserConfig'),
   needsPush: async () => GenericWrapperActions.needsPush('UserConfig'),
   push: async () => GenericWrapperActions.push('UserConfig'),
@@ -106,10 +112,10 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
   /* Reuse the GenericWrapperActions with the ContactConfig argument */
   init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
     GenericWrapperActions.init('ContactsConfig', ed25519Key, dump),
-  confirmPushed: async (seqno: number) =>
-    GenericWrapperActions.confirmPushed('ContactsConfig', seqno),
+  confirmPushed: async (seqno: number, hash: string) =>
+    GenericWrapperActions.confirmPushed('ContactsConfig', seqno, hash),
   dump: async () => GenericWrapperActions.dump('ContactsConfig'),
-  merge: async (toMerge: Array<Uint8Array>) =>
+  merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) =>
     GenericWrapperActions.merge('ContactsConfig', toMerge),
   needsDump: async () => GenericWrapperActions.needsDump('ContactsConfig'),
   needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'),
@@ -121,9 +127,9 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
     callLibSessionWorker(['ContactsConfig', 'get', pubkeyHex]) as Promise<
       ReturnType<ContactsWrapperActionsCalls['get']>
     >,
-  getOrCreate: async (pubkeyHex: string) =>
-    callLibSessionWorker(['ContactsConfig', 'getOrCreate', pubkeyHex]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['getOrCreate']>
+  getOrConstruct: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ContactsConfig', 'getOrConstruct', pubkeyHex]) as Promise<
+      ReturnType<ContactsWrapperActionsCalls['getOrConstruct']>
     >,
   getAll: async () =>
     callLibSessionWorker(['ContactsConfig', 'getAll']) as Promise<
@@ -165,6 +171,59 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
     >,
 };
 
+export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = {
+  /* Reuse the GenericWrapperActions with the ContactConfig argument */
+  init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
+    GenericWrapperActions.init('UserGroupsConfig', ed25519Key, dump),
+  confirmPushed: async (seqno: number, hash: string) =>
+    GenericWrapperActions.confirmPushed('UserGroupsConfig', seqno, hash),
+  dump: async () => GenericWrapperActions.dump('UserGroupsConfig'),
+  merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) =>
+    GenericWrapperActions.merge('UserGroupsConfig', toMerge),
+  needsDump: async () => GenericWrapperActions.needsDump('UserGroupsConfig'),
+  needsPush: async () => GenericWrapperActions.needsPush('UserGroupsConfig'),
+  push: async () => GenericWrapperActions.push('UserGroupsConfig'),
+  storageNamespace: async () => GenericWrapperActions.storageNamespace('UserGroupsConfig'),
+
+  /** UserGroups wrapper specific actions */
+
+  getCommunityByFullUrl: async (fullUrlWithOrWithoutPubkey: string) =>
+    callLibSessionWorker([
+      'UserGroupsConfig',
+      'getCommunityByFullUrl',
+      fullUrlWithOrWithoutPubkey,
+    ]) as Promise<ReturnType<UserGroupsWrapperActionsCalls['getCommunityByFullUrl']>>,
+
+  setCommunityByFullUrl: async (fullUrl: string, priority: number) =>
+    callLibSessionWorker([
+      'UserGroupsConfig',
+      'setCommunityByFullUrl',
+      fullUrl,
+      priority,
+    ]) as Promise<ReturnType<UserGroupsWrapperActionsCalls['setCommunityByFullUrl']>>,
+
+  getAllCommunities: async () =>
+    callLibSessionWorker(['UserGroupsConfig', 'getAllCommunities']) as Promise<
+      ReturnType<UserGroupsWrapperActionsCalls['getAllCommunities']>
+    >,
+
+  eraseCommunityByFullUrl: async (fullUrlWithoutPubkey: string) =>
+    callLibSessionWorker([
+      'UserGroupsConfig',
+      'eraseCommunityByFullUrl',
+      fullUrlWithoutPubkey,
+    ]) as Promise<ReturnType<UserGroupsWrapperActionsCalls['eraseCommunityByFullUrl']>>,
+
+  buildFullUrlFromDetails: async (baseUrl: string, roomId: string, pubkeyHex: string) =>
+    callLibSessionWorker([
+      'UserGroupsConfig',
+      'buildFullUrlFromDetails',
+      baseUrl,
+      roomId,
+      pubkeyHex,
+    ]) as Promise<ReturnType<UserGroupsWrapperActionsCalls['buildFullUrlFromDetails']>>,
+};
+
 const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {
   return internalCallLibSessionWorker(callToMake);
 };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 6a0add291..157898b0e 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -4,6 +4,7 @@ import {
   BaseConfigWrapperInsideWorker,
   ContactsConfigWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
+  UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
@@ -13,8 +14,9 @@ import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functi
 // we can only have one of those so don't worry about storing them in a map for now
 let userProfileWrapper: UserConfigWrapperInsideWorker | undefined;
 let contactsConfigWrapper: ContactsConfigWrapperInsideWorker | undefined;
+let userGroupsConfigWrapper: UserGroupsWrapperInsideWorker | undefined;
 
-type UserWrapperType = 'UserConfig' | 'ContactsConfig';
+type UserWrapperType = 'UserConfig' | 'ContactsConfig' | 'UserGroupsConfig';
 
 function getUserWrapper(type: UserWrapperType): BaseConfigWrapperInsideWorker | undefined {
   switch (type) {
@@ -22,6 +24,8 @@ function getUserWrapper(type: UserWrapperType): BaseConfigWrapperInsideWorker |
       return userProfileWrapper;
     case 'ContactsConfig':
       return contactsConfigWrapper;
+    case 'UserGroupsConfig':
+      return userGroupsConfigWrapper;
   }
 }
 
@@ -31,6 +35,7 @@ function getCorrespondingWrapper(
   switch (wrapperType) {
     case 'UserConfig':
     case 'ContactsConfig':
+    case 'UserGroupsConfig':
       const wrapper = getUserWrapper(wrapperType);
       if (!wrapper) {
         throw new Error(`${wrapperType} is not init yet`);
@@ -44,7 +49,11 @@ function isUInt8Array(value: any) {
 }
 
 function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapperType {
-  if (wrapperType !== 'ContactsConfig' && wrapperType !== 'UserConfig') {
+  if (
+    wrapperType !== 'ContactsConfig' &&
+    wrapperType !== 'UserConfig' &&
+    wrapperType !== 'UserGroupsConfig'
+  ) {
     throw new Error(`wrapperType "${wrapperType} is not of type User"`);
   }
   return wrapperType;
@@ -79,6 +88,9 @@ function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): Bas
     case 'ContactsConfig':
       contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(edSecretKey, dump);
       return contactsConfigWrapper;
+    case 'UserGroupsConfig':
+      userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(edSecretKey, dump);
+      return userGroupsConfigWrapper;
   }
 }
 

From c4e17d082581f368a9bf322d9baebcaddd3e140e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 8 Mar 2023 17:39:29 +1100
Subject: [PATCH 041/178] fix: add mgmt of members in user groups wrapper

---
 .../AvatarPlaceHolder/ClosedGroupAvatar.tsx   |   5 +-
 .../conversation/TimerNotification.tsx        |   4 +-
 .../message-item/GroupUpdateMessage.tsx       |   6 +-
 .../dialog/AdminLeaveClosedGroupDialog.tsx    |  15 +-
 .../dialog/SessionPasswordDialog.tsx          |   4 +-
 ts/components/lightbox/Lightbox.tsx           |   3 +-
 ts/components/menu/Menu.tsx                   |   2 +-
 .../settings/SessionSettingsHeader.tsx        |   9 +-
 ts/interactions/conversationInteractions.ts   |   3 +-
 ts/mains/main_renderer.tsx                    |  12 +-
 ts/models/conversation.ts                     |  38 +-
 ts/node/migration/sessionMigrations.ts        | 211 +++++++---
 ts/node/sql.ts                                |  21 +-
 ts/receiver/cache.ts                          |  10 +-
 ts/receiver/closedGroups.ts                   |   1 -
 ts/receiver/configMessage.ts                  | 384 +++++++++++++-----
 ts/receiver/contentMessage.ts                 |  86 ++--
 ts/receiver/receiver.ts                       |  24 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |   3 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   7 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |  16 +-
 .../open_group_api/sogsv3/sogsV3BatchPoll.ts  |  14 +-
 ts/session/apis/snode_api/swarmPolling.ts     | 153 ++++---
 .../conversations/ConversationController.ts   |  50 ++-
 ts/session/conversations/createClosedGroup.ts |   6 +-
 ts/session/group/closed-group.ts              |   7 +-
 ts/session/sending/MessageQueue.ts            |   1 -
 ts/session/sending/MessageSender.ts           |   1 -
 .../jobs/ConfigurationSyncDumpJob.ts          |  36 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  31 +-
 .../utils/libsession/libsession_utils.ts      |  22 +-
 .../libsession/libsession_utils_contacts.ts   |   8 +-
 .../libsession_utils_user_groups.ts           | 189 ++++++---
 ts/session/utils/sync/syncUtils.ts            |   1 +
 .../libsession_wrapper_contacts_test.ts       |  41 +-
 .../libsession_wrapper_usergroups_test.ts     | 127 ++++--
 ts/test/session/unit/utils/SyncUtils_test.ts  |  22 -
 ts/types/sqlSharedTypes.ts                    |  74 +++-
 .../browser/libsession_worker_interface.ts    |  20 +
 .../node/libsession/libsession.worker.ts      |   4 +-
 40 files changed, 1149 insertions(+), 522 deletions(-)
 delete mode 100644 ts/test/session/unit/utils/SyncUtils_test.ts

diff --git a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
index 486993064..ba7525f07 100644
--- a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { useMembersAvatars } from '../../../hooks/useMembersAvatars';
+import { assertUnreachable } from '../../../types/sqlSharedTypes';
 import { Avatar, AvatarSize } from '../Avatar';
 
 type Props = {
@@ -11,6 +12,8 @@ type Props = {
 function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
   // Always use the size directly under the one requested
   switch (size) {
+    case AvatarSize.XS:
+      throw new Error('AvatarSize.XS is not supported for closed group avatar sizes');
     case AvatarSize.S:
       return AvatarSize.XS;
     case AvatarSize.M:
@@ -22,7 +25,7 @@ function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
     case AvatarSize.HUGE:
       return AvatarSize.XL;
     default:
-      throw new Error(`Invalid size request for closed group avatar: ${size}`);
+      assertUnreachable(size, `Invalid size request for closed group avatar "${size}"`);
   }
 }
 
diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 698740657..0aeb232ce 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { missingCaseError } from '../../util/missingCaseError';
 import { PropsForExpirationTimer } from '../../state/ducks/conversations';
 import { NotificationBubble } from './message/message-item/notification-bubble/NotificationBubble';
 import { ReadableMessage } from './message/message-item/ReadableMessage';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export const TimerNotification = (props: PropsForExpirationTimer) => {
   const { messageId, receivedAt, isUnread, pubkey, profileName, timespan, type, disabled } = props;
@@ -28,7 +28,7 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
         : window.i18n('timerSetOnSync', [timespan]);
       break;
     default:
-      throw missingCaseError(type);
+      assertUnreachable(type, `TimerNotification: Missing case error "${type}"`);
   }
 
   if (!textToRender || textToRender.length === 0) {
diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
index 96afe7bc3..723555936 100644
--- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
+++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
@@ -8,6 +8,7 @@ import { NotificationBubble } from './notification-bubble/NotificationBubble';
 import { ReadableMessage } from './ReadableMessage';
 import { arrayContainsUsOnly } from '../../../../models/message';
 import { useConversationsUsernameWithQuoteOrFullPubkey } from '../../../../hooks/useParamSelector';
+import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 
 // This component is used to display group updates in the conversation view.
 
@@ -51,7 +52,8 @@ const ChangeItemLeft = (left: Array<string>): string => {
 
 // tslint:disable-next-line: cyclomatic-complexity
 const ChangeItem = (change: PropsForGroupUpdateType): string => {
-  switch (change.type) {
+  const type = change.type;
+  switch (type) {
     case 'name':
       return window.i18n('titleIsNow', [change.newName || '']);
     case 'add':
@@ -66,7 +68,7 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => {
     case 'general':
       return window.i18n('updatedTheGroup');
     default:
-      throw new Error('Missing case error');
+      assertUnreachable(type, `ChangeItem: Missing case error "${type}"`);
   }
 };
 
diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
index abb95aeda..36c433593 100644
--- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
+++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
@@ -1,10 +1,11 @@
-import React, { useState } from 'react';
-import { SpacerLG } from '../basic/Text';
+import React from 'react';
+import styled from 'styled-components';
 import { getConversationController } from '../../session/conversations';
+import { leaveClosedGroup } from '../../session/group/closed-group';
 import { adminLeaveClosedGroup } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SpacerLG } from '../basic/Text';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import styled from 'styled-components';
 
 type Props = {
   conversationId: string;
@@ -21,15 +22,9 @@ export const AdminLeaveClosedGroupDialog = (props: Props) => {
   const warningAsAdmin = `${window.i18n('leaveGroupConfirmationAdmin')}`;
   const okText = window.i18n('leaveAndRemoveForEveryone');
   const cancelText = window.i18n('cancel');
-  const [_isLoading, setIsLoading] = useState(false);
 
   const onClickOK = async () => {
-    setIsLoading(true);
-    await getConversationController()
-      .get(props.conversationId)
-      .leaveClosedGroup();
-    setIsLoading(false);
-
+    await leaveClosedGroup(props.conversationId);
     closeDialog();
   };
 
diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx
index e085431fe..dcb94b658 100644
--- a/ts/components/dialog/SessionPasswordDialog.tsx
+++ b/ts/components/dialog/SessionPasswordDialog.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { missingCaseError } from '../../util';
 import { ToastUtils } from '../../session/utils';
 import { Data } from '../../data/data';
 import { SpacerSM } from '../basic/Text';
@@ -10,6 +9,7 @@ import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 import { matchesHash, validatePassword } from '../../util/passwordUtils';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export type PasswordAction = 'set' | 'change' | 'remove' | 'enter';
 
@@ -329,7 +329,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
         return;
       }
       default:
-        throw missingCaseError(passwordAction);
+        assertUnreachable(passwordAction, 'passwordAction');
     }
   }
 
diff --git a/ts/components/lightbox/Lightbox.tsx b/ts/components/lightbox/Lightbox.tsx
index c8d8f1d34..22a1afa03 100644
--- a/ts/components/lightbox/Lightbox.tsx
+++ b/ts/components/lightbox/Lightbox.tsx
@@ -15,6 +15,7 @@ import { SessionIconButton, SessionIconType } from '../icon';
 import * as MIME from '../../types/MIME';
 import { isUndefined } from 'lodash';
 import styled from 'styled-components';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 const colorSVG = (url: string, color: string) => {
   return {
@@ -166,7 +167,7 @@ const IconButton = ({ onClick, type }: IconButtonProps) => {
 
       break;
     default:
-      throw new TypeError(`Invalid button type: ${type}`);
+      assertUnreachable(type, `Invalid button type: ${type}`);
   }
 
   return (
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 62f846460..e671e0add 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -225,7 +225,7 @@ export const DeleteContactMenuItem = () => {
           onClickClose,
           okTheme: SessionButtonColor.Danger,
           onClickOk: async () => {
-            await getConversationController().deleteContact(convoId);
+            await getConversationController().deleteContact(convoId, false);
           },
         })
       );
diff --git a/ts/components/settings/SessionSettingsHeader.tsx b/ts/components/settings/SessionSettingsHeader.tsx
index f08924bca..2f6f35772 100644
--- a/ts/components/settings/SessionSettingsHeader.tsx
+++ b/ts/components/settings/SessionSettingsHeader.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { missingCaseError } from '../../util';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { SessionSettingCategory, SettingsViewProps } from './SessionSettings';
 
 type Props = Pick<SettingsViewProps, 'category'>;
@@ -44,8 +44,13 @@ export const SettingsHeader = (props: Props) => {
     case SessionSettingCategory.Privacy:
       categoryTitle = window.i18n('privacySettingsTitle');
       break;
+    case SessionSettingCategory.ClearData:
+    case SessionSettingCategory.MessageRequests:
+    case SessionSettingCategory.RecoveryPhrase:
+      throw new Error(`no header for should be tried to be rendered for "${category}"`);
+
     default:
-      throw missingCaseError('SettingsHeader' as never);
+      assertUnreachable(category, `SettingsHeader "${category}"`);
   }
 
   return (
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 153452356..afeeaaa38 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -36,6 +36,7 @@ import { encryptProfile } from '../util/crypto/profileEncrypter';
 import { setLastProfileUpdateTimestamp } from '../util/storage';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
+import { leaveClosedGroup } from '../session/group/closed-group';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -203,7 +204,7 @@ export function showLeaveGroupByConvoId(conversationId: string) {
         title,
         message,
         onClickOk: async () => {
-          await conversation.leaveClosedGroup();
+          await leaveClosedGroup(conversation.id);
           onClickClose();
         },
         onClickClose,
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index 95e96faa0..a66573cc5 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -188,10 +188,14 @@ Storage.onready(async () => {
   await window.Events.setThemeSetting(newThemeSetting);
 
   try {
-    try {
-      await LibSessionUtil.initializeLibSessionUtilWrappers();
-    } catch (e) {
-      window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
+    if (Registration.isDone()) {
+      try {
+        await LibSessionUtil.initializeLibSessionUtilWrappers();
+      } catch (e) {
+        window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
+        // TODO what should we do if this happens?
+        throw e;
+      }
     }
     await initialiseEmojiData(nativeEmojiData);
     await AttachmentDownloads.initAttachmentPaths();
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 14c1e2c6d..d8fcbf893 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -18,7 +18,6 @@ import {
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
-import { leaveClosedGroup } from '../session/group/closed-group';
 import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { PubKey } from '../session/types';
 import { ToastUtils, UserUtils } from '../session/utils';
@@ -103,6 +102,7 @@ import {
   isOpenOrClosedGroup,
 } from './conversationAttributes';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
+import { Registration } from '../util/registration';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -343,10 +343,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.isTyping = true;
     }
 
-    if (isTyping) {
-      toRet.isTyping = true;
-    }
-
     if (avatarPath) {
       toRet.avatarPath = avatarPath;
     }
@@ -1279,16 +1275,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     });
   }
 
-  public async leaveClosedGroup() {
-    if (this.isMediumGroup()) {
-      await leaveClosedGroup(this.id);
-    } else {
-      throw new Error(
-        'Legacy group are not supported anymore. You need to create this group again.'
-      );
-    }
-  }
-
   /**
    * Mark everything as read efficiently if possible.
    *
@@ -2241,31 +2227,31 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   }
   // write to DB
   // TODO remove duplicates between db and wrapper (except nickname&name as we need them for search)
-
   // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
+
   await Data.saveConversation(convo.attributes);
 
-  const shouldBeSavedToContactsWrapper = SessionUtilContact.filterContactsToStoreInContactsWrapper(
+  const shouldBeSavedToContactsWrapper = SessionUtilContact.isContactToStoreInContactsWrapper(
     convo
   );
-  const shouldBeSavedToUserGroupsWrapper = SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
-    convo
+  const shouldBeSavedToUserGroupsWrapper = SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo);
+
+  console.warn(
+    `should be saved to wrapper ${id}: contacts:${shouldBeSavedToContactsWrapper}; usergroups:${shouldBeSavedToUserGroupsWrapper}`
   );
 
-  console.warn(`should be saved to contacts wrapper ${id}: ${shouldBeSavedToContactsWrapper}`);
-  console.warn(`should be saved to usergroups wrapper ${id}: ${shouldBeSavedToUserGroupsWrapper}`);
   if (shouldBeSavedToContactsWrapper) {
     await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
   } else if (shouldBeSavedToUserGroupsWrapper) {
     await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
   }
 
-  // save the new dump if needed to the DB asap
-  // this call throttled so we do not run this too often (and not for every .commit())
-  await ConfigurationDumpSync.queueNewJobIfNeeded();
+  if (Registration.isDone()) {
+    // save the new dump if needed to the DB asap
+    // this call throttled so we do not run this too often (and not for every .commit())
+    await ConfigurationDumpSync.queueNewJobIfNeeded();
 
-  // if we need to sync the dump, also send add a job for syncing
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    // if we need to sync the dump, also send add a job for syncing
     await ConfigurationSync.queueNewJobIfNeeded();
   }
   convo.triggerUIRefresh();
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 649308747..ae6eb73ca 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -7,11 +7,13 @@ import {
   UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
 import { ConversationAttributes } from '../../models/conversationAttributes';
+import { HexKeyPair } from '../../receiver/keypairs';
 import { fromHexToArray } from '../../session/utils/String';
 import {
   CONFIG_DUMP_TABLE,
   getCommunityInfoFromDBValues,
   getContactInfoFromDBValues,
+  getLegacyGroupInfoFromDBValues,
 } from '../../types/sqlSharedTypes';
 import {
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
@@ -1361,6 +1363,51 @@ function insertCommunityIntoWrapper(
   }
 }
 
+function insertLegacyGroupIntoWrapper(
+  legacyGroup: Pick<
+    ConversationAttributes,
+    'hidden' | 'id' | 'isPinned' | 'expireTimer' | 'displayNameInProfile'
+  > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
+  userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
+  db: BetterSqlite3.Database
+) {
+  const {
+    isPinned,
+    id,
+    hidden,
+    expireTimer,
+    groupAdmins,
+    members,
+    displayNameInProfile,
+  } = legacyGroup;
+
+  const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair(
+    legacyGroup.id,
+    db
+  ) as HexKeyPair | undefined;
+
+  const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
+    id,
+    hidden,
+    isPinned,
+    expireTimer,
+    groupAdmins,
+    members,
+    displayNameInProfile,
+    encPubkeyHex: latestEncryptionKeyPairHex?.publicHex || '',
+    encSeckeyHex: latestEncryptionKeyPairHex?.privateHex || '',
+  });
+
+  try {
+    console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
+    userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup);
+  } catch (e) {
+    console.error(
+      `userGroupConfigWrapper.set during migration failed with ${e.message} for legacyGroup.id: "${legacyGroup.id}". Skipping that legacy group entirely`
+    );
+  }
+}
+
 function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
   try {
     const blockedItem = sqlNode.getItemById('blocked', db);
@@ -1368,13 +1415,13 @@ function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
       throw new Error('no blocked contacts at all');
     }
     const foundBlocked = blockedItem?.value;
-    console.warn('foundBlockedNumbers during migration', foundBlocked);
+    console.info('foundBlockedNumbers during migration', foundBlocked);
     if (isArray(foundBlocked)) {
       return foundBlocked;
     }
     return [];
   } catch (e) {
-    console.warn('failed to read blocked numbers. Considering no blocked numbers', e.stack);
+    console.info('failed to read blocked numbers. Considering no blocked numbers', e.stack);
     return [];
   }
 }
@@ -1411,7 +1458,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         WHERE type <> 'private' AND active_at > 0;`
     ).run({});
 
-    db.exec(`CREATE TABLE configDump(
+    db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
       variant TEXT NOT NULL,
       publicKey TEXT NOT NULL,
       data BLOB,
@@ -1419,10 +1466,58 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       );
       `);
 
+    const allOpengroupsConvo = db
+      .prepare(
+        `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
+      type = 'group' AND
+      id LIKE 'publicChat:%'
+     ORDER BY id ASC;`
+      )
+      .all();
+
+    const allValidOpengroupsDetails = allOpengroupsConvo
+      .filter(m => isString(m.id) && m.id.indexOf('@') > 0)
+      .map(row => {
+        const roomNameStart = (row.id.indexOf(':') as number) + 1;
+        const roomNameEnd = row.id.indexOf('@');
+        const roomName = row.id.substring(roomNameStart, roomNameEnd);
+        const baseUrl = row.id.substring((roomNameEnd as number) + 1);
+
+        return { roomName, baseUrl, oldConvoId: row.id };
+      });
+
+    allValidOpengroupsDetails.forEach(convoDetails => {
+      const newId = `${convoDetails.baseUrl}/${convoDetails.roomName}`;
+      db.prepare(
+        `UPDATE ${CONVERSATIONS_TABLE} SET
+          id = $newId
+          WHERE id = $oldId;`
+      ).run({
+        newId,
+        oldId: convoDetails.oldConvoId,
+      });
+      // do the same for messages and where else?
+
+      db.prepare(
+        `UPDATE ${MESSAGES_TABLE} SET
+          conversationId = $newId,
+          json = json_set(json,'$.conversationId', $newId)
+          WHERE conversationId = $oldConvoId;`
+      ).run({ oldConvoId: convoDetails.oldConvoId, newId });
+
+      db.prepare(
+        `UPDATE ${OPEN_GROUP_ROOMS_V2_TABLE} SET
+          conversationId = $newId,
+          json = json_set(json, '$.conversationId', $newId);`
+      ).run({ newId });
+    });
+
     try {
       const keys = getIdentityKeysDuringMigration(db);
 
-      if (!keys || !keys.privateEd25519 || isEmpty(keys.privateEd25519)) {
+      const userAlreadyCreated = !!keys && !isEmpty(keys.privateEd25519);
+
+      if (!userAlreadyCreated) {
         throw new Error('privateEd25519 was empty. Considering no users are logged in');
       }
       const { privateEd25519, publicKeyHex } = keys;
@@ -1475,17 +1570,17 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
        */
       const blockedNumbers = getBlockedNumbersDuringMigration(db);
 
-      // this filter is based on the `filterContactsToStoreInContactsWrapper` function.
+      // this filter is based on the `isContactToStoreInContactsWrapper` function.
       const contactsToWriteInWrapper = db
         .prepare(
-          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> $us AND id NOT LIKE '15%' ;`
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
         )
         .all({
           us: publicKeyHex,
         });
 
       if (isArray(contactsToWriteInWrapper) && contactsToWriteInWrapper.length) {
-        console.warn(
+        console.info(
           '===================== Starting contact inserting into wrapper ======================='
         );
 
@@ -1498,7 +1593,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
           insertContactIntoWrapper(contact, blockedNumbers, contactsConfigWrapper);
         });
 
-        console.warn('===================== Done with contact inserting =======================');
+        console.info('===================== Done with contact inserting =======================');
       }
       const contactsDump = contactsConfigWrapper.dump();
 
@@ -1518,53 +1613,11 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         data: contactsDump,
       });
 
-      const allOpengroupsConvo = db
-        .prepare(
-          `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
-        type = 'group' AND
-        id LIKE 'publicChat:%'
-       ORDER BY id ASC;`
-        )
-        .all();
+      /**
+       * Setup up the UserGroups Wrapper with all the comunities details which needs to be stored in it.
+       */
 
-      const allValidOpengroupsDetails = allOpengroupsConvo
-        .filter(m => isString(m.id) && m.id.indexOf('@') > 0)
-        .map(row => {
-          const roomNameStart = (row.id.indexOf(':') as number) + 1;
-          const roomNameEnd = row.id.indexOf('@');
-          const roomName = row.id.substring(roomNameStart, roomNameEnd);
-          const baseUrl = row.id.substring((roomNameEnd as number) + 1);
-
-          return { roomName, baseUrl, oldConvoId: row.id };
-        });
-
-      allValidOpengroupsDetails.forEach(convoDetails => {
-        const newId = `${convoDetails.baseUrl}/${convoDetails.roomName}`;
-        db.prepare(
-          `UPDATE ${CONVERSATIONS_TABLE} SET
-            id = $newId
-            WHERE id = $oldId;`
-        ).run({
-          newId,
-          oldId: convoDetails.oldConvoId,
-        });
-        // do the same for messages and where else?
-
-        db.prepare(
-          `UPDATE ${MESSAGES_TABLE} SET
-            conversationId = $newId,
-            json = json_set(json,'$.conversationId', $newId)
-            WHERE conversationId = $oldConvoId;`
-        ).run({ oldConvoId: convoDetails.oldConvoId, newId });
-
-        db.prepare(
-          `UPDATE ${OPEN_GROUP_ROOMS_V2_TABLE} SET
-            conversationId = $newId,
-            json = json_set(json, '$.conversationId', $newId);`
-        ).run({ newId });
-      });
-
-      // this filter is based on the `filterUserGroupsToStoreInWrapper` function.
+      // this filter is based on the `isCommunityToStoreInWrapper` function.
       const communitiesToWriteInWrapper = db
         .prepare(
           `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'group' AND active_at > 0 AND id LIKE 'http%' ;`
@@ -1572,26 +1625,52 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         .all({});
 
       if (isArray(communitiesToWriteInWrapper) && communitiesToWriteInWrapper.length) {
-        console.warn(
-          '===================== Starting communities inserting into wrapper ======================='
-        );
-
         console.info(
-          'Writing communities to wrapper during migration. length: ',
-          communitiesToWriteInWrapper?.length
+          `===================== Starting communities inserting into wrapper ${communitiesToWriteInWrapper?.length} =======================`
         );
 
         communitiesToWriteInWrapper.forEach(community => {
-          insertCommunityIntoWrapper(community, userGroupsConfigWrapper, db);
-
-          console.info('Writing community: ', JSON.stringify(community));
+          try {
+            console.info('Writing community: ', JSON.stringify(community));
+            insertCommunityIntoWrapper(community, userGroupsConfigWrapper, db);
+          } catch (e) {
+            console.info(`failed to insert community with ${e.message}`, community);
+          }
         });
 
-        console.warn(
+        console.info(
           '===================== Done with communinities inserting ======================='
         );
-        // TODO we need to do the same for closed groups
       }
+
+      // this filter is based on the `isLegacyGroupToStoreInWrapper` function.
+      const legacyGroupsToWriteInWrapper = db
+        .prepare(
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'group' AND active_at > 0 AND id LIKE '05%' AND NOT isKickedFromGroup AND NOT left ;`
+        )
+        .all({});
+
+      if (isArray(legacyGroupsToWriteInWrapper) && legacyGroupsToWriteInWrapper.length) {
+        console.info(
+          `===================== Starting legacy group inserting into wrapper length: ${legacyGroupsToWriteInWrapper?.length} =======================`
+        );
+
+        legacyGroupsToWriteInWrapper.forEach(legacyGroup => {
+          try {
+            console.info('Writing legacy group: ', JSON.stringify(legacyGroup));
+
+            insertLegacyGroupIntoWrapper(legacyGroup, userGroupsConfigWrapper, db);
+          } catch (e) {
+            console.info(`failed to insert legacy group with ${e.message}`, legacyGroup);
+          }
+        });
+
+        console.info(
+          '===================== Done with legacy group inserting ======================='
+        );
+      }
+      // TODO we need to do the same for new groups once they are available
+
       const userGroupsDump = userGroupsConfigWrapper.dump();
 
       db.prepare(
@@ -1627,8 +1706,6 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
     // Didn't find any reference to this serverTimestamp in the unprocessed table needed.
     db.exec(`ALTER TABLE unprocessed DROP COLUMN serverTimestamp;`);
 
-    // we need to populate those fields with the current state of the conversation so let's throw null until this is done
-    // throw new Error('update me');
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 18ec179ce..4a1318cb4 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1809,17 +1809,23 @@ function getMessagesCountByConversation(
  * The returned array is ordered based on the timestamp, the latest is at the end.
  * @param groupPublicKey string | PubKey
  */
-function getAllEncryptionKeyPairsForGroup(groupPublicKey: string | PubKey) {
-  const rows = getAllEncryptionKeyPairsForGroupRaw(groupPublicKey);
+function getAllEncryptionKeyPairsForGroup(
+  groupPublicKey: string | PubKey,
+  db?: BetterSqlite3.Database
+) {
+  const rows = getAllEncryptionKeyPairsForGroupRaw(groupPublicKey, db);
 
   return map(rows, row => jsonToObject(row.json));
 }
 
-function getAllEncryptionKeyPairsForGroupRaw(groupPublicKey: string | PubKey) {
+function getAllEncryptionKeyPairsForGroupRaw(
+  groupPublicKey: string | PubKey,
+  db?: BetterSqlite3.Database
+) {
   const pubkeyAsString = (groupPublicKey as PubKey).key
     ? (groupPublicKey as PubKey).key
     : groupPublicKey;
-  const rows = assertGlobalInstance()
+  const rows = assertGlobalInstanceOrInstance(db)
     .prepare(
       `SELECT * FROM ${CLOSED_GROUP_V2_KEY_PAIRS_TABLE} WHERE groupPublicKey = $groupPublicKey ORDER BY timestamp ASC;`
     )
@@ -1830,8 +1836,11 @@ function getAllEncryptionKeyPairsForGroupRaw(groupPublicKey: string | PubKey) {
   return rows;
 }
 
-function getLatestClosedGroupEncryptionKeyPair(groupPublicKey: string) {
-  const rows = getAllEncryptionKeyPairsForGroup(groupPublicKey);
+function getLatestClosedGroupEncryptionKeyPair(
+  groupPublicKey: string,
+  db?: BetterSqlite3.Database
+) {
+  const rows = getAllEncryptionKeyPairsForGroup(groupPublicKey, db);
   if (!rows || rows.length === 0) {
     return undefined;
   }
diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts
index 5e334c1a8..67b3fd8d3 100644
--- a/ts/receiver/cache.ts
+++ b/ts/receiver/cache.ts
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import { Data } from '../data/data';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
-export async function removeFromCache(envelope: EnvelopePlus) {
+export async function removeFromCache(envelope: Pick<EnvelopePlus, 'id'>) {
   return Data.removeUnprocessed(envelope.id);
 }
 
@@ -91,10 +91,10 @@ export async function getAllFromCacheForSource(source: string) {
 }
 
 export async function updateCacheWithDecryptedContent(
-  envelope: EnvelopePlus,
+  envelope: Pick<EnvelopePlus, 'id' | 'senderIdentity' | 'source'>,
   plaintext: ArrayBuffer
 ): Promise<void> {
-  const { id } = envelope;
+  const { id, senderIdentity, source } = envelope;
   const item = await Data.getUnprocessedById(id);
   if (!item) {
     window?.log?.error(
@@ -103,11 +103,11 @@ export async function updateCacheWithDecryptedContent(
     return;
   }
 
-  item.source = envelope.source;
+  item.source = source;
 
   // For medium-size closed groups
   if (envelope.senderIdentity) {
-    item.senderIdentity = envelope.senderIdentity;
+    item.senderIdentity = senderIdentity;
   }
 
   item.decrypted = StringUtils.decode(plaintext, 'base64');
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 92e58ea18..28b6698f1 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -319,7 +319,6 @@ export async function handleNewClosedGroup(
   convo.updateLastMessage();
 
   await convo.commit();
-  // sanity checks validate this
   // tslint:disable: no-non-null-assertion
   const ecKeyPair = new ECKeyPair(encryptionKeyPair!.publicKey, encryptionKeyPair!.privateKey);
   window?.log?.info(`Received the encryptionKeyPair for new group ${groupId}`);
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 4f6c692c8..b0b240a5e 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -4,6 +4,7 @@ import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { SignalService } from '../protobuf';
+import { ClosedGroup } from '../session';
 import {
   joinOpenGroupV2WithUIEvents,
   parseOpenGroupV2,
@@ -20,8 +21,10 @@ import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
+import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
 import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
   GenericWrapperActions,
@@ -29,33 +32,75 @@ import {
   UserGroupsWrapperActions,
 } from '../webworker/workers/browser/libsession_worker_interface';
 import { removeFromCache } from './cache';
-import { handleNewClosedGroup } from './closedGroups';
+import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGroups';
+import { HexKeyPair } from './keypairs';
 import { EnvelopePlus } from './types';
 
+function groupByVariant(
+  incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
+) {
+  const groupedByVariant: Map<
+    ConfigWrapperObjectTypes,
+    Array<IncomingMessage<SignalService.ISharedConfigMessage>>
+  > = new Map();
+
+  incomingConfigs.forEach(incomingConfig => {
+    const { kind } = incomingConfig.message;
+
+    const wrapperId = LibSessionUtil.kindToVariant(kind);
+
+    if (!groupedByVariant.has(wrapperId)) {
+      groupedByVariant.set(wrapperId, []);
+    }
+
+    groupedByVariant.get(wrapperId)?.push(incomingConfig);
+  });
+  return groupedByVariant;
+}
+
 async function mergeConfigsWithIncomingUpdates(
-  incomingConfig: IncomingMessage<SignalService.ISharedConfigMessage>
-): Promise<{ kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }> {
-  const { kind } = incomingConfig.message;
+  incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
+): Promise<Map<ConfigWrapperObjectTypes, IncomingConfResult>> {
+  // first, group by variant so we do a single merge call
+  const groupedByVariant = groupByVariant(incomingConfigs);
+
+  const groupedResults: Map<ConfigWrapperObjectTypes, IncomingConfResult> = new Map();
+
+  // TODO currently we only poll for user config messages, so this can be hardcoded
+  const publicKey = UserUtils.getOurPubKeyStrFromCache();
 
-  const toMerge = [{ data: incomingConfig.message.data, hash: incomingConfig.messageHash }];
-  const wrapperId = LibSessionUtil.kindToVariant(kind);
   try {
-    await GenericWrapperActions.merge(wrapperId, toMerge);
-    const needsPush = await GenericWrapperActions.needsPush(wrapperId);
-    const needsDump = await GenericWrapperActions.needsDump(wrapperId);
-    window.log.info(`${wrapperId} needsPush:${needsPush} needsDump:${needsDump} `);
+    for (let index = 0; index < groupedByVariant.size; index++) {
+      const variant = [...groupedByVariant.keys()][index];
+      const sameVariant = groupedByVariant.get(variant);
+      if (!sameVariant?.length) {
+        continue;
+      }
+      const toMerge = sameVariant.map(msg => ({
+        data: msg.message.data,
+        hash: msg.messageHash,
+      }));
 
-    const messageHashes = [incomingConfig.messageHash];
-    const latestSentTimestamp = incomingConfig.envelopeTimestamp;
+      await GenericWrapperActions.merge(variant, toMerge);
+      const needsPush = await GenericWrapperActions.needsPush(variant);
+      const needsDump = await GenericWrapperActions.needsDump(variant);
+      window.log.info(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
 
-    const incomingConfResult: IncomingConfResult = {
-      latestSentTimestamp,
-      messageHashes,
-      needsDump,
-      needsPush,
-    };
+      const messageHashes = toMerge.map(m => m.hash);
+      const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
 
-    return { kind, result: incomingConfResult };
+      const incomingConfResult: IncomingConfResult = {
+        messageHashes,
+        needsDump,
+        needsPush,
+        kind: LibSessionUtil.variantToKind(variant),
+        publicKey,
+        latestEnvelopeTimestamp: latestEnvelopeTimestamp ? latestEnvelopeTimestamp : Date.now(),
+      };
+      groupedResults.set(variant, incomingConfResult);
+    }
+
+    return groupedResults;
   } catch (e) {
     window.log.error('mergeConfigsWithIncomingUpdates failed with', e);
     throw e;
@@ -155,16 +200,13 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
   return result;
 }
 
-async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
-
+async function handleCommunitiesUpdate() {
   // first let's check which communities needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB
+
   const allCommunitiesInWrapper = await UserGroupsWrapperActions.getAllCommunities();
   const allCommunitiesConversation = getConversationController()
     .getConversations()
-    .filter(SessionUtilUserGroups.filterUserCommunitiesToStoreInWrapper);
+    .filter(SessionUtilUserGroups.isCommunityToStoreInWrapper);
 
   const allCommunitiesIdsInDB = allCommunitiesConversation.map(m => m.id as string);
 
@@ -189,11 +231,7 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
           m.baseUrl,
           m.roomCasePreserved
         );
-        if (allCommunitiesIdsInDB.includes(builtConvoId)) {
-          return null;
-        }
-        console.warn('builtConvoId', builtConvoId, allCommunitiesIdsInDB);
-        return m;
+        return allCommunitiesIdsInDB.includes(builtConvoId) ? null : m;
       } catch (e) {
         return null;
       }
@@ -206,15 +244,10 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
     })
   );
 
-  console.warn(
-    'communitiesToJoinInDB',
-    communitiesToJoinInDB.map(m => `${m.fullUrl}`)
-  );
-
   for (let index = 0; index < communitiesToLeaveInDB.length; index++) {
     const toLeave = communitiesToLeaveInDB[index];
     console.warn('leaving community with convoId ', toLeave.id);
-    await getConversationController().deleteContact(toLeave.id);
+    await getConversationController().deleteContact(toLeave.id, true);
   }
 
   // this call can take quite a long time and should not cause issues to not be awaited
@@ -254,86 +287,255 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
       }
     }
   }
+}
+
+async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
+  // first let's check which closed groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB
+
+  const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups();
+  if (allLegacyGroupsInWrapper.some(m => m.members.length === 0)) {
+    debugger;
+  }
+  const allLegacyGroupsInDb = getConversationController()
+    .getConversations()
+    .filter(SessionUtilUserGroups.isLegacyGroupToStoreInWrapper);
+
+  const allLegacyGroupsIdsInDB = allLegacyGroupsInDb.map(m => m.id as string);
+  const allLegacyGroupsIdsInWrapper = allLegacyGroupsInWrapper.map(m => m.pubkeyHex);
+
+  const legacyGroupsToJoinInDB = allLegacyGroupsInWrapper.filter(m => {
+    return !allLegacyGroupsIdsInDB.includes(m.pubkeyHex);
+  });
+
+  const legacyGroupsToLeaveInDB = allLegacyGroupsInDb.filter(m => {
+    return !allLegacyGroupsIdsInWrapper.includes(m.id);
+  });
+
+  window.log.info(
+    `we have to join ${legacyGroupsToJoinInDB.length} legacy groups in DB compared to what is in the wrapper`
+  );
+
+  window.log.info(
+    `we have to leave ${legacyGroupsToLeaveInDB.length} legacy groups in DB compared to what is in the wrapper`
+  );
+
+  for (let index = 0; index < legacyGroupsToLeaveInDB.length; index++) {
+    const toLeave = legacyGroupsToLeaveInDB[index];
+    console.warn('leaving legacy group from configuration sync message with convoId ', toLeave.id);
+    await getConversationController().deleteContact(toLeave.id, true);
+  }
+
+  for (let index = 0; index < legacyGroupsToJoinInDB.length; index++) {
+    const toJoin = legacyGroupsToJoinInDB[index];
+    console.warn(
+      'joining legacy group from configuration sync message with convoId ',
+      toJoin.pubkeyHex
+    );
+
+    // let's just create the required convo here, as we update the fields right below
+    await getConversationController().getOrCreateAndWait(
+      toJoin.pubkeyHex,
+      ConversationTypeEnum.GROUP
+    );
+  }
+  for (let index = 0; index < allLegacyGroupsInWrapper.length; index++) {
+    const fromWrapper = allLegacyGroupsInWrapper[index];
+
+    if (fromWrapper.members.length === 0) {
+      debugger;
+    }
+    const convo = getConversationController().get(fromWrapper.pubkeyHex);
+    if (!convo) {
+      // this should not happen as we made sure to create them before
+      window.log.warn(
+        'could not find legacy group which should already be there:',
+        fromWrapper.pubkeyHex
+      );
+      continue;
+    }
+
+    const members = fromWrapper.members.map(m => m.pubkeyHex);
+    const admins = fromWrapper.members.filter(m => m.isAdmin).map(m => m.pubkeyHex);
+    // then for all the existing legacy group in the wrapper, we need to override the field of what we have in the DB with what is in the wrapper
+    // We only set group admins on group creation
+    const groupDetails: ClosedGroup.GroupInfo = {
+      id: fromWrapper.pubkeyHex,
+      name: fromWrapper.name,
+      members,
+      admins,
+      activeAt:
+        !!convo.get('active_at') && convo.get('active_at') < latestEnvelopeTimestamp
+          ? convo.get('active_at')
+          : latestEnvelopeTimestamp,
+      weWereJustAdded: false, // TODO to remove
+    };
+
+    await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
+
+    let changes = false;
+    if (convo.isPinned() !== fromWrapper.priority > 0) {
+      await convo.setIsPinned(fromWrapper.priority > 0, false);
+      changes = true;
+    }
+    if (!!convo.isHidden() !== !!fromWrapper.hidden) {
+      convo.set({ hidden: !!fromWrapper.hidden });
+      changes = true;
+    }
+    if (convo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
+      await convo.updateExpireTimer(
+        fromWrapper.disappearingTimerSeconds,
+        undefined,
+        latestEnvelopeTimestamp,
+        {
+          fromSync: true,
+        }
+      );
+      changes = true;
+    }
+
+    if (changes) {
+      await convo.commit();
+    }
+
+    // save the encryption keypair if needed
+    if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
+      const inWrapperKeypair: HexKeyPair = {
+        publicHex: toHex(fromWrapper.encPubkey),
+        privateHex: toHex(fromWrapper.encSeckey),
+      };
+
+      await addKeyPairToCacheAndDBIfNeeded(fromWrapper.pubkeyHex, inWrapperKeypair);
+    }
+  }
+
+  // // if the convos already exists, make sure to update the fields if needed
+  // for (let index = 0; index < allCommunitiesInWrapper.length; index++) {
+  //   const fromWrapper = allCommunitiesInWrapper[index];
+  //   const convoId = OpenGroupUtils.getOpenGroupV2ConversationId(
+  //     fromWrapper.baseUrl,
+  //     fromWrapper.roomCasePreserved
+  //   );
+
+  //   const existingConvo = getConversationController().get(convoId);
+  //   if (fromWrapper && existingConvo) {
+  //     let changes = false;
+
+  //     //TODO priority means more than just isPinned but has an order logic in it too
+  //     const shouldBePinned = fromWrapper.priority > 0;
+  //     if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
+  //       await existingConvo.setIsPinned(shouldBePinned, false);
+  //       changes = true;
+  //     }
+
+  //     // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
+  //     if (changes) {
+  //       await existingConvo.commit();
+  //     }
+  //   }
+  // }
+}
+
+async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
+  if (!result.needsDump) {
+    return result;
+  }
+
+  const toHandle = SessionUtilUserGroups.getUserGroupTypes();
+  for (let index = 0; index < toHandle.length; index++) {
+    const typeToHandle = toHandle[index];
+    switch (typeToHandle) {
+      case 'Community':
+        await handleCommunitiesUpdate();
+        break;
+
+      case 'LegacyGroup':
+        await handleLegacyGroupUpdate(result.latestEnvelopeTimestamp);
+        break;
+
+      default:
+        assertUnreachable(typeToHandle, `handleUserGroupsUpdate unhandled type "${typeToHandle}"`);
+    }
+  }
+
   return result;
 }
 
-async function processMergingResults(
-  envelope: EnvelopePlus,
-  result: { kind: SignalService.SharedConfigMessage.Kind; result: IncomingConfResult }
-) {
-  const pubkey = envelope.source;
-
-  const { kind, result: incomingResult } = result;
-
-  if (!incomingResult) {
-    await removeFromCache(envelope);
+async function processMergingResults(results: Map<ConfigWrapperObjectTypes, IncomingConfResult>) {
+  if (!results || !results.size) {
     return;
   }
 
-  try {
-    let finalResult = incomingResult;
-
-    switch (kind) {
-      case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
-        finalResult = await handleUserProfileUpdate(incomingResult);
-        break;
-      case SignalService.SharedConfigMessage.Kind.CONTACTS:
-        finalResult = await handleContactsUpdate(incomingResult);
-        break;
-      case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
-        finalResult = await handleUserGroupsUpdate(incomingResult);
-        break;
-      default:
-        throw new Error(`processMergingResults unknown kind of contact : ${kind}`);
-    }
-    const variant = LibSessionUtil.kindToVariant(kind);
-
-    if (finalResult.needsDump) {
-      // The config data had changes so regenerate the dump and save it
-
-      const dump = await GenericWrapperActions.dump(variant);
-      await ConfigDumpData.saveConfigDump({
-        data: dump,
-        publicKey: pubkey,
-        variant,
-      });
+  const keys = [...results.keys()];
+  let anyNeedsPush = false;
+  for (let index = 0; index < keys.length; index++) {
+    const wrapperType = keys[index];
+    const incomingResult = results.get(wrapperType);
+    if (!incomingResult) {
+      continue;
     }
 
-    await removeFromCache(envelope);
-  } catch (e) {
-    window.log.error(`processMergingResults failed with ${e.message}`);
-    await removeFromCache(envelope);
-    return;
+    try {
+      const { kind } = incomingResult;
+      switch (kind) {
+        case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
+          await handleUserProfileUpdate(incomingResult);
+          break;
+        case SignalService.SharedConfigMessage.Kind.CONTACTS:
+          await handleContactsUpdate(incomingResult);
+          break;
+        case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
+          await handleUserGroupsUpdate(incomingResult);
+          break;
+        default:
+          assertUnreachable(kind, `processMergingResults unsupported kind: "${kind}"`);
+      }
+      const variant = LibSessionUtil.kindToVariant(kind);
+
+      if (incomingResult.needsDump) {
+        // The config data had changes so regenerate the dump and save it
+
+        const dump = await GenericWrapperActions.dump(variant);
+        await ConfigDumpData.saveConfigDump({
+          data: dump,
+          publicKey: incomingResult.publicKey,
+          variant,
+        });
+      }
+
+      if (incomingResult.needsPush) {
+        anyNeedsPush = true;
+      }
+    } catch (e) {
+      window.log.error(`processMergingResults failed with ${e.message}`);
+      return;
+    }
   }
-
   // Now that the local state has been updated, trigger a config sync (this will push any
   // pending updates and properly update the state)
-  if (result.result.needsPush) {
+  if (anyNeedsPush) {
     await ConfigurationSync.queueNewJobIfNeeded();
   }
 }
 
-async function handleConfigMessageViaLibSession(
-  envelope: EnvelopePlus,
-  configMessage: IncomingMessage<SignalService.ISharedConfigMessage>
+async function handleConfigMessagesViaLibSession(
+  configMessages: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
 ) {
   // TODO: Remove this once `useSharedUtilForUserConfig` is permanent
   if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    await removeFromCache(envelope);
     return;
   }
 
-  if (!configMessage) {
-    await removeFromCache(envelope);
-
+  if (isEmpty(configMessages)) {
     return;
   }
 
-  window?.log?.info('Handling our sharedConfig message via libsession_util.');
+  window?.log?.info(
+    `Handling our sharedConfig message via libsession_util: ${configMessages.length}`
+  );
 
-  const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessage);
+  const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages);
 
-  await processMergingResults(envelope, incomingMergeResult);
+  await processMergingResults(incomingMergeResult);
 }
 
 async function handleOurProfileUpdateLegacy(
@@ -564,5 +766,5 @@ async function handleConfigurationMessageLegacy(
 
 export const ConfigMessageHandler = {
   handleConfigurationMessageLegacy,
-  handleConfigMessageViaLibSession,
+  handleConfigMessagesViaLibSession,
 };
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 3676ab3f1..ba7f169cb 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -17,22 +17,22 @@ import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open
 import { getConversationController } from '../session/conversations';
 import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
 import { removeMessagePadding } from '../session/crypto/BufferPadding';
-import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { GroupUtils, UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { fromHexToArray, toHex } from '../session/utils/String';
+import { assertUnreachable } from '../types/sqlSharedTypes';
+import { BlockedNumberController } from '../util';
 import { ReadReceipts } from '../util/readReceipts';
 import { Storage } from '../util/storage';
 import { handleCallMessage } from './callMessage';
 import { getAllCachedECKeyPair } from './closedGroups';
 import { ConfigMessageHandler } from './configMessage';
 import { ECKeyPair } from './keypairs';
-import { BlockedNumberController } from '../util';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
-    const plaintext = await decrypt(envelope, envelope.content);
+    const plaintext = await decrypt(envelope);
 
     if (!plaintext) {
       return;
@@ -48,7 +48,7 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH
   }
 }
 
-async function decryptForClosedGroup(envelope: EnvelopePlus, ciphertext: ArrayBuffer) {
+async function decryptForClosedGroup(envelope: EnvelopePlus) {
   // case .closedGroupCiphertext: for ios
   window?.log?.info('received closed group message');
   try {
@@ -82,7 +82,7 @@ async function decryptForClosedGroup(envelope: EnvelopePlus, ciphertext: ArrayBu
 
         decryptedContent = await decryptWithSessionProtocol(
           envelope,
-          ciphertext,
+          envelope.content,
           encryptionKeyPair,
           true
         );
@@ -205,11 +205,15 @@ export async function decryptWithSessionProtocol(
   return plaintext;
 }
 
-async function decryptUnidentifiedSender(
-  envelope: EnvelopePlus,
-  ciphertext: ArrayBuffer
+/**
+ * This function is used to decrypt any messages send to our own pubkey.
+ * Either messages deposited into our swarm by other people, or messages we sent to ourselves, or config messages stored on the user namespaces.
+ * @param envelope the envelope contaning an encrypted .content field to decrypt
+ * @returns the decrypted content, or null
+ */
+export async function decryptEnvelopeWithOurKey(
+  envelope: EnvelopePlus
 ): Promise<ArrayBuffer | null> {
-  // window?.log?.info('received unidentified sender message');
   try {
     const userX25519KeyPair = await UserUtils.getIdentityKeyPair();
 
@@ -225,7 +229,11 @@ async function decryptUnidentifiedSender(
     // keep the await so the try catch works as expected
     perfStart(`decryptUnidentifiedSender-${envelope.id}`);
 
-    const retSessionProtocol = await decryptWithSessionProtocol(envelope, ciphertext, ecKeyPair);
+    const retSessionProtocol = await decryptWithSessionProtocol(
+      envelope,
+      envelope.content,
+      ecKeyPair
+    );
 
     const ret = removeMessagePadding(retSessionProtocol);
     perfEnd(`decryptUnidentifiedSender-${envelope.id}`, 'decryptUnidentifiedSender');
@@ -237,32 +245,28 @@ async function decryptUnidentifiedSender(
   }
 }
 
-async function doDecrypt(
-  envelope: EnvelopePlus,
-  ciphertext: ArrayBuffer
-): Promise<ArrayBuffer | null> {
-  if (ciphertext.byteLength === 0) {
-    throw new Error('Received an empty envelope.'); // Error.noData
-  }
-
-  switch (envelope.type) {
-    // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
-    case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
-      return decryptForClosedGroup(envelope, ciphertext);
-    case SignalService.Envelope.Type.SESSION_MESSAGE: {
-      return decryptUnidentifiedSender(envelope, ciphertext);
-    }
-    default:
-      throw new Error(`Unknown message type:${envelope.type}`);
-  }
-}
-
 // tslint:disable-next-line: max-func-body-length
-async function decrypt(envelope: EnvelopePlus, ciphertext: ArrayBuffer): Promise<any> {
+async function decrypt(envelope: EnvelopePlus): Promise<any> {
   try {
-    const plaintext = await doDecrypt(envelope, ciphertext);
+    if (envelope.content.byteLength === 0) {
+      throw new Error('Received an empty envelope.');
+    }
+
+    let plaintext: ArrayBuffer | null = null;
+    switch (envelope.type) {
+      // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
+      case SignalService.Envelope.Type.SESSION_MESSAGE:
+        plaintext = await decryptEnvelopeWithOurKey(envelope);
+        break;
+      case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
+        plaintext = await decryptForClosedGroup(envelope);
+        break;
+      default:
+        assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`);
+    }
 
     if (!plaintext) {
+      // content could not be decrypted.
       await removeFromCache(envelope);
       return null;
     }
@@ -431,20 +435,10 @@ export async function innerHandleSwarmContentMessage(
       return;
     }
     if (content.sharedConfigMessage) {
-      if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-        const asIncomingMsg: IncomingMessage<SignalService.ISharedConfigMessage> = {
-          envelopeTimestamp: sentAtTimestamp,
-          message: content.sharedConfigMessage,
-          messageHash: messageHash,
-          authorOrGroupPubkey: envelope.source,
-          authorInGroup: envelope.senderIdentity,
-        };
-        await ConfigMessageHandler.handleConfigMessageViaLibSession(envelope, asIncomingMsg);
-        return;
-      } else {
-        await removeFromCache(envelope);
-        return;
-      }
+      window.log.warn('content.sharedConfigMessage are handled outside of the receiving pipeline');
+      // this should never happen, but remove it from cache just in case something is messed up
+      await removeFromCache(envelope);
+      return;
     }
     if (content.dataExtractionNotification) {
       perfStart(`handleDataExtractionNotification-${envelope.id}`);
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 1382c9dee..58c5d737a 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -16,10 +16,6 @@ import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
-export type ReqOptions = {
-  conversationId: string;
-};
-
 const incomingMessagePromises: Array<Promise<any>> = [];
 
 async function handleSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) {
@@ -73,7 +69,7 @@ function queueSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) {
 
 async function handleRequestDetail(
   plaintext: Uint8Array,
-  options: ReqOptions,
+  inConversation: string | null,
   lastPromise: Promise<any>,
   messageHash: string
 ): Promise<void> {
@@ -83,7 +79,7 @@ async function handleRequestDetail(
   //   fault, and we should handle them gracefully and tell the
   //   user they received an invalid message
   // The message is for a medium size group
-  if (options.conversationId) {
+  if (inConversation) {
     const ourNumber = UserUtils.getOurPubKeyStrFromCache();
     const senderIdentity = envelope.source;
 
@@ -93,7 +89,7 @@ async function handleRequestDetail(
 
     // Sender identity will be lost if we load from cache, because
     // plaintext (and protobuf.Envelope) does not have that field...
-    envelope.source = options.conversationId;
+    envelope.source = inConversation;
     // tslint:disable-next-line no-parameter-reassignment
     plaintext = SignalService.Envelope.encode(envelope).finish();
     envelope.senderIdentity = senderIdentity;
@@ -124,17 +120,23 @@ async function handleRequestDetail(
   }
 }
 
+/**
+ *
+ * @param inConversation if the request is related to a group, this will be set to the group pubkey. Otherwise, it is set to null
+ */
 export function handleRequest(
   plaintext: Uint8Array,
-  options: ReqOptions,
+  inConversation: string | null,
   messageHash: string
 ): void {
   // tslint:disable-next-line no-promise-as-boolean
   const lastPromise = _.last(incomingMessagePromises) || Promise.resolve();
 
-  const promise = handleRequestDetail(plaintext, options, lastPromise, messageHash).catch(e => {
-    window?.log?.error('Error handling incoming message:', e && e.stack ? e.stack : e);
-  });
+  const promise = handleRequestDetail(plaintext, inConversation, lastPromise, messageHash).catch(
+    e => {
+      window?.log?.error('Error handling incoming message:', e && e.stack ? e.stack : e);
+    }
+  );
 
   incomingMessagePromises.push(promise);
 }
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index 9432857dd..7fe71ce71 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -81,7 +81,8 @@ async function joinOpenGroupV2(
   } else if (existingConvo) {
     // we already have a convo associated with it. Remove everything related to it so we start fresh
     window?.log?.warn('leaving before rejoining open group v2 room', conversationId);
-    await getConversationController().deleteContact(conversationId);
+
+    await getConversationController().deleteContact(conversationId, true);
   }
 
   // Try to connect to server
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 0c254db83..0f850220a 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -115,14 +115,15 @@ export class OpenGroupManagerV2 {
     }
 
     const inWrapperCommunities = SessionUtilUserGroups.getAllCommunities();
+
     const inWrapperIds = inWrapperCommunities.map(m =>
       getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)
     );
 
     let allRoomInfos = OpenGroupData.getAllV2OpenGroupRoomsMap();
 
-    // this is time for some cleanup!
-    // We consider the wrapper is our source-of-truth,
+    // Itis time for some cleanup!
+    // We consider the wrapper to be our source-of-truth,
     // so if there is a roomInfos without an associated entry in the wrapper, we remove it from the map of opengroups rooms
     if (allRoomInfos?.size) {
       const roomInfosAsArray = [...allRoomInfos.values()];
@@ -135,7 +136,7 @@ export class OpenGroupManagerV2 {
 
             await OpenGroupData.removeV2OpenGroupRoom(roomConvoId);
             getOpenGroupManager().removeRoomFromPolledRooms(infos);
-            await getConversationController().deleteContact(roomConvoId);
+            await getConversationController().deleteContact(roomConvoId, false);
           }
         } catch (e) {
           window?.log?.warn('cleanup roomInfos error', e);
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 29fbaa735..e337c8648 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -37,6 +37,7 @@ import { Data } from '../../../../data/data';
 import { processMessagesUsingCache } from './sogsV3MutationCache';
 import { destroyMessagesAndUpdateRedux } from '../../../../util/expiringMessages';
 import { sogsRollingDeletions } from './sogsRollingDeletions';
+import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 
 /**
  * Get the convo matching those criteria and make sure it is an opengroup convo, or return null.
@@ -550,8 +551,21 @@ export const handleBatchPollResults = async (
         case 'outbox':
           await handleInboxOutboxMessages(subResponse.body, serverUrl, true);
           break;
+
+        case 'addRemoveModerators':
+        case 'deleteMessage':
+        case 'banUnbanUser':
+        case 'deleteAllPosts':
+        case 'updateRoom':
+        case 'deleteReaction':
+          // we do nothing for all of those, but let's make sure if we ever add something batch polled for, we include it's handling here.
+          // the assertUnreachable will fail to compile everytime we add a new batch poll endpoint without taking care of it.
+          break;
         default:
-          window.log.error('No matching subrequest response body for type: ', responseType);
+          assertUnreachable(
+            responseType,
+            `No matching subrequest response body for type: "${responseType}"`
+          );
       }
     }
   }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
index 7461b16f4..9d880b8d3 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
@@ -1,14 +1,15 @@
+import { AbortSignal } from 'abort-controller';
+import { flatten, isEmpty, isNumber, isObject } from 'lodash';
 import { OpenGroupData } from '../../../../data/opengroups';
-import _, { flatten, isEmpty, isNumber, isObject } from 'lodash';
+import { assertUnreachable } from '../../../../types/sqlSharedTypes';
+import { Reactions } from '../../../../util/reactions';
 import { OnionSending, OnionV4JSONSnodeResponse } from '../../../onions/onionSend';
 import {
   OpenGroupPollingUtils,
   OpenGroupRequestHeaders,
 } from '../opengroupV2/OpenGroupPollingUtils';
-import { addJsonContentTypeToHeaders } from './sogsV3SendMessage';
-import { AbortSignal } from 'abort-controller';
 import { roomHasBlindEnabled } from './sogsV3Capabilities';
-import { Reactions } from '../../../../util/reactions';
+import { addJsonContentTypeToHeaders } from './sogsV3SendMessage';
 
 type BatchFetchRequestOptions = {
   method: 'POST' | 'PUT' | 'GET' | 'DELETE';
@@ -228,7 +229,8 @@ export type OpenGroupBatchRow =
 const makeBatchRequestPayload = (
   options: OpenGroupBatchRow
 ): BatchSubRequest | Array<BatchSubRequest> | null => {
-  switch (options.type) {
+  const type = options.type;
+  switch (type) {
     case 'capabilities':
       return {
         method: 'GET',
@@ -323,7 +325,7 @@ const makeBatchRequestPayload = (
         path: `/room/${options.deleteReaction.roomId}/reactions/${options.deleteReaction.messageId}/${options.deleteReaction.reaction}`,
       };
     default:
-      throw new Error('Invalid batch request row');
+      assertUnreachable(type, 'Invalid batch request row');
   }
 
   return null;
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 6a5bd3138..1ffe7d78f 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -1,31 +1,33 @@
-import { PubKey } from '../../types';
-import * as snodePool from './snodePool';
-import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
+import { compact, concat, difference, flatten, last, sample, toNumber, uniqBy } from 'lodash';
+import { Data, Snode } from '../../../data/data';
 import { SignalService } from '../../../protobuf';
 import * as Receiver from '../../../receiver/receiver';
-import _, { compact, concat, difference, flatten, last, sample, uniqBy } from 'lodash';
-import { Data, Snode } from '../../../data/data';
+import { PubKey } from '../../types';
+import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
+import * as snodePool from './snodePool';
 
-import { StringUtils, UserUtils } from '../../utils';
+import pRetry from 'p-retry';
 import { ConversationModel } from '../../../models/conversation';
+import { ConfigMessageHandler } from '../../../receiver/configMessage';
+import { decryptEnvelopeWithOurKey } from '../../../receiver/contentMessage';
+import { EnvelopePlus } from '../../../receiver/types';
+import { updateIsOnline } from '../../../state/ducks/onion';
 import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants';
 import { getConversationController } from '../../conversations';
-import { perfEnd, perfStart } from '../../utils/Performance';
+import { IncomingMessage } from '../../messages/incoming/IncomingMessage';
 import { ed25519Str } from '../../onions/onionPath';
-import { updateIsOnline } from '../../../state/ducks/onion';
-import pRetry from 'p-retry';
-import { SnodeAPIRetrieve } from './retrieveRequest';
+import { StringUtils, UserUtils } from '../../utils';
+import { perfEnd, perfStart } from '../../utils/Performance';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
+import { SnodeAPIRetrieve } from './retrieveRequest';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
 
 export function extractWebSocketContent(
   message: string,
-  options: any = {},
   messageHash: string
 ): null | {
   body: Uint8Array;
   messageHash: string;
-  options: any;
 } {
   try {
     const dataPlaintext = new Uint8Array(StringUtils.encode(message, 'base64'));
@@ -37,12 +39,11 @@ export function extractWebSocketContent(
       return {
         body: messageBuf.request.body,
         messageHash,
-        options,
       };
     }
     return null;
   } catch (error) {
-    window?.log?.warn('processMessage Failed to handle message:', error.message);
+    window?.log?.warn('extractWebSocketContent from message failed with:', error.message);
     return null;
   }
 }
@@ -196,9 +197,9 @@ export class SwarmPolling {
     isGroup: boolean,
     namespaces: Array<SnodeNamespaces>
   ) {
-    const pkStr = pubkey.key;
+    const polledPubkey = pubkey.key;
 
-    const swarmSnodes = await snodePool.getSwarmFor(pkStr);
+    const swarmSnodes = await snodePool.getSwarmFor(polledPubkey);
 
     // Select nodes for which we already have lastHashes
     const alreadyPolled = swarmSnodes.filter((n: Snode) => this.lastHashes[n.pubkey_ed25519]);
@@ -220,7 +221,6 @@ export class SwarmPolling {
       resultsFromAllNamespaces = null;
     }
 
-    let userConfigMessagesMerged: Array<RetrieveMessageItem> = [];
     let allNamespacesWithoutUserConfigIfNeeded: Array<RetrieveMessageItem> = [];
 
     // check if we just fetched the details from the config namespaces.
@@ -237,14 +237,29 @@ export class SwarmPolling {
             .map(r => r.messages.messages)
         )
       );
-      userConfigMessagesMerged = flatten(compact(userConfigMessages));
+
+      if (!isGroup) {
+        const userConfigMessagesMerged = flatten(compact(userConfigMessages));
+
+        window.log.info(
+          `received userConfigMessagesMerged: ${userConfigMessagesMerged.length} for key ${pubkey.key}`
+        );
+        try {
+          await this.handleSharedConfigMessages(userConfigMessagesMerged);
+        } catch (e) {
+          window.log.warn(
+            `handleSharedConfigMessages of ${userConfigMessagesMerged.length} failed with ${e.message}`
+          );
+          // not rethrowing
+        }
+      }
+
+      // first make sure to handle the shared user config message first
     } else {
       allNamespacesWithoutUserConfigIfNeeded = flatten(
         compact(resultsFromAllNamespaces?.map(m => m.messages.messages))
       );
     }
-
-    window.log.info(`received userConfigMessagesMerged: ${userConfigMessagesMerged.length}`);
     window.log.info(
       `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
     );
@@ -274,40 +289,76 @@ export class SwarmPolling {
         }
         return group;
       });
-    } else if (isGroup) {
-      window?.log?.info(
-        `Polled for group(${ed25519Str(
-          pubkey.key
-        )}):, but no snode returned something else than null.`
-      );
     }
 
-    perfStart(`handleSeenMessages-${pkStr}`);
+    perfStart(`handleSeenMessages-${polledPubkey}`);
     const newMessages = await this.handleSeenMessages(messages);
-    perfEnd(`handleSeenMessages-${pkStr}`, 'handleSeenMessages');
+    perfEnd(`handleSeenMessages-${polledPubkey}`, 'handleSeenMessages');
 
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      const extractedUserConfigMessage = compact(
-        userConfigMessagesMerged.map((m: RetrieveMessageItem) => {
-          return extractWebSocketContent(m.data, {}, m.hash);
-        })
-      );
+    // trigger the handling of all the other messages, not shared config related
+    newMessages.forEach(m => {
+      const content = extractWebSocketContent(m.data, m.hash);
+      if (!content) {
+        return;
+      }
 
-      extractedUserConfigMessage.forEach(m => {
-        Receiver.handleRequest(m.body, m.options, m.messageHash);
-      });
-    }
+      Receiver.handleRequest(content.body, isGroup ? polledPubkey : null, content.messageHash);
+    });
+  }
 
-    const extractedContentMessage = compact(
-      newMessages.map((m: RetrieveMessageItem) => {
-        const options = isGroup ? { conversationId: pkStr } : {};
-        return extractWebSocketContent(m.data, options, m.hash);
+  private async handleSharedConfigMessages(userConfigMessagesMerged: Array<RetrieveMessageItem>) {
+    const extractedUserConfigMessage = compact(
+      userConfigMessagesMerged.map((m: RetrieveMessageItem) => {
+        return extractWebSocketContent(m.data, m.hash);
       })
     );
 
-    extractedContentMessage.forEach(m => {
-      Receiver.handleRequest(m.body, m.options, m.messageHash);
-    });
+    const allDecryptedConfigMessages: Array<IncomingMessage<
+      SignalService.ISharedConfigMessage
+    >> = [];
+
+    for (let index = 0; index < extractedUserConfigMessage.length; index++) {
+      const userConfigMessage = extractedUserConfigMessage[index];
+
+      try {
+        const envelope: EnvelopePlus = SignalService.Envelope.decode(userConfigMessage.body) as any;
+        const decryptedEnvelope = await decryptEnvelopeWithOurKey(envelope);
+        if (!decryptedEnvelope?.byteLength) {
+          continue;
+        }
+        const content = SignalService.Content.decode(new Uint8Array(decryptedEnvelope));
+        if (content.sharedConfigMessage) {
+          const asIncomingMsg: IncomingMessage<SignalService.ISharedConfigMessage> = {
+            envelopeTimestamp: toNumber(envelope.timestamp),
+            message: content.sharedConfigMessage,
+            messageHash: userConfigMessage.messageHash,
+            authorOrGroupPubkey: envelope.source,
+            authorInGroup: envelope.senderIdentity,
+          };
+          allDecryptedConfigMessages.push(asIncomingMsg);
+        } else {
+          throw new Error(
+            'received a message to a namespace reserved for user config but not containign a sharedConfigMessage'
+          );
+        }
+      } catch (e) {
+        window.log.warn(
+          `failed to decrypt message with hash "${userConfigMessage.messageHash}": ${e.message}`
+        );
+      }
+    }
+
+    try {
+      window.log.info(
+        `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession`
+      );
+      await ConfigMessageHandler.handleConfigMessagesViaLibSession(allDecryptedConfigMessages);
+    } catch (e) {
+      const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(',');
+      window.log.warn(
+        `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"`
+      );
+    }
   }
 
   // Fetches messages for `pubkey` from `node` potentially updating
@@ -458,9 +509,9 @@ export class SwarmPolling {
     hash: string;
     expiration: number;
   }): Promise<void> {
-    if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
-      return;
-    }
+    // if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
+    //   return;
+    // }
     const pkStr = pubkey.key;
     const cached = await this.getLastHash(edkey, pubkey.key, namespace);
 
@@ -484,9 +535,9 @@ export class SwarmPolling {
   }
 
   private async getLastHash(nodeEdKey: string, pubkey: string, namespace: number): Promise<string> {
-    if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
-      return '';
-    }
+    // if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
+    //   return '';
+    // }
     if (!this.lastHashes[nodeEdKey]?.[pubkey]?.[namespace]) {
       const lastHash = await Data.getLastHashBySnode(pubkey, nodeEdKey, namespace);
 
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index b800ecad1..604ac61d4 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -11,6 +11,8 @@ import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/con
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
+import { leaveClosedGroup } from '../group/closed-group';
+import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
 
 let instance: ConversationController | null;
 
@@ -197,7 +199,7 @@ export class ConversationController {
     await conversation.commit();
   }
 
-  public async deleteContact(id: string) {
+  public async deleteContact(id: string, fromSyncMessage: boolean) {
     if (!this._initialFetchComplete) {
       throw new Error('getConversationController().deleteContact() needs complete initial fetch');
     }
@@ -210,12 +212,17 @@ export class ConversationController {
       return;
     }
 
+    // those are the stuff to do for all conversation types
+    window.log.info(`deleteContact destroyingMessages: ${id}`);
+    await deleteAllMessagesByConvoIdNoConfirmation(id);
+    window.log.info(`deleteContact messages destroyed: ${id}`);
+
     // Closed/Medium group leaving
     if (conversation.isClosedGroup()) {
       window.log.info(`deleteContact ClosedGroup case: ${id}`);
-      await conversation.leaveClosedGroup();
+      await leaveClosedGroup(conversation.id);
       // open group v2
-    } else if (conversation.isOpenGroupV2()) {
+    } else if (conversation.isPublic()) {
       window?.log?.info('leaving open group v2', conversation.id);
       const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
       if (roomInfos) {
@@ -229,24 +236,17 @@ export class ConversationController {
         window?.log?.info('removeV2OpenGroupRoom failed:', e);
       }
       try {
-        console.error(' plop1', SessionUtilUserGroups.getAllCommunities());
         await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
-        console.error(' plop2', SessionUtilUserGroups.getAllCommunities());
       } catch (e) {
         window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
       }
     }
 
-    // those are the stuff to do for all contact types
-    window.log.info(`deleteContact destroyingMessages: ${id}`);
-
-    await deleteAllMessagesByConvoIdNoConfirmation(conversation.id);
-    window.log.info(`deleteContact messages destroyed: ${id}`);
-    // if this conversation is a private conversation it's in fact a `contact` for desktop.
-    // we just want to remove everything related to it, set the active_at to undefined
-    // so conversation still exists (useful for medium groups members or opengroups) but is not shown on the UI
     if (conversation.isPrivate()) {
-      window.log.info(`deleteContact isPrivate, marking as inactive: ${id}`);
+      // if this conversation is a private conversation it's in fact a `contact` for desktop.
+      // we just want to remove everything related to it and set the hidden field to true
+      // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation
+      window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
 
       conversation.set({
         hidden: true,
@@ -256,11 +256,11 @@ export class ConversationController {
       await conversation.commit();
       // TODO the call above won't mark the conversation as hidden in the wrapper, it will just stop being updated (which is a bad thing)
     } else {
-      window.log.info(`deleteContact !isPrivate, removing convo from DB: ${id}`);
+      window.log.info(`deleteContact NOT private, removing convo from DB: ${id}`);
       // not a private conversation, so not a contact for the ContactWrapper
       await Data.removeConversation(id);
 
-      window.log.info(`deleteContact !isPrivate, convo removed from DB: ${id}`);
+      window.log.info(`deleteContact NOT private, convo removed from DB: ${id}`);
 
       // TODO remove group related entries from their corresponding wrappers here
       this.conversations.remove(conversation);
@@ -273,7 +273,11 @@ export class ConversationController {
       );
       window.inboxStore?.dispatch(conversationActions.conversationRemoved(conversation.id));
 
-      window.log.info(`deleteContact !isPrivate, convo removed from store: ${id}`);
+      window.log.info(`deleteContact NOT private, convo removed from store: ${id}`);
+    }
+
+    if (!fromSyncMessage) {
+      await ConfigurationSync.queueNewJobIfNeeded();
     }
   }
 
@@ -306,18 +310,22 @@ export class ConversationController {
         console.time('refreshAllWrapperContactsData');
         for (let index = 0; index < collection.models.length; index++) {
           const convo = collection.models[index];
-          if (SessionUtilContact.filterContactsToStoreInContactsWrapper(convo)) {
+          if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
             await SessionUtilContact.refreshMappedValue(convo.id, true);
           }
-          if (SessionUtilUserGroups.filterUserCommunitiesToStoreInWrapper(convo)) {
-            await SessionUtilUserGroups.refreshCommunityMappedValue(convo.id, true);
+          if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+            await SessionUtilUserGroups.refreshMappedValue(convo.id, true);
           }
         }
         console.timeEnd('refreshAllWrapperContactsData');
 
         this._initialFetchComplete = true;
         this.conversations.forEach((conversation: ConversationModel) => {
-          if (conversation.isActive() && !conversation.get('lastMessage')) {
+          if (
+            conversation.isActive() &&
+            !conversation.isHidden() &&
+            !conversation.get('lastMessage')
+          ) {
             conversation.updateLastMessage();
           }
         });
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index affce6fb9..e99cd7c1a 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -106,11 +106,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
   if (allInvitesSent) {
     const newHexKeypair = encryptionKeyPair.toHexKeyPair();
 
-    const isHexKeyPairSaved = await addKeyPairToCacheAndDBIfNeeded(groupPublicKey, newHexKeypair);
-
-    if (isHexKeyPairSaved) {
-      window?.log?.info('Dropping already saved keypair for group', groupPublicKey);
-    }
+    await addKeyPairToCacheAndDBIfNeeded(groupPublicKey, newHexKeypair);
 
     // Subscribe to this group id
     getSwarmPollingInstance().addGroupId(new PubKey(groupPublicKey));
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index b55ff43a9..ca3acdcd0 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -235,7 +235,7 @@ function isV3(details: GroupInfo | GroupInfoV3): details is GroupInfoV3 {
 }
 
 export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3) {
-  const { id, weWereJustAdded } = details;
+  const { id, weWereJustAdded, expireTimer } = details;
 
   const conversation = await getConversationController().getOrCreateAndWait(
     id,
@@ -279,8 +279,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
 
   await conversation.commit();
 
-  const { expireTimer } = details;
-
   if (expireTimer === undefined || typeof expireTimer !== 'number') {
     return;
   }
@@ -297,10 +295,11 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
 export async function leaveClosedGroup(groupId: string) {
   const convo = getConversationController().get(groupId);
 
-  if (!convo) {
+  if (!convo || !convo.isMediumGroup()) {
     window?.log?.error('Cannot leave non-existing group');
     return;
   }
+
   const ourNumber = UserUtils.getOurPubKeyFromCache();
   const isCurrentUserAdmin = convo.get('groupAdmins')?.includes(ourNumber.key);
 
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 3dd786990..68c93254b 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -258,7 +258,6 @@ export class MessageQueue {
    */
   public async processPending(device: PubKey, isSyncMessage: boolean = false) {
     const messages = await this.pendingMessageCache.getForDevice(device);
-    console.warn('processPending', messages);
 
     const jobQueue = this.getJobQueue(device);
     messages.forEach(async message => {
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 977eff96e..372484749 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -223,7 +223,6 @@ async function sendMessagesDataToSnode(
         })
       : null;
 
-  console.error('oldMessageHashes', oldMessageHashes);
   const snode = sample(swarm);
   if (!snode) {
     throw new EmptySwarmError(destination, 'Ran out of swarm nodes to query');
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index 91b309bff..2d97ba0d3 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -2,7 +2,7 @@ import { isNumber } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
-import { ConfigWrapperObjectTypes } from '../../../../webworker/workers/browser/libsession_worker_functions';
+import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { DURATION } from '../../../constants';
 import { getConversationController } from '../../../conversations';
@@ -25,16 +25,10 @@ const defaultMaxAttempts = 2;
  */
 let lastRunConfigSyncJobDumpTimestamp: number | null = null;
 
-const variantsToSaveRegularly: Array<ConfigWrapperObjectTypes> = [
-  'UserConfig',
-  'ContactsConfig',
-  'UserGroupsConfig',
-];
-
 async function saveDumpsNeededToDB(): Promise<boolean> {
   let savedAtLeastOne = false;
-  for (let i = 0; i < variantsToSaveRegularly.length; i++) {
-    const variant = variantsToSaveRegularly[i];
+  for (let i = 0; i < LibSessionUtil.userVariants.length; i++) {
+    const variant = LibSessionUtil.userVariants[i];
     const needsDump = await GenericWrapperActions.needsDump(variant);
 
     if (!needsDump) {
@@ -100,9 +94,24 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       // refresh all the data stored by the wrappers we need to store.
       // so when we call needsDump(), we know for sure that we are up to date
       console.time('ConfigurationSyncDumpJob insertAll');
-      await LibSessionUtil.insertUserProfileIntoWrapper();
-      await LibSessionUtil.insertAllContactsIntoContactsWrapper();
-      await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+
+      for (let index = 0; index < LibSessionUtil.userVariants.length; index++) {
+        const variant = LibSessionUtil.userVariants[index];
+        switch (variant) {
+          case 'UserConfig':
+            await LibSessionUtil.insertUserProfileIntoWrapper();
+            break;
+          case 'ContactsConfig':
+            await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+            break;
+          case 'UserGroupsConfig':
+            await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+            break;
+
+          default:
+            assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
+        }
+      }
       console.timeEnd('ConfigurationSyncDumpJob insertAll');
       await saveDumpsNeededToDB();
       return RunJobResult.Success;
@@ -148,6 +157,9 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
+  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   if (
     !lastRunConfigSyncJobDumpTimestamp ||
     lastRunConfigSyncJobDumpTimestamp < Date.now() - defaultMsBetweenRetries
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 307a1b69d..03f3080c1 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -2,6 +2,7 @@ import { compact, groupBy, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
+import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes';
 import { getConversationController } from '../../../conversations';
@@ -129,7 +130,11 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
   for (let i = 0; i < changes.length; i++) {
     const change = changes[i];
     const variant = LibSessionUtil.kindToVariant(change.message.kind);
-    console.warn('buildAndSaveDumpsToDB: change.updatedHash: ', change.updatedHash);
+    console.warn(
+      `ConfigurationSyncJob.saveDumpToDB: "${variant}" updatedHash: "${
+        change.updatedHash
+      }:${change.message.seqno.toNumber()}"`
+    );
     const needsDump = await LibSessionUtil.markAsPushed(
       variant,
       change.publicKey,
@@ -186,9 +191,23 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         window.log.warn('did not find our own conversation');
         return RunJobResult.PermanentFailure;
       }
-      await LibSessionUtil.insertUserProfileIntoWrapper();
-      await LibSessionUtil.insertAllContactsIntoContactsWrapper();
-      await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+      for (let index = 0; index < LibSessionUtil.userVariants.length; index++) {
+        const variant = LibSessionUtil.userVariants[index];
+        switch (variant) {
+          case 'UserConfig':
+            await LibSessionUtil.insertUserProfileIntoWrapper();
+            break;
+          case 'ContactsConfig':
+            await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+            break;
+          case 'UserGroupsConfig':
+            await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+            break;
+
+          default:
+            assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
+        }
+      }
 
       const singleDestChanges = await retrieveSingleDestinationChanges();
 
@@ -211,7 +230,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
             };
           });
           const asSet = new Set(dest.allOldHashes);
-          console.warn('asSet', [...asSet]);
           return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
         })
       );
@@ -271,6 +289,9 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
+  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    return;
+  }
   if (
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 8294750c6..8273541ec 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -3,6 +3,7 @@ import Long from 'long';
 import { UserUtils } from '..';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 import { SignalService } from '../../../protobuf';
+import { assertUnreachable } from '../../../types/sqlSharedTypes';
 import { ConfigWrapperObjectTypes } from '../../../webworker/workers/browser/libsession_worker_functions';
 import { GenericWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
@@ -14,7 +15,7 @@ import { SessionUtilUserGroups } from './libsession_utils_user_groups';
 import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 // TODO complete this list
-const requiredUserDumpVariants: Array<ConfigWrapperObjectTypes> = [
+const userVariants: Array<ConfigWrapperObjectTypes> = [
   'UserConfig',
   'ContactsConfig',
   'UserGroupsConfig',
@@ -24,7 +25,9 @@ export type IncomingConfResult = {
   needsPush: boolean;
   needsDump: boolean;
   messageHashes: Array<string>;
-  latestSentTimestamp: number;
+  kind: SignalService.SharedConfigMessage.Kind;
+  publicKey: string;
+  latestEnvelopeTimestamp: number;
 };
 
 export type OutgoingConfResult = {
@@ -42,7 +45,7 @@ async function initializeLibSessionUtilWrappers() {
   const privateKeyEd25519 = keypair.privKeyBytes;
   // let's plan a sync on start for now
   // TODO is this causing any issues?
-  setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 3000);
+  setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 20000);
 
   // fetch the dumps we already have from the database
   const dumps = await ConfigDumpData.getAllDumpsWithData();
@@ -75,13 +78,13 @@ async function initializeLibSessionUtilWrappers() {
   console.warn('requiredVariants: FIXME add conversation volatile wrapper as required ');
 
   const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(
-    requiredUserDumpVariants,
+    LibSessionUtil.userVariants,
     [...userVariantsBuildWithoutErrors.values()]
   );
 
   if (missingRequiredVariants.length) {
     // TODO this is only needed for debugging. Should be removed as we force them created right below with an empty dump
-    throw new Error(`missingRequiredVariants: ${JSON.stringify(missingRequiredVariants)}`);
+    // throw new Error(`missingRequiredVariants: ${JSON.stringify(missingRequiredVariants)}`);
   }
 
   for (let index = 0; index < missingRequiredVariants.length; index++) {
@@ -97,7 +100,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   // Ensure we always check the required user config types for changes even if there is no dump
   // data yet (to deal with first launch cases)
   if (pubkey === us) {
-    LibSessionUtil.requiredUserDumpVariants.forEach(requiredVariant => {
+    LibSessionUtil.userVariants.forEach(requiredVariant => {
       if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) {
         dumps.push({
           publicKey: us,
@@ -146,7 +149,7 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap
     case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
       return 'UserGroupsConfig';
     default:
-      throw new Error(`kindToVariant: Unsupported variant: "${kind}"`);
+      assertUnreachable(kind, `kindToVariant: Unsupported variant: "${kind}"`);
   }
 }
 
@@ -159,7 +162,7 @@ function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedC
     case 'UserGroupsConfig':
       return SignalService.SharedConfigMessage.Kind.USER_GROUPS;
     default:
-      throw new Error(`variantToKind: Unsupported kind: "${variant}"`);
+      assertUnreachable(variant, `variantToKind: Unsupported kind: "${variant}"`);
   }
 }
 
@@ -181,12 +184,13 @@ async function markAsPushed(
 
 export const LibSessionUtil = {
   initializeLibSessionUtilWrappers,
-  requiredUserDumpVariants,
+  userVariants,
   pendingChangesForPubkey,
   insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
   insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
   insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
   removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
   kindToVariant,
+  variantToKind,
   markAsPushed,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index dea1b494a..dee864ddc 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -31,7 +31,7 @@ const mappedContactWrapperValues = new Map<string, ContactInfo>();
 async function insertAllContactsIntoContactsWrapper() {
   const idsToInsert = getConversationController()
     .getConversations()
-    .filter(filterContactsToStoreInContactsWrapper)
+    .filter(isContactToStoreInContactsWrapper)
     .map(m => m.id);
 
   window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts`);
@@ -48,7 +48,7 @@ async function insertAllContactsIntoContactsWrapper() {
  * `isApproved` or `didApproveMe` field set.
  * So that would be all the private conversations we either sent or receive a message from, not blinded
  */
-function filterContactsToStoreInContactsWrapper(convo: ConversationModel): boolean {
+function isContactToStoreInContactsWrapper(convo: ConversationModel): boolean {
   return (
     !convo.isMe() &&
     convo.isPrivate() &&
@@ -69,7 +69,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     return;
   }
 
-  if (!filterContactsToStoreInContactsWrapper(foundConvo)) {
+  if (!isContactToStoreInContactsWrapper(foundConvo)) {
     // window.log.info(`insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved. Skipping`);
     return;
   }
@@ -133,7 +133,7 @@ function getMappedValue(id: string) {
 }
 
 export const SessionUtilContact = {
-  filterContactsToStoreInContactsWrapper,
+  isContactToStoreInContactsWrapper,
   insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
   getMappedValue,
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index ea6496609..7e2612aee 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,18 +1,26 @@
-import { isEmpty, uniq } from 'lodash';
-import { CommunityInfo } from 'session_util_wrapper';
+import { uniq } from 'lodash';
+import { CommunityInfo, LegacyGroupInfo, UserGroupsType } from 'session_util_wrapper';
+import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
-import { getCommunityInfoFromDBValues } from '../../../types/sqlSharedTypes';
+import {
+  getCommunityInfoFromDBValues,
+  getLegacyGroupInfoFromDBValues,
+} from '../../../types/sqlSharedTypes';
 import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { OpenGroupUtils } from '../../apis/open_group_api/utils';
 import { getConversationController } from '../../conversations';
 
 /**
  * The key of this map is the convoId as stored in the database.
- * Note: the wrapper clean
  */
 const mappedCommunityWrapperValues = new Map<string, CommunityInfo>();
 
+/**
+ * The key of this map is the convoId as stored in the database. So the legacy group 05 sessionID
+ */
+const mappedLegacyGroupWrapperValues = new Map<string, LegacyGroupInfo>();
+
 /**
  * Update the UserGroupsWrapper with all the data is cares about from the database.
  */
@@ -20,19 +28,12 @@ async function insertAllUserGroupsIntoWrapper() {
   const convoIdsToInsert = uniq(
     getConversationController()
       .getConversations()
-      .filter(filterUserGroupsToStoreInWrapper)
-      .map(m => m.id)
-  );
-
-  const communitiesIdsToInsert = uniq(
-    getConversationController()
-      .getConversations()
-      .filter(filterUserCommunitiesToStoreInWrapper)
+      .filter(isUserGroupToStoreInWrapper)
       .map(m => m.id)
   );
 
   window.log.debug(
-    `UserGroupsWrapper keep tracks of ${convoIdsToInsert.length} usergroups of which ${communitiesIdsToInsert.length} are communities`
+    `UserGroupsWrapper keep tracks of ${convoIdsToInsert.length} usergroups including groups and communities`
   );
 
   for (let index = 0; index < convoIdsToInsert.length; index++) {
@@ -45,17 +46,29 @@ async function insertAllUserGroupsIntoWrapper() {
 /**
  * Returns true if that conversation is an active group
  */
-function filterUserGroupsToStoreInWrapper(convo: ConversationModel): boolean {
-  return convo.isGroup() && convo.isActive();
+function isUserGroupToStoreInWrapper(convo: ConversationModel): boolean {
+  return isCommunityToStoreInWrapper(convo) || isLegacyGroupToStoreInWrapper(convo);
 }
 
-function filterUserCommunitiesToStoreInWrapper(convo: ConversationModel): boolean {
-  return convo.isPublic() && convo.isActive();
+function isCommunityToStoreInWrapper(convo: ConversationModel): boolean {
+  return convo.isGroup() && convo.isPublic() && convo.isActive();
+}
+
+function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean {
+  return (
+    convo.isGroup() &&
+    !convo.isPublic() &&
+    convo.id.startsWith('05') && // new closed groups won't start with 05
+    convo.isActive() &&
+    !convo.get('isKickedFromGroup') &&
+    !convo.get('left')
+  );
 }
 
 /**
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that community does not exist in the wrapper, it is created before being updated.
+ * Same applies for a legacy group.
  */
 async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise<void> {
   const foundConvo = getConversationController().get(convoId);
@@ -63,13 +76,12 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
     return;
   }
 
-  if (!filterUserGroupsToStoreInWrapper(foundConvo)) {
+  if (!isUserGroupToStoreInWrapper(foundConvo)) {
     return;
   }
 
-  if (foundConvo.isOpenGroupV2()) {
+  if (isCommunityToStoreInWrapper(foundConvo)) {
     const asOpengroup = foundConvo.toOpenGroupV2();
-    const isPinned = !!foundConvo.get('isPinned');
 
     const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
     if (!roomDetails) {
@@ -84,64 +96,85 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
     );
 
     const wrapperComm = getCommunityInfoFromDBValues({
-      isPinned,
+      isPinned: !!foundConvo.get('isPinned'),
       fullUrl,
     });
 
     try {
-      console.info(`inserting into usergroup wrapper ${convoId}...`);
+      console.info(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
       // this does the create or the update of the matching existing community
       await UserGroupsWrapperActions.setCommunityByFullUrl(
         wrapperComm.fullUrl,
         wrapperComm.priority
       );
+      await refreshMappedValue(convoId);
     } catch (e) {
       window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
       // we still let this go through
     }
+  } else if (isLegacyGroupToStoreInWrapper(foundConvo)) {
+    const encryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(convoId);
+    const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
+      id: foundConvo.id,
+      isPinned: !!foundConvo.get('isPinned'),
+      members: foundConvo.get('members') || [],
+      groupAdmins: foundConvo.get('groupAdmins') || [],
+      expireTimer: foundConvo.get('expireTimer'),
+      displayNameInProfile: foundConvo.get('displayNameInProfile'),
+      hidden: false,
+      encPubkeyHex: encryptionKeyPair?.publicHex || '',
+      encSeckeyHex: encryptionKeyPair?.privateHex || '',
+    });
+    if (wrapperLegacyGroup.members.length === 0) {
+      debugger;
+    }
 
-    await refreshCommunityMappedValue(convoId);
-  } else {
-    // TODO
-    // throw new Error('insertGroupsFromDBIntoWrapperAndRefresh group and legacy todo');
+    try {
+      console.info(`inserting into usergroup wrapper "${foundConvo.id}"...`);
+      // this does the create or the update of the matching existing legacy group
+
+      await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
+      await refreshMappedValue(convoId);
+    } catch (e) {
+      window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
+      // we still let this go through
+    }
   }
 }
 
 /**
  * refreshMappedValue is used to query the UserGroups Wrapper for the details of that group and update the cached in-memory entry representing its content.
- * @param id the pubkey to re fresh the cached value from
+ * @param id the pubkey to re fresh the cached value from1
  * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
  */
-async function refreshCommunityMappedValue(convoId: string, duringAppStart = false) {
+async function refreshMappedValue(convoId: string, duringAppStart = false) {
   try {
-    if (!OpenGroupUtils.isOpenGroupV2(convoId)) {
-      throw new Error(`Not an opengroupv2: "${convoId}"`);
-    }
-    const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
-    if (fromWrapper) {
-      SessionUtilUserGroups.setCommunityMappedValue(convoId, fromWrapper);
-      if (!duringAppStart) {
-        getConversationController()
-          .get(convoId)
-          ?.triggerUIRefresh();
+    let refreshed = false;
+    if (OpenGroupUtils.isOpenGroupV2(convoId)) {
+      const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
+      if (fromWrapper && fromWrapper.fullUrl) {
+        mappedCommunityWrapperValues.set(convoId, fromWrapper);
       }
+      refreshed = true;
+    } else if (convoId.startsWith('05')) {
+      // currently this should only be a legacy group here
+      const fromWrapper = await UserGroupsWrapperActions.getLegacyGroup(convoId);
+      if (fromWrapper) {
+        mappedLegacyGroupWrapperValues.set(convoId, fromWrapper);
+      }
+      refreshed = true;
+    }
+
+    if (refreshed && !duringAppStart) {
+      getConversationController()
+        .get(convoId)
+        ?.triggerUIRefresh();
     }
-    return;
   } catch (e) {
-    window.log.info(`refreshCommunityMappedValue: not an opengroup convoID: ${convoId}`, e);
+    window.log.info(`refreshMappedValue: not an opengroup convoID: ${convoId}`, e);
   }
 
-  // TODO
-  // throw new Error('refreshMappedValue group and legacy todo');
-}
-
-function setCommunityMappedValue(convoId: string, info: CommunityInfo) {
-  if (isEmpty(info.fullUrl)) {
-    throw new Error(`setCommunityMappedValue needs a valid info.fullUrl ${info.fullUrl}`);
-  }
-
-  // this has the pubkey associated with it
-  mappedCommunityWrapperValues.set(convoId, info);
+  // TODO handle the new closed groups once we got them ready
 }
 
 function getCommunityMappedValueByConvoId(convoId: string) {
@@ -153,7 +186,7 @@ function getAllCommunities(): Array<CommunityInfo> {
 }
 
 /**
- * Remove the matching community from the wrapper and from the cached list of communities
+ * Removes the matching community from the wrapper and from the cached list of communities
  */
 async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutPubkey: string) {
   const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(
@@ -163,18 +196,58 @@ async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutP
   if (fromWrapper) {
     await UserGroupsWrapperActions.eraseCommunityByFullUrl(fromWrapper.fullUrl);
   }
-  // might not be there but better make sure
   mappedCommunityWrapperValues.delete(convoId);
 }
 
+function getLegacyGroupMappedValueByConvoId(convoId: string) {
+  return mappedLegacyGroupWrapperValues.get(convoId);
+}
+
+function getAllLegacyGroups(): Array<LegacyGroupInfo> {
+  return [...mappedLegacyGroupWrapperValues.values()];
+}
+
+/**
+ * Remove the matching legacy group from the wrapper and from the cached list of legacy groups
+ */
+async function removeLegacyGroupFromWrapper(groupPk: string) {
+  const fromWrapper = await UserGroupsWrapperActions.getLegacyGroup(groupPk);
+
+  if (fromWrapper) {
+    await UserGroupsWrapperActions.eraseLegacyGroup(groupPk);
+  }
+
+  mappedLegacyGroupWrapperValues.delete(groupPk);
+}
+
+/**
+ * This function can be used where there are things to do for all the types handled by this wrapper.
+ * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
+ *
+ *
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ */
+function getUserGroupTypes(): Array<UserGroupsType> {
+  return ['Community', 'LegacyGroup'];
+}
+
 export const SessionUtilUserGroups = {
-  filterUserGroupsToStoreInWrapper,
-  filterUserCommunitiesToStoreInWrapper,
-  getAllCommunities,
+  // shared
+  isUserGroupToStoreInWrapper,
   insertAllUserGroupsIntoWrapper,
   insertGroupsFromDBIntoWrapperAndRefresh,
-  setCommunityMappedValue,
+  refreshMappedValue,
+  getUserGroupTypes,
+
+  // communities
+  isCommunityToStoreInWrapper,
+  getAllCommunities,
   getCommunityMappedValueByConvoId,
-  refreshCommunityMappedValue,
   removeCommunityFromWrapper,
+
+  // legacy group
+  isLegacyGroupToStoreInWrapper,
+  getLegacyGroupMappedValueByConvoId,
+  getAllLegacyGroups,
+  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
 };
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index c28fc5b48..277c164a9 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -76,6 +76,7 @@ export const syncConfigurationIfNeeded = async () => {
 
 export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) =>
   new Promise(resolve => {
+    // TODO  this should check for feature flag and queue a ConfigurationSyncJob
     const allConvos = getConversationController().getConversations();
     // if we hang for more than 10sec, force resolve this promise.
     setTimeout(() => {
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 04dcae4cb..56e2acebd 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -309,6 +309,7 @@ describe('libsession_contacts', () => {
       id: '051111567890acbdef',
       type: ConversationTypeEnum.PRIVATE,
       isApproved: true,
+      active_at: 123,
       didApproveMe: true,
     };
     beforeEach(() => {
@@ -320,7 +321,7 @@ describe('libsession_contacts', () => {
 
     it('excludes ourselves', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({ ...validArgs, id: ourNumber } as any)
         )
       ).to.be.eq(false);
@@ -328,7 +329,7 @@ describe('libsession_contacts', () => {
 
     it('excludes non private', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({ ...validArgs, type: ConversationTypeEnum.GROUP } as any)
         )
       ).to.be.eq(false);
@@ -336,15 +337,27 @@ describe('libsession_contacts', () => {
 
     it('includes private', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({ ...validArgs, type: ConversationTypeEnum.PRIVATE } as any)
         )
       ).to.be.eq(true);
     });
 
+    it('includes hidden private', () => {
+      expect(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            type: ConversationTypeEnum.PRIVATE,
+            hidden: true,
+          } as any)
+        )
+      ).to.be.eq(true);
+    });
+
     it('excludes blinded', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({
             ...validArgs,
             type: ConversationTypeEnum.PRIVATE,
@@ -356,7 +369,7 @@ describe('libsession_contacts', () => {
 
     it('excludes non approved by us nor did approveme', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: false,
@@ -368,7 +381,7 @@ describe('libsession_contacts', () => {
 
     it('includes approved only by us ', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: false,
@@ -377,9 +390,23 @@ describe('libsession_contacts', () => {
         )
       ).to.be.eq(true);
     });
+
+    it('excludes not active ', () => {
+      expect(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
+          new ConversationModel({
+            ...validArgs,
+            didApproveMe: false,
+            isApproved: true,
+            active_at: undefined,
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+
     it('includes approved only by them ', () => {
       expect(
-        SessionUtilContact.filterContactsToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInContactsWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: true,
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index cd42140b8..2d5933029 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -25,49 +25,120 @@ describe('libsession_groups', () => {
       Sinon.restore();
     });
 
-    it('includes public group/community', () => {
-      expect(
-        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
-          new ConversationModel({ ...validArgs } as any)
-        )
-      ).to.be.eq(true);
+    describe('communities', () => {
+      it('includes public group/community', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({ ...validArgs } as any)
+          )
+        ).to.be.eq(true);
+      });
+
+      it('excludes public group/community inactive', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({ ...validArgs, active_at: undefined } as any)
+          )
+        ).to.be.eq(false);
+      });
     });
 
-    it('excludes public group/community inactive', () => {
-      expect(
-        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
-          new ConversationModel({ ...validArgs, active_at: undefined } as any)
-        )
-      ).to.be.eq(false);
+    describe('legacy closed groups', () => {
+      const validLegacyGroupArgs = {
+        ...validArgs,
+        type: ConversationTypeEnum.GROUP,
+        id: '05123456564',
+      } as any;
+
+      it('includes legacy group', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({
+              ...validLegacyGroupArgs,
+            })
+          )
+        ).to.be.eq(true);
+      });
+
+      it('exclude legacy group left', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({
+              ...validLegacyGroupArgs,
+              left: true,
+            })
+          )
+        ).to.be.eq(false);
+      });
+      it('exclude legacy group kicked', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({
+              ...validLegacyGroupArgs,
+              isKickedFromGroup: true,
+            })
+          )
+        ).to.be.eq(false);
+      });
+
+      it('exclude legacy group not active', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({
+              ...validLegacyGroupArgs,
+              active_at: undefined,
+            })
+          )
+        ).to.be.eq(false);
+      });
+
+      it('include hidden legacy group', () => {
+        expect(
+          SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+            new ConversationModel({
+              ...validLegacyGroupArgs,
+              hidden: true,
+            })
+          )
+        ).to.be.eq(true);
+      });
     });
 
-    it('includes closed group', () => {
+    it('excludes closed group v3 (for now)', () => {
       expect(
-        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
-          new ConversationModel({
-            ...validArgs,
-            type: ConversationTypeEnum.GROUP,
-            id: '05123456564',
-          } as any)
-        )
-      ).to.be.eq(true);
-    });
-
-    it('includes closed group v3', () => {
-      expect(
-        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+        SessionUtilUserGroups.isUserGroupToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             type: ConversationTypeEnum.GROUPV3,
             id: '03123456564',
           } as any)
         )
-      ).to.be.eq(true);
+      ).to.be.eq(false);
+    });
+
+    it('excludes empty id', () => {
+      expect(
+        SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            id: '',
+          } as any)
+        )
+      ).to.be.eq(false);
+
+      expect(
+        SessionUtilUserGroups.isUserGroupToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            id: '9871',
+          } as any)
+        )
+      ).to.be.eq(false);
     });
 
     it('excludes private', () => {
       expect(
-        SessionUtilUserGroups.filterUserGroupsToStoreInWrapper(
+        SessionUtilUserGroups.isUserGroupToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             id: '0511111',
diff --git a/ts/test/session/unit/utils/SyncUtils_test.ts b/ts/test/session/unit/utils/SyncUtils_test.ts
deleted file mode 100644
index 76fecfc9b..000000000
--- a/ts/test/session/unit/utils/SyncUtils_test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// tslint:disable: no-implicit-dependencies
-import chai from 'chai';
-
-import chaiAsPromised from 'chai-as-promised';
-import Sinon from 'sinon';
-chai.use(chaiAsPromised as any);
-
-describe('SyncUtils', () => {
-  afterEach(() => {
-    Sinon.restore();
-  });
-
-  describe('syncConfigurationIfNeeded', () => {
-    it.skip('sync if last sync undefined', () => {
-      // TestUtils.stubData('getItemById').resolves(undefined);
-      // sandbox.stub(ConversationController, 'getConversations').returns([]);
-      // const getCurrentConfigurationMessageSpy = sandbox.spy(MessageUtils, 'getCurrentConfigurationMessage');
-      // await syncConfigurationIfNeeded();
-      // expect(getCurrentConfigurationMessageSpy.callCount).equal(1);
-    });
-  });
-});
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index d084689e8..4d2c2467b 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,5 +1,7 @@
-import { isEmpty, isEqual } from 'lodash';
-import { ContactInfo } from 'session_util_wrapper';
+import { from_hex } from 'libsodium-wrappers-sumo';
+import { isArray, isEmpty, isEqual } from 'lodash';
+import { ContactInfo, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
+import { ConversationAttributes } from '../models/conversationAttributes';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { fromHexToArray } from '../session/utils/String';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
@@ -162,3 +164,71 @@ export function getCommunityInfoFromDBValues({
 
   return community;
 }
+
+function maybeArrayJSONtoArray(arr: string | Array<string>): Array<string> {
+  try {
+    if (isArray(arr)) {
+      return arr;
+    }
+
+    const parsed = JSON.parse(arr);
+    if (isArray(parsed)) {
+      return parsed;
+    }
+    return [];
+  } catch (e) {
+    return [];
+  }
+}
+
+export function getLegacyGroupInfoFromDBValues({
+  id,
+  hidden,
+  isPinned,
+  members: maybeMembers,
+  displayNameInProfile,
+  expireTimer,
+  encPubkeyHex,
+  encSeckeyHex,
+  groupAdmins: maybeAdmins,
+}: Pick<
+  ConversationAttributes,
+  'hidden' | 'id' | 'isPinned' | 'displayNameInProfile' | 'expireTimer'
+> & {
+  encPubkeyHex: string;
+  encSeckeyHex: string;
+  members: string | Array<string>;
+  groupAdmins: string | Array<string>;
+}) {
+  const admins: Array<string> = maybeArrayJSONtoArray(maybeAdmins);
+  const members: Array<string> = maybeArrayJSONtoArray(maybeMembers);
+
+  const wrappedMembers: Array<LegacyGroupMemberInfo> = (members || []).map(m => {
+    return {
+      isAdmin: admins.includes(m),
+      pubkeyHex: m,
+    };
+  });
+  const legacyGroup: LegacyGroupInfo = {
+    pubkeyHex: id,
+    disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
+    hidden: !!hidden,
+    name: displayNameInProfile || '',
+    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+    members: wrappedMembers,
+    encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
+    encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
+  };
+
+  console.warn('legacyGroup', legacyGroup);
+  return legacyGroup;
+}
+
+/**
+ * This function can be used to make sure all the possible values as input of a switch as taken care off, without having a default case.
+ *
+ */
+export function assertUnreachable(_x: never, message: string): never {
+  console.info(`assertUnreachable: Didn't expect to get here with "${message}"`);
+  throw new Error("Didn't expect to get here");
+}
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 77c0f9dd5..e8fbac2ed 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -7,6 +7,7 @@ import {
   BaseWrapperActionsCalls,
   ContactInfo,
   ContactsWrapperActionsCalls,
+  LegacyGroupInfo,
   UserConfigWrapperActionsCalls,
   UserGroupsWrapperActionsCalls,
 } from 'session_util_wrapper';
@@ -222,6 +223,25 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = {
       roomId,
       pubkeyHex,
     ]) as Promise<ReturnType<UserGroupsWrapperActionsCalls['buildFullUrlFromDetails']>>,
+
+  getLegacyGroup: async (pubkeyHex: string) =>
+    callLibSessionWorker(['UserGroupsConfig', 'getLegacyGroup', pubkeyHex]) as Promise<
+      ReturnType<UserGroupsWrapperActionsCalls['getLegacyGroup']>
+    >,
+  getAllLegacyGroups: async () =>
+    callLibSessionWorker(['UserGroupsConfig', 'getAllLegacyGroups']) as Promise<
+      ReturnType<UserGroupsWrapperActionsCalls['getAllLegacyGroups']>
+    >,
+
+  setLegacyGroup: async (info: LegacyGroupInfo) =>
+    callLibSessionWorker(['UserGroupsConfig', 'setLegacyGroup', info]) as Promise<
+      ReturnType<UserGroupsWrapperActionsCalls['setLegacyGroup']>
+    >,
+
+  eraseLegacyGroup: async (pubkeyHex: string) =>
+    callLibSessionWorker(['UserGroupsConfig', 'eraseLegacyGroup', pubkeyHex]) as Promise<
+      ReturnType<UserGroupsWrapperActionsCalls['eraseLegacyGroup']>
+    >,
 };
 
 const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 157898b0e..124df4eb4 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,4 +1,4 @@
-import _, { isEmpty, isNull } from 'lodash';
+import { isEmpty, isNull } from 'lodash';
 import {
   BaseConfigWrapper,
   BaseConfigWrapperInsideWorker,
@@ -64,7 +64,7 @@ function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapp
  */
 function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): BaseConfigWrapper {
   const wrapper = getUserWrapper(wrapperType);
-  console.warn('initUserWrapper: ', wrapperType);
+  console.warn('initUserWrapper: ', wrapperType, options);
   if (wrapper) {
     throw new Error(`${wrapperType} already init`);
   }

From 21d8151b8b996da75654e5e5f21958d32a97f660 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 9 Mar 2023 17:12:59 +1100
Subject: [PATCH 042/178] feat: add convo volatile info mgmt

---
 protos/SignalService.proto                    |   8 +-
 ts/models/conversation.ts                     |  11 +-
 ts/receiver/configMessage.ts                  |  44 ++-
 ts/session/apis/snode_api/namespaces.ts       |  42 +--
 ts/session/apis/snode_api/swarmPolling.ts     |   6 -
 .../conversations/ConversationController.ts   |   8 +
 .../jobs/ConfigurationSyncDumpJob.ts          |  12 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   8 +-
 .../utils/libsession/libsession_utils.ts      |  24 +-
 .../libsession/libsession_utils_contacts.ts   |   2 -
 .../libsession_utils_convo_info_volatile.ts   | 253 ++++++++++++++++++
 .../libsession_utils_user_groups.ts           | 120 +++++----
 .../unit/swarm_polling/SwarmPolling_test.ts   |  37 +--
 .../browser/libsession_worker_functions.d.ts  |  21 +-
 .../browser/libsession_worker_interface.ts    |  77 ++++++
 .../node/libsession/libsession.worker.ts      |  44 ++-
 16 files changed, 556 insertions(+), 161 deletions(-)
 create mode 100644 ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index ff4850069..3db7416d7 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -40,10 +40,10 @@ message MessageRequestResponse {
 
 message SharedConfigMessage {
   enum Kind {
-    USER_PROFILE            = 1;
-    CONTACTS                = 2;
-   // CONVO_INFO_VOLATILE       = 3;
-    USER_GROUPS    = 4;
+    USER_PROFILE              = 1;
+    CONTACTS                  = 2;
+    CONVO_INFO_VOLATILE       = 3;
+    USER_GROUPS               = 4;
    // CLOSED_GROUP_INFO       = 5;
    // CLOSED_GROUP_MEMBERS    = 6;
    // ENCRYPTION_KEYS         = 7;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index d8fcbf893..f8d23f994 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -103,6 +103,7 @@ import {
 } from './conversationAttributes';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { Registration } from '../util/registration';
+import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -2235,9 +2236,12 @@ export async function commitConversationAndRefreshWrapper(id: string) {
     convo
   );
   const shouldBeSavedToUserGroupsWrapper = SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo);
+  const shouldBeSavedToConvoInfoVolatileWrapper = SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(
+    convo
+  );
 
   console.warn(
-    `should be saved to wrapper ${id}: contacts:${shouldBeSavedToContactsWrapper}; usergroups:${shouldBeSavedToUserGroupsWrapper}`
+    `should be saved to wrapper ${id}: contacts:${shouldBeSavedToContactsWrapper}; usergroups:${shouldBeSavedToUserGroupsWrapper}, volatile:${shouldBeSavedToConvoInfoVolatileWrapper}`
   );
 
   if (shouldBeSavedToContactsWrapper) {
@@ -2246,12 +2250,13 @@ export async function commitConversationAndRefreshWrapper(id: string) {
     await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
   }
 
+  if (shouldBeSavedToConvoInfoVolatileWrapper) {
+    await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
+  }
   if (Registration.isDone()) {
     // save the new dump if needed to the DB asap
     // this call throttled so we do not run this too often (and not for every .commit())
     await ConfigurationDumpSync.queueNewJobIfNeeded();
-
-    // if we need to sync the dump, also send add a job for syncing
     await ConfigurationSync.queueNewJobIfNeeded();
   }
   convo.triggerUIRefresh();
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index b0b240a5e..36e58dd77 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -291,11 +291,7 @@ async function handleCommunitiesUpdate() {
 
 async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   // first let's check which closed groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB
-
   const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups();
-  if (allLegacyGroupsInWrapper.some(m => m.members.length === 0)) {
-    debugger;
-  }
   const allLegacyGroupsInDb = getConversationController()
     .getConversations()
     .filter(SessionUtilUserGroups.isLegacyGroupToStoreInWrapper);
@@ -341,9 +337,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   for (let index = 0; index < allLegacyGroupsInWrapper.length; index++) {
     const fromWrapper = allLegacyGroupsInWrapper[index];
 
-    if (fromWrapper.members.length === 0) {
-      debugger;
-    }
     const convo = getConversationController().get(fromWrapper.pubkeyHex);
     if (!convo) {
       // this should not happen as we made sure to create them before
@@ -460,6 +453,34 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
   return result;
 }
 
+async function handleConvoInfoVolatileUpdate(
+  result: IncomingConfResult
+): Promise<IncomingConfResult> {
+  if (!result.needsDump) {
+    return result;
+  }
+  console.error('handleConvoInfoVolatileUpdate : TODO ');
+
+  // const toHandle = SessionUtilUserGroups.getUserGroupTypes();
+  // for (let index = 0; index < toHandle.length; index++) {
+  //   const typeToHandle = toHandle[index];
+  //   switch (typeToHandle) {
+  //     case 'Community':
+  //       await handleCommunitiesUpdate();
+  //       break;
+
+  //     case 'LegacyGroup':
+  //       await handleLegacyGroupUpdate(result.latestEnvelopeTimestamp);
+  //       break;
+
+  //     default:
+  //       assertUnreachable(typeToHandle, `handleUserGroupsUpdate unhandled type "${typeToHandle}"`);
+  //   }
+  // }
+
+  return result;
+}
+
 async function processMergingResults(results: Map<ConfigWrapperObjectTypes, IncomingConfResult>) {
   if (!results || !results.size) {
     return;
@@ -486,8 +507,15 @@ async function processMergingResults(results: Map<ConfigWrapperObjectTypes, Inco
         case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
           await handleUserGroupsUpdate(incomingResult);
           break;
+        case SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE:
+          await handleConvoInfoVolatileUpdate(incomingResult);
+          break;
         default:
-          assertUnreachable(kind, `processMergingResults unsupported kind: "${kind}"`);
+          try {
+            assertUnreachable(kind, `processMergingResults unsupported kind: "${kind}"`);
+          } catch (e) {
+            window.log.warn('assertUnreachable failed', e.message);
+          }
       }
       const variant = LibSessionUtil.kindToVariant(kind);
 
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index bd08f5eb3..a6d9ef20c 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -1,3 +1,5 @@
+import { assertUnreachable } from '../../../types/sqlSharedTypes';
+
 export enum SnodeNamespaces {
   /**
    * This is the namespace anyone can deposit a message for us
@@ -12,6 +14,10 @@ export enum SnodeNamespaces {
    * This is the namespace used to sync our contacts
    */
   UserContacts = 3,
+  /**
+   * This is the namespace used to sync our contacts
+   */
+  ConvoInfoVolatile = 4,
 
   /**
    *  This is the namespace used to sync our user groups and communities
@@ -47,30 +53,24 @@ export type SnodeNamespacesUser = PickEnum<
  * Returns true if that namespace is associated with the config of a user (not his messages, only configs)
  */
 function isUserConfigNamespace(namespace: SnodeNamespaces) {
-  return (
-    namespace === SnodeNamespaces.UserContacts ||
-    namespace === SnodeNamespaces.UserProfile ||
-    namespace === SnodeNamespaces.UserGroups
-  );
-}
+  switch (namespace) {
+    case SnodeNamespaces.UserMessages:
+      // user messages is not hosting config based messages
+      return false;
+    case SnodeNamespaces.UserContacts:
+    case SnodeNamespaces.UserProfile:
+    case SnodeNamespaces.UserGroups:
+    case SnodeNamespaces.ConvoInfoVolatile:
+      return true;
+    case SnodeNamespaces.ClosedGroupInfo:
+    case SnodeNamespaces.ClosedGroupMessage:
+      return false;
 
-/**
- * Returns true if that namespace is associated with the config of a closed group (not its messages, only configs)
- */
-function isGroupConfigNamespace(namespace: SnodeNamespaces) {
-  return namespace === SnodeNamespaces.ClosedGroupInfo;
-}
-
-/**
- * Returns true if that specific namespace hashes should be tracked.
- * We do not care about hash tracking for any of the config namespaces as we poll for all of them each poll event.
- */
-function isNamespaceAlwaysPolled(namespace: SnodeNamespaces) {
-  return !isUserConfigNamespace(namespace) && !isGroupConfigNamespace(namespace);
+    default:
+      assertUnreachable(namespace, `isUserConfigNamespace case not handled: ${namespace}`);
+  }
 }
 
 export const SnodeNamespace = {
   isUserConfigNamespace,
-  isGroupConfigNamespace,
-  isNamespaceAlwaysPolled,
 };
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 1ffe7d78f..cd9a7b28d 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -509,9 +509,6 @@ export class SwarmPolling {
     hash: string;
     expiration: number;
   }): Promise<void> {
-    // if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
-    //   return;
-    // }
     const pkStr = pubkey.key;
     const cached = await this.getLastHash(edkey, pubkey.key, namespace);
 
@@ -535,9 +532,6 @@ export class SwarmPolling {
   }
 
   private async getLastHash(nodeEdKey: string, pubkey: string, namespace: number): Promise<string> {
-    // if (!SnodeNamespace.isNamespaceAlwaysPolled(namespace)) {
-    //   return '';
-    // }
     if (!this.lastHashes[nodeEdKey]?.[pubkey]?.[namespace]) {
       const lastHash = await Data.getLastHashBySnode(pubkey, nodeEdKey, namespace);
 
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 604ac61d4..6c38ff1ef 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -13,6 +13,7 @@ import { SessionUtilContact } from '../utils/libsession/libsession_utils_contact
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 import { leaveClosedGroup } from '../group/closed-group';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
+import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
 
 let instance: ConversationController | null;
 
@@ -316,6 +317,13 @@ export class ConversationController {
           if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
             await SessionUtilUserGroups.refreshMappedValue(convo.id, true);
           }
+          if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
+            await SessionUtilConvoInfoVolatile.refreshMappedValue(
+              convo.id,
+              Boolean(convo.isClosedGroup() && convo.id.startsWith('05')),
+              true
+            );
+          }
         }
         console.timeEnd('refreshAllWrapperContactsData');
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index 2d97ba0d3..fceac3ef4 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -27,8 +27,8 @@ let lastRunConfigSyncJobDumpTimestamp: number | null = null;
 
 async function saveDumpsNeededToDB(): Promise<boolean> {
   let savedAtLeastOne = false;
-  for (let i = 0; i < LibSessionUtil.userVariants.length; i++) {
-    const variant = LibSessionUtil.userVariants[i];
+  for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) {
+    const variant = LibSessionUtil.requiredUserVariants[i];
     const needsDump = await GenericWrapperActions.needsDump(variant);
 
     if (!needsDump) {
@@ -95,8 +95,8 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       // so when we call needsDump(), we know for sure that we are up to date
       console.time('ConfigurationSyncDumpJob insertAll');
 
-      for (let index = 0; index < LibSessionUtil.userVariants.length; index++) {
-        const variant = LibSessionUtil.userVariants[index];
+      for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
+        const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
             await LibSessionUtil.insertUserProfileIntoWrapper();
@@ -107,7 +107,9 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
           case 'UserGroupsConfig':
             await LibSessionUtil.insertAllUserGroupsIntoWrapper();
             break;
-
+          case 'ConvoInfoVolatileConfig':
+            await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
+            break;
           default:
             assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
         }
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 03f3080c1..ebb331cdc 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -191,8 +191,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         window.log.warn('did not find our own conversation');
         return RunJobResult.PermanentFailure;
       }
-      for (let index = 0; index < LibSessionUtil.userVariants.length; index++) {
-        const variant = LibSessionUtil.userVariants[index];
+      for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
+        const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
             await LibSessionUtil.insertUserProfileIntoWrapper();
@@ -203,7 +203,9 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
           case 'UserGroupsConfig':
             await LibSessionUtil.insertAllUserGroupsIntoWrapper();
             break;
-
+          case 'ConvoInfoVolatileConfig':
+            await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
+            break;
           default:
             assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
         }
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 8273541ec..57e92c625 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -11,14 +11,16 @@ import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { SessionUtilContact } from './libsession_utils_contacts';
+import { SessionUtilConvoInfoVolatile } from './libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from './libsession_utils_user_groups';
 import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 // TODO complete this list
-const userVariants: Array<ConfigWrapperObjectTypes> = [
+const requiredUserVariants: Array<ConfigWrapperObjectTypes> = [
   'UserConfig',
   'ContactsConfig',
   'UserGroupsConfig',
+  'ConvoInfoVolatileConfig',
 ];
 
 export type IncomingConfResult = {
@@ -74,21 +76,14 @@ async function initializeLibSessionUtilWrappers() {
     }
   }
 
-  // TODO
-  console.warn('requiredVariants: FIXME add conversation volatile wrapper as required ');
-
   const missingRequiredVariants: Array<ConfigWrapperObjectTypes> = difference(
-    LibSessionUtil.userVariants,
+    LibSessionUtil.requiredUserVariants,
     [...userVariantsBuildWithoutErrors.values()]
   );
 
-  if (missingRequiredVariants.length) {
-    // TODO this is only needed for debugging. Should be removed as we force them created right below with an empty dump
-    // throw new Error(`missingRequiredVariants: ${JSON.stringify(missingRequiredVariants)}`);
-  }
-
   for (let index = 0; index < missingRequiredVariants.length; index++) {
     const missingVariant = missingRequiredVariants[index];
+    window.log.warn('initializeLibSessionUtilWrappers: missingRequiredVariants: ', missingVariant);
     await GenericWrapperActions.init(missingVariant, privateKeyEd25519, null);
   }
 }
@@ -100,7 +95,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   // Ensure we always check the required user config types for changes even if there is no dump
   // data yet (to deal with first launch cases)
   if (pubkey === us) {
-    LibSessionUtil.userVariants.forEach(requiredVariant => {
+    LibSessionUtil.requiredUserVariants.forEach(requiredVariant => {
       if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) {
         dumps.push({
           publicKey: us,
@@ -148,6 +143,8 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap
       return 'ContactsConfig';
     case SignalService.SharedConfigMessage.Kind.USER_GROUPS:
       return 'UserGroupsConfig';
+    case SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE:
+      return 'ConvoInfoVolatileConfig';
     default:
       assertUnreachable(kind, `kindToVariant: Unsupported variant: "${kind}"`);
   }
@@ -161,6 +158,8 @@ function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedC
       return SignalService.SharedConfigMessage.Kind.CONTACTS;
     case 'UserGroupsConfig':
       return SignalService.SharedConfigMessage.Kind.USER_GROUPS;
+    case 'ConvoInfoVolatileConfig':
+      return SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE;
     default:
       assertUnreachable(variant, `variantToKind: Unsupported kind: "${variant}"`);
   }
@@ -184,11 +183,12 @@ async function markAsPushed(
 
 export const LibSessionUtil = {
   initializeLibSessionUtilWrappers,
-  userVariants,
+  requiredUserVariants,
   pendingChangesForPubkey,
   insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
   insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
   insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
+  insertAllConvoInfoVolatileIntoWrapper: SessionUtilConvoInfoVolatile.insertAllConvosIntoWrapper,
   removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
   kindToVariant,
   variantToKind,
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index dee864ddc..0e86318e2 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -108,8 +108,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
 }
 
 /**
- * refreshMappedValue is used to query the Contacts Wrapper for the details of that contact and update the cached in-memory entry representing its content.
- * @param id the pubkey to re fresh the cached value from
  * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
  */
 async function refreshMappedValue(id: string, duringAppStart = false) {
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
new file mode 100644
index 000000000..738eeed9c
--- /dev/null
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -0,0 +1,253 @@
+import { uniq } from 'lodash';
+import {
+  ConvoInfoVolatile1o1,
+  ConvoInfoVolatileCommunity,
+  ConvoInfoVolatileLegacyGroup,
+  ConvoVolatileType,
+} from 'session_util_wrapper';
+import { OpenGroupData } from '../../../data/opengroups';
+import { ConversationModel } from '../../../models/conversation';
+import { assertUnreachable } from '../../../types/sqlSharedTypes';
+import {
+  ConvoInfoVolatileWrapperActions,
+  UserGroupsWrapperActions,
+} from '../../../webworker/workers/browser/libsession_worker_interface';
+import { OpenGroupUtils } from '../../apis/open_group_api/utils';
+import { getConversationController } from '../../conversations';
+import { SessionUtilContact } from './libsession_utils_contacts';
+import { SessionUtilUserGroups } from './libsession_utils_user_groups';
+
+/**
+ * The key of this map is the convoId as stored in the database.
+ */
+const mapped1o1WrapperValues = new Map<string, ConvoInfoVolatile1o1>();
+
+/**
+ * The key of this map is the convoId as stored in the database. So the legacy group 05 sessionID
+ */
+const mappedLegacyGroupWrapperValues = new Map<string, ConvoInfoVolatileLegacyGroup>();
+
+/**
+ * The key of this map is the convoId as stored in the database, so withoutpubkey
+ */
+const mappedCommunityWrapperValues = new Map<string, ConvoInfoVolatileCommunity>();
+
+/**
+ * Update the ConvoInfoVolatileWrapper with all the data is cares about from the database.
+ */
+async function insertAllConvosIntoWrapper() {
+  const convoIdsToInsert = uniq(
+    getConversationController()
+      .getConversations()
+      .filter(isConvoToStoreInWrapper)
+      .map(m => m.id)
+  );
+
+  window.log.debug(
+    `ConvoInfoVolatileWrapper keep tracks of ${convoIdsToInsert.length} convos in total.`
+  );
+
+  for (let index = 0; index < convoIdsToInsert.length; index++) {
+    const id = convoIdsToInsert[index];
+
+    await insertConvoFromDBIntoWrapperAndRefresh(id);
+  }
+}
+
+/**
+ * Returns true if that conversation should be stored in the conversation volatile info wrapper.
+ * It actually relies on the two other wrappers to know what to store:
+ *    - Usergroups to know which communities and legacy group to store
+ *    - Contacts to know which contacts to store
+ */
+function isConvoToStoreInWrapper(convo: ConversationModel): boolean {
+  return (
+    SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo) || // this checks for community & legacy group
+    SessionUtilContact.isContactToStoreInContactsWrapper(convo) // this checks for contacts
+  );
+}
+function getConvoType(convo: ConversationModel): ConvoVolatileType {
+  const convoType: ConvoVolatileType = SessionUtilContact.isContactToStoreInContactsWrapper(convo)
+    ? '1o1'
+    : SessionUtilUserGroups.isCommunityToStoreInWrapper(convo)
+    ? 'Community'
+    : 'LegacyGroup';
+
+  return convoType;
+}
+
+/**
+ * Fetches the specified convo and updates the required field in the wrapper.
+ * If that community does not exist in the wrapper, it is created before being updated.
+ * Same applies for a legacy group.
+ */
+async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<void> {
+  const foundConvo = getConversationController().get(convoId);
+  if (!foundConvo) {
+    return;
+  }
+
+  if (!isConvoToStoreInWrapper(foundConvo)) {
+    return;
+  }
+
+  console.info(`inserting into convoInfoVolatile wrapper "${convoId}"...`);
+
+  console.warn('ConvoInfoVolatileWrapperActions to finish with unread and readAt');
+  const convoType = getConvoType(foundConvo);
+  switch (convoType) {
+    case '1o1':
+      try {
+        await ConvoInfoVolatileWrapperActions.set1o1(convoId, 0, false);
+        await refreshMappedValue(convoId, false, false);
+      } catch (e) {
+        window.log.warn(
+          `ConvoInfoVolatileWrapperActions.set1o1 of ${convoId} failed with ${e.message}`
+        );
+      }
+      break;
+    case 'LegacyGroup':
+      try {
+        await ConvoInfoVolatileWrapperActions.setLegacyGroup(convoId, 0, false);
+        await refreshMappedValue(convoId, true, false);
+      } catch (e) {
+        window.log.warn(
+          `ConvoInfoVolatileWrapperActions.setLegacyGroup of ${convoId} failed with ${e.message}`
+        );
+        // we stil let this go through
+      }
+      break;
+    case 'Community':
+      try {
+        const asOpengroup = foundConvo.toOpenGroupV2();
+        const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
+        if (!roomDetails) {
+          return;
+        }
+
+        // we need to build the full URL with the pubkey so we can add it to the wrapper. Let's reuse the exposed method from the wrapper for that
+        const fullUrlWithPubkey = await UserGroupsWrapperActions.buildFullUrlFromDetails(
+          roomDetails.serverUrl,
+          roomDetails.roomId,
+          roomDetails.serverPublicKey
+        );
+        console.info(`inserting into convoInfoVolatile wrapper "${fullUrlWithPubkey}"...`);
+        // this does the create or the update of the matching existing community
+        await ConvoInfoVolatileWrapperActions.setCommunityByFullUrl(fullUrlWithPubkey, 0, false);
+        await refreshMappedValue(convoId, false, false);
+      } catch (e) {
+        window.log.warn(
+          `ConvoInfoVolatileWrapperActions.setCommunityByFullUrl of ${convoId} failed with ${e.message}`
+        );
+        // we still let this go through
+      }
+      break;
+    default:
+      assertUnreachable(
+        convoType,
+        `insertConvoFromDBIntoWrapperAndRefresh unhandled case "${convoType}"`
+      );
+  }
+}
+
+/**
+ * @param isLegacyGroup we need this to know if the corresponding 05 starting pubkey is associated with a legacy group or not
+ * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
+ */
+async function refreshMappedValue(
+  convoId: string,
+  isLegacyGroup: boolean,
+  duringAppStart: boolean
+) {
+  try {
+    let refreshed = false;
+    if (OpenGroupUtils.isOpenGroupV2(convoId)) {
+      const fromWrapper = await ConvoInfoVolatileWrapperActions.getCommunity(convoId);
+      if (fromWrapper && fromWrapper.fullUrlWithPubkey) {
+        mappedCommunityWrapperValues.set(convoId, fromWrapper);
+      }
+      refreshed = true;
+    } else if (convoId.startsWith('05') && isLegacyGroup) {
+      const fromWrapper = await ConvoInfoVolatileWrapperActions.getLegacyGroup(convoId);
+      if (fromWrapper) {
+        mappedLegacyGroupWrapperValues.set(convoId, fromWrapper);
+      }
+      refreshed = true;
+    } else if (convoId.startsWith('05')) {
+      const fromWrapper = await ConvoInfoVolatileWrapperActions.get1o1(convoId);
+      if (fromWrapper) {
+        mapped1o1WrapperValues.set(convoId, fromWrapper);
+      }
+      refreshed = true;
+    }
+
+    if (refreshed && !duringAppStart) {
+      getConversationController()
+        .get(convoId)
+        ?.triggerUIRefresh();
+    }
+  } catch (e) {
+    window.log.info(`refreshMappedValue for volatile convoID: ${convoId}`, e.message);
+  }
+
+  // TODO handle the new closed groups once we got them ready
+}
+
+function get1o1(convoId: string): ConvoInfoVolatile1o1 | undefined {
+  return mapped1o1WrapperValues.get(convoId);
+}
+
+function getAll1o1(): Array<ConvoInfoVolatile1o1> {
+  return [...mapped1o1WrapperValues.values()];
+}
+
+function getCommunityMappedValueByConvoId(convoId: string) {
+  return mappedCommunityWrapperValues.get(convoId);
+}
+
+function getAllCommunities(): Array<ConvoInfoVolatileCommunity> {
+  return [...mappedCommunityWrapperValues.values()];
+}
+
+function getLegacyGroupMappedValueByConvoId(convoId: string) {
+  return mappedLegacyGroupWrapperValues.get(convoId);
+}
+
+function getAllLegacyGroups(): Array<ConvoInfoVolatileLegacyGroup> {
+  return [...mappedLegacyGroupWrapperValues.values()];
+}
+
+/**
+ * This function can be used where there are things to do for all the types handled by this wrapper.
+ * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
+ *
+ *
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ */
+function getConvoInfoVolatileTypes(): Array<ConvoVolatileType> {
+  return ['1o1', 'LegacyGroup', 'Community'];
+}
+
+export const SessionUtilConvoInfoVolatile = {
+  // shared
+  isConvoToStoreInWrapper,
+  insertAllConvosIntoWrapper,
+  insertConvoFromDBIntoWrapperAndRefresh,
+  refreshMappedValue,
+  getConvoInfoVolatileTypes,
+
+  // 1o1
+  get1o1,
+  getAll1o1,
+  // removeCommunityFromWrapper,
+
+  // legacy group
+  getLegacyGroupMappedValueByConvoId,
+  getAllLegacyGroups,
+  // removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
+
+  // communities
+  getAllCommunities,
+  getCommunityMappedValueByConvoId,
+  // removeCommunityFromWrapper,
+};
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 7e2612aee..354ef0915 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -4,6 +4,7 @@ import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
 import {
+  assertUnreachable,
   getCommunityInfoFromDBValues,
   getLegacyGroupInfoFromDBValues,
 } from '../../../types/sqlSharedTypes';
@@ -80,71 +81,80 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
     return;
   }
 
-  if (isCommunityToStoreInWrapper(foundConvo)) {
-    const asOpengroup = foundConvo.toOpenGroupV2();
+  const convoType: UserGroupsType = isCommunityToStoreInWrapper(foundConvo)
+    ? 'Community'
+    : 'LegacyGroup';
 
-    const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
-    if (!roomDetails) {
-      return;
-    }
+  switch (convoType) {
+    case 'Community':
+      const asOpengroup = foundConvo.toOpenGroupV2();
 
-    // we need to build the full URL with the pubkey so we can add it to the wrapper. Let's reuse the exposed method from the wrapper for that
-    const fullUrl = await UserGroupsWrapperActions.buildFullUrlFromDetails(
-      roomDetails.serverUrl,
-      roomDetails.roomId,
-      roomDetails.serverPublicKey
-    );
+      const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
+      if (!roomDetails) {
+        return;
+      }
 
-    const wrapperComm = getCommunityInfoFromDBValues({
-      isPinned: !!foundConvo.get('isPinned'),
-      fullUrl,
-    });
-
-    try {
-      console.info(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
-      // this does the create or the update of the matching existing community
-      await UserGroupsWrapperActions.setCommunityByFullUrl(
-        wrapperComm.fullUrl,
-        wrapperComm.priority
+      // we need to build the full URL with the pubkey so we can add it to the wrapper. Let's reuse the exposed method from the wrapper for that
+      const fullUrl = await UserGroupsWrapperActions.buildFullUrlFromDetails(
+        roomDetails.serverUrl,
+        roomDetails.roomId,
+        roomDetails.serverPublicKey
       );
-      await refreshMappedValue(convoId);
-    } catch (e) {
-      window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
-      // we still let this go through
-    }
-  } else if (isLegacyGroupToStoreInWrapper(foundConvo)) {
-    const encryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(convoId);
-    const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
-      id: foundConvo.id,
-      isPinned: !!foundConvo.get('isPinned'),
-      members: foundConvo.get('members') || [],
-      groupAdmins: foundConvo.get('groupAdmins') || [],
-      expireTimer: foundConvo.get('expireTimer'),
-      displayNameInProfile: foundConvo.get('displayNameInProfile'),
-      hidden: false,
-      encPubkeyHex: encryptionKeyPair?.publicHex || '',
-      encSeckeyHex: encryptionKeyPair?.privateHex || '',
-    });
-    if (wrapperLegacyGroup.members.length === 0) {
-      debugger;
-    }
 
-    try {
-      console.info(`inserting into usergroup wrapper "${foundConvo.id}"...`);
-      // this does the create or the update of the matching existing legacy group
+      const wrapperComm = getCommunityInfoFromDBValues({
+        isPinned: !!foundConvo.get('isPinned'),
+        fullUrl,
+      });
 
-      await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
-      await refreshMappedValue(convoId);
-    } catch (e) {
-      window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
-      // we still let this go through
-    }
+      try {
+        console.info(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
+        // this does the create or the update of the matching existing community
+        await UserGroupsWrapperActions.setCommunityByFullUrl(
+          wrapperComm.fullUrl,
+          wrapperComm.priority
+        );
+        await refreshMappedValue(convoId);
+      } catch (e) {
+        window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
+        // we still let this go through
+      }
+      break;
+
+    case 'LegacyGroup':
+      const encryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(convoId);
+      const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
+        id: foundConvo.id,
+        isPinned: !!foundConvo.get('isPinned'),
+        members: foundConvo.get('members') || [],
+        groupAdmins: foundConvo.get('groupAdmins') || [],
+        expireTimer: foundConvo.get('expireTimer'),
+        displayNameInProfile: foundConvo.get('displayNameInProfile'),
+        hidden: false, // TODO we do not handle hidden yet for groups
+        encPubkeyHex: encryptionKeyPair?.publicHex || '',
+        encSeckeyHex: encryptionKeyPair?.privateHex || '',
+      });
+
+      try {
+        console.info(`inserting into usergroup wrapper "${foundConvo.id}"...`);
+        // this does the create or the update of the matching existing legacy group
+
+        await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
+        await refreshMappedValue(convoId);
+      } catch (e) {
+        window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
+        // we still let this go through
+      }
+      break;
+
+    default:
+      assertUnreachable(
+        convoType,
+        `insertGroupsFromDBIntoWrapperAndRefresh case not handeld "${convoType}"`
+      );
   }
 }
 
 /**
- * refreshMappedValue is used to query the UserGroups Wrapper for the details of that group and update the cached in-memory entry representing its content.
- * @param id the pubkey to re fresh the cached value from1
  * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
  */
 async function refreshMappedValue(convoId: string, duringAppStart = false) {
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 6e90ea4b3..607636b90 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -1,24 +1,23 @@
 // tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
 
 import chai from 'chai';
-import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
+import Sinon, * as sinon from 'sinon';
 
 import chaiAsPromised from 'chai-as-promised';
-import { TestUtils } from '../../../test-utils';
-import { UserUtils } from '../../../../session/utils';
-import { getConversationController } from '../../../../session/conversations';
+import { ConversationCollection, ConversationModel } from '../../../../models/conversation';
+import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { getSwarmPollingInstance, SnodePool } from '../../../../session/apis/snode_api';
+import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling';
+import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest';
 import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling';
 import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants';
-import { ConversationCollection, ConversationModel } from '../../../../models/conversation';
+import { getConversationController } from '../../../../session/conversations';
 import { PubKey } from '../../../../session/types';
-import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
-import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling';
+import { UserUtils } from '../../../../session/utils';
 import { sleepFor } from '../../../../session/utils/Promise';
-import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest';
-import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces';
+import { TestUtils } from '../../../test-utils';
+import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
 // tslint:disable: chai-vague-errors
 
 chai.use(chaiAsPromised as any);
@@ -678,22 +677,4 @@ describe('SwarmPolling', () => {
       });
     });
   });
-
-  describe('isNamespaceAlwaysPolled', () => {
-    it('cares only for non config hashes', () => {
-      for (let namespace = -20; namespace < 20; namespace++) {
-        if (namespace === 2 || namespace === 3 || namespace === 5 || namespace === 1) {
-          expect(SnodeNamespace.isNamespaceAlwaysPolled(namespace)).to.be.eq(
-            false,
-            `should be false for any non "message" namespace ${namespace}`
-          );
-        } else {
-          expect(SnodeNamespace.isNamespaceAlwaysPolled(namespace)).to.be.eq(
-            true,
-            `should be true for the "message" namespaces ${namespace}`
-          );
-        }
-      }
-    });
-  });
 });
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index 3f7908713..6a9e9ebf4 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -3,16 +3,20 @@ import {
   ContactsConfigActionsType,
   UserConfigActionsType,
   UserGroupsConfigActionsType,
+  ConvoInfoVolatileConfigActionsType,
 } from 'session_util_wrapper';
 
-type UserConfig = 'UserConfig'; // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
+// we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
+type UserConfig = 'UserConfig';
 type ContactsConfig = 'ContactsConfig';
 type UserGroupsConfig = 'UserGroupsConfig';
+type ConvoInfoVolatileConfig = 'ConvoInfoVolatileConfig';
 
-// type ClosedGroupConfigPrefix = 'ClosedGroupConfig-03'; // we can have a bunch of those wrapper as we need to be able to send them to a different swarm for each group
-// type ClosedGroupConfig = `${ClosedGroupConfigPrefix}${string}`;
-// | ClosedGroupConfig;
-export type ConfigWrapperObjectTypes = UserConfig | ContactsConfig | UserGroupsConfig;
+export type ConfigWrapperObjectTypes =
+  | UserConfig
+  | ContactsConfig
+  | UserGroupsConfig
+  | ConvoInfoVolatileConfig;
 
 type UserConfigFunctions =
   | [UserConfig, ...BaseConfigActions]
@@ -20,12 +24,15 @@ type UserConfigFunctions =
 type ContactsConfigFunctions =
   | [ContactsConfig, ...BaseConfigActions]
   | [ContactsConfig, ...ContactsConfigActionsType];
-
 type UserGroupsConfigFunctions =
   | [UserGroupsConfig, ...BaseConfigActions]
   | [UserGroupsConfig, ...UserGroupsConfigActionsType];
+type ConvoInfoVolatileConfigFunctions =
+  | [ConvoInfoVolatileConfig, ...BaseConfigActions]
+  | [ConvoInfoVolatileConfig, ...ConvoInfoVolatileConfigActionsType];
 
 export type LibSessionWorkerFunctions =
   | UserConfigFunctions
   | ContactsConfigFunctions
-  | UserGroupsConfigFunctions;
+  | UserGroupsConfigFunctions
+  | ConvoInfoVolatileConfigFunctions;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index e8fbac2ed..c5a95d469 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -7,6 +7,7 @@ import {
   BaseWrapperActionsCalls,
   ContactInfo,
   ContactsWrapperActionsCalls,
+  ConvoInfoVolatileWrapperActionsCalls,
   LegacyGroupInfo,
   UserConfigWrapperActionsCalls,
   UserGroupsWrapperActionsCalls,
@@ -244,6 +245,82 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = {
     >,
 };
 
+export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = {
+  /* Reuse the GenericWrapperActions with the ContactConfig argument */
+  init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) =>
+    GenericWrapperActions.init('ConvoInfoVolatileConfig', ed25519Key, dump),
+  confirmPushed: async (seqno: number, hash: string) =>
+    GenericWrapperActions.confirmPushed('ConvoInfoVolatileConfig', seqno, hash),
+  dump: async () => GenericWrapperActions.dump('ConvoInfoVolatileConfig'),
+  merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) =>
+    GenericWrapperActions.merge('ConvoInfoVolatileConfig', toMerge),
+  needsDump: async () => GenericWrapperActions.needsDump('ConvoInfoVolatileConfig'),
+  needsPush: async () => GenericWrapperActions.needsPush('ConvoInfoVolatileConfig'),
+  push: async () => GenericWrapperActions.push('ConvoInfoVolatileConfig'),
+  storageNamespace: async () => GenericWrapperActions.storageNamespace('ConvoInfoVolatileConfig'),
+
+  /** ConvoInfoVolatile wrapper specific actions */
+  // 1o1
+  get1o1: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'get1o1', pubkeyHex]) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['get1o1']>
+    >,
+
+  getAll1o1: async () =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'getAll1o1']) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['getAll1o1']>
+    >,
+
+  set1o1: async (pubkeyHex: string, lastRead: number, unread: boolean) =>
+    callLibSessionWorker([
+      'ConvoInfoVolatileConfig',
+      'set1o1',
+      pubkeyHex,
+      lastRead,
+      unread,
+    ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['set1o1']>>,
+
+  // legacy groups
+  getLegacyGroup: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'getLegacyGroup', pubkeyHex]) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['getLegacyGroup']>
+    >,
+
+  getAllLegacyGroups: async () =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'getAllLegacyGroups']) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['getAllLegacyGroups']>
+    >,
+
+  setLegacyGroup: async (pubkeyHex: string, lastRead: number, unread: boolean) =>
+    callLibSessionWorker([
+      'ConvoInfoVolatileConfig',
+      'setLegacyGroup',
+      pubkeyHex,
+      lastRead,
+      unread,
+    ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['setLegacyGroup']>>,
+
+  // communities
+  getCommunity: async (communityFullUrl: string) =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'getCommunity', communityFullUrl]) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['getCommunity']>
+    >,
+
+  getAllCommunities: async () =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'getAllCommunities']) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['getAllCommunities']>
+    >,
+
+  setCommunityByFullUrl: async (fullUrlWithPubkey: string, lastRead: number, unread: boolean) =>
+    callLibSessionWorker([
+      'ConvoInfoVolatileConfig',
+      'setCommunityByFullUrl',
+      fullUrlWithPubkey,
+      lastRead,
+      unread,
+    ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['setCommunityByFullUrl']>>,
+};
+
 const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {
   return internalCallLibSessionWorker(callToMake);
 };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 124df4eb4..9f747d835 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -3,11 +3,22 @@ import {
   BaseConfigWrapper,
   BaseConfigWrapperInsideWorker,
   ContactsConfigWrapperInsideWorker,
+  ConvoInfoVolatileWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
+/**
+ *
+ * @param _x Looks like we need to duplicate this function here as we cannot import the existing one from a webworker context
+ * @param message
+ */
+function assertUnreachable(_x: never, message: string): never {
+  console.info(`assertUnreachable: Didn't expect to get here with "${message}"`);
+  throw new Error("Didn't expect to get here");
+}
+
 /* eslint-disable no-console */
 /* eslint-disable strict */
 
@@ -15,10 +26,9 @@ import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functi
 let userProfileWrapper: UserConfigWrapperInsideWorker | undefined;
 let contactsConfigWrapper: ContactsConfigWrapperInsideWorker | undefined;
 let userGroupsConfigWrapper: UserGroupsWrapperInsideWorker | undefined;
+let convoInfoVolatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker | undefined;
 
-type UserWrapperType = 'UserConfig' | 'ContactsConfig' | 'UserGroupsConfig';
-
-function getUserWrapper(type: UserWrapperType): BaseConfigWrapperInsideWorker | undefined {
+function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperInsideWorker | undefined {
   switch (type) {
     case 'UserConfig':
       return userProfileWrapper;
@@ -26,6 +36,10 @@ function getUserWrapper(type: UserWrapperType): BaseConfigWrapperInsideWorker |
       return contactsConfigWrapper;
     case 'UserGroupsConfig':
       return userGroupsConfigWrapper;
+    case 'ConvoInfoVolatileConfig':
+      return convoInfoVolatileConfigWrapper;
+    default:
+      assertUnreachable(type, `getUserWrapper: Missing case error "${type}"`);
   }
 }
 
@@ -36,11 +50,17 @@ function getCorrespondingWrapper(
     case 'UserConfig':
     case 'ContactsConfig':
     case 'UserGroupsConfig':
+    case 'ConvoInfoVolatileConfig':
       const wrapper = getUserWrapper(wrapperType);
       if (!wrapper) {
         throw new Error(`${wrapperType} is not init yet`);
       }
       return wrapper;
+    default:
+      assertUnreachable(
+        wrapperType,
+        `getCorrespondingWrapper: Missing case error "${wrapperType}"`
+      );
   }
 }
 
@@ -48,11 +68,12 @@ function isUInt8Array(value: any) {
   return value.constructor === Uint8Array;
 }
 
-function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapperType {
+function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperObjectTypes {
   if (
     wrapperType !== 'ContactsConfig' &&
     wrapperType !== 'UserConfig' &&
-    wrapperType !== 'UserGroupsConfig'
+    wrapperType !== 'UserGroupsConfig' &&
+    wrapperType !== 'ConvoInfoVolatileConfig'
   ) {
     throw new Error(`wrapperType "${wrapperType} is not of type User"`);
   }
@@ -62,7 +83,12 @@ function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): UserWrapp
 /**
  * This function can be used to initialize a wrapper which takes the private ed25519 key of the user and a dump as argument.
  */
-function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): BaseConfigWrapper {
+function initUserWrapper(
+  options: Array<any>,
+  wrapperType: ConfigWrapperObjectTypes
+): BaseConfigWrapper {
+  const userType = assertUserWrapperType(wrapperType);
+
   const wrapper = getUserWrapper(wrapperType);
   console.warn('initUserWrapper: ', wrapperType, options);
   if (wrapper) {
@@ -80,7 +106,6 @@ function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): Bas
   if (!isNull(dump) && !isUInt8Array(dump)) {
     throw new Error(`${wrapperType} init needs a valid dump`);
   }
-  const userType = assertUserWrapperType(wrapperType);
   switch (userType) {
     case 'UserConfig':
       userProfileWrapper = new UserConfigWrapperInsideWorker(edSecretKey, dump);
@@ -91,6 +116,11 @@ function initUserWrapper(options: Array<any>, wrapperType: UserWrapperType): Bas
     case 'UserGroupsConfig':
       userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(edSecretKey, dump);
       return userGroupsConfigWrapper;
+    case 'ConvoInfoVolatileConfig':
+      convoInfoVolatileConfigWrapper = new ConvoInfoVolatileWrapperInsideWorker(edSecretKey, dump);
+      return convoInfoVolatileConfigWrapper;
+    default:
+      assertUnreachable(userType, `initUserWrapper: Missing case error "${userType}"`);
   }
 }
 

From 2a5dc5f2a5ad7de41927409d011682d77ea2a417 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 10 Mar 2023 11:14:23 +1100
Subject: [PATCH 043/178] feat: add more compilation errors if forgetting to
 handle a wrapper type

---
 ts/models/conversation.ts                     | 71 ++++++++++++-------
 ts/node/sql.ts                                |  8 +--
 .../jobs/ConfigurationSyncDumpJob.ts          |  2 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  2 +-
 .../libsession_utils_convo_info_volatile.ts   |  9 +++
 .../libsession_utils_user_profile.ts          | 15 +++-
 6 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index f8d23f994..dbf529bb9 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -104,6 +104,10 @@ import {
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { Registration } from '../util/registration';
 import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
+import { assertUnreachable } from '../types/sqlSharedTypes';
+
+import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
+import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -350,6 +354,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     const foundContact = SessionUtilContact.getMappedValue(this.id);
     const foundCommunity = SessionUtilUserGroups.getCommunityMappedValueByConvoId(this.id);
+    const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupMappedValueByConvoId(this.id);
+    const foundVolatileInfo = SessionUtilConvoInfoVolatile.getFromAny(this.id);
 
     if (foundContact) {
       if (foundContact.name) {
@@ -408,11 +414,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    if (foundCommunity) {
-      if (foundCommunity.priority > 0) {
-        toRet.isPinned = true; // TODO priority also handles sorting
-      }
-    }
+    // if (foundCommunity) {
+    //   if (foundCommunity.priority > 0) {
+    //     toRet.isPinned = true; // TODO priority also handles sorting
+    //   }
+    // }
 
     if (unreadCount) {
       toRet.unreadCount = unreadCount;
@@ -445,10 +451,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.members = uniq(members);
     }
 
-    if (zombies && zombies.length) {
-      toRet.zombies = uniq(zombies);
-    }
-
     if (expireTimer) {
       toRet.expireTimer = expireTimer;
     }
@@ -460,6 +462,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.currentNotificationSetting = currentNotificationSetting;
     }
 
+    if (zombies && zombies.length) {
+      toRet.zombies = uniq(zombies);
+    }
+
     if (this.isOpenGroupV2()) {
       const room = OpenGroupData.getV2OpenGroupRoom(this.id);
       if (room && isArray(room.capabilities) && room.capabilities.length) {
@@ -2232,27 +2238,40 @@ export async function commitConversationAndRefreshWrapper(id: string) {
 
   await Data.saveConversation(convo.attributes);
 
-  const shouldBeSavedToContactsWrapper = SessionUtilContact.isContactToStoreInContactsWrapper(
-    convo
-  );
-  const shouldBeSavedToUserGroupsWrapper = SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo);
-  const shouldBeSavedToConvoInfoVolatileWrapper = SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(
-    convo
-  );
+  for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
+    const variant = LibSessionUtil.requiredUserVariants[index];
 
-  console.warn(
-    `should be saved to wrapper ${id}: contacts:${shouldBeSavedToContactsWrapper}; usergroups:${shouldBeSavedToUserGroupsWrapper}, volatile:${shouldBeSavedToConvoInfoVolatileWrapper}`
-  );
+    switch (variant) {
+      case 'UserConfig':
+        if (SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id)) {
+          await SessionUtilUserProfile.insertUserProfileIntoWrapper(convo.id);
+        }
+        break;
+      case 'ContactsConfig':
+        if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
+          await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
+        }
+        break;
+      case 'UserGroupsConfig':
+        if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+          await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
+        }
+        break;
 
-  if (shouldBeSavedToContactsWrapper) {
-    await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
-  } else if (shouldBeSavedToUserGroupsWrapper) {
-    await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
+      case 'ConvoInfoVolatileConfig':
+        if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
+          await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
+        }
+        break;
+
+      default:
+        assertUnreachable(
+          variant,
+          `commitConversationAndRefreshWrapper unhandled case "${variant}"`
+        );
+    }
   }
 
-  if (shouldBeSavedToConvoInfoVolatileWrapper) {
-    await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
-  }
   if (Registration.isDone()) {
     // save the new dump if needed to the DB asap
     // this call throttled so we do not run this too often (and not for every .commit())
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 4a1318cb4..c10424188 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1032,7 +1032,7 @@ function getUnreadByConversation(conversationId: string) {
      ORDER BY received_at DESC;`
     )
     .all({
-      unread: 1,
+      unread: toSqliteBoolean(true),
       conversationId,
     });
 
@@ -1055,7 +1055,7 @@ function markAllAsReadByConversationNoExpiration(
   conversationId = $conversationId;`
       )
       .all({
-        unread: 1,
+        unread: toSqliteBoolean(true),
         conversationId,
       });
     toReturn = compact(messagesUnreadBefore.map(row => jsonToObject(row.json).sent_at));
@@ -1069,7 +1069,7 @@ function markAllAsReadByConversationNoExpiration(
       conversationId = $conversationId;`
     )
     .run({
-      unread: 1,
+      unread: toSqliteBoolean(true),
       conversationId,
     });
 
@@ -1084,7 +1084,7 @@ function getUnreadCountByConversation(conversationId: string) {
     conversationId = $conversationId;`
     )
     .get({
-      unread: 1,
+      unread: toSqliteBoolean(true),
       conversationId,
     });
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index fceac3ef4..240b84a3f 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -99,7 +99,7 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
-            await LibSessionUtil.insertUserProfileIntoWrapper();
+            await LibSessionUtil.insertUserProfileIntoWrapper(us);
             break;
           case 'ContactsConfig':
             await LibSessionUtil.insertAllContactsIntoContactsWrapper();
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index ebb331cdc..c3875c583 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -195,7 +195,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
-            await LibSessionUtil.insertUserProfileIntoWrapper();
+            await LibSessionUtil.insertUserProfileIntoWrapper(us);
             break;
           case 'ContactsConfig':
             await LibSessionUtil.insertAllContactsIntoContactsWrapper();
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 738eeed9c..a0cb1b7b8 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -217,6 +217,14 @@ function getAllLegacyGroups(): Array<ConvoInfoVolatileLegacyGroup> {
   return [...mappedLegacyGroupWrapperValues.values()];
 }
 
+function getFromAny(convoId: string) {
+  return (
+    mapped1o1WrapperValues.get(convoId) ||
+    mappedLegacyGroupWrapperValues.get(convoId) ||
+    mappedCommunityWrapperValues.get(convoId)
+  );
+}
+
 /**
  * This function can be used where there are things to do for all the types handled by this wrapper.
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
@@ -250,4 +258,5 @@ export const SessionUtilConvoInfoVolatile = {
   getAllCommunities,
   getCommunityMappedValueByConvoId,
   // removeCommunityFromWrapper,
+  getFromAny,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index d24e7ffea..87cb3b489 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -4,7 +4,10 @@ import { UserConfigWrapperActions } from '../../../webworker/workers/browser/lib
 import { getConversationController } from '../../conversations';
 import { fromHexToArray } from '../String';
 
-async function insertUserProfileIntoWrapper() {
+async function insertUserProfileIntoWrapper(convoId: string) {
+  if (!isUserProfileToStoreInContactsWrapper(convoId)) {
+    return;
+  }
   const us = UserUtils.getOurPubKeyStrFromCache();
   const ourConvo = getConversationController().get(us);
 
@@ -24,6 +27,16 @@ async function insertUserProfileIntoWrapper() {
   }
 }
 
+function isUserProfileToStoreInContactsWrapper(convoId: string) {
+  try {
+    const us = UserUtils.getOurPubKeyStrFromCache();
+    return convoId === us;
+  } catch (e) {
+    return false;
+  }
+}
+
 export const SessionUtilUserProfile = {
   insertUserProfileIntoWrapper,
+  isUserProfileToStoreInContactsWrapper,
 };

From f5efb52fea6519b201c8e00a335b61d35eb1e32e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 10 Mar 2023 16:39:48 +1100
Subject: [PATCH 044/178] feat: remove closedgroupv3 uneeded stuff for now

also move the room stuff which can be kept in memory into another redux
slice
---
 ts/components/SessionInboxView.tsx            |   5 +
 .../conversation/ConversationHeader.tsx       |  41 +-----
 .../conversation/SessionRightPanel.tsx        |   8 +-
 ts/models/conversation.ts                     |  70 +++------
 ts/models/conversationAttributes.ts           |  19 ++-
 ts/node/database_utility.ts                   |  29 +---
 ts/node/migration/sessionMigrations.ts        |  68 ++++-----
 ts/node/sql.ts                                |  40 +++---
 ts/receiver/queuedJob.ts                      |   7 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |   2 +-
 ts/session/conversations/createClosedGroup.ts |  17 +--
 ts/session/group/closed-group.ts              |  24 +---
 ts/state/ducks/conversations.ts               |   4 -
 ts/state/ducks/index.ts                       |  29 ----
 ts/state/ducks/sogsRoomInfo.tsx               |  62 ++++++++
 ts/state/ducks/userConfig.tsx                 |   9 +-
 ts/state/reducer.ts                           |   3 +
 ts/state/selectors/conversations.ts           |  65 +++++----
 ts/state/selectors/sogsRoomInfo.ts            |  36 +++++
 ts/state/selectors/userConfig.ts              |  27 ++--
 .../unit/models/ConversationModels_test.ts    |  15 --
 .../models/formatRowOfConversation_test.ts    | 136 ++++++++++--------
 .../unit/selectors/conversations_test.ts      |  10 --
 ts/util/accountManager.ts                     |  13 +-
 24 files changed, 347 insertions(+), 392 deletions(-)
 delete mode 100644 ts/state/ducks/index.ts
 create mode 100644 ts/state/ducks/sogsRoomInfo.tsx
 create mode 100644 ts/state/selectors/sogsRoomInfo.ts

diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index f4408d539..9feb12f6e 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -31,6 +31,7 @@ import { ExpirationTimerOptions } from '../util/expiringMessages';
 // moment does not support es-419 correctly (and cause white screen on app start)
 import moment from 'moment';
 import styled from 'styled-components';
+import { initialSogsRoomInfoState } from '../state/ducks/sogsRoomInfo';
 
 // Default to the locale from env. It will be overriden if moment
 // does not recognize it with what moment knows which is the closest.
@@ -117,11 +118,15 @@ export class SessionInboxView extends React.Component<any, State> {
       },
       stagedAttachments: getEmptyStagedAttachmentsState(),
       call: initialCallState,
+      sogsRoomInfo: initialSogsRoomInfoState,
     };
 
     this.store = createStore(initialState);
     window.inboxStore = this.store;
 
+    console.warn('initialState', JSON.stringify(initialState));
+    console.warn('this.store', JSON.stringify(this.store.getState()));
+
     window.openConversationWithMessages = openConversationWithMessages;
 
     this.setState({ isInitialLoadComplete: true });
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index a518a4e29..9404bf774 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -8,6 +8,7 @@ import { ConversationNotificationSettingType } from '../../models/conversationAt
 import {
   getConversationHeaderTitleProps,
   getCurrentNotificationSettingText,
+  getCurrentSubscriberCount,
   getIsSelectedActive,
   getIsSelectedBlocked,
   getIsSelectedNoteToSelf,
@@ -55,37 +56,6 @@ export interface TimerOption {
   value: number;
 }
 
-export type ConversationHeaderProps = {
-  conversationKey: string;
-  name?: string;
-
-  profileName?: string;
-  avatarPath: string | null;
-
-  isMe: boolean;
-  isGroup: boolean;
-  isPrivate: boolean;
-  isPublic: boolean;
-  weAreAdmin: boolean;
-
-  // We might not always have the full list of members,
-  // e.g. for open groups where we could have thousands
-  // of members. We'll keep this for now (for closed chats)
-  members: Array<any>;
-
-  // not equal members.length (see above)
-  subscriberCount?: number;
-
-  expirationSettingName?: string;
-  currentNotificationSetting: ConversationNotificationSettingType;
-  hasNickname: boolean;
-
-  isBlocked: boolean;
-
-  isKickedFromGroup: boolean;
-  left: boolean;
-};
-
 const SelectionOverlay = () => {
   const selectedMessageIds = useSelector(getSelectedMessageIds);
   const selectedConversationKey = useSelector(getSelectedConversationKey);
@@ -276,7 +246,6 @@ export type ConversationHeaderTitleProps = {
   isGroup: boolean;
   isPublic: boolean;
   members: Array<any>;
-  subscriberCount?: number;
   isKickedFromGroup: boolean;
   currentNotificationSetting?: ConversationNotificationSettingType;
 };
@@ -295,17 +264,19 @@ export const ConversationHeaderSubtitle = (props: { text?: string | null }): JSX
 };
 
 const ConversationHeaderTitle = () => {
+  const dispatch = useDispatch();
+
   const headerTitleProps = useSelector(getConversationHeaderTitleProps);
   const notificationSetting = useSelector(getCurrentNotificationSettingText);
   const isRightPanelOn = useSelector(isRightPanelShowing);
-
   const convoName = useConversationUsername(headerTitleProps?.conversationKey);
-  const dispatch = useDispatch();
+  const subscriberCount = useSelector(getCurrentSubscriberCount);
+
   if (!headerTitleProps) {
     return null;
   }
 
-  const { isGroup, isPublic, members, subscriberCount, isMe, isKickedFromGroup } = headerTitleProps;
+  const { isGroup, isPublic, members, isMe, isKickedFromGroup } = headerTitleProps;
 
   const { i18n } = window;
 
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 7a836dbb7..2927fbe89 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -17,7 +17,11 @@ import {
 } from '../../interactions/conversationInteractions';
 import { Constants } from '../../session';
 import { closeRightPanel } from '../../state/ducks/conversations';
-import { getSelectedConversation, isRightPanelShowing } from '../../state/selectors/conversations';
+import {
+  getCurrentSubscriberCount,
+  getSelectedConversation,
+  isRightPanelShowing,
+} from '../../state/selectors/conversations';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
 import { AttachmentTypeWithPath } from '../../types/Attachment';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
@@ -189,6 +193,7 @@ export const SessionRightPanelWithDetails = () => {
 
   const selectedConversation = useSelector(getSelectedConversation);
   const isShowing = useSelector(isRightPanelShowing);
+  const subscriberCount = useSelector(getCurrentSubscriberCount);
 
   useEffect(() => {
     let isRunning = true;
@@ -229,7 +234,6 @@ export const SessionRightPanelWithDetails = () => {
 
   const {
     id,
-    subscriberCount,
     displayNameInProfile,
     isKickedFromGroup,
     left,
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index dbf529bb9..4e90f7f5a 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -80,6 +80,8 @@ import { ed25519Str } from '../session/onions/onionPath';
 import { ConfigurationDumpSync } from '../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
+import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
+import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import { getOurProfile } from '../session/utils/User';
 import { createLastMessageUpdate } from '../types/Conversation';
@@ -90,8 +92,10 @@ import {
 } from '../types/MessageAttachment';
 import { IMAGE_JPEG } from '../types/MIME';
 import { Reaction } from '../types/Reaction';
+import { assertUnreachable } from '../types/sqlSharedTypes';
 import { Notifications } from '../util/notifications';
 import { Reactions } from '../util/reactions';
+import { Registration } from '../util/registration';
 import { Storage } from '../util/storage';
 import {
   ConversationAttributes,
@@ -101,13 +105,14 @@ import {
   isDirectConversation,
   isOpenOrClosedGroup,
 } from './conversationAttributes';
-import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
-import { Registration } from '../util/registration';
-import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
-import { assertUnreachable } from '../types/sqlSharedTypes';
 
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile';
+import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo';
+import {
+  getCanWriteOutsideRedux,
+  getSubscriberCountOutsideRedux,
+} from '../state/selectors/sogsRoomInfo';
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -307,7 +312,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const isTyping = !!this.typingTimer;
     const unreadCount = this.get('unreadCount') || undefined;
     const mentionedUs = this.get('mentionedUs') || undefined;
-    const subscriberCount = this.get('subscriberCount');
     const isKickedFromGroup = !!this.get('isKickedFromGroup');
     const left = !!this.get('left');
     const expireTimer = this.get('expireTimer');
@@ -435,10 +439,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.left = left;
     }
 
-    if (subscriberCount) {
-      toRet.subscriberCount = subscriberCount;
-    }
-
     if (groupAdmins && groupAdmins.length) {
       toRet.groupAdmins = uniq(groupAdmins);
     }
@@ -471,16 +471,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (room && isArray(room.capabilities) && room.capabilities.length) {
         toRet.capabilities = room.capabilities;
       }
-
-      if (this.get('writeCapability')) {
-        toRet.writeCapability = this.get('writeCapability');
-      }
-      if (this.get('readCapability')) {
-        toRet.readCapability = this.get('readCapability');
-      }
-      if (this.get('uploadCapability')) {
-        toRet.uploadCapability = this.get('uploadCapability');
-      }
     }
 
     const lastMessageText = this.get('lastMessage');
@@ -1375,13 +1365,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     read = filter(read, m => Boolean(m.sender));
     const realUnreadCount = await this.getUnreadCount();
     if (read.length === 0) {
-      const cachedUnreadCountOnConvo = this.get('unreadCount');
-      if (cachedUnreadCountOnConvo !== realUnreadCount) {
+      if (this.get('unreadCount') !== realUnreadCount) {
         // reset the unreadCount on the convo to the real one coming from markRead messages on the db
         this.set({ unreadCount: realUnreadCount });
         await this.commit();
-      } else {
-        // window?.log?.info('markRead(): nothing newly read.');
       }
       return;
     }
@@ -1624,21 +1611,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     await this.commit();
   }
 
-  public async setSubscriberCount(count: number) {
-    if (this.get('subscriberCount') !== count) {
-      this.set({ subscriberCount: count });
-      await this.commit();
-    }
-    // Not sure if we care about updating the database
-  }
-
   /**
    * Saves the infos of that room directly on the conversation table.
    * This does not write anything to the db if no changes are detected
    */
   // tslint:disable-next-line: cyclomatic-complexity
   public async setPollInfo(infos?: {
-    subscriberCount: number;
+    active_users: number;
     read: boolean;
     write: boolean;
     upload: boolean;
@@ -1655,29 +1634,18 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return;
     }
     let hasChange = false;
-    const { read, write, upload, subscriberCount, details } = infos;
+    const { write, active_users, details } = infos;
+
     if (
-      isNumber(infos.subscriberCount) &&
-      infos.subscriberCount !== 0 &&
-      this.get('subscriberCount') !== subscriberCount
+      isFinite(infos.active_users) &&
+      infos.active_users !== 0 &&
+      getSubscriberCountOutsideRedux(this.id) !== active_users
     ) {
-      hasChange = true;
-      this.set('subscriberCount', subscriberCount);
+      ReduxSogsRoomInfos.setSubscriberCountOutsideRedux(this.id, active_users);
     }
 
-    if (Boolean(this.get('readCapability')) !== Boolean(read)) {
-      hasChange = true;
-      this.set('readCapability', Boolean(read));
-    }
-
-    if (Boolean(this.get('writeCapability')) !== Boolean(write)) {
-      hasChange = true;
-      this.set('writeCapability', Boolean(write));
-    }
-
-    if (Boolean(this.get('uploadCapability')) !== Boolean(upload)) {
-      hasChange = true;
-      this.set('uploadCapability', Boolean(upload));
+    if (getCanWriteOutsideRedux(this.id) !== !!write) {
+      ReduxSogsRoomInfos.setCanWriteOutsideRedux(this.id, !!write);
     }
 
     const adminChanged = await this.handleModsOrAdminsChanges({
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index aa04cd3ee..de1e4a4cc 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -36,6 +36,14 @@ export function isDirectConversation(conversationType: ConversationTypeEnum) {
 export const ConversationNotificationSetting = ['all', 'disabled', 'mentions_only'] as const;
 export type ConversationNotificationSettingType = typeof ConversationNotificationSetting[number];
 
+/**
+ * Soem fields are retrieved from the database as a select, but should not be saved in a commit()
+ */
+export type ConversationAttributesNotSaved = {
+  mentionedUs: boolean;
+  unreadCount: number;
+};
+
 export interface ConversationAttributes {
   id: string;
   type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV3 | ConversationTypeEnum.GROUP;
@@ -68,11 +76,6 @@ export interface ConversationAttributes {
   groupModerators: Array<string>; // for sogs only, this is the moderator in that room.
   isKickedFromGroup: boolean;
 
-  subscriberCount: number;
-  readCapability: boolean;
-  writeCapability: boolean;
-  uploadCapability: boolean;
-
   is_medium_group: boolean;
 
   avatarPointer?: string; // this is the url of the avatar on the file server v2. we use this to detect if we need to redownload the avatar from someone (not used for opengroups)
@@ -90,11 +93,6 @@ export interface ConversationAttributes {
 
   markedAsUnread: boolean;
 
-  /**
-   * When we create a closed group v3 or get promoted to admim, we need to save the private key of that closed group.
-   */
-  // identityPrivateKey?: string;
-
   hidden: boolean;
 }
 
@@ -114,7 +112,6 @@ export const fillConvoAttributesWithDefaults = (
 
     unreadCount: 0,
     lastJoinedTimestamp: 0,
-    subscriberCount: 0,
     expireTimer: 0,
     active_at: 0,
 
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 0339029da..aff2ccb71 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -61,10 +61,6 @@ const allowedKeysFormatRowOfConversation = [
   'triggerNotificationsFor',
   'unreadCount',
   'lastJoinedTimestamp',
-  'subscriberCount',
-  'readCapability',
-  'writeCapability',
-  'uploadCapability',
   'expireTimer',
   'active_at',
   'id',
@@ -76,12 +72,14 @@ const allowedKeysFormatRowOfConversation = [
   'avatarInProfile',
   'displayNameInProfile',
   'conversationIdOrigin',
-  'identityPrivateKey',
   'markedAsUnread',
   'hidden',
 ];
 // tslint:disable: cyclomatic-complexity
-export function formatRowOfConversation(row?: Record<string, any>): ConversationAttributes | null {
+export function formatRowOfConversation(
+  row: Record<string, any>,
+  from: string
+): ConversationAttributes | null {
   if (!row) {
     return null;
   }
@@ -93,7 +91,7 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
 
   if (foundInRowButNotInAllowed?.length) {
     console.error(
-      'formatRowOfConversation: foundInRowButNotInAllowed: ',
+      `formatRowOfConversation: "from:${from}" foundInRowButNotInAllowed: `,
       foundInRowButNotInAllowed
     );
 
@@ -131,9 +129,6 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
   convo.mentionedUs = Boolean(convo.mentionedUs);
   convo.isKickedFromGroup = Boolean(convo.isKickedFromGroup);
   convo.left = Boolean(convo.left);
-  convo.readCapability = Boolean(convo.readCapability);
-  convo.writeCapability = Boolean(convo.writeCapability);
-  convo.uploadCapability = Boolean(convo.uploadCapability);
   convo.markedAsUnread = Boolean(convo.markedAsUnread);
   convo.hidden = Boolean(convo.hidden);
 
@@ -161,10 +156,6 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
     convo.lastJoinedTimestamp = 0;
   }
 
-  if (!convo.subscriberCount) {
-    convo.subscriberCount = 0;
-  }
-
   if (!convo.expireTimer) {
     convo.expireTimer = 0;
   }
@@ -173,11 +164,6 @@ export function formatRowOfConversation(row?: Record<string, any>): Conversation
     convo.active_at = 0;
   }
 
-  // convo.identityPrivateKey = row.identityPrivateKey;
-  // if (!convo.identityPrivateKey) {
-  //   convo.identityPrivateKey = undefined;
-  // }
-
   return convo;
 }
 
@@ -199,10 +185,6 @@ const allowedKeysOfConversationAttributes = [
   'triggerNotificationsFor',
   'unreadCount',
   'lastJoinedTimestamp',
-  'subscriberCount',
-  'readCapability',
-  'writeCapability',
-  'uploadCapability',
   'expireTimer',
   'active_at',
   'id',
@@ -214,7 +196,6 @@ const allowedKeysOfConversationAttributes = [
   'avatarInProfile',
   'displayNameInProfile',
   'conversationIdOrigin',
-  'identityPrivateKey',
   'markedAsUnread',
   'hidden',
 ];
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index ae6eb73ca..0dbda50ec 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -96,7 +96,6 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToSessionSchemaVersion28,
   updateToSessionSchemaVersion29,
   updateToSessionSchemaVersion30,
-  updateToSessionSchemaVersion31,
 ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
@@ -604,23 +603,26 @@ function updateToSessionSchemaVersion20(currentVersion: number, db: BetterSqlite
       console.info('found column friendRequestStatus. Dropping it');
       db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN friendRequestStatus;`);
     }
-    // looking for all private conversations, with a nickname set
-    const rowsToUpdate = db
-      .prepare(
-        `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND (name IS NULL or name = '') AND json_extract(json, '$.nickname') <> '';`
-      )
-      .all();
-    // tslint:disable-next-line: no-void-expression
-    (rowsToUpdate || []).forEach(r => {
-      const obj = jsonToObject(r.json);
+    // disable those updates as sqlNode.saveConversation will break if called without the right type of arguments.
+    // and when called during a migration we won't have the expected arguments. Plus, this migration is almost a year old already
 
-      // obj.profile.displayName is the display as this user set it.
-      if (obj?.nickname?.length && obj?.profile?.displayName?.length) {
-        // this one has a nickname set, but name is unset, set it to the displayName in the lokiProfile if it's exisitng
-        obj.name = obj.profile.displayName;
-        sqlNode.saveConversation(obj as ConversationAttributes, db);
-      }
-    });
+    // looking for all private conversations, with a nickname set
+    // const rowsToUpdate = db
+    //   .prepare(
+    //     `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND (name IS NULL or name = '') AND json_extract(json, '$.nickname') <> '';`
+    //   )
+    //   .all();
+    // tslint:disable-next-line: no-void-expression
+    // (rowsToUpdate || []).forEach(r => {
+    //   const obj = jsonToObject(r.json);
+
+    //   // obj.profile.displayName is the display as this user set it.
+    //   if (obj?.nickname?.length && obj?.profile?.displayName?.length) {
+    //     // this one has a nickname set, but name is unset, set it to the displayName in the lokiProfile if it's exisitng
+    //     obj.name = obj.profile.displayName;
+    //     sqlNode.saveConversation(obj as ConversationAttributes, db);
+    //   }
+    // });
     writeSessionSchemaVersion(targetVersion, db);
   });
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
@@ -1203,24 +1205,6 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite3.Database) {
-  const targetVersion = 30;
-  if (currentVersion >= targetVersion) {
-    return;
-  }
-
-  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
-  // this column will only be set when this is a closed group v3 and we are the admin/got promoted to admin
-  db.transaction(() => {
-    db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE}
-      ADD COLUMN identityPrivateKey TEXT;
-      `);
-    writeSessionSchemaVersion(targetVersion, db);
-  })();
-
-  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
-}
-
 function getIdentityKeysDuringMigration(db: BetterSqlite3.Database) {
   const row = db.prepare(`SELECT * FROM ${ITEMS_TABLE} WHERE id = $id;`).get({
     id: 'identityKey',
@@ -1426,8 +1410,8 @@ function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
   }
 }
 
-function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite3.Database) {
-  const targetVersion = 31;
+function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 30;
   if (currentVersion >= targetVersion) {
     return;
   }
@@ -1442,8 +1426,16 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
     db.exec(
       `ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN hidden INTEGER NOT NULL DEFAULT ${toSqliteBoolean(
         true
-      )} ;`
+      )};
+      `
     );
+    // drop unused readCapability & uploadCapability columns. Also move `writeCapability` to memory only value.
+    db.exec(`
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN readCapability;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN writeCapability;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN uploadCapability;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN subscriberCount;
+      `);
     // mark every "active" private chats as not hidden
     db.prepare(
       `UPDATE ${CONVERSATIONS_TABLE} SET
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index c10424188..68f122b79 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -428,10 +428,6 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     groupAdmins,
     groupModerators,
     isKickedFromGroup,
-    subscriberCount,
-    readCapability,
-    writeCapability,
-    uploadCapability,
     is_medium_group,
     avatarPointer,
     avatarImageId,
@@ -444,11 +440,10 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     displayNameInProfile,
     conversationIdOrigin,
     hidden,
-    // identityPrivateKey,
+    markedAsUnread,
   } = formatted;
 
-  console.warn('FIXME omit(formatted, identityPrivateKey);');
-  const omited = omit(formatted, 'identityPrivateKey', 'markedAsUnread');
+  const omited = omit(formatted);
   const keys = Object.keys(omited);
   const columnsCommaSeparated = keys.join(', ');
   const valuesArgs = keys.map(k => `$${k}`).join(', ');
@@ -488,10 +483,6 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       groupModerators:
         groupModerators && groupModerators.length ? arrayStrToJson(groupModerators) : '[]',
       isKickedFromGroup: toSqliteBoolean(isKickedFromGroup),
-      subscriberCount,
-      readCapability: toSqliteBoolean(readCapability),
-      writeCapability: toSqliteBoolean(writeCapability),
-      uploadCapability: toSqliteBoolean(uploadCapability),
 
       is_medium_group: toSqliteBoolean(is_medium_group),
       avatarPointer,
@@ -504,8 +495,8 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       avatarInProfile,
       displayNameInProfile,
       conversationIdOrigin,
-      // identityPrivateKey,
       hidden,
+      markedAsUnread: toSqliteBoolean(markedAsUnread),
     });
 }
 
@@ -536,14 +527,14 @@ function getConversationById(id: string, instance?: BetterSqlite3.Database) {
       id,
     });
 
-  return formatRowOfConversation(row);
+  return formatRowOfConversation(row, 'getConversationById');
 }
 
 function getAllConversations() {
   const rows = assertGlobalInstance()
     .prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} ORDER BY id ASC;`)
     .all();
-  return (rows || []).map(formatRowOfConversation);
+  return (rows || []).map(m => formatRowOfConversation(m, 'getAllConversations'));
 }
 
 function getPubkeysInPublicConversation(conversationId: string) {
@@ -590,7 +581,7 @@ function searchConversations(query: string) {
       limit: 50,
     });
 
-  return (rows || []).map(formatRowOfConversation);
+  return (rows || []).map(m => formatRowOfConversation(m, 'searchConversations'));
 }
 
 // order by clause is the same as orderByClause but with a table prefix so we cannot reuse it
@@ -1089,9 +1080,7 @@ function getUnreadCountByConversation(conversationId: string) {
     });
 
   if (!row) {
-    throw new Error(
-      `getUnreadCountByConversation: Unable to get unread count of ${conversationId}`
-    );
+    throw new Error(`Unable to get unread count of ${conversationId}`);
   }
 
   return row['count(*)'];
@@ -2131,12 +2120,15 @@ function cleanUpOldOpengroupsOnStart() {
             start}ms. Old message count: ${messagesInConvoBefore}, new message count: ${messagesInConvoAfter}`
         );
 
-        const unreadCount = getUnreadCountByConversation(convoId);
-        const convoProps = getConversationById(convoId);
-        if (convoProps) {
-          convoProps.unreadCount = unreadCount;
-          saveConversation(convoProps);
-        }
+        // no need to update the `unreadCount` during the migration anymore.
+        // `saveConversation` is broken when called with a argument without all the required fields.
+        // and this makes little sense as the unreadCount will be updated on opening
+        // const unreadCount = getUnreadCountByConversation(convoId);
+        // const convoProps = getConversationById(convoId);
+        // if (convoProps) {
+        //   convoProps.unreadCount = unreadCount;
+        //   saveConversation(convoProps);
+        // }
       } else {
         console.info(
           `Not cleaning messages older than 6 months in public convo: ${convoId}. message count: ${messagesInConvoBefore}`
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 0010e7e1e..48111bd4c 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -9,13 +9,14 @@ import { Data } from '../../ts/data/data';
 
 import { SignalService } from '../protobuf';
 import { UserUtils } from '../session/utils';
-import { showMessageRequestBanner } from '../state/ducks/userConfig';
+import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig';
 import { MessageDirection } from '../models/messageType';
 import { LinkPreviews } from '../util/linkPreviews';
 import { GoogleChrome } from '../util';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { getUsBlindedInThatServer } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
+import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig';
 
 function contentTypeSupported(type: string): boolean {
   const Chrome = GoogleChrome;
@@ -258,9 +259,9 @@ async function handleRegularMessage(
       if (
         conversation.isIncomingRequest() &&
         isFirstRequestMessage &&
-        window.inboxStore?.getState().userConfig.hideMessageRequests
+        getHideMessageRequestBannerOutsideRedux()
       ) {
-        window.inboxStore?.dispatch(showMessageRequestBanner());
+        showMessageRequestBannerOutsideRedux();
       }
 
       // For edge case when messaging a client that's unable to explicitly send request approvals
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index e337c8648..5a6e90c7b 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -119,7 +119,7 @@ async function handlePollInfoResponse(
     read,
     write,
     upload,
-    subscriberCount: active_users,
+    active_users: active_users,
     details: pick(
       details,
       'admins',
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index e99cd7c1a..f95184578 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -25,6 +25,10 @@ import { getConversationController } from './ConversationController';
 export async function createClosedGroup(groupName: string, members: Array<string>, isV3: boolean) {
   const setOfMembers = new Set(members);
 
+  if (isV3) {
+    throw new Error('groupv3 is not supported yet');
+  }
+
   const us = UserUtils.getOurPubKeyStrFromCache();
 
   const identityKeyPair = await generateGroupV3Keypair();
@@ -63,17 +67,6 @@ export async function createClosedGroup(groupName: string, members: Array<string
     expireTimer: existingExpireTimer,
   };
 
-  const groupDetailsV3: ClosedGroup.GroupInfoV3 = {
-    id: groupPublicKey,
-    identityPrivateKey: isV3 ? identityKeyPair.privateKey : undefined,
-    isV3: true,
-    name: groupName,
-    members: listOfMembers,
-    admins,
-    activeAt: Date.now(),
-    expireTimer: existingExpireTimer,
-  };
-
   // used for UI only, adding of a message to remind who is in the group and the name of the group
   const groupDiff: ClosedGroup.GroupDiff = {
     newName: groupName,
@@ -83,7 +76,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
   const dbMessage = await ClosedGroup.addUpdateMessage(convo, groupDiff, us, Date.now());
   // be sure to call this before sending the message.
   // the sending pipeline needs to know from GroupUtils when a message is for a medium group
-  await ClosedGroup.updateOrCreateClosedGroup(isV3 ? groupDetailsV3 : groupDetails);
+  await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
   await convo.commit();
   convo.updateLastMessage();
 
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index ca3acdcd0..ba1a3d9fc 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -43,19 +43,6 @@ export type GroupInfo = {
   weWereJustAdded?: boolean;
 };
 
-export type GroupInfoV3 = {
-  id: string;
-  identityPrivateKey?: string; // only set if we created the closed group v3 or got promoted to admin (and received the identity private key)
-  isV3: true;
-  name: string;
-  members: Array<string>;
-  activeAt?: number;
-  expireTimer?: number | null;
-  blocked?: boolean;
-  admins?: Array<string>;
-  weWereJustAdded?: boolean;
-};
-
 export interface GroupDiff extends MemberChanges {
   newName?: string;
 }
@@ -230,11 +217,7 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff
   return groupDiff;
 }
 
-function isV3(details: GroupInfo | GroupInfoV3): details is GroupInfoV3 {
-  return (details as GroupInfoV3).isV3 === true;
-}
-
-export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3) {
+export async function updateOrCreateClosedGroup(details: GroupInfo) {
   const { id, weWereJustAdded, expireTimer } = details;
 
   const conversation = await getConversationController().getOrCreateAndWait(
@@ -245,7 +228,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
   const updates: Pick<
     ConversationAttributes,
     | 'type'
-    // | 'identityPrivateKey'
     | 'members'
     | 'displayNameInProfile'
     | 'is_medium_group'
@@ -256,15 +238,13 @@ export async function updateOrCreateClosedGroup(details: GroupInfo | GroupInfoV3
   > = {
     displayNameInProfile: details.name,
     members: details.members,
-    type: isV3(details) ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP,
+    type: ConversationTypeEnum.GROUP,
     is_medium_group: true,
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
     hidden: false,
-    // identityPrivateKey: isV3(details) ? details.identityPrivateKey : undefined,
   };
-  console.warn('updates', updates);
 
   conversation.set(updates);
 
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index faea4d895..e38831aac 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -251,7 +251,6 @@ export interface ReduxConversationType {
   isBlocked?: boolean;
   isHidden: boolean;
   isKickedFromGroup?: boolean;
-  subscriberCount?: number;
   left?: boolean;
   avatarPath?: string | null; // absolute filepath to the avatar
   groupAdmins?: Array<string>; // admins for closed groups and admins for open groups
@@ -271,9 +270,6 @@ export interface ReduxConversationType {
 
   // Should only be present on opengroups - the capabilities we have on this room.
   capabilities?: Array<string>;
-  readCapability?: boolean;
-  writeCapability?: boolean;
-  uploadCapability?: boolean;
 }
 
 export interface NotificationForConvoOption {
diff --git a/ts/state/ducks/index.ts b/ts/state/ducks/index.ts
deleted file mode 100644
index 443edb61e..000000000
--- a/ts/state/ducks/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import * as CallDucks from './call';
-import * as conversationDucks from './conversations';
-import * as defaultRoomDucks from './defaultRooms';
-import * as DialogsDucks from './modalDialog';
-import * as OnionDucks from './onion';
-import * as PrimaryColorDucks from './primaryColor';
-import * as SearchDucks from './search';
-import * as SectionDucks from './section';
-import * as StagedAttachmentDucks from './stagedAttachments';
-import * as ThemeDucks from './theme';
-import * as TimerOptionsDucks from './timerOptions';
-import * as UserDucks from './user';
-import * as UserConfigDucks from './userConfig';
-
-export {
-  CallDucks,
-  DialogsDucks,
-  OnionDucks,
-  PrimaryColorDucks,
-  SearchDucks,
-  SectionDucks,
-  StagedAttachmentDucks,
-  ThemeDucks,
-  TimerOptionsDucks,
-  UserConfigDucks,
-  UserDucks,
-  conversationDucks,
-  defaultRoomDucks,
-};
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
new file mode 100644
index 000000000..8be4d6ec6
--- /dev/null
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -0,0 +1,62 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+type RoomInfo = {
+  canWrite: boolean;
+  subscriberCount: number;
+};
+
+export type SogsRoomInfoState = {
+  rooms: Record<string, RoomInfo>;
+};
+
+export const initialSogsRoomInfoState: SogsRoomInfoState = {
+  rooms: {},
+};
+
+function addEmptyEntryIfNeeded(state: any, convoId: string) {
+  if (!state.rooms[convoId]) {
+    state.rooms[convoId] = { canWrite: true, subscriberCount: 0 };
+  }
+}
+
+/**
+ * This slice is the one holding the memory-only infos of sogs room. This includes
+ * - writeCapability
+ * - subscriberCount
+ */
+const sogsRoomInfosSlice = createSlice({
+  name: 'sogsRoomInfos',
+  initialState: initialSogsRoomInfoState,
+  reducers: {
+    setSubscriberCount(state, action: PayloadAction<{ convoId: string; subscriberCount: number }>) {
+      addEmptyEntryIfNeeded(state, action.payload.convoId);
+      if (isFinite(action.payload.subscriberCount)) {
+        state.rooms[action.payload.convoId].subscriberCount = action.payload.subscriberCount;
+      }
+      return state;
+    },
+    setCanWrite(state, action: PayloadAction<{ convoId: string; canWrite: boolean }>) {
+      addEmptyEntryIfNeeded(state, action.payload.convoId);
+      state.rooms[action.payload.convoId].canWrite = !!action.payload.canWrite;
+
+      return state;
+    },
+  },
+});
+
+const { actions, reducer } = sogsRoomInfosSlice;
+const { setSubscriberCount, setCanWrite } = actions;
+
+export const ReduxSogsRoomInfos = {
+  setSubscriberCountOutsideRedux,
+  setCanWriteOutsideRedux,
+  sogsRoomInfoReducer: reducer,
+};
+
+function setSubscriberCountOutsideRedux(convoId: string, subscriberCount: number) {
+  window.inboxStore?.dispatch(setSubscriberCount({ convoId, subscriberCount }));
+}
+
+function setCanWriteOutsideRedux(convoId: string, canWrite: boolean) {
+  window.inboxStore?.dispatch(setCanWrite({ convoId, canWrite }));
+}
diff --git a/ts/state/ducks/userConfig.tsx b/ts/state/ducks/userConfig.tsx
index 7881ffa62..502367b87 100644
--- a/ts/state/ducks/userConfig.tsx
+++ b/ts/state/ducks/userConfig.tsx
@@ -26,9 +26,6 @@ const userConfigSlice = createSlice({
     disableRecoveryPhrasePrompt: state => {
       state.showRecoveryPhrasePrompt = false;
     },
-    toggleMessageRequests: state => {
-      state.hideMessageRequests = !state.hideMessageRequests;
-    },
     showMessageRequestBanner: state => {
       state.hideMessageRequests = false;
     },
@@ -42,8 +39,10 @@ const { actions, reducer } = userConfigSlice;
 export const {
   toggleAudioAutoplay,
   disableRecoveryPhrasePrompt,
-  toggleMessageRequests,
-  showMessageRequestBanner,
   hideMessageRequestBanner,
 } = actions;
 export const userConfigReducer = reducer;
+
+export function showMessageRequestBannerOutsideRedux() {
+  window.inboxStore?.dispatch(actions.showMessageRequestBanner());
+}
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index 0029e2725..da394d25f 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -7,6 +7,7 @@ import { reducer as theme } from './ducks/theme';
 import { reducer as primaryColor } from './ducks/primaryColor';
 import { reducer as section, SectionStateType } from './ducks/section';
 import { defaultRoomReducer as defaultRooms, DefaultRoomsState } from './ducks/defaultRooms';
+import { ReduxSogsRoomInfos, SogsRoomInfoState } from './ducks/sogsRoomInfo';
 import { callReducer as call, CallStateType } from './ducks/call';
 
 import { defaultOnionReducer as onionPaths, OnionState } from './ducks/onion';
@@ -33,6 +34,7 @@ export type StateType = {
   timerOptions: TimerOptionsState;
   stagedAttachments: StagedAttachmentsStateType;
   call: CallStateType;
+  sogsRoomInfo: SogsRoomInfoState;
 };
 
 export const reducers = {
@@ -49,6 +51,7 @@ export const reducers = {
   timerOptions,
   stagedAttachments,
   call,
+  sogsRoomInfo: ReduxSogsRoomInfos.sogsRoomInfoReducer,
 };
 
 // Making this work would require that our reducer signature supported AnyAction, not
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 3a5175369..a67d3a74c 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -37,6 +37,7 @@ import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversa
 
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { filter, isEmpty, pick, sortBy } from 'lodash';
+import { getCanWrite, getSubscriberCount } from './sogsRoomInfo';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
@@ -74,22 +75,21 @@ export const getSelectedConversationIsPublic = createSelector(
   }
 );
 
-export const getIsTypingEnabled = createSelector(
-  getConversations,
-  getSelectedConversationKey,
-  (state: ConversationsStateType, selectedConvoPubkey?: string): boolean => {
-    if (!selectedConvoPubkey) {
-      return false;
-    }
-    const selectedConvo = state.conversationLookup[selectedConvoPubkey];
-    if (!selectedConvo) {
-      return false;
-    }
-    const { isBlocked, isKickedFromGroup, left, isPublic, writeCapability } = selectedConvo;
-
-    return !(isBlocked || isKickedFromGroup || left || (isPublic && !writeCapability));
+export function getIsTypingEnabled(state: StateType) {
+  const selectedConvoPubkey = getSelectedConversationKey(state);
+  if (!selectedConvoPubkey) {
+    return false;
   }
-);
+  const selectedConvo = state.conversations.conversationLookup[selectedConvoPubkey];
+  if (!selectedConvo) {
+    return false;
+  }
+  const canWrite = getCanWrite(state, selectedConvoPubkey);
+  const { isBlocked, isKickedFromGroup, left, isPublic } = selectedConvo;
+
+  return !(isBlocked || isKickedFromGroup || left || (isPublic && !canWrite));
+}
+
 /**
  * Returns true if the current conversation selected is a group conversation.
  * Returns false if the current conversation selected is not a group conversation, or none are selected
@@ -551,23 +551,32 @@ export const getUnreadMessageCount = createSelector(getLeftPaneLists, (state): n
   return state.unreadCount;
 });
 
-export const getConversationHeaderTitleProps = createSelector(getSelectedConversation, (state):
-  | ConversationHeaderTitleProps
-  | undefined => {
-  if (!state) {
+export const getConversationHeaderTitleProps = (
+  state: StateType
+): ConversationHeaderTitleProps | undefined => {
+  const convo = getSelectedConversation(state);
+  if (!convo) {
     return undefined;
   }
+
   return {
-    isKickedFromGroup: !!state.isKickedFromGroup,
-    conversationKey: state.id,
-    isMe: !!state.isMe,
-    members: state.members || [],
-    isPublic: !!state.isPublic,
-    subscriberCount: state.subscriberCount,
-    isGroup: isOpenOrClosedGroup(state.type),
-    currentNotificationSetting: state.currentNotificationSetting,
+    isKickedFromGroup: !!convo.isKickedFromGroup,
+    conversationKey: convo.id,
+    isMe: !!convo.isMe,
+    members: convo.members || [],
+    isPublic: !!convo.isPublic,
+    isGroup: isOpenOrClosedGroup(convo.type),
+    currentNotificationSetting: convo.currentNotificationSetting,
   };
-});
+};
+
+export const getCurrentSubscriberCount = (state: StateType): number | undefined => {
+  const convo = getSelectedConversation(state);
+  if (!convo) {
+    return undefined;
+  }
+  return getSubscriberCount(state, convo.id);
+};
 
 /**
  * Returns the formatted text for notification setting.
diff --git a/ts/state/selectors/sogsRoomInfo.ts b/ts/state/selectors/sogsRoomInfo.ts
new file mode 100644
index 000000000..34b61be69
--- /dev/null
+++ b/ts/state/selectors/sogsRoomInfo.ts
@@ -0,0 +1,36 @@
+import { isNil } from 'lodash';
+import { SogsRoomInfoState } from '../ducks/sogsRoomInfo';
+import { StateType } from '../reducer';
+
+const getSogsRoomInfoState = (state: StateType): SogsRoomInfoState => state.sogsRoomInfo;
+
+export function getCanWrite(state: StateType, selectedConvo?: string): boolean {
+  if (!selectedConvo) {
+    return false;
+  }
+
+  const canWrite = getSogsRoomInfoState(state).rooms[selectedConvo]?.canWrite;
+  // if there is no entry in the redux slice, consider it true (as this selector will be hit for non sogs convo too)
+  return isNil(canWrite) ? true : canWrite;
+}
+
+export function getSubscriberCount(state: StateType, selectedConvo?: string): number {
+  if (!selectedConvo) {
+    return 0;
+  }
+
+  const subscriberCount = getSogsRoomInfoState(state).rooms[selectedConvo]?.subscriberCount;
+  // if there is no entry in the redux slice, consider it 0 (as this selector will be hit for non sogs convo too)
+  return isNil(subscriberCount) ? 0 : subscriberCount;
+}
+
+export function getSubscriberCountOutsideRedux(convoId: string) {
+  const state = window.inboxStore?.getState();
+
+  return state ? getSubscriberCount(state, convoId) : 0;
+}
+
+export function getCanWriteOutsideRedux(convoId: string) {
+  const state = window.inboxStore?.getState();
+  return state ? getCanWrite(state, convoId) : false;
+}
diff --git a/ts/state/selectors/userConfig.ts b/ts/state/selectors/userConfig.ts
index 2c1960b96..377b7fa9b 100644
--- a/ts/state/selectors/userConfig.ts
+++ b/ts/state/selectors/userConfig.ts
@@ -1,20 +1,17 @@
 import { StateType } from '../reducer';
-import { UserConfigState } from '../ducks/userConfig';
-import { createSelector } from '@reduxjs/toolkit';
 
-export const getUserConfig = (state: StateType): UserConfigState => state.userConfig;
+export const getAudioAutoplay = (state: StateType): boolean => state.userConfig.audioAutoplay;
 
-export const getAudioAutoplay = createSelector(
-  getUserConfig,
-  (state: UserConfigState): boolean => state.audioAutoplay
-);
+export const getShowRecoveryPhrasePrompt = (state: StateType): boolean =>
+  state.userConfig?.showRecoveryPhrasePrompt || false;
 
-export const getShowRecoveryPhrasePrompt = createSelector(
-  getUserConfig,
-  (state: UserConfigState): boolean => state.showRecoveryPhrasePrompt
-);
+export const getHideMessageRequestBanner = (state: StateType): boolean => {
+  // I am not too sure why, but it seems that state.userConfig is not set early enough and we try to somehow fetch this too early?
+  return state.userConfig?.hideMessageRequests || false;
+};
 
-export const getHideMessageRequestBanner = createSelector(
-  getUserConfig,
-  (state: UserConfigState): boolean => state.hideMessageRequests
-);
+export const getHideMessageRequestBannerOutsideRedux = (): boolean => {
+  const state = window.inboxStore?.getState();
+
+  return state ? getHideMessageRequestBanner(state) : true;
+};
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index 048c8ba07..a1474bc35 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -84,21 +84,6 @@ describe('fillConvoAttributesWithDefaults', () => {
     });
   });
 
-  describe('subscriberCount', () => {
-    it('initialize subscriberCount if not given', () => {
-      expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-        'subscriberCount',
-        0
-      );
-    });
-
-    it('do not override subscriberCount if given', () => {
-      expect(
-        fillConvoAttributesWithDefaults({ subscriberCount: 123 } as ConversationAttributes)
-      ).to.have.deep.property('subscriberCount', 123);
-    });
-  });
-
   describe('expireTimer', () => {
     it('initialize expireTimer if not given', () => {
       expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 5468b1a81..3265e034e 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -13,69 +13,79 @@ import { formatRowOfConversation } from '../../../../node/database_utility';
 describe('formatRowOfConversation', () => {
   describe('isTrustedForAttachmentDownload', () => {
     it('initialize isTrustedForAttachmentDownload if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property(
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property(
         'isTrustedForAttachmentDownload',
         false
       );
     });
 
     it('do not override isTrustedForAttachmentDownload if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isTrustedForAttachmentDownload: 1 })).to.have.deep.property(
-        'isTrustedForAttachmentDownload',
-        true
-      );
+      expect(
+        formatRowOfConversation({ isTrustedForAttachmentDownload: 1 }, 'test')
+      ).to.have.deep.property('isTrustedForAttachmentDownload', true);
     });
 
     it('do not override isTrustedForAttachmentDownload if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isTrustedForAttachmentDownload: 0 })).to.have.deep.property(
-        'isTrustedForAttachmentDownload',
-        false
-      );
+      expect(
+        formatRowOfConversation({ isTrustedForAttachmentDownload: 0 }, 'test')
+      ).to.have.deep.property('isTrustedForAttachmentDownload', false);
     });
   });
 
   describe('isPinned', () => {
     it('initialize isPinned if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('isPinned', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isPinned', false);
     });
 
     it('do not override isPinned if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isPinned: 1 })).to.have.deep.property('isPinned', true);
+      expect(formatRowOfConversation({ isPinned: 1 }, 'test')).to.have.deep.property(
+        'isPinned',
+        true
+      );
     });
 
     it('do not override isPinned if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isPinned: 0 })).to.have.deep.property('isPinned', false);
+      expect(formatRowOfConversation({ isPinned: 0 }, 'test')).to.have.deep.property(
+        'isPinned',
+        false
+      );
     });
   });
 
   describe('isApproved', () => {
     it('initialize isApproved if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('isApproved', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isApproved', false);
     });
 
     it('do not override isApproved if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isApproved: 1 })).to.have.deep.property('isApproved', true);
+      expect(formatRowOfConversation({ isApproved: 1 }, 'test')).to.have.deep.property(
+        'isApproved',
+        true
+      );
     });
 
     it('do not override isApproved if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isApproved: 0 })).to.have.deep.property('isApproved', false);
+      expect(formatRowOfConversation({ isApproved: 0 }, 'test')).to.have.deep.property(
+        'isApproved',
+        false
+      );
     });
   });
 
   describe('didApproveMe', () => {
     it('initialize didApproveMe if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('didApproveMe', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('didApproveMe', false);
     });
 
     it('do not override didApproveMe if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ didApproveMe: 1 })).to.have.deep.property(
+      expect(formatRowOfConversation({ didApproveMe: 1 }, 'test')).to.have.deep.property(
         'didApproveMe',
         true
       );
     });
 
     it('do not override didApproveMe if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ didApproveMe: 0 })).to.have.deep.property(
+      expect(formatRowOfConversation({ didApproveMe: 0 }, 'test')).to.have.deep.property(
         'didApproveMe',
         false
       );
@@ -84,18 +94,18 @@ describe('formatRowOfConversation', () => {
 
   describe('is_medium_group', () => {
     it('initialize is_medium_group if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('is_medium_group', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('is_medium_group', false);
     });
 
     it('do not override is_medium_group if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ is_medium_group: 1 })).to.have.deep.property(
+      expect(formatRowOfConversation({ is_medium_group: 1 }, 'test')).to.have.deep.property(
         'is_medium_group',
         true
       );
     });
 
     it('do not override is_medium_group if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ is_medium_group: 0 })).to.have.deep.property(
+      expect(formatRowOfConversation({ is_medium_group: 0 }, 'test')).to.have.deep.property(
         'is_medium_group',
         false
       );
@@ -104,18 +114,18 @@ describe('formatRowOfConversation', () => {
 
   describe('mentionedUs', () => {
     it('initialize mentionedUs if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('mentionedUs', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('mentionedUs', false);
     });
 
     it('do not override mentionedUs if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ mentionedUs: 1 })).to.have.deep.property(
+      expect(formatRowOfConversation({ mentionedUs: 1 }, 'test')).to.have.deep.property(
         'mentionedUs',
         true
       );
     });
 
     it('do not override mentionedUs if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ mentionedUs: 0 })).to.have.deep.property(
+      expect(formatRowOfConversation({ mentionedUs: 0 }, 'test')).to.have.deep.property(
         'mentionedUs',
         false
       );
@@ -124,18 +134,18 @@ describe('formatRowOfConversation', () => {
 
   describe('isKickedFromGroup', () => {
     it('initialize isKickedFromGroup if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('isKickedFromGroup', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isKickedFromGroup', false);
     });
 
     it('do not override isKickedFromGroup if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isKickedFromGroup: 1 })).to.have.deep.property(
+      expect(formatRowOfConversation({ isKickedFromGroup: 1 }, 'test')).to.have.deep.property(
         'isKickedFromGroup',
         true
       );
     });
 
     it('do not override isKickedFromGroup if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isKickedFromGroup: 0 })).to.have.deep.property(
+      expect(formatRowOfConversation({ isKickedFromGroup: 0 }, 'test')).to.have.deep.property(
         'isKickedFromGroup',
         false
       );
@@ -144,28 +154,28 @@ describe('formatRowOfConversation', () => {
 
   describe('left', () => {
     it('initialize left if they are not given', () => {
-      expect(formatRowOfConversation({})).to.have.deep.property('left', false);
+      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('left', false);
     });
 
     it('do not override left if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ left: 1 })).to.have.deep.property('left', true);
+      expect(formatRowOfConversation({ left: 1 }, 'test')).to.have.deep.property('left', true);
     });
 
     it('do not override left if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ left: 0 })).to.have.deep.property('left', false);
+      expect(formatRowOfConversation({ left: 0 }, 'test')).to.have.deep.property('left', false);
     });
   });
 
   describe('row', () => {
     it('row null returns null', () => {
-      expect(formatRowOfConversation(null as any)).to.be.equal(
+      expect(formatRowOfConversation(null as any, 'test')).to.be.equal(
         null,
         'formatRowOfConversation with null should return null'
       );
     });
 
     it('row undefined returns null', () => {
-      expect(formatRowOfConversation(undefined as any)).to.be.equal(
+      expect(formatRowOfConversation(undefined as any, 'test')).to.be.equal(
         null,
         'formatRowOfConversation with undefined should return null'
       );
@@ -174,21 +184,21 @@ describe('formatRowOfConversation', () => {
 
   describe('groupAdmins', () => {
     it('groupAdmins undefined fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: undefined })).to.be.have.deep.property(
+      expect(formatRowOfConversation({ groupAdmins: undefined }, 'test')).to.be.have.deep.property(
         'groupAdmins',
         []
       );
     });
 
     it('groupAdmins null fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: null })).to.be.have.deep.property(
+      expect(formatRowOfConversation({ groupAdmins: null }, 'test')).to.be.have.deep.property(
         'groupAdmins',
         []
       );
     });
 
     it('groupAdmins [] fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: '[]' })).to.be.have.deep.property(
+      expect(formatRowOfConversation({ groupAdmins: '[]' }, 'test')).to.be.have.deep.property(
         'groupAdmins',
         []
       );
@@ -196,86 +206,96 @@ describe('formatRowOfConversation', () => {
 
     it('groupAdmins ["12345"] from db as string', () => {
       expect(
-        formatRowOfConversation({ groupAdmins: '["12345"]' })
+        formatRowOfConversation({ groupAdmins: '["12345"]' }, 'test')
       ).to.be.have.deep.property('groupAdmins', ['12345']);
     });
 
     it('groupAdmins ["12345", "52345"] fills it with []', () => {
       expect(
-        formatRowOfConversation({ groupAdmins: '["12345", "52345"]' })
+        formatRowOfConversation({ groupAdmins: '["12345", "52345"]' }, 'test')
       ).to.be.have.deep.property('groupAdmins', ['12345', '52345']);
     });
   });
 
   describe('members', () => {
     it('members undefined fills it with []', () => {
-      expect(formatRowOfConversation({ members: undefined })).to.be.have.deep.property(
+      expect(formatRowOfConversation({ members: undefined }, 'test')).to.be.have.deep.property(
         'members',
         []
       );
     });
 
     it('members null fills it with []', () => {
-      expect(formatRowOfConversation({ members: null })).to.be.have.deep.property('members', []);
+      expect(formatRowOfConversation({ members: null }, 'test')).to.be.have.deep.property(
+        'members',
+        []
+      );
     });
 
     it('members [] fills it with []', () => {
-      expect(formatRowOfConversation({ members: '[]' })).to.be.have.deep.property('members', []);
+      expect(formatRowOfConversation({ members: '[]' }, 'test')).to.be.have.deep.property(
+        'members',
+        []
+      );
     });
 
     it('members ["12345"] from db as string', () => {
-      expect(formatRowOfConversation({ members: '["12345"]' })).to.be.have.deep.property(
-        'members',
-        ['12345']
-      );
+      expect(
+        formatRowOfConversation({ members: '["12345"]' }, 'test')
+      ).to.be.have.deep.property('members', ['12345']);
     });
 
     it('members ["12345", "52345"] fills it with []', () => {
       expect(
-        formatRowOfConversation({ members: '["12345", "52345"]' })
+        formatRowOfConversation({ members: '["12345", "52345"]' }, 'test')
       ).to.be.have.deep.property('members', ['12345', '52345']);
     });
   });
 
   describe('zombies', () => {
     it('zombies undefined fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: undefined })).to.be.have.deep.property(
+      expect(formatRowOfConversation({ zombies: undefined }, 'test')).to.be.have.deep.property(
         'zombies',
         []
       );
     });
 
     it('zombies null fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: null })).to.be.have.deep.property('zombies', []);
+      expect(formatRowOfConversation({ zombies: null }, 'test')).to.be.have.deep.property(
+        'zombies',
+        []
+      );
     });
 
     it('zombies [] fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: '[]' })).to.be.have.deep.property('zombies', []);
+      expect(formatRowOfConversation({ zombies: '[]' }, 'test')).to.be.have.deep.property(
+        'zombies',
+        []
+      );
     });
 
     it('zombies ["12345"] from db as string', () => {
-      expect(formatRowOfConversation({ zombies: '["12345"]' })).to.be.have.deep.property(
-        'zombies',
-        ['12345']
-      );
+      expect(
+        formatRowOfConversation({ zombies: '["12345"]' }, 'test')
+      ).to.be.have.deep.property('zombies', ['12345']);
     });
 
     it('zombies ["12345", "52345"] fills it with ["12345", "52345"]', () => {
       expect(
-        formatRowOfConversation({ zombies: '["12345", "52345"]' })
+        formatRowOfConversation({ zombies: '["12345", "52345"]' }, 'test')
       ).to.be.have.deep.property('zombies', ['12345', '52345']);
     });
   });
 
   it('throws an error if a key is not expected', () => {
-    expect(() => formatRowOfConversation({ not_valid: undefined })).throws(
+    expect(() => formatRowOfConversation({ not_valid: undefined }, 'test')).throws(
       'formatRowOfConversation: an invalid key was given in the record: not_valid'
     );
   });
 
   it('throws an error if a key is not expected but has other valid keys', () => {
     expect(() =>
-      formatRowOfConversation({ triggerNotificationsFor: 'all', not_valid: undefined })
+      formatRowOfConversation({ triggerNotificationsFor: 'all', not_valid: undefined }, 'test')
     ).throws('formatRowOfConversation: an invalid key was given in the record: not_valid');
   });
 
@@ -291,7 +311,8 @@ describe('formatRowOfConversation', () => {
           avatarPointer: 'avatarPointer',
           avatarInProfile: 'avatarInProfile',
           avatarImageId: 1234,
-        } as ConversationAttributes)
+        } as ConversationAttributes),
+        'test'
       )
     ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
 
@@ -306,7 +327,8 @@ describe('formatRowOfConversation', () => {
           avatarPointer: 'avatarPointer',
           avatarInProfile: 'avatarInProfile',
           avatarImageId: 1234,
-        } as ConversationAttributes)
+        } as ConversationAttributes),
+        'test'
       )
     ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
   });
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 34a4c9549..ef230f79e 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -28,7 +28,6 @@ describe('state/selectors/conversations', () => {
           left: false,
           hasNickname: false,
           isPublic: false,
-          subscriberCount: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
           isGroup: false,
@@ -58,7 +57,6 @@ describe('state/selectors/conversations', () => {
           left: false,
           hasNickname: false,
           isPublic: false,
-          subscriberCount: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
           isGroup: false,
@@ -88,7 +86,6 @@ describe('state/selectors/conversations', () => {
           left: false,
           hasNickname: false,
           isPublic: false,
-          subscriberCount: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
           isGroup: false,
@@ -118,7 +115,6 @@ describe('state/selectors/conversations', () => {
           left: false,
           hasNickname: false,
           isPublic: false,
-          subscriberCount: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
           isGroup: false,
@@ -148,7 +144,6 @@ describe('state/selectors/conversations', () => {
           left: false,
           hasNickname: false,
           isPublic: false,
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -193,7 +188,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -224,7 +218,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -254,7 +247,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -285,7 +277,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -316,7 +307,6 @@ describe('state/selectors/conversations', () => {
           isKickedFromGroup: false,
           left: false,
 
-          subscriberCount: 0,
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index e1d35b959..63f4b3c4f 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -179,8 +179,13 @@ async function createAccount(identityKeyPair: SessionKeyPair) {
 async function registrationDone(ourPubkey: string, displayName: string) {
   window?.log?.info('registration done');
 
+  // initializeLibSessionUtilWrappers needs our publicKey to be set
   await Storage.put('primaryDevicePubKey', ourPubkey);
-
+  try {
+    await LibSessionUtil.initializeLibSessionUtilWrappers();
+  } catch (e) {
+    window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
+  }
   // Ensure that we always have a conversation for ourself
   const conversation = await getConversationController().getOrCreateAndWait(
     ourPubkey,
@@ -199,11 +204,7 @@ async function registrationDone(ourPubkey: string, displayName: string) {
   window.inboxStore?.dispatch(userActions.userChanged(user));
 
   await Registration.markDone();
-  try {
-    await LibSessionUtil.initializeLibSessionUtilWrappers();
-  } catch (e) {
-    window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
-  }
+
   window?.log?.info('dispatching registration event');
   trigger('registration_done');
 }

From bf2456df8ecca13b9595c6f2e5a17741ff7481af Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 16 Mar 2023 10:49:06 +1100
Subject: [PATCH 045/178] chore: do not store mentionedUs and unreadCount as
 attribute in convo

---
 _locales/en/messages.json                     |   2 +
 ts/components/SessionInboxView.tsx            |   3 -
 .../message-content/MessageContent.tsx        |   6 +-
 .../message/message-item/ReadableMessage.tsx  |  28 +-
 ts/components/dialog/InviteContactsDialog.tsx |   2 +-
 .../dialog/UpdateGroupMembersDialog.tsx       |  15 +-
 ts/components/leftpane/ActionsPanel.tsx       |   6 +-
 .../conversation-list-item/HeaderItem.tsx     | 169 ++-
 .../conversation-list-item/MessageItem.tsx    |  33 +-
 .../menu/ConversationListItemContextMenu.tsx  |   2 +
 ts/components/menu/Menu.tsx                   |  25 +-
 ts/data/data.ts                               |  37 +-
 ts/data/dataInit.ts                           |   1 +
 ts/data/settings-key.ts                       |   3 +
 ts/hooks/useParamSelector.ts                  |  42 +-
 ts/interactions/conversationInteractions.ts   |   4 +-
 .../conversations/unsendingInteractions.ts    |   2 +-
 ts/models/conversation.ts                     | 456 ++++----
 ts/models/conversationAttributes.ts           |  51 +-
 ts/models/message.ts                          | 132 ++-
 ts/node/database_utility.ts                   |  30 +-
 ts/node/migration/sessionMigrations.ts        |  64 +-
 ts/node/sql.ts                                | 196 +++-
 ts/receiver/attachments.ts                    |   2 +-
 ts/receiver/configMessage.ts                  |  70 +-
 ts/receiver/queuedJob.ts                      |  83 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   2 +-
 .../opengroupV2/OpenGroupServerPoller.ts      |   6 +-
 .../open_group_api/sogsv3/knownBlindedkeys.ts |   5 +-
 .../open_group_api/sogsv3/sogsV3BatchPoll.ts  |   3 +-
 .../sogsv3/sogsV3Capabilities.ts              |  18 +-
 .../open_group_api/sogsv3/sogsV3FetchFile.ts  |   2 +-
 .../sogsv3/sogsV3MutationCache.ts             |  12 +-
 .../open_group_api/sogsv3/sogsV3RoomInfos.ts  |   6 +-
 .../open_group_api/sogsv3/sogsV3SendFile.ts   |   2 +-
 .../sogsv3/sogsV3SendReaction.ts              |   3 +-
 ts/session/apis/snode_api/getNetworkTime.ts   |   2 +-
 ts/session/apis/snode_api/retrieveRequest.ts  |  12 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  37 +-
 .../conversations/ConversationController.ts   |  48 +-
 .../crypto/DecryptedAttachmentsManager.ts     |   4 +-
 ts/session/group/closed-group.ts              |   7 +-
 .../jobs/ConfigurationSyncDumpJob.ts          |   4 +-
 .../utils/libsession/libsession_utils.ts      |   3 +-
 .../libsession_utils_convo_info_volatile.ts   | 151 +--
 .../libsession_utils_user_groups.ts           |  22 +-
 ts/state/ducks/conversations.ts               |  16 +-
 ts/state/selectors/conversations.ts           |  25 +-
 ts/state/selectors/section.ts                 |   4 +
 .../unit/models/ConversationModels_test.ts    |  56 +-
 .../models/formatRowOfConversation_test.ts    | 180 ++--
 .../session/unit/onion/OnionErrors_test.ts    |   3 +-
 .../unit/selectors/conversations_test.ts      |  10 -
 ts/test/session/unit/sogsv3/ApiUtil_test.ts   |   5 +-
 .../unit/sogsv3/knownBlindedKeys_test.ts      |   5 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   |   4 +-
 ts/test/session/unit/utils/Messages_test.ts   |  29 +-
 ts/types/LocalizerKeys.ts                     | 977 +++++++++---------
 ts/types/sqlSharedTypes.ts                    |  20 +-
 ts/util/attachmentsUtil.ts                    |   6 +-
 ts/util/reactions.ts                          |   9 +-
 .../browser/libsession_worker_interface.ts    |  12 +
 62 files changed, 1692 insertions(+), 1482 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index beeefcc03..55e74ab10 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -411,7 +411,9 @@
   "trustThisContactDialogTitle": "Trust $name$?",
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
+
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index 9feb12f6e..f2b29b113 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -124,9 +124,6 @@ export class SessionInboxView extends React.Component<any, State> {
     this.store = createStore(initialState);
     window.inboxStore = this.store;
 
-    console.warn('initialState', JSON.stringify(initialState));
-    console.warn('this.store', JSON.stringify(this.store.getState()));
-
     window.openConversationWithMessages = openConversationWithMessages;
 
     this.setState({ isInitialLoadComplete: true });
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index 28ad3d166..ecebf8408 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -1,9 +1,10 @@
 import classNames from 'classnames';
+import { isEmpty } from 'lodash';
 import moment from 'moment';
 import React, { createContext, useCallback, useContext, useLayoutEffect, useState } from 'react';
 import { InView } from 'react-intersection-observer';
 import { useSelector } from 'react-redux';
-import { isEmpty } from 'lodash';
+import styled, { css } from 'styled-components';
 import { MessageModelType, MessageRenderingProps } from '../../../../models/messageType';
 import {
   getMessageContentSelectorProps,
@@ -11,12 +12,11 @@ import {
   getQuotedMessageToAnimate,
   getShouldHighlightMessage,
 } from '../../../../state/selectors/conversations';
+import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
 import { MessageAttachment } from './MessageAttachment';
 import { MessageLinkPreview } from './MessageLinkPreview';
 import { MessageQuote } from './MessageQuote';
 import { MessageText } from './MessageText';
-import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
-import styled, { css } from 'styled-components';
 
 export type MessageContentSelectorProps = Pick<
   MessageRenderingProps,
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index a57cead51..4d4927720 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -3,6 +3,7 @@ import React, { useCallback, useContext, useLayoutEffect, useState } from 'react
 import { InView } from 'react-intersection-observer';
 import { useDispatch, useSelector } from 'react-redux';
 import { Data } from '../../../../data/data';
+import { useHasUnread } from '../../../../hooks/useParamSelector';
 import { getConversationController } from '../../../../session/conversations';
 import {
   fetchBottomMessagesForConversation,
@@ -12,7 +13,6 @@ import {
 } from '../../../../state/ducks/conversations';
 import {
   areMoreMessagesBeingFetched,
-  getConversationHasUnread,
   getLoadedMessagesLength,
   getMostRecentMessageId,
   getOldestMessageId,
@@ -69,9 +69,8 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   const oldestMessageId = useSelector(getOldestMessageId);
   const youngestMessageId = useSelector(getYoungestMessageId);
   const fetchingMoreInProgress = useSelector(areMoreMessagesBeingFetched);
-  const conversationHasUnread = useSelector(getConversationHasUnread);
+  const conversationHasUnread = useHasUnread(selectedConversationKey);
   const scrollButtonVisible = useSelector(getShowScrollButton);
-  const shouldMarkReadWhenVisible = isUnread;
 
   const [didScroll, setDidScroll] = useState(false);
   const quotedMessageToAnimate = useSelector(getQuotedMessageToAnimate);
@@ -106,7 +105,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
           dispatch(showScrollToBottomButton(false));
           getConversationController()
             .get(selectedConversationKey)
-            ?.markRead(receivedAt || 0);
+            ?.markConversationRead(receivedAt || 0); // TODO this should be `sentAt || serverTimestamp` I believe?
 
           dispatch(markConversationFullyRead(selectedConversationKey));
         } else if (inView === false) {
@@ -140,21 +139,20 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
           ((inView as any).type === 'focus' && (inView as any).returnValue === true)) &&
         isAppFocused
       ) {
-        if (shouldMarkReadWhenVisible) {
+        if (isUnread) {
+          // TODO this is pretty expensive and should instead use values from the redux store
           const found = await Data.getMessageById(messageId);
 
           if (found && Boolean(found.get('unread'))) {
-            const foundSentAt = found.get('sent_at');
-            // mark the message as read.
-            // this will trigger the expire timer.
-            await found.markRead(Date.now());
-
+            const foundSentAt = found.get('sent_at') || found.get('serverTimestamp');
             // we should stack those and send them in a single message once every 5secs or something.
             // this would be part of an redesign of the sending pipeline
-            if (foundSentAt && selectedConversationKey) {
-              void getConversationController()
+            // mark the whole conversation as read until this point.
+            // this will trigger the expire timer.
+            if (selectedConversationKey && foundSentAt) {
+              getConversationController()
                 .get(selectedConversationKey)
-                ?.sendReadReceiptsIfNeeded([foundSentAt]);
+                ?.markConversationRead(foundSentAt, Date.now());
             }
           }
         }
@@ -168,8 +166,8 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
       isAppFocused,
       loadedMessagesLength,
       receivedAt,
-      shouldMarkReadWhenVisible,
       messageId,
+      isUnread,
     ]
   );
 
@@ -180,7 +178,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
       onContextMenu={onContextMenu}
       className={className}
       as="div"
-      threshold={0.8}
+      threshold={0.5} // consider that more than 50% of the message visible means it is read
       delay={isAppFocused ? 100 : 200}
       onChange={isAppFocused ? onVisible : noop}
       triggerOnce={false}
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index b3002b0b6..8aad39239 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -29,7 +29,7 @@ function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
     throw new Error('submitForOpenGroup group not found');
   }
   try {
-    const roomDetails = SessionUtilUserGroups.getCommunityMappedValueByConvoId(convo.id);
+    const roomDetails = SessionUtilUserGroups.getCommunityByConvoIdCached(convo.id);
     if (!roomDetails) {
       throw new Error(`getCommunityByFullUrl returned no result for ${convo.id}`);
     }
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index 56985d50d..6b6958358 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -112,14 +112,11 @@ const ZombiesList = ({ convoId }: { convoId: string }) => {
 
 // tslint:disable-next-line: max-func-body-length
 async function onSubmit(convoId: string, membersAfterUpdate: Array<string>) {
-  // not ideal to get the props here, but this is not run often
-  const convoProps = getConversationController()
-    .get(convoId)
-    .getConversationModelProps();
-  if (!convoProps || !convoProps.isGroup || convoProps.isPublic) {
+  const convoFound = getConversationController().get(convoId);
+  if (!convoFound || !convoFound.isGroup()) {
     throw new Error('Invalid convo for updateGroupMembersDialog');
   }
-  if (!convoProps.weAreAdmin) {
+  if (!convoFound.isAdmin(UserUtils.getOurPubKeyStrFromCache())) {
     window.log.warn('Skipping update of members, we are not the admin');
     return;
   }
@@ -134,8 +131,8 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array<string>) {
   // We consider that the admin ALWAYS wants to remove zombies (actually they should be removed
   // automatically by him when the LEFT message is received)
 
-  const existingMembers = convoProps.members || [];
-  const existingZombies = convoProps.zombies || [];
+  const existingMembers = convoFound.get('members') || [];
+  const existingZombies = convoFound.get('zombies') || [];
 
   const allExistingMembersWithZombies = _.uniq(existingMembers.concat(existingZombies));
 
@@ -164,7 +161,7 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array<string>) {
 
   void initiateClosedGroupUpdate(
     convoId,
-    convoProps.displayNameInProfile || 'Unknown',
+    convoFound.get('displayNameInProfile') || 'Unknown',
     filteredMembers
   );
 }
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 470f8c668..4b6136673 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -17,7 +17,7 @@ import { clearSearch } from '../../state/ducks/search';
 import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
 import {
   getOurPrimaryConversation,
-  getUnreadMessageCount,
+  getGlobalUnreadMessageCount,
 } from '../../state/selectors/conversations';
 import { getFocusedSection } from '../../state/selectors/section';
 import { getOurNumber } from '../../state/selectors/user';
@@ -50,7 +50,7 @@ import { switchThemeTo } from '../../themes/switchTheme';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
-  const unreadMessageCount = useSelector(getUnreadMessageCount);
+  const globalUnreadMessageCount = useSelector(getGlobalUnreadMessageCount);
   const dispatch = useDispatch();
   const { type } = props;
 
@@ -97,7 +97,7 @@ const Section = (props: { type: SectionType }) => {
     );
   }
 
-  const unreadToShow = type === SectionType.Message ? unreadMessageCount : undefined;
+  const unreadToShow = type === SectionType.Message ? globalUnreadMessageCount : undefined;
 
   switch (type) {
     case SectionType.Message:
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index c6bb9034c..aff79b258 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -1,28 +1,34 @@
 import classNames from 'classnames';
-import React, { useCallback, useContext } from 'react';
+import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../../data/data';
-import { useConversationPropsById, useIsPinned } from '../../../hooks/useParamSelector';
-import { getUsBlindedInThatServer } from '../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { UserUtils } from '../../../session/utils';
+import {
+  useActiveAt,
+  useConversationPropsById,
+  useHasUnread,
+  useIsForcedUnreadWithoutUnreadMsg,
+  useIsPinned,
+  useMentionedUs,
+  useUnreadCount,
+} from '../../../hooks/useParamSelector';
 import {
   openConversationToSpecificMessage,
   openConversationWithMessages,
 } from '../../../state/ducks/conversations';
-import { SectionType } from '../../../state/ducks/section';
 import { isSearching } from '../../../state/selectors/search';
-import { getFocusedSection } from '../../../state/selectors/section';
+import { getIsMessageSection } from '../../../state/selectors/section';
 import { Timestamp } from '../../conversation/Timestamp';
 import { SessionIcon } from '../../icon';
 import { ContextConversationId } from './ConversationListItem';
 import { UserItem } from './UserItem';
 
-const NotificationSettingIcon = (props: { isMessagesSection: boolean }) => {
+const NotificationSettingIcon = () => {
+  const isMessagesSection = useSelector(getIsMessageSection);
   const convoId = useContext(ContextConversationId);
   const convoSetting = useConversationPropsById(convoId)?.currentNotificationSetting;
 
-  if (!props.isMessagesSection) {
+  if (!isMessagesSection) {
     return null;
   }
 
@@ -59,36 +65,22 @@ const StyledConversationListItemIconWrapper = styled.div`
   flex-direction: row;
 `;
 
-function useHeaderItemProps(conversationId: string) {
-  const convoProps = useConversationPropsById(conversationId);
-  if (!convoProps) {
-    return null;
-  }
-  return {
-    isPinned: !!convoProps.isPinned,
-    mentionedUs: convoProps.mentionedUs || false,
-    unreadCount: convoProps.unreadCount || 0,
-    activeAt: convoProps.activeAt,
-  };
-}
-
-const ListItemIcons = () => {
-  const isMessagesSection = useSelector(getFocusedSection) === SectionType.Message;
+const PinIcon = () => {
   const conversationId = useContext(ContextConversationId);
+
+  const isMessagesSection = useSelector(getIsMessageSection);
   const isPinned = useIsPinned(conversationId);
 
-  const pinIcon =
-    isMessagesSection && isPinned ? (
-      <SessionIcon
-        iconType="pin"
-        iconColor={'var(--conversation-tab-text-color)'}
-        iconSize="small"
-      />
-    ) : null;
+  return isMessagesSection && isPinned ? (
+    <SessionIcon iconType="pin" iconColor={'var(--conversation-tab-text-color)'} iconSize="small" />
+  ) : null;
+};
+
+const ListItemIcons = () => {
   return (
     <StyledConversationListItemIconWrapper>
-      {pinIcon}
-      <NotificationSettingIcon isMessagesSection={isMessagesSection} />
+      <PinIcon />
+      <NotificationSettingIcon />
     </StyledConversationListItemIconWrapper>
   );
 };
@@ -119,80 +111,87 @@ const MentionAtSymbol = styled.span`
   }
 `;
 
+/**
+ * When clicking on the `@` symbol of a conversation, we open the conversation to the first unread message tagging us (with the @pubkey syntax)
+ */
+async function openConvoToLastMention(
+  e: React.MouseEvent<HTMLSpanElement>,
+  conversationId: string
+) {
+  e.stopPropagation();
+  e.preventDefault();
+
+  // mousedown is invoked sooner than onClick, but for both right and left click
+  if (e.button === 0) {
+    const oldestMessageUnreadWithMention =
+      (await Data.getFirstUnreadMessageWithMention(conversationId)) || null;
+    if (oldestMessageUnreadWithMention) {
+      await openConversationToSpecificMessage({
+        conversationKey: conversationId,
+        messageIdToNavigateTo: oldestMessageUnreadWithMention,
+        shouldHighlightMessage: true,
+      });
+    } else {
+      window.log.info('cannot open to latest mention as no unread mention are found');
+      await openConversationWithMessages({
+        conversationKey: conversationId,
+        messageId: null,
+      });
+    }
+  }
+}
+
+const AtSymbol = ({ convoId }: { convoId: string }) => {
+  const hasMentionedUs = useMentionedUs(convoId);
+  const hasUnread = useHasUnread(convoId);
+
+  return hasMentionedUs && hasUnread ? (
+    <MentionAtSymbol
+      title="Open to latest mention"
+      onMouseDown={e => openConvoToLastMention(e, convoId)}
+    >
+      @
+    </MentionAtSymbol>
+  ) : null;
+};
+
+const UnreadCount = ({ convoId }: { convoId: string }) => {
+  const unreadMsgCount = useUnreadCount(convoId);
+  const forcedUnread = useIsForcedUnreadWithoutUnreadMsg(convoId);
+
+  return unreadMsgCount > 0 || forcedUnread ? (
+    <p className="module-conversation-list-item__unread-count">{unreadMsgCount || ' '}</p>
+  ) : null;
+};
+
 export const ConversationListItemHeaderItem = () => {
   const conversationId = useContext(ContextConversationId);
 
   const isSearchingMode = useSelector(isSearching);
 
-  const convoProps = useHeaderItemProps(conversationId);
-
-  const openConvoToLastMention = useCallback(
-    async (e: React.MouseEvent<HTMLDivElement>) => {
-      e.stopPropagation();
-      e.preventDefault();
-
-      // mousedown is invoked sooner than onClick, but for both right and left click
-      if (e.button === 0) {
-        const usInThatConversation =
-          getUsBlindedInThatServer(conversationId) || UserUtils.getOurPubKeyStrFromCache();
-
-        const oldestMessageUnreadWithMention =
-          (await Data.getFirstUnreadMessageWithMention(conversationId, usInThatConversation)) ||
-          null;
-        if (oldestMessageUnreadWithMention) {
-          await openConversationToSpecificMessage({
-            conversationKey: conversationId,
-            messageIdToNavigateTo: oldestMessageUnreadWithMention,
-            shouldHighlightMessage: true,
-          });
-        } else {
-          window.log.info('cannot open to latest mention as no unread mention are found');
-          await openConversationWithMessages({
-            conversationKey: conversationId,
-            messageId: null,
-          });
-        }
-      }
-    },
-    [conversationId]
-  );
-
-  if (!convoProps) {
-    return null;
-  }
-  const { unreadCount, mentionedUs, activeAt } = convoProps;
-
-  let atSymbol = null;
-  let unreadCountDiv = null;
-  if (unreadCount > 0) {
-    atSymbol = mentionedUs ? (
-      <MentionAtSymbol title="Open to latest mention" onMouseDown={openConvoToLastMention}>
-        @
-      </MentionAtSymbol>
-    ) : null;
-    unreadCountDiv = <p className="module-conversation-list-item__unread-count">{unreadCount}</p>;
-  }
+  const hasUnread = useHasUnread(conversationId);
+  const activeAt = useActiveAt(conversationId);
 
   return (
     <div className="module-conversation-list-item__header">
       <div
         className={classNames(
           'module-conversation-list-item__header__name',
-          unreadCount > 0 ? 'module-conversation-list-item__header__name--with-unread' : null
+          hasUnread ? 'module-conversation-list-item__header__name--with-unread' : null
         )}
       >
         <UserItem />
       </div>
       <ListItemIcons />
 
-      {unreadCountDiv}
-      {atSymbol}
+      <UnreadCount convoId={conversationId} />
+      <AtSymbol convoId={conversationId} />
 
       {!isSearchingMode && (
         <div
           className={classNames(
             'module-conversation-list-item__header__date',
-            unreadCount > 0 ? 'module-conversation-list-item__header__date--has-unread' : null
+            hasUnread ? 'module-conversation-list-item__header__date--has-unread' : null
           )}
         >
           <Timestamp timestamp={activeAt} isConversationListItem={true} momentFromNow={true} />
diff --git a/ts/components/leftpane/conversation-list-item/MessageItem.tsx b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
index 59e60a0eb..f4905910c 100644
--- a/ts/components/leftpane/conversation-list-item/MessageItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
@@ -1,7 +1,12 @@
 import classNames from 'classnames';
 import React, { useContext } from 'react';
 import { isEmpty } from 'lodash';
-import { useConversationPropsById, useIsPrivate } from '../../../hooks/useParamSelector';
+import {
+  useConversationPropsById,
+  useHasUnread,
+  useIsPrivate,
+  useIsTyping,
+} from '../../../hooks/useParamSelector';
 import { MessageBody } from '../../conversation/message/message-content/MessageBody';
 import { OutgoingMessageStatus } from '../../conversation/message/message-content/OutgoingMessageStatus';
 import { TypingAnimation } from '../../conversation/TypingAnimation';
@@ -9,31 +14,25 @@ import { ContextConversationId } from './ConversationListItem';
 import { useSelector } from 'react-redux';
 import { isSearching } from '../../../state/selectors/search';
 
-function useMessageItemProps(convoId: string) {
+function useLastMessageFromConvo(convoId: string) {
   const convoProps = useConversationPropsById(convoId);
   if (!convoProps) {
     return null;
   }
-  return {
-    isTyping: !!convoProps.isTyping,
-    lastMessage: convoProps.lastMessage,
-    unreadCount: convoProps.unreadCount || 0,
-  };
+  return convoProps.lastMessage;
 }
 
 export const MessageItem = (props: { isMessageRequest: boolean }) => {
   const conversationId = useContext(ContextConversationId);
-  const convoProps = useMessageItemProps(conversationId);
-
+  const lastMessage = useLastMessageFromConvo(conversationId);
   const isGroup = !useIsPrivate(conversationId);
 
-  const isSearchingMode = useSelector(isSearching);
-  if (!convoProps) {
-    return null;
-  }
-  const { lastMessage, isTyping, unreadCount } = convoProps;
+  const hasUnread = useHasUnread(conversationId);
+  const isConvoTyping = useIsTyping(conversationId);
 
-  if (!lastMessage && !isTyping) {
+  const isSearchingMode = useSelector(isSearching);
+
+  if (!lastMessage && !isConvoTyping) {
     return null;
   }
   const text = lastMessage?.text || '';
@@ -47,10 +46,10 @@ export const MessageItem = (props: { isMessageRequest: boolean }) => {
       <div
         className={classNames(
           'module-conversation-list-item__message__text',
-          unreadCount > 0 ? 'module-conversation-list-item__message__text--has-unread' : null
+          hasUnread ? 'module-conversation-list-item__message__text--has-unread' : null
         )}
       >
-        {isTyping ? (
+        {isConvoTyping ? (
           <TypingAnimation />
         ) : (
           <MessageBody text={text} disableJumbomoji={true} disableLinks={true} isGroup={isGroup} />
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 7f91d0b62..29b1a01c0 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -15,6 +15,7 @@ import {
   InviteContactMenuItem,
   LeaveGroupMenuItem,
   MarkAllReadMenuItem,
+  MarkConversationUnreadMenuItem,
   NotificationForConvoMenuItem,
   PinConversationMenuItem,
   ShowUserDetailsMenuItem,
@@ -39,6 +40,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
         <BlockMenuItem />
         <CopyMenuItem />
         <MarkAllReadMenuItem />
+        <MarkConversationUnreadMenuItem />
         <ChangeNicknameMenuItem />
         <ClearNicknameMenuItem />
         <DeleteMessagesMenuItem />
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index e671e0add..9ca5153dd 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -12,6 +12,7 @@ import {
   useIsKickedFromGroup,
   useIsLeft,
   useIsMe,
+  useIsPinned,
   useIsPrivate,
   useIsPublic,
   useIsRequest,
@@ -47,9 +48,8 @@ import {
   updateConfirmModal,
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
-import { SectionType } from '../../state/ducks/section';
 import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
-import { getFocusedSection } from '../../state/selectors/section';
+import { getIsMessageSection } from '../../state/selectors/section';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButtonColor } from '../basic/SessionButton';
@@ -175,12 +175,12 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
 
 export const PinConversationMenuItem = (): JSX.Element | null => {
   const conversationId = useContext(ContextConversationId);
-  const isMessagesSection = useSelector(getFocusedSection) === SectionType.Message;
+  const isMessagesSection = useSelector(getIsMessageSection);
   const isRequest = useIsRequest(conversationId);
+  const isPinned = useIsPinned(conversationId);
 
   if (isMessagesSection && !isRequest) {
     const conversation = getConversationController().get(conversationId);
-    const isPinned = conversation?.isPinned() || false;
 
     const togglePinConversation = async () => {
       await conversation?.setIsPinned(!isPinned);
@@ -192,6 +192,23 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
   return null;
 };
 
+export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
+  const conversationId = useContext(ContextConversationId);
+  const isMessagesSection = useSelector(getIsMessageSection);
+  const isRequest = useIsRequest(conversationId);
+
+  if (isMessagesSection && !isRequest) {
+    const conversation = getConversationController().get(conversationId);
+
+    const markUnread = async () => {
+      await conversation?.markAsUnread(true);
+    };
+
+    return <Item onClick={markUnread}>{window.i18n('markUnread')}</Item>;
+  }
+  return null;
+};
+
 export const DeleteContactMenuItem = () => {
   const dispatch = useDispatch();
   const convoId = useContext(ContextConversationId);
diff --git a/ts/data/data.ts b/ts/data/data.ts
index d6467b315..c76c82ca4 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -3,7 +3,7 @@
 
 import _ from 'lodash';
 import { MessageResultProps } from '../components/search/MessageSearchResults';
-import { ConversationCollection, ConversationModel } from '../models/conversation';
+import { ConversationModel } from '../models/conversation';
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { MessageCollection, MessageModel } from '../models/message';
 import { MessageAttributes, MessageDirection } from '../models/messageType';
@@ -15,6 +15,7 @@ import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/uti
 import {
   AsyncWrapper,
   MsgDuplicateSearchOpenGroup,
+  SaveConversationReturn,
   UnprocessedDataNode,
   UpdateLastHashType,
 } from '../types/sqlSharedTypes';
@@ -23,6 +24,7 @@ import { Storage } from '../util/storage';
 import { channels } from './channels';
 import * as dataInit from './dataInit';
 import { cleanData } from './dataUtils';
+import { SNODE_POOL_ITEM_ID } from './settings-key';
 
 const ERASE_SQL_KEY = 'erase-sql-key';
 const ERASE_ATTACHMENTS_KEY = 'erase-attachments';
@@ -141,7 +143,7 @@ async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: string): P
 }
 
 // Conversation
-async function saveConversation(data: ConversationAttributes): Promise<void> {
+async function saveConversation(data: ConversationAttributes): Promise<SaveConversationReturn> {
   const cleaned = cleanData(data) as ConversationAttributes;
   /**
    * Merging two conversations in `handleMessageRequestResponse` introduced a bug where we would mark conversation active_at to be -Infinity.
@@ -151,7 +153,11 @@ async function saveConversation(data: ConversationAttributes): Promise<void> {
     cleaned.active_at = Date.now();
   }
 
-  await channels.saveConversation(cleaned);
+  return channels.saveConversation(cleaned);
+}
+
+async function fetchConvoMemoryDetails(convoId: string): Promise<SaveConversationReturn> {
+  return channels.fetchConvoMemoryDetails(convoId);
 }
 
 async function getConversationById(id: string): Promise<ConversationModel | undefined> {
@@ -173,12 +179,12 @@ async function removeConversation(id: string): Promise<void> {
   }
 }
 
-async function getAllConversations(): Promise<ConversationCollection> {
-  const conversations = await channels.getAllConversations();
+async function getAllConversations(): Promise<Array<ConversationModel>> {
+  const conversationsAttrs = (await channels.getAllConversations()) as Array<
+    ConversationAttributes
+  >;
 
-  const collection = new ConversationCollection();
-  collection.add(conversations);
-  return collection;
+  return conversationsAttrs.map(attr => new ConversationModel(attr));
 }
 
 /**
@@ -356,8 +362,11 @@ async function getMessageBySenderAndTimestamp({
   return new MessageModel(messages[0]);
 }
 
-async function getUnreadByConversation(conversationId: string): Promise<MessageCollection> {
-  const messages = await channels.getUnreadByConversation(conversationId);
+async function getUnreadByConversation(
+  conversationId: string,
+  sentBeforeTimestamp: number
+): Promise<MessageCollection> {
+  const messages = await channels.getUnreadByConversation(conversationId, sentBeforeTimestamp);
   return new MessageCollection(messages);
 }
 
@@ -470,10 +479,9 @@ async function getFirstUnreadMessageIdInConversation(
 }
 
 async function getFirstUnreadMessageWithMention(
-  conversationId: string,
-  ourPubkey: string
+  conversationId: string
 ): Promise<string | undefined> {
-  return channels.getFirstUnreadMessageWithMention(conversationId, ourPubkey);
+  return channels.getFirstUnreadMessageWithMention(conversationId);
 }
 
 async function hasConversationOutgoingMessage(conversationId: string): Promise<boolean> {
@@ -633,8 +641,6 @@ async function getMessagesWithFileAttachments(
   return channels.getMessagesWithFileAttachments(conversationId, limit);
 }
 
-export const SNODE_POOL_ITEM_ID = 'SNODE_POOL_ITEM_ID';
-
 async function getSnodePoolFromDb(): Promise<Array<Snode> | null> {
   // this is currently all stored as a big string as we don't really need to do anything with them (no filtering or anything)
   // everything is made in memory and written to disk
@@ -755,6 +761,7 @@ export const Data = {
   addClosedGroupEncryptionKeyPair,
   removeAllClosedGroupEncryptionKeyPairs,
   saveConversation,
+  fetchConvoMemoryDetails,
   getConversationById,
   removeConversation,
   getAllConversations,
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index fc3646fb8..e87fbaaec 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -26,6 +26,7 @@ const channelsToMake = new Set([
   'getSwarmNodesForPubkey',
   'updateSwarmNodesForPubkey',
   'saveConversation',
+  'fetchConvoMemoryDetails',
   'getConversationById',
   'removeConversation',
   'getAllConversations',
diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts
index ab853d11a..de2d43fb7 100644
--- a/ts/data/settings-key.ts
+++ b/ts/data/settings-key.ts
@@ -22,3 +22,6 @@ export const SettingsKey = {
   settingsNotification,
   settingsAudioNotification,
 };
+
+export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';
+export const SNODE_POOL_ITEM_ID = 'SNODE_POOL_ITEM_ID';
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 2a5706af6..ef57f7ff5 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,4 +1,4 @@
-import { pick } from 'lodash';
+import { isEmpty, pick } from 'lodash';
 import { useSelector } from 'react-redux';
 import { ConversationModel } from '../models/conversation';
 import { PubKey } from '../session/types';
@@ -88,7 +88,7 @@ export function useIsBlinded(convoId?: string) {
 
 export function useHasNickname(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
-  return Boolean(convoProps && convoProps.hasNickname);
+  return Boolean(convoProps && !isEmpty(convoProps.nickname));
 }
 
 export function useNotificationSetting(convoId?: string) {
@@ -105,9 +105,13 @@ export function useIsBlocked(convoId?: string) {
   return Boolean(convoProps && convoProps.isBlocked);
 }
 
-export function useIsActive(convoId?: string) {
+export function useActiveAt(convoId?: string): number | undefined {
   const convoProps = useConversationPropsById(convoId);
-  return Boolean(convoProps && convoProps.activeAt);
+  return convoProps?.activeAt;
+}
+
+export function useIsActive(convoId?: string) {
+  return !!useActiveAt(convoId);
 }
 
 export function useIsLeft(convoId?: string) {
@@ -183,3 +187,33 @@ export function useMessageReactsPropsById(messageId?: string) {
     return messageReactsProps;
   });
 }
+
+export function useUnreadCount(conversationId?: string): number {
+  const convoProps = useConversationPropsById(conversationId);
+  return convoProps?.unreadCount || 0;
+}
+
+export function useHasUnread(conversationId?: string): boolean {
+  return useUnreadCount(conversationId) > 0;
+}
+
+export function useIsForcedUnreadWithoutUnreadMsg(conversationId?: string): boolean {
+  const convoProps = useConversationPropsById(conversationId);
+  return convoProps?.isMarkedUnread || false;
+}
+
+function useMentionedUsNoUnread(conversationId?: string) {
+  const convoProps = useConversationPropsById(conversationId);
+  return convoProps?.mentionedUs || false;
+}
+
+export function useMentionedUs(conversationId?: string): boolean {
+  const hasMentionedUs = useMentionedUsNoUnread(conversationId);
+  const hasUnread = useHasUnread(conversationId);
+
+  return hasMentionedUs && hasUnread;
+}
+
+export function useIsTyping(conversationId?: string): boolean {
+  return useConversationPropsById(conversationId)?.isTyping || false;
+}
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index afeeaaa38..1f8e13d02 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -40,7 +40,7 @@ import { leaveClosedGroup } from '../session/group/closed-group';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
-    const fromWrapper = SessionUtilUserGroups.getCommunityMappedValueByConvoId(convoId);
+    const fromWrapper = SessionUtilUserGroups.getCommunityByConvoIdCached(convoId);
 
     if (!fromWrapper) {
       throw new Error('opengroup to copy was not found in the UserGroupsWrapper');
@@ -280,8 +280,6 @@ export async function deleteAllMessagesByConvoIdNoConfirmation(conversationId: s
   // conversation still appears on the conversation list but is empty
   conversation.set({
     lastMessage: null,
-    unreadCount: 0,
-    mentionedUs: false,
   });
 
   await conversation.commit();
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 887a8a67e..6f42572b5 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -204,7 +204,7 @@ export async function deleteMessageLocallyOnly({
   } else {
     // just mark the message as deleted but still show in conversation
     await message.markAsDeleted();
-    await message.markRead(Date.now());
+    await message.markMessageAsRead(Date.now());
   }
   conversation.updateLastMessage();
 }
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 4e90f7f5a..ad0d10a3c 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -3,14 +3,12 @@ import Backbone from 'backbone';
 import {
   debounce,
   defaults,
-  filter,
   includes,
   isArray,
   isEmpty,
   isEqual,
   isNumber,
   isString,
-  map,
   sortBy,
   throttle,
   uniq,
@@ -59,13 +57,10 @@ import { OpenGroupData } from '../data/opengroups';
 import { SettingsKey } from '../data/settings-key';
 import {
   findCachedOurBlindedPubkeyOrLookItUp,
+  getUsBlindedInThatServer,
   isUsAnySogsFromCache,
 } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding';
-import {
-  roomHasBlindEnabled,
-  roomHasReactionsEnabled,
-} from '../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
 import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
@@ -92,7 +87,12 @@ import {
 } from '../types/MessageAttachment';
 import { IMAGE_JPEG } from '../types/MIME';
 import { Reaction } from '../types/Reaction';
-import { assertUnreachable } from '../types/sqlSharedTypes';
+import {
+  assertUnreachable,
+  roomHasBlindEnabled,
+  roomHasReactionsEnabled,
+  SaveConversationReturn,
+} from '../types/sqlSharedTypes';
 import { Notifications } from '../util/notifications';
 import { Reactions } from '../util/reactions';
 import { Registration } from '../util/registration';
@@ -114,17 +114,24 @@ import {
   getSubscriberCountOutsideRedux,
 } from '../state/selectors/sogsRoomInfo';
 
+type InMemoryConvoInfos = {
+  mentionedUs: boolean;
+  unreadCount: number;
+  lastReadTimestampMessage: number | null;
+};
+
+const inMemoryConvoInfos: Map<string, InMemoryConvoInfos> = new Map();
+
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
   public throttledBumpTyping: () => void;
   public throttledNotify: (message: MessageModel) => void;
-  public markRead: (newestUnreadDate: number, providedOptions?: any) => void;
+  public markConversationRead: (newestUnreadDate: number, readAt?: number) => void;
   public initialPromise: any;
 
   private typingRefreshTimer?: NodeJS.Timeout | null;
   private typingPauseTimer?: NodeJS.Timeout | null;
   private typingTimer?: NodeJS.Timeout | null;
-  private lastReadTimestamp: number;
 
   private pending?: Promise<any>;
 
@@ -143,26 +150,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     });
 
     this.throttledNotify = debounce(this.notify, 2000, { maxWait: 2000, trailing: true });
-    //start right away the function is called, and wait 1sec before calling it again
-    const markReadDebounced = debounce(this.markReadBouncy, 1000, {
+    // start right away the function is called, and wait 1sec before calling it again
+    this.markConversationRead = debounce(this.markConversationReadBouncy, 1000, {
       leading: true,
       trailing: true,
     });
-    this.markRead = (newestUnreadDate: number) => {
-      const lastReadTimestamp = this.lastReadTimestamp;
-      if (newestUnreadDate > lastReadTimestamp) {
-        this.lastReadTimestamp = newestUnreadDate;
-      }
-
-      if (newestUnreadDate !== lastReadTimestamp) {
-        void markReadDebounced(newestUnreadDate);
-      }
-    };
-    // Listening for out-of-band data updates
 
     this.typingRefreshTimer = null;
     this.typingPauseTimer = null;
-    this.lastReadTimestamp = 0;
     window.inboxStore?.dispatch(
       conversationChanged({ id: this.id, data: this.getConversationModelProps() })
     );
@@ -296,11 +291,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
   // tslint:disable-next-line: cyclomatic-complexity max-func-body-length
   public getConversationModelProps(): ReduxConversationType {
-    const groupAdmins = this.getGroupAdmins();
     const groupModerators = this.getGroupModerators();
     const isPublic = this.isPublic();
 
-    const members = this.isClosedGroup() ? this.get('members') : [];
     const zombies = this.isClosedGroup() ? this.get('zombies') : [];
     const ourNumber = UserUtils.getOurPubKeyStrFromCache();
     const avatarPath = this.getAvatarPath();
@@ -310,11 +303,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const weAreModerator = this.isModerator(ourNumber); // only used for sogs
     const isMe = this.isMe();
     const isTyping = !!this.typingTimer;
-    const unreadCount = this.get('unreadCount') || undefined;
-    const mentionedUs = this.get('mentionedUs') || undefined;
+    // const unreadCount = this.get('unreadCount') || undefined;
+    // const mentionedUs = this.get('mentionedUs') || undefined;
     const isKickedFromGroup = !!this.get('isKickedFromGroup');
     const left = !!this.get('left');
-    const expireTimer = this.get('expireTimer');
     const currentNotificationSetting = this.get('triggerNotificationsFor');
 
     // To reduce the redux store size, only set fields which cannot be undefined.
@@ -324,6 +316,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       activeAt: this.get('active_at'),
       type: this.get('type'),
       isHidden: !!this.get('hidden'),
+      isMarkedUnread: !!this.get('markedAsUnread'),
     };
 
     if (isPrivate) {
@@ -357,9 +350,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     const foundContact = SessionUtilContact.getMappedValue(this.id);
-    const foundCommunity = SessionUtilUserGroups.getCommunityMappedValueByConvoId(this.id);
-    const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupMappedValueByConvoId(this.id);
-    const foundVolatileInfo = SessionUtilConvoInfoVolatile.getFromAny(this.id);
+    const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
+    const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
+    const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
 
     if (foundContact) {
       if (foundContact.name) {
@@ -368,7 +361,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
       if (foundContact.nickname) {
         toRet.nickname = foundContact.nickname;
-        toRet.hasNickname = !!toRet.nickname;
       }
 
       if (foundContact.blocked) {
@@ -388,6 +380,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (foundContact.priority > 0) {
         toRet.isPinned = true; // TODO priority also handles sorting
       }
+
+      // TODO expire timer (not in wrapper yet)
     } else {
       if (this.get('displayNameInProfile')) {
         toRet.displayNameInProfile = this.get('displayNameInProfile');
@@ -395,7 +389,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
       if (this.get('nickname')) {
         toRet.nickname = this.get('nickname');
-        toRet.hasNickname = !!toRet.nickname;
       }
 
       if (BlockedNumberController.isBlocked(this.id)) {
@@ -418,18 +411,44 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    // if (foundCommunity) {
-    //   if (foundCommunity.priority > 0) {
-    //     toRet.isPinned = true; // TODO priority also handles sorting
-    //   }
-    // }
+    if (foundLegacyGroup) {
+      toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || [];
+      toRet.groupAdmins =
+        foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || [];
+      toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name)
+        ? undefined
+        : foundLegacyGroup.name;
+      toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds;
 
-    if (unreadCount) {
-      toRet.unreadCount = unreadCount;
+      if (foundLegacyGroup.priority > 0) {
+        toRet.isPinned = Boolean(foundLegacyGroup.priority > 0);
+      }
     }
 
-    if (mentionedUs) {
-      toRet.mentionedUs = mentionedUs;
+    if (foundCommunity) {
+      if (foundCommunity.priority > 0) {
+        toRet.isPinned = true; // TODO priority also handles sorting
+      }
+
+      if (groupModerators?.length) {
+        toRet.groupModerators = uniq(groupModerators);
+      }
+    }
+
+    if (foundVolatileInfo) {
+      if (foundVolatileInfo.unread) {
+        toRet.isMarkedUnread = foundVolatileInfo.unread;
+      }
+    }
+
+    const inMemoryConvoInfo = inMemoryConvoInfos.get(this.id);
+    if (inMemoryConvoInfo) {
+      if (inMemoryConvoInfo.unreadCount) {
+        toRet.unreadCount = inMemoryConvoInfo.unreadCount;
+      }
+      if (inMemoryConvoInfo.mentionedUs) {
+        toRet.mentionedUs = inMemoryConvoInfo.mentionedUs;
+      }
     }
 
     if (isKickedFromGroup) {
@@ -439,22 +458,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.left = left;
     }
 
-    if (groupAdmins && groupAdmins.length) {
-      toRet.groupAdmins = uniq(groupAdmins);
-    }
-
-    if (groupModerators && groupModerators.length) {
-      toRet.groupModerators = uniq(groupModerators);
-    }
-
-    if (members && members.length) {
-      toRet.members = uniq(members);
-    }
-
-    if (expireTimer) {
-      toRet.expireTimer = expireTimer;
-    }
-
     if (
       currentNotificationSetting &&
       currentNotificationSetting !== ConversationNotificationSetting[0]
@@ -466,13 +469,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.zombies = uniq(zombies);
     }
 
-    if (this.isOpenGroupV2()) {
-      const room = OpenGroupData.getV2OpenGroupRoom(this.id);
-      if (room && isArray(room.capabilities) && room.capabilities.length) {
-        toRet.capabilities = room.capabilities;
-      }
-    }
-
     const lastMessageText = this.get('lastMessage');
     if (lastMessageText && lastMessageText.length) {
       const lastMessageStatus = this.get('lastMessageStatus');
@@ -486,10 +482,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async updateGroupAdmins(groupAdmins: Array<string>, shouldCommit: boolean) {
-    const existingAdmins = uniq(sortBy(this.getGroupAdmins()));
-    const newAdmins = uniq(sortBy(groupAdmins));
+    const sortedExistingAdmins = uniq(sortBy(this.getGroupAdmins()));
+    const sortedNewAdmins = uniq(sortBy(groupAdmins));
 
-    if (isEqual(existingAdmins, newAdmins)) {
+    if (isEqual(sortedExistingAdmins, sortedNewAdmins)) {
       return false;
     }
     this.set({ groupAdmins });
@@ -516,10 +512,54 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return true;
   }
 
-  public async getUnreadCount() {
-    const unreadCount = await Data.getUnreadCountByConversation(this.id);
+  /**
+   * Fetches from the Database an update of what are the memory only informations like mentionedUs and the unreadCount, etc
+   */
+  public async refreshInMemoryDetails(providedMemoryDetails?: SaveConversationReturn) {
+    if (!SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(this)) {
+      return;
+    }
+    const memoryDetails = providedMemoryDetails || (await Data.fetchConvoMemoryDetails(this.id));
 
-    return unreadCount;
+    if (!memoryDetails) {
+      inMemoryConvoInfos.delete(this.id);
+      return;
+    }
+    console.warn('memoryDetails', memoryDetails);
+
+    if (!inMemoryConvoInfos.get(this.id)) {
+      inMemoryConvoInfos.set(this.id, {
+        mentionedUs: false,
+        unreadCount: 0,
+        lastReadTimestampMessage: null,
+      });
+    }
+
+    const existing = inMemoryConvoInfos.get(this.id);
+    if (!existing) {
+      return;
+    }
+    let changes = false;
+    if (existing.unreadCount !== memoryDetails.unreadCount) {
+      existing.unreadCount = memoryDetails.unreadCount;
+      changes = true;
+    }
+    if (existing.lastReadTimestampMessage !== memoryDetails.lastReadTimestampMessage) {
+      existing.lastReadTimestampMessage = memoryDetails.lastReadTimestampMessage;
+      changes = true;
+    }
+    if (existing.mentionedUs !== memoryDetails.mentionedUs) {
+      existing.mentionedUs = memoryDetails.mentionedUs;
+      changes = true;
+    }
+
+    if (changes) {
+      this.triggerUIRefresh();
+    }
+  }
+
+  public getCachedLastReadTimestampMessage() {
+    return inMemoryConvoInfos.get(this.id)?.lastReadTimestampMessage || null;
   }
 
   public async queueJob(callback: () => Promise<void>) {
@@ -1049,48 +1089,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     });
   }
 
-  public async bouncyUpdateLastMessage() {
-    if (!this.id || !this.get('active_at')) {
-      return;
-    }
-    const messages = await Data.getLastMessagesByConversation(this.id, 1, true);
-
-    if (!messages || !messages.length) {
-      return;
-    }
-    const lastMessageModel = messages.at(0);
-    const lastMessageStatusModel = lastMessageModel
-      ? lastMessageModel.getMessagePropStatus()
-      : undefined;
-    const lastMessageUpdate = createLastMessageUpdate({
-      lastMessageStatus: lastMessageStatusModel,
-      lastMessageNotificationText: lastMessageModel
-        ? lastMessageModel.getNotificationText()
-        : undefined,
-    });
-
-    if (
-      lastMessageUpdate.lastMessage !== this.get('lastMessage') ||
-      lastMessageUpdate.lastMessageStatus !== this.get('lastMessageStatus')
-    ) {
-      const lastMessageAttribute = this.get('lastMessage');
-      if (
-        lastMessageUpdate.lastMessageStatus === this.get('lastMessageStatus') &&
-        lastMessageUpdate.lastMessage &&
-        lastMessageUpdate.lastMessage.length > 40 &&
-        lastMessageAttribute &&
-        lastMessageAttribute.length > 40 &&
-        lastMessageUpdate.lastMessage.startsWith(lastMessageAttribute)
-      ) {
-        // if status is the same, and text has a long length which starts with the db status, do not trigger an update.
-        // we only store the first 60 chars in the db for the lastMessage attributes (see sql.ts)
-        return;
-      }
-      this.set(lastMessageUpdate);
-      await this.commit();
-    }
-  }
-
   public async updateExpireTimer(
     providedExpireTimer: number | null,
     providedSource?: string,
@@ -1290,118 +1288,36 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
      * (if there is an expireTimer, we do it the slow way, handling each message separately)
      */
     const expireTimerSet = !!this.get('expireTimer');
-    if (this.isOpenGroupV2() || !expireTimerSet) {
-      // for opengroups, we batch everything as there is no expiration timer to take care (and potentially a lot of messages)
+    const isOpenGroup = this.isOpenGroupV2();
+
+    if (isOpenGroup || !expireTimerSet) {
+      // for opengroups, we batch everything as there is no expiration timer to take care of (and potentially a lot of messages)
 
-      const isOpenGroup = this.isOpenGroupV2();
       // if this is an opengroup there is no need to send read receipt, and so no need to fetch messages updated.
-      const allReadMessages = await Data.markAllAsReadByConversationNoExpiration(
+      const allReadMessagesIds = await Data.markAllAsReadByConversationNoExpiration(
         this.id,
         !isOpenGroup
       );
-      this.set({ mentionedUs: false, unreadCount: 0 });
 
+      await this.markAsUnread(false, false);
       await this.commit();
-      if (!this.isOpenGroupV2() && allReadMessages.length) {
-        await this.sendReadReceiptsIfNeeded(uniq(allReadMessages));
+      if (allReadMessagesIds.length) {
+        await this.sendReadReceiptsIfNeeded(uniq(allReadMessagesIds));
       }
       Notifications.clearByConversationID(this.id);
       window.inboxStore?.dispatch(markConversationFullyRead(this.id));
 
       return;
     }
-    // otherwise, do it the slow way
-    await this.markReadBouncy(Date.now());
+
+    // otherwise, do it the slow and expensive way
+    await this.markConversationReadBouncy(Date.now());
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
-  public async markReadBouncy(
-    newestUnreadDate: number,
-    providedOptions: { sendReadReceipts?: boolean; readAt?: number } = {}
-  ) {
-    const lastReadTimestamp = this.lastReadTimestamp;
-    if (newestUnreadDate < lastReadTimestamp) {
-      return;
-    }
-
-    const readAt = providedOptions?.readAt || Date.now();
-    const sendReadReceipts = providedOptions?.sendReadReceipts || true;
-
-    const conversationId = this.id;
-    Notifications.clearByConversationID(conversationId);
-    let allUnreadMessagesInConvo = (await this.getUnread()).models;
-
-    const oldUnreadNowRead = allUnreadMessagesInConvo.filter(
-      message => (message.get('received_at') as number) <= newestUnreadDate
-    );
-
-    let read = [];
-
-    // Build the list of updated message models so we can mark them all as read on a single sqlite call
-    for (const nowRead of oldUnreadNowRead) {
-      nowRead.markReadNoCommit(readAt);
-
-      const errors = nowRead.get('errors');
-      read.push({
-        sender: nowRead.get('source'),
-        timestamp: nowRead.get('sent_at'),
-        hasErrors: Boolean(errors && errors.length),
-      });
-    }
-    const oldUnreadNowReadAttrs = oldUnreadNowRead.map(m => m.attributes);
-    if (oldUnreadNowReadAttrs?.length) {
-      await Data.saveMessages(oldUnreadNowReadAttrs);
-    }
-    const allProps: Array<MessageModelPropsWithoutConvoProps> = [];
-
-    for (const nowRead of oldUnreadNowRead) {
-      allProps.push(nowRead.getMessageModelProps());
-    }
-
-    if (allProps.length) {
-      window.inboxStore?.dispatch(conversationActions.messagesChanged(allProps));
-    }
-    // Some messages we're marking read are local notifications with no sender
-    read = filter(read, m => Boolean(m.sender));
-    const realUnreadCount = await this.getUnreadCount();
-    if (read.length === 0) {
-      if (this.get('unreadCount') !== realUnreadCount) {
-        // reset the unreadCount on the convo to the real one coming from markRead messages on the db
-        this.set({ unreadCount: realUnreadCount });
-        await this.commit();
-      }
-      return;
-    }
-
-    allUnreadMessagesInConvo = allUnreadMessagesInConvo.filter((m: any) => Boolean(m.isIncoming()));
-
-    this.set({ unreadCount: realUnreadCount });
-
-    const mentionRead = (() => {
-      const stillUnread = allUnreadMessagesInConvo.filter(
-        (m: any) => m.get('received_at') > newestUnreadDate
-      );
-      const ourNumber = UserUtils.getOurPubKeyStrFromCache();
-      return !stillUnread.some(m => m.get('body')?.indexOf(`@${ourNumber}`) !== -1);
-    })();
-
-    if (mentionRead) {
-      this.set({ mentionedUs: false });
-    }
-
-    await this.commit();
-
-    // If a message has errors, we don't want to send anything out about it.
-    //   read syncs - let's wait for a client that really understands the message
-    //      to mark it read. we'll mark our local error read locally, though.
-    //   read receipts - here we can run into infinite loops, where each time the
-    //      conversation is viewed, another error message shows up for the contact
-    read = read.filter(item => !item.hasErrors);
-
-    if (read.length && sendReadReceipts) {
-      const timestamps = map(read, 'timestamp').filter(t => !!t) as Array<number>;
-      await this.sendReadReceiptsIfNeeded(timestamps);
-    }
+  public getUsInThatConversation() {
+    const usInThatConversation =
+      getUsBlindedInThatServer(this) || UserUtils.getOurPubKeyStrFromCache();
+    return usInThatConversation;
   }
 
   public async sendReadReceiptsIfNeeded(timestamps: Array<number>) {
@@ -1572,6 +1488,21 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
+  public async markAsUnread(forcedValue: boolean, shouldCommit: boolean = true) {
+    if (!!forcedValue !== !!this.get('markedAsUnread')) {
+      this.set({
+        markedAsUnread: !!forcedValue,
+      });
+      if (shouldCommit) {
+        await this.commit();
+      }
+    }
+  }
+
+  public isMarkedUnread(): boolean {
+    return !!this.get('markedAsUnread');
+  }
+
   public async setIsApproved(value: boolean, shouldCommit: boolean = true) {
     const valueForced = Boolean(value);
 
@@ -1942,8 +1873,104 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       : null;
   }
 
-  private async getUnread() {
-    return Data.getUnreadByConversation(this.id);
+  /**
+   * This call is not debounced and can be quite heavy, so only call it when handling config messages updates
+   */
+  public async markReadFromConfigMessage(newestUnreadDate: number) {
+    return this.markConversationReadBouncy(newestUnreadDate);
+  }
+
+  private async bouncyUpdateLastMessage() {
+    if (!this.id || !this.get('active_at')) {
+      return;
+    }
+    const messages = await Data.getLastMessagesByConversation(this.id, 1, true);
+
+    if (!messages || !messages.length) {
+      return;
+    }
+    const lastMessageModel = messages.at(0);
+    const lastMessageStatusModel = lastMessageModel
+      ? lastMessageModel.getMessagePropStatus()
+      : undefined;
+    const lastMessageUpdate = createLastMessageUpdate({
+      lastMessageStatus: lastMessageStatusModel,
+      lastMessageNotificationText: lastMessageModel
+        ? lastMessageModel.getNotificationText()
+        : undefined,
+    });
+
+    if (
+      lastMessageUpdate.lastMessage !== this.get('lastMessage') ||
+      lastMessageUpdate.lastMessageStatus !== this.get('lastMessageStatus')
+    ) {
+      const lastMessageAttribute = this.get('lastMessage');
+      if (
+        lastMessageUpdate.lastMessageStatus === this.get('lastMessageStatus') &&
+        lastMessageUpdate.lastMessage &&
+        lastMessageUpdate.lastMessage.length > 40 &&
+        lastMessageAttribute &&
+        lastMessageAttribute.length > 40 &&
+        lastMessageUpdate.lastMessage.startsWith(lastMessageAttribute)
+      ) {
+        // if status is the same, and text has a long length which starts with the db status, do not trigger an update.
+        // we only store the first 60 chars in the db for the lastMessage attributes (see sql.ts)
+        return;
+      }
+      this.set(lastMessageUpdate);
+      await this.commit();
+    }
+  }
+
+  private async markConversationReadBouncy(newestUnreadDate: number, readAt: number = Date.now()) {
+    const conversationId = this.id;
+    Notifications.clearByConversationID(conversationId);
+
+    const oldUnreadNowRead = (await this.getUnreadByConversation(newestUnreadDate)).models;
+
+    if (!oldUnreadNowRead.length) {
+      //no new messages where read, no need to do anything
+      return;
+    }
+
+    // Build the list of updated message models so we can mark them all as read on a single sqlite call
+    const readDetails = [];
+    for (const nowRead of oldUnreadNowRead) {
+      nowRead.markMessageReadNoCommit(readAt);
+
+      const validTimestamp = nowRead.get('sent_at') || nowRead.get('serverTimestamp');
+      if (nowRead.get('source') && validTimestamp && isFinite(validTimestamp)) {
+        readDetails.push({
+          sender: nowRead.get('source'),
+          timestamp: validTimestamp,
+        });
+      }
+    }
+    const oldUnreadNowReadAttrs = oldUnreadNowRead.map(m => m.attributes);
+    if (oldUnreadNowReadAttrs?.length) {
+      await Data.saveMessages(oldUnreadNowReadAttrs);
+    }
+    const allProps: Array<MessageModelPropsWithoutConvoProps> = [];
+
+    for (const nowRead of oldUnreadNowRead) {
+      allProps.push(nowRead.getMessageModelProps());
+    }
+
+    if (allProps.length) {
+      window.inboxStore?.dispatch(conversationActions.messagesChanged(allProps));
+    }
+
+    await this.commit();
+
+    if (readDetails.length) {
+      const us = UserUtils.getOurPubKeyStrFromCache();
+      const timestamps = readDetails.filter(m => m.sender !== us).map(m => m.timestamp);
+      await this.sendReadReceiptsIfNeeded(timestamps);
+    }
+  }
+
+  private async getUnreadByConversation(sentBeforeTs: number) {
+    return Data.getUnreadByConversation(this.id, sentBeforeTs);
   }
 
   /**
@@ -1968,8 +1995,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     const messageModelProps = model.getMessageModelProps();
     window.inboxStore?.dispatch(conversationActions.messagesChanged([messageModelProps]));
-    const unreadCount = await this.getUnreadCount();
-    this.set({ unreadCount });
     this.updateLastMessage();
 
     await this.commit();
@@ -2204,7 +2229,8 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   // TODO remove duplicates between db and wrapper (except nickname&name as we need them for search)
   // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
 
-  await Data.saveConversation(convo.attributes);
+  const savedDetails = await Data.saveConversation(convo.attributes);
+  await convo.refreshInMemoryDetails(savedDetails);
 
   for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
     const variant = LibSessionUtil.requiredUserVariants[index];
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index de1e4a4cc..f6f5f00e8 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -37,13 +37,17 @@ export const ConversationNotificationSetting = ['all', 'disabled', 'mentions_onl
 export type ConversationNotificationSettingType = typeof ConversationNotificationSetting[number];
 
 /**
- * Soem fields are retrieved from the database as a select, but should not be saved in a commit()
+ * Some fields are retrieved from the database as a select, but should not be saved in a commit()
+ * TODO (do we, and can we use this)
  */
 export type ConversationAttributesNotSaved = {
   mentionedUs: boolean;
   unreadCount: number;
 };
 
+export type ConversationAttributesWithNotSavedOnes = ConversationAttributes &
+  ConversationAttributesNotSaved;
+
 export interface ConversationAttributes {
   id: string;
   type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV3 | ConversationTypeEnum.GROUP;
@@ -51,17 +55,8 @@ export interface ConversationAttributes {
   // 0 means inactive (undefined and null too but we try to get rid of them and only have 0 = inactive)
   active_at: number;
 
-  displayNameInProfile?: string; // no matter the type of conversation, this is the real name as set by the user/name of the open or closed group
-  nickname?: string; // this is the name WE gave to that user (only applicable to private chats, not closed group neither opengroups)
-
-  profileKey?: string; // Consider this being a hex string if it is set
-
-  members: Array<string>; // members are all members for this group. zombies excluded
-  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin
+  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin TODO to remove
   left: boolean;
-  expireTimer: number;
-  mentionedUs: boolean;
-  unreadCount: number;
   lastMessageStatus: LastMessageStatusType;
 
   /**
@@ -72,27 +67,42 @@ export interface ConversationAttributes {
    */
   lastMessage: string | null;
   lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group
-  groupAdmins: Array<string>; // for sogs and closed group: the admins of that group.
-  groupModerators: Array<string>; // for sogs only, this is the moderator in that room.
+  groupModerators: Array<string>; // for sogs only, this is the moderators in that room.
   isKickedFromGroup: boolean;
 
   is_medium_group: boolean;
 
-  avatarPointer?: string; // this is the url of the avatar on the file server v2. we use this to detect if we need to redownload the avatar from someone (not used for opengroups)
   avatarInProfile?: string; // this is the avatar path locally once downloaded and stored in the application attachments folder
-  avatarImageId?: number; //Avatar imageID is currently used only for opengroupv2. It's the fileID of the image uploaded and set as the sogs avatar
+  avatarImageId?: number; // avatar imageID is currently used only for sogs. It's the fileID of the image uploaded and set as the sogs avatar
 
-  triggerNotificationsFor: ConversationNotificationSettingType;
   isTrustedForAttachmentDownload: boolean;
+
+  /** The community chat this conversation originated from (relevant to **blinded** message requests) */
+  conversationIdOrigin?: string;
+
+  // ===========================================================================
+  // All of the items below are duplicated one way or the other with libsession.
+  // It would be nice to at some point be able to only rely on libsession dumps
+  // for those so there is no need to keep them in sync.
+
+  displayNameInProfile?: string; // no matter the type of conversation, this is the real name as set by the user/name of the open or closed group
+  nickname?: string; // this is the name WE gave to that user (only applicable to private chats, not closed group neither opengroups)
+  profileKey?: string; // Consider this being a hex string if it is set
+  triggerNotificationsFor: ConversationNotificationSettingType;
+  avatarPointer?: string; // this is the url of the avatar on the file server v2. we use this to detect if we need to redownload the avatar from someone (not used for opengroups)
+  expireTimer: number;
+
+  members: Array<string>; // members are all members for this group. zombies excluded
+  groupAdmins: Array<string>; // for sogs and closed group: the admins of that group.
+
   isPinned: boolean;
   isApproved: boolean;
   didApproveMe: boolean;
 
-  /** The open group chat this conversation originated from (if from closed group) */
-  conversationIdOrigin?: string;
-
+  // Force the conversation as unread even if all the messages are read. Used to highlight a conversation the user wants to check again later, synced.
   markedAsUnread: boolean;
 
+  // hides a conversation, but keep it the history and nicknames, etc.
   hidden: boolean;
 }
 
@@ -110,7 +120,6 @@ export const fillConvoAttributesWithDefaults = (
     zombies: [],
     groupAdmins: [],
 
-    unreadCount: 0,
     lastJoinedTimestamp: 0,
     expireTimer: 0,
     active_at: 0,
@@ -125,9 +134,9 @@ export const fillConvoAttributesWithDefaults = (
     isApproved: false,
     didApproveMe: false,
     is_medium_group: false,
-    mentionedUs: false,
     isKickedFromGroup: false,
     left: false,
     hidden: true,
+    markedAsUnread: false,
   });
 };
diff --git a/ts/models/message.ts b/ts/models/message.ts
index ff3c90767..902cb3c04 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -5,7 +5,6 @@ import { SignalService } from '../../ts/protobuf';
 import { getMessageQueue } from '../../ts/session';
 import { getConversationController } from '../../ts/session/conversations';
 import { DataMessage } from '../../ts/session/messages/outgoing';
-import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { PubKey } from '../../ts/session/types';
 import {
   uploadAttachmentsToFileServer,
@@ -13,6 +12,7 @@ import {
   uploadQuoteThumbnailsToFileServer,
   UserUtils,
 } from '../../ts/session/utils';
+import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import {
   DataExtractionNotificationMsg,
   fillMessageAttributesWithDefaults,
@@ -25,8 +25,43 @@ import {
 } from './messageType';
 
 import autoBind from 'auto-bind';
+import {
+  cloneDeep,
+  debounce,
+  groupBy,
+  isEmpty,
+  map,
+  partition,
+  pick,
+  reduce,
+  reject,
+  size as lodashSize,
+  sortBy,
+  uniq,
+} from 'lodash';
 import { Data } from '../../ts/data/data';
-import { ConversationModel } from './conversation';
+import { OpenGroupData } from '../data/opengroups';
+import { SettingsKey } from '../data/settings-key';
+import {
+  findCachedBlindedIdFromUnblinded,
+  isUsAnySogsFromCache,
+} from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
+import { QUOTED_TEXT_MAX_LENGTH } from '../session/constants';
+import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
+import {
+  VisibleMessage,
+  VisibleMessageParams,
+} from '../session/messages/outgoing/visibleMessage/VisibleMessage';
+import {
+  uploadAttachmentsV3,
+  uploadLinkPreviewsV3,
+  uploadQuoteThumbnailsV3,
+} from '../session/utils/AttachmentsV2';
+import { perfEnd, perfStart } from '../session/utils/Performance';
+import { buildSyncMessage } from '../session/utils/sync/syncUtils';
+import { isUsFromCache } from '../session/utils/User';
 import {
   FindAndFormatContactType,
   LastMessageStatusType,
@@ -44,36 +79,8 @@ import {
   PropsForGroupUpdateName,
   PropsForMessageWithoutConvoProps,
 } from '../state/ducks/conversations';
-import {
-  VisibleMessage,
-  VisibleMessageParams,
-} from '../session/messages/outgoing/visibleMessage/VisibleMessage';
-import { buildSyncMessage } from '../session/utils/sync/syncUtils';
-import {
-  uploadAttachmentsV3,
-  uploadLinkPreviewsV3,
-  uploadQuoteThumbnailsV3,
-} from '../session/utils/AttachmentsV2';
-import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
-import { OpenGroupData } from '../data/opengroups';
-import { isUsFromCache } from '../session/utils/User';
-import { perfEnd, perfStart } from '../session/utils/Performance';
 import { AttachmentTypeWithPath, isVoiceMessage } from '../types/Attachment';
-import _, {
-  cloneDeep,
-  debounce,
-  groupBy,
-  isEmpty,
-  map,
-  partition,
-  pick,
-  reduce,
-  reject,
-  size as lodashSize,
-  sortBy,
-  uniq,
-} from 'lodash';
-import { SettingsKey } from '../data/settings-key';
+import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata';
 import {
   deleteExternalMessageFiles,
   getAbsoluteAttachmentPath,
@@ -81,21 +88,13 @@ import {
   loadPreviewData,
   loadQuoteData,
 } from '../types/MessageAttachment';
+import { ReactionList } from '../types/Reaction';
 import { ExpirationTimerOptions } from '../util/expiringMessages';
+import { LinkPreviews } from '../util/linkPreviews';
 import { Notifications } from '../util/notifications';
 import { Storage } from '../util/storage';
-import { LinkPreviews } from '../util/linkPreviews';
-import { roomHasBlindEnabled } from '../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
-import {
-  findCachedBlindedIdFromUnblinded,
-  getUsBlindedInThatServer,
-  isUsAnySogsFromCache,
-} from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { QUOTED_TEXT_MAX_LENGTH } from '../session/constants';
-import { ReactionList } from '../types/Reaction';
-import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata';
-import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
-import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
+import { ConversationModel } from './conversation';
+import { roomHasBlindEnabled } from '../types/sqlSharedTypes';
 // tslint:disable: cyclomatic-complexity
 
 /**
@@ -865,7 +864,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       reacts: undefined,
       reactsIndex: undefined,
     });
-    await this.markRead(Date.now());
+    await this.markMessageAsRead(Date.now());
     await this.commit();
   }
 
@@ -1122,41 +1121,34 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return id;
   }
 
-  public async markRead(readAt: number) {
-    this.markReadNoCommit(readAt);
+  public async markMessageAsRead(readAt: number) {
+    this.markMessageReadNoCommit(readAt);
     await this.commit();
     // the line below makes sure that getNextExpiringMessage will find this message as expiring.
     // getNextExpiringMessage is used on app start to clean already expired messages which should have been removed already, but are not
     await this.setToExpire();
 
-    const convo = this.getConversation();
-    if (convo) {
-      const beforeUnread = convo.get('unreadCount');
-      const unreadCount = await convo.getUnreadCount();
-      const usInThatConversation =
-        getUsBlindedInThatServer(convo) || UserUtils.getOurPubKeyStrFromCache();
-      const nextMentionedUs = await Data.getFirstUnreadMessageWithMention(
-        convo.id,
-        usInThatConversation
-      );
-      let mentionedUsChange = false;
-      if (convo.get('mentionedUs') && !nextMentionedUs) {
-        convo.set('mentionedUs', false);
-        mentionedUsChange = true;
-      }
-      if (beforeUnread !== unreadCount || mentionedUsChange) {
-        convo.set({ unreadCount });
-        await convo.commit();
-      }
-    }
+    this.getConversation()?.refreshInMemoryDetails();
   }
 
-  public markReadNoCommit(readAt: number) {
+  public markMessageReadNoCommit(readAt: number) {
     this.set({ unread: 0 });
 
-    if (this.get('expireTimer') && !this.get('expirationStartTimestamp')) {
+    if (
+      this.get('expireTimer') &&
+      !this.get('expirationStartTimestamp') &&
+      !this.get('expires_at')
+    ) {
       const expirationStartTimestamp = Math.min(Date.now(), readAt || Date.now());
       this.set({ expirationStartTimestamp });
+      const start = this.get('expirationStartTimestamp');
+      const delta = this.get('expireTimer') * 1000;
+      if (!start) {
+        return;
+      }
+      const expiresAt = start + delta;
+      // based on `setToExpire()`
+      this.set({ expires_at: expiresAt });
     }
 
     Notifications.clearByMessageId(this.id);
@@ -1187,8 +1179,8 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return msFromNow;
   }
 
-  public async setToExpire(force = false) {
-    if (this.isExpiring() && (force || !this.get('expires_at'))) {
+  public async setToExpire() {
+    if (this.isExpiring() && !this.get('expires_at')) {
       const start = this.get('expirationStartTimestamp');
       const delta = this.get('expireTimer') * 1000;
       if (!start) {
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index aff2ccb71..52cdcaf4b 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -1,5 +1,8 @@
 import { difference, omit, pick } from 'lodash';
-import { ConversationAttributes } from '../models/conversationAttributes';
+import {
+  ConversationAttributes,
+  ConversationAttributesWithNotSavedOnes,
+} from '../models/conversationAttributes';
 
 import * as BetterSqlite3 from 'better-sqlite3';
 
@@ -78,8 +81,10 @@ const allowedKeysFormatRowOfConversation = [
 // tslint:disable: cyclomatic-complexity
 export function formatRowOfConversation(
   row: Record<string, any>,
-  from: string
-): ConversationAttributes | null {
+  from: string,
+  unreadCount: number,
+  mentionedUs: boolean
+): ConversationAttributesWithNotSavedOnes | null {
   if (!row) {
     return null;
   }
@@ -126,7 +131,6 @@ export function formatRowOfConversation(
   convo.isApproved = Boolean(convo.isApproved);
   convo.didApproveMe = Boolean(convo.didApproveMe);
   convo.is_medium_group = Boolean(convo.is_medium_group);
-  convo.mentionedUs = Boolean(convo.mentionedUs);
   convo.isKickedFromGroup = Boolean(convo.isKickedFromGroup);
   convo.left = Boolean(convo.left);
   convo.markedAsUnread = Boolean(convo.markedAsUnread);
@@ -148,10 +152,6 @@ export function formatRowOfConversation(
     convo.triggerNotificationsFor = 'all';
   }
 
-  if (!convo.unreadCount) {
-    convo.unreadCount = 0;
-  }
-
   if (!convo.lastJoinedTimestamp) {
     convo.lastJoinedTimestamp = 0;
   }
@@ -164,7 +164,11 @@ export function formatRowOfConversation(
     convo.active_at = 0;
   }
 
-  return convo;
+  return {
+    ...convo,
+    mentionedUs,
+    unreadCount,
+  };
 }
 
 const allowedKeysOfConversationAttributes = [
@@ -177,13 +181,11 @@ const allowedKeysOfConversationAttributes = [
   'isApproved',
   'didApproveMe',
   'is_medium_group',
-  'mentionedUs',
   'isKickedFromGroup',
   'left',
   'lastMessage',
   'lastMessageStatus',
   'triggerNotificationsFor',
-  'unreadCount',
   'lastJoinedTimestamp',
   'expireTimer',
   'active_at',
@@ -218,9 +220,9 @@ export function assertValidConversationAttributes(
     console.error(
       `assertValidConversationAttributes: an invalid key was given in the record: ${foundInAttributesButNotInAllowed}`
     );
-    throw new Error(
-      `assertValidConversationAttributes: found a not allowed key: ${foundInAttributesButNotInAllowed[0]}`
-    );
+    // throw new Error(
+    //   `assertValidConversationAttributes: found a not allowed key: ${foundInAttributesButNotInAllowed[0]}`
+    // );
   }
 
   return pick(data, allowedKeysOfConversationAttributes) as ConversationAttributes;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 0dbda50ec..11ddd3769 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,5 +1,4 @@
 import * as BetterSqlite3 from 'better-sqlite3';
-import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
 import { compact, isArray, isEmpty, isString, map, pick } from 'lodash';
 import {
   ContactsConfigWrapperInsideWorker,
@@ -20,8 +19,6 @@ import {
   CONVERSATIONS_TABLE,
   dropFtsAndTriggers,
   GUARD_NODE_TABLE,
-  ITEMS_TABLE,
-  jsonToObject,
   LAST_HASHES_TABLE,
   MESSAGES_TABLE,
   NODES_FOR_PUBKEY_TABLE,
@@ -31,7 +28,7 @@ import {
   toSqliteBoolean,
 } from '../database_utility';
 
-import { sqlNode } from '../sql';
+import { getIdentityKeys, sqlNode } from '../sql';
 
 // tslint:disable: no-console quotemark one-variable-per-declaration
 
@@ -1085,13 +1082,15 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
         `withIpButNotDuplicateConvo: renaming convo old:${r.id} with saveConversation() new- conversationId:${newConvoId}`
       );
       convoIdsToMigrateFromIpToDns.set(r.id, newConvoId);
-      sqlNode.saveConversation(
-        {
-          ...r,
-          id: newConvoId,
-        },
-        db
-      );
+      // commenting this as saveConversation should not be called during migration.
+      // I actually suspect that this code was not working at all.
+      // sqlNode.saveConversation(
+      //   {
+      //     ...r,
+      //     id: newConvoId,
+      //   },
+      //   db
+      // );
     });
 
     /**
@@ -1205,43 +1204,6 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-function getIdentityKeysDuringMigration(db: BetterSqlite3.Database) {
-  const row = db.prepare(`SELECT * FROM ${ITEMS_TABLE} WHERE id = $id;`).get({
-    id: 'identityKey',
-  });
-
-  if (!row) {
-    return null;
-  }
-  try {
-    const parsedIdentityKey = jsonToObject(row.json);
-    if (
-      !parsedIdentityKey?.value?.pubKey ||
-      !parsedIdentityKey?.value?.ed25519KeyPair?.privateKey
-    ) {
-      return null;
-    }
-    const publicKeyBase64 = parsedIdentityKey?.value?.pubKey;
-    const publicKeyHex = to_hex(from_base64(publicKeyBase64, base64_variants.ORIGINAL));
-
-    const ed25519PrivateKeyUintArray = parsedIdentityKey?.value?.ed25519KeyPair?.privateKey;
-
-    // TODO migrate the ed25519KeyPair for all the users already logged in to a base64 representation
-    const privateEd25519 = new Uint8Array(Object.values(ed25519PrivateKeyUintArray));
-
-    if (!privateEd25519 || isEmpty(privateEd25519)) {
-      return null;
-    }
-
-    return {
-      publicKeyHex,
-      privateEd25519,
-    };
-  } catch (e) {
-    return null;
-  }
-}
-
 function insertContactIntoWrapper(
   contact: any,
   blockedNumbers: Array<string>,
@@ -1505,7 +1467,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
     });
 
     try {
-      const keys = getIdentityKeysDuringMigration(db);
+      const keys = getIdentityKeys(db);
 
       const userAlreadyCreated = !!keys && !isEmpty(keys.privateEd25519);
 
@@ -1681,6 +1643,8 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         data: userGroupsDump,
       });
 
+      // TODO add the conversation volatile one with handling of contacts and note to self and reference to `isConvoToStoreInWrapper`
+
       // TODO we've just created the initial dumps. We have to add an initial SyncJob to the database so it is run on the next app start/
       // or find another way of adding one on the next start (store an another item in the DB and check for it on app start?)
     } catch (e) {
@@ -1695,7 +1659,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
     // for manually flagging conversations as :unread"
     db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN markedAsUnread BOOLEAN;`);
 
-    // Didn't find any reference to this serverTimestamp in the unprocessed table needed.
+    // Didn't find any reference to this serverTimestamp in the unprocessed table needed, so let's clean it up
     db.exec(`ALTER TABLE unprocessed DROP COLUMN serverTimestamp;`);
 
     writeSessionSchemaVersion(targetVersion, db);
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 68f122b79..76ffd5df3 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -51,12 +51,14 @@ import { OpenGroupV2Room } from '../data/opengroups';
 import {
   CONFIG_DUMP_TABLE,
   MsgDuplicateSearchOpenGroup,
+  roomHasBlindEnabled,
+  SaveConversationReturn,
   UnprocessedDataNode,
   UnprocessedParameter,
   UpdateLastHashType,
 } from '../types/sqlSharedTypes';
 
-import { SettingsKey } from '../data/settings-key';
+import { KNOWN_BLINDED_KEYS_ITEM, SettingsKey } from '../data/settings-key';
 import {
   getSQLCipherIntegrityCheck,
   openAndMigrateDatabase,
@@ -70,6 +72,7 @@ import {
   isInstanceInitialized,
 } from './sqlInstance';
 import { configDumpData } from './sql_calls/config_dump';
+import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -404,10 +407,14 @@ function getConversationCount() {
   return row['count(*)'];
 }
 
-// tslint:disable-next-line: max-func-body-length
-// tslint:disable-next-line: cyclomatic-complexity
-// tslint:disable-next-line: max-func-body-length
-function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3.Database) {
+/**
+ * Because the argument list can change when saving a conversation (and actually doing a lot of other stuff),
+ * it is not a good idea to try to use it to update a conversation while doing migrations.
+ * Because everytime you'll update the saveConversation with a new argument, the migration you wrote a month ago still relies on the old way.
+ * Because of that, there is no `instance` argument here, and you should not add one as this is only needed during migrations (which will break if you do it)
+ */
+// tslint:disable-next-line: max-func-body-length cyclomatic-complexity
+function saveConversation(data: ConversationAttributes): SaveConversationReturn {
   const formatted = assertValidConversationAttributes(data);
 
   const {
@@ -420,8 +427,6 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     zombies,
     left,
     expireTimer,
-    mentionedUs,
-    unreadCount,
     lastMessageStatus,
     lastMessage,
     lastJoinedTimestamp,
@@ -455,7 +460,7 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
     isString(lastMessage) && lastMessage.length > maxLength
       ? lastMessage.substring(0, maxLength)
       : lastMessage;
-  assertGlobalInstanceOrInstance(instance)
+  assertGlobalInstance()
     .prepare(
       `INSERT OR REPLACE INTO ${CONVERSATIONS_TABLE} (
 	${columnsCommaSeparated}
@@ -473,8 +478,6 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       zombies: zombies && zombies.length ? arrayStrToJson(zombies) : '[]',
       left: toSqliteBoolean(left),
       expireTimer,
-      mentionedUs: toSqliteBoolean(mentionedUs),
-      unreadCount,
       lastMessageStatus,
       lastMessage: shortenedLastMessage,
 
@@ -498,6 +501,20 @@ function saveConversation(data: ConversationAttributes, instance?: BetterSqlite3
       hidden,
       markedAsUnread: toSqliteBoolean(markedAsUnread),
     });
+
+  return fetchConvoMemoryDetails(id);
+}
+
+function fetchConvoMemoryDetails(convoId: string): SaveConversationReturn {
+  const hasMentionedUsUnread = !!getFirstUnreadMessageWithMention(convoId);
+  const unreadCount = getUnreadCountByConversation(convoId);
+  const lastReadTimestampMessageSentTimestamp = getLastMessageReadInConversation(convoId);
+
+  return {
+    mentionedUs: hasMentionedUsUnread,
+    unreadCount,
+    lastReadTimestampMessage: lastReadTimestampMessageSentTimestamp,
+  };
 }
 
 function removeConversation(id: string | Array<string>) {
@@ -520,6 +537,73 @@ function removeConversation(id: string | Array<string>) {
     .run(id);
 }
 
+export function getIdentityKeys(db: BetterSqlite3.Database) {
+  const row = db.prepare(`SELECT * FROM ${ITEMS_TABLE} WHERE id = $id;`).get({
+    id: 'identityKey',
+  });
+
+  if (!row) {
+    return null;
+  }
+  try {
+    const parsedIdentityKey = jsonToObject(row.json);
+    if (
+      !parsedIdentityKey?.value?.pubKey ||
+      !parsedIdentityKey?.value?.ed25519KeyPair?.privateKey
+    ) {
+      return null;
+    }
+    const publicKeyBase64 = parsedIdentityKey?.value?.pubKey;
+    const publicKeyHex = to_hex(from_base64(publicKeyBase64, base64_variants.ORIGINAL));
+
+    const ed25519PrivateKeyUintArray = parsedIdentityKey?.value?.ed25519KeyPair?.privateKey;
+
+    // TODO migrate the ed25519KeyPair for all the users already logged in to a base64 representation
+    const privateEd25519 = new Uint8Array(Object.values(ed25519PrivateKeyUintArray));
+
+    if (!privateEd25519 || isEmpty(privateEd25519)) {
+      return null;
+    }
+
+    return {
+      publicKeyHex,
+      privateEd25519,
+    };
+  } catch (e) {
+    return null;
+  }
+}
+
+function getUsBlindedInThatServerIfNeeded(
+  convoId: string,
+  instance?: BetterSqlite3.Database
+): string | undefined {
+  const usNaked = getIdentityKeys(assertGlobalInstanceOrInstance(instance))?.publicKeyHex;
+  if (!usNaked) {
+    return undefined;
+  }
+  const room = getV2OpenGroupRoom(convoId, instance) as OpenGroupV2Room | null;
+  if (!room || !roomHasBlindEnabled(room) || !room.serverPublicKey) {
+    return usNaked;
+  }
+
+  const blinded = getItemById(KNOWN_BLINDED_KEYS_ITEM, instance);
+  // this is essentially a duplicate of getUsBlindedInThatServer made at a database level (with db from the DB directly and not cached on the renderer side)
+  try {
+    const allBlinded = JSON.parse(blinded?.value);
+    const found = allBlinded.find(
+      (m: any) => m.serverPublicKey === room.serverPublicKey && m.realSessionId === usNaked
+    );
+
+    const blindedId = found?.blindedId;
+    return isString(blindedId) ? blindedId : usNaked;
+  } catch (e) {
+    console.warn('getUsBlindedInThatServerIfNeeded failed with ', e.message);
+  }
+
+  return usNaked;
+}
+
 function getConversationById(id: string, instance?: BetterSqlite3.Database) {
   const row = assertGlobalInstanceOrInstance(instance)
     .prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`)
@@ -527,14 +611,22 @@ function getConversationById(id: string, instance?: BetterSqlite3.Database) {
       id,
     });
 
-  return formatRowOfConversation(row, 'getConversationById');
+  const unreadCount = getUnreadCountByConversation(id, instance) || 0;
+  const mentionedUsStillUnread = !!getFirstUnreadMessageWithMention(id, instance);
+
+  return formatRowOfConversation(row, 'getConversationById', unreadCount, mentionedUsStillUnread);
 }
 
 function getAllConversations() {
   const rows = assertGlobalInstance()
     .prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} ORDER BY id ASC;`)
     .all();
-  return (rows || []).map(m => formatRowOfConversation(m, 'getAllConversations'));
+
+  return (rows || []).map(m => {
+    const unreadCount = getUnreadCountByConversation(m.id) || 0;
+    const mentionedUsStillUnread = !!getFirstUnreadMessageWithMention(m.id);
+    return formatRowOfConversation(m, 'getAllConversations', unreadCount, mentionedUsStillUnread);
+  });
 }
 
 function getPubkeysInPublicConversation(conversationId: string) {
@@ -581,7 +673,19 @@ function searchConversations(query: string) {
       limit: 50,
     });
 
-  return (rows || []).map(m => formatRowOfConversation(m, 'searchConversations'));
+  return (rows || []).map(m => {
+    const unreadCount = getUnreadCountByConversation(m.id);
+    const mentionedUsStillUnread = !!getFirstUnreadMessageWithMention(m.id);
+
+    const formatted = formatRowOfConversation(
+      m,
+      'searchConversations',
+      unreadCount,
+      mentionedUsStillUnread
+    );
+
+    return formatted;
+  });
 }
 
 // order by clause is the same as orderByClause but with a table prefix so we cannot reuse it
@@ -1014,17 +1118,19 @@ function filterAlreadyFetchedOpengroupMessage(
   return filteredNonBlinded;
 }
 
-function getUnreadByConversation(conversationId: string) {
+function getUnreadByConversation(conversationId: string, sentBeforeTimestamp: number) {
   const rows = assertGlobalInstance()
     .prepare(
       `SELECT * FROM ${MESSAGES_TABLE} WHERE
       unread = $unread AND
-      conversationId = $conversationId
-     ORDER BY received_at DESC;`
+      conversationId = $conversationId AND
+      COALESCE(serverTimestamp, sent_at) <= $sentBeforeTimestamp
+     ${orderByClauseASC};`
     )
     .all({
       unread: toSqliteBoolean(true),
       conversationId,
+      sentBeforeTimestamp,
     });
 
   return map(rows, row => jsonToObject(row.json));
@@ -1067,8 +1173,11 @@ function markAllAsReadByConversationNoExpiration(
   return toReturn;
 }
 
-function getUnreadCountByConversation(conversationId: string) {
-  const row = assertGlobalInstance()
+function getUnreadCountByConversation(
+  conversationId: string,
+  instance?: BetterSqlite3.Database
+): number {
+  const row = assertGlobalInstanceOrInstance(instance)
     .prepare(
       `SELECT count(*) FROM ${MESSAGES_TABLE} WHERE
     unread = $unread AND
@@ -1255,7 +1364,7 @@ function getFirstUnreadMessageIdInConversation(conversationId: string) {
     )
     .all({
       conversationId,
-      unread: 1,
+      unread: toSqliteBoolean(true),
     });
 
   if (rows.length === 0) {
@@ -1264,16 +1373,41 @@ function getFirstUnreadMessageIdInConversation(conversationId: string) {
   return rows[0].id;
 }
 
+/**
+ *
+ * Returns the last read message timestamp in the specific conversation (the columns `serverTimestamp` || `sent_at`)
+ */
+function getLastMessageReadInConversation(conversationId: string): number | null {
+  const rows = assertGlobalInstance()
+    .prepare(
+      `
+      SELECT MAX(MAX(COALESCE(serverTimestamp, 0)), MAX(COALESCE(sent_at, 0)) ) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+    )
+    .get({
+      conversationId,
+      unread: toSqliteBoolean(false), // we want to find the message read with the higher sent_at timestamp
+    });
+
+  return rows?.max_sent_at || null;
+}
+
 function getFirstUnreadMessageWithMention(
   conversationId: string,
-  ourPkInThatRoom: string // this might be a blinded id for a sogs
+  instance?: BetterSqlite3.Database
 ): string | undefined {
-  if (!ourPkInThatRoom || !ourPkInThatRoom.length) {
+  const ourPkInThatConversation = getUsBlindedInThatServerIfNeeded(conversationId, instance);
+
+  if (!ourPkInThatConversation || !ourPkInThatConversation.length) {
     throw new Error('getFirstUnreadMessageWithMention needs our pubkey but nothing was given');
   }
-  const likeMatch = `%@${ourPkInThatRoom}%`;
+  const likeMatch = `%@${ourPkInThatConversation}%`;
 
-  const rows = assertGlobalInstance()
+  // TODO make this use the fts search table rather than this one?
+  const rows = assertGlobalInstanceOrInstance(instance)
     .prepare(
       `
     SELECT id, json FROM ${MESSAGES_TABLE} WHERE
@@ -1286,7 +1420,7 @@ function getFirstUnreadMessageWithMention(
     )
     .all({
       conversationId,
-      unread: 1,
+      unread: toSqliteBoolean(true),
       likeMatch,
     });
 
@@ -1896,13 +2030,6 @@ function getV2OpenGroupRoom(conversationId: string, db?: BetterSqlite3.Database)
       conversationId,
     });
 
-  console.warn(
-    '=================',
-    assertGlobalInstanceOrInstance(db)
-      .prepare(`SELECT json FROM ${OPEN_GROUP_ROOMS_V2_TABLE};`)
-      .all()
-  );
-
   if (!row) {
     return null;
   }
@@ -2123,10 +2250,10 @@ function cleanUpOldOpengroupsOnStart() {
         // no need to update the `unreadCount` during the migration anymore.
         // `saveConversation` is broken when called with a argument without all the required fields.
         // and this makes little sense as the unreadCount will be updated on opening
-        // const unreadCount = getUnreadCountByConversation(convoId);
-        // const convoProps = getConversationById(convoId);
+        // const unreadCount = get UnreadCountByConversation(convoId);
+        // const convoProps = get ConversationById(convoId);
         // if (convoProps) {
-        //   convoProps.unreadCount = unreadCount;
+        //   convoProps.unread Count = unread Count;
         //   saveConversation(convoProps);
         // }
       } else {
@@ -2210,6 +2337,7 @@ export const sqlNode = {
 
   getConversationCount,
   saveConversation,
+  fetchConvoMemoryDetails,
   getConversationById,
   removeConversation,
   getAllConversations,
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index 0221e26a2..c7a58dc26 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -135,7 +135,7 @@ export async function downloadAttachmentSogsV3(
   } else {
     // nothing to do, the attachment has already the correct size.
     // There is just no padding included, which is what we agreed on
-    window?.log?.info('Received opengroupv2 unpadded attachment size:', attachment.size);
+    // window?.log?.info('Received opengroupv2 unpadded attachment size:', attachment.size);
   }
 
   return {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 36e58dd77..8fb0d1e8c 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -18,6 +18,7 @@ import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { UserUtils } from '../session/utils';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
+import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
@@ -27,6 +28,7 @@ import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '..
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
+  ConvoInfoVolatileWrapperActions,
   GenericWrapperActions,
   UserConfigWrapperActions,
   UserGroupsWrapperActions,
@@ -86,6 +88,7 @@ async function mergeConfigsWithIncomingUpdates(
       const needsDump = await GenericWrapperActions.needsDump(variant);
       window.log.info(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
 
+      // TODO do we need to keep track of the hashes or the library does in the end?
       const messageHashes = toMerge.map(m => m.hash);
       const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
 
@@ -456,27 +459,60 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
 async function handleConvoInfoVolatileUpdate(
   result: IncomingConfResult
 ): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
+  // TODO do we want to enforce this?
+  // if (!result.needsDump) {
+  //   return result;
+  // }
   console.error('handleConvoInfoVolatileUpdate : TODO ');
 
-  // const toHandle = SessionUtilUserGroups.getUserGroupTypes();
-  // for (let index = 0; index < toHandle.length; index++) {
-  //   const typeToHandle = toHandle[index];
-  //   switch (typeToHandle) {
-  //     case 'Community':
-  //       await handleCommunitiesUpdate();
-  //       break;
+  const types = SessionUtilConvoInfoVolatile.getConvoInfoVolatileTypes();
+  for (let typeIndex = 0; typeIndex < types.length; typeIndex++) {
+    const type = types[typeIndex];
+    switch (type) {
+      case '1o1':
+        // Note: "Note to Self" comes here too
+        const privateChats = await ConvoInfoVolatileWrapperActions.getAll1o1();
+        for (let index = 0; index < privateChats.length; index++) {
+          const fromWrapper = privateChats[index];
+          const foundConvo = getConversationController().get(fromWrapper.pubkeyHex);
+          // TODO should we create the conversation if the conversation does not exist locally? Or assume that it should be coming from a contacts update?
+          if (foundConvo) {
+            // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
+            console.warn(
+              `fromWrapper from getAll1o1: ${fromWrapper.pubkeyHex}: ${fromWrapper.unread}`
+            );
+            await foundConvo.markReadFromConfigMessage(fromWrapper.lastRead);
+            // this commits to the DB, if needed
+            await foundConvo.markAsUnread(fromWrapper.unread, true);
 
-  //     case 'LegacyGroup':
-  //       await handleLegacyGroupUpdate(result.latestEnvelopeTimestamp);
-  //       break;
+            if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
+              await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
+                foundConvo.id,
+                foundConvo.isClosedGroup(),
+                false
+              );
 
-  //     default:
-  //       assertUnreachable(typeToHandle, `handleUserGroupsUpdate unhandled type "${typeToHandle}"`);
-  //   }
-  // }
+              await foundConvo.refreshInMemoryDetails();
+            }
+          }
+        }
+        console.warn('handleConvoInfoVolatileUpdate: privateChats', privateChats);
+
+        break;
+      case 'Community':
+        const comms = await ConvoInfoVolatileWrapperActions.getAllCommunities();
+        console.warn('handleConvoInfoVolatileUpdate: comms', comms);
+        break;
+
+      case 'LegacyGroup':
+        const legacyGroup = await ConvoInfoVolatileWrapperActions.getAllLegacyGroups();
+        console.warn('handleConvoInfoVolatileUpdate: legacyGroup', legacyGroup);
+        break;
+
+      default:
+        assertUnreachable(type, `handleConvoInfoVolatileUpdate: unhandeld switch case: ${type}`);
+    }
+  }
 
   return result;
 }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 48111bd4c..923a76a14 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -1,22 +1,20 @@
 import { queueAttachmentDownloads } from './attachments';
 
-import { Quote } from './types';
 import _ from 'lodash';
-import { getConversationController } from '../session/conversations';
+import { Data } from '../../ts/data/data';
 import { ConversationModel } from '../models/conversation';
 import { MessageModel, sliceQuoteText } from '../models/message';
-import { Data } from '../../ts/data/data';
+import { getConversationController } from '../session/conversations';
+import { Quote } from './types';
 
-import { SignalService } from '../protobuf';
-import { UserUtils } from '../session/utils';
-import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig';
-import { MessageDirection } from '../models/messageType';
-import { LinkPreviews } from '../util/linkPreviews';
-import { GoogleChrome } from '../util';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
-import { getUsBlindedInThatServer } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { MessageDirection } from '../models/messageType';
+import { SignalService } from '../protobuf';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
+import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig';
 import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig';
+import { GoogleChrome } from '../util';
+import { LinkPreviews } from '../util/linkPreviews';
 
 function contentTypeSupported(type: string): boolean {
   const Chrome = GoogleChrome;
@@ -143,21 +141,6 @@ async function processProfileKeyNoCommit(
   }
 }
 
-/**
- * Mark the conversation as mentionedUs, if the content of the message matches our id in this conversation
- * @param ourIdInThisConversation can be a blinded or our naked id, depending on the case
- */
-function handleMentions(
-  message: MessageModel,
-  conversation: ConversationModel,
-  ourIdInThisConversation: string
-) {
-  const body = message.get('body');
-  if (body && body.indexOf(`@${ourIdInThisConversation}`) !== -1) {
-    conversation.set({ mentionedUs: true });
-  }
-}
-
 function updateReadStatus(message: MessageModel) {
   if (message.isExpirationTimerUpdate()) {
     message.set({ unread: 0 });
@@ -168,7 +151,7 @@ function handleSyncedReceiptsNoCommit(message: MessageModel, conversation: Conve
   // If the newly received message is from us, we assume that we've seen the messages up until that point
   const sentTimestamp = message.get('sent_at');
   if (sentTimestamp) {
-    conversation.markRead(sentTimestamp);
+    conversation.markConversationRead(sentTimestamp);
   }
 }
 
@@ -243,11 +226,6 @@ async function handleRegularMessage(
   // Expire timer updates are now explicit.
   // We don't handle an expire timer from a incoming message except if it is an ExpireTimerUpdate message.
 
-  const ourIdInThisConversation =
-    getUsBlindedInThatServer(conversation.id) || UserUtils.getOurPubKeyStrFromCache();
-
-  handleMentions(message, conversation, ourIdInThisConversation);
-
   if (type === 'incoming') {
     if (conversation.isPrivate()) {
       updateReadStatus(message);
@@ -276,11 +254,13 @@ async function handleRegularMessage(
       await conversation.setDidApproveMe(true);
     }
   } else if (type === 'outgoing') {
-    // we want to do this for all types of conversations, not just private chats
-    handleSyncedReceiptsNoCommit(message, conversation);
+    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      // we want to do this for all types of conversations, not just private chats
+      handleSyncedReceiptsNoCommit(message, conversation);
 
-    if (conversation.isPrivate()) {
-      await conversation.setIsApproved(true);
+      if (conversation.isPrivate()) {
+        await conversation.setIsApproved(true);
+      }
     }
   }
 
@@ -381,10 +361,8 @@ export async function handleMessageJob(
     //   call it after we have an id for this message, because the jobs refer back
     //   to their source message.
 
-    const unreadCount = await conversation.getUnreadCount();
-    conversation.set({ unreadCount });
     conversation.set({
-      active_at: Math.max(conversation.attributes.active_at, messageModel.get('sent_at') || 0),
+      active_at: Math.max(conversation.get('active_at'), messageModel.get('sent_at') || 0),
     });
     // this is a throttled call and will only run once every 1 sec at most
     conversation.updateLastMessage();
@@ -407,35 +385,6 @@ export async function handleMessageJob(
       );
     }
 
-    // even with all the warnings, I am very sus about if this is usefull or not
-    // try {
-    //   // We go to the database here because, between the message save above and
-    //   // the previous line's trigger() call, we might have marked all messages
-    //   // unread in the database. This message might already be read!
-    //   const fetched = await getMessageById(messageModel.get('id'));
-
-    //   const previousUnread = messageModel.get('unread');
-
-    //   // Important to update message with latest read state from database
-    //   messageModel.merge(fetched);
-
-    //   if (previousUnread !== messageModel.get('unread')) {
-    //     window?.log?.warn(
-    //       'Caught race condition on new message read state! ' + 'Manually starting timers.'
-    //     );
-    //     // We call markRead() even though the message is already
-    //     // marked read because we need to start expiration
-    //     // timers, etc.
-    //     await messageModel.markRead(Date.now());
-    //   }
-    // } catch (error) {
-    //   window?.log?.warn(
-    //     'handleMessageJob: Message',
-    //     messageModel.idForLogging(),
-    //     'was deleted'
-    //   );
-    // }
-
     if (messageModel.get('unread')) {
       conversation.throttledNotify(messageModel);
     }
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 0f850220a..1c30247c9 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -114,7 +114,7 @@ export class OpenGroupManagerV2 {
       return;
     }
 
-    const inWrapperCommunities = SessionUtilUserGroups.getAllCommunities();
+    const inWrapperCommunities = SessionUtilUserGroups.getAllCommunitiesCached();
 
     const inWrapperIds = inWrapperCommunities.map(m =>
       getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index 73717359f..cb45e8788 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -15,15 +15,13 @@ import {
   SubRequestMessagesObjectType,
 } from '../sogsv3/sogsV3BatchPoll';
 import { handleBatchPollResults } from '../sogsv3/sogsApiV3';
-import {
-  fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl,
-  roomHasBlindEnabled,
-} from '../sogsv3/sogsV3Capabilities';
+import { fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl } from '../sogsv3/sogsV3Capabilities';
 import { OpenGroupReaction } from '../../../../types/Reaction';
 import {
   markConversationInitialLoadingInProgress,
   openConversationWithMessages,
 } from '../../../../state/ducks/conversations';
+import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 
 export type OpenGroupMessageV4 = {
   /** AFAIK: indicates the number of the message in the group. e.g. 2nd message will be 1 or 2 */
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index 00b0b1ca6..96d32ed5e 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -11,7 +11,8 @@ import { ConversationModel } from '../../../../models/conversation';
 import { UserUtils } from '../../../utils';
 import { SogsBlinding } from './sogsBlinding';
 import { fromHexToArray } from '../../../utils/String';
-import { roomHasBlindEnabled } from './sogsV3Capabilities';
+import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key';
+import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 
 export type BlindedIdMapping = {
   blindedId: string;
@@ -19,8 +20,6 @@ export type BlindedIdMapping = {
   realSessionId: string;
 };
 
-export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';
-
 // for now, we assume we won't find a lot of blinded keys.
 // So we can store all of those in a single JSON string in the db.
 let cachedKnownMapping: Array<BlindedIdMapping> | null = null;
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
index 9d880b8d3..be020db4b 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
@@ -1,14 +1,13 @@
 import { AbortSignal } from 'abort-controller';
 import { flatten, isEmpty, isNumber, isObject } from 'lodash';
 import { OpenGroupData } from '../../../../data/opengroups';
-import { assertUnreachable } from '../../../../types/sqlSharedTypes';
+import { assertUnreachable, roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 import { Reactions } from '../../../../util/reactions';
 import { OnionSending, OnionV4JSONSnodeResponse } from '../../../onions/onionSend';
 import {
   OpenGroupPollingUtils,
   OpenGroupRequestHeaders,
 } from '../opengroupV2/OpenGroupPollingUtils';
-import { roomHasBlindEnabled } from './sogsV3Capabilities';
 import { addJsonContentTypeToHeaders } from './sogsV3SendMessage';
 
 type BatchFetchRequestOptions = {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
index 7e790e78f..4f535b1f4 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
@@ -1,8 +1,8 @@
-import _, { isArray, isEmpty, isEqual, isObject } from 'lodash';
+import AbortController, { AbortSignal } from 'abort-controller';
+import { isArray, isEmpty, isEqual, isObject } from 'lodash';
+import { OpenGroupData } from '../../../../data/opengroups';
 import { OnionSending } from '../../../onions/onionSend';
 import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils';
-import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
-import AbortController, { AbortSignal } from 'abort-controller';
 import { batchGlobalIsSuccess } from './sogsV3BatchPoll';
 
 const capabilitiesFetchForServer = async (
@@ -68,18 +68,6 @@ export type ParsedMemberCount = {
   memberCount: number;
 };
 
-export function roomHasBlindEnabled(openGroup?: OpenGroupV2Room) {
-  return capabilitiesListHasBlindEnabled(openGroup?.capabilities);
-}
-
-export function capabilitiesListHasBlindEnabled(caps?: Array<string> | null) {
-  return Boolean(caps?.includes('blind'));
-}
-
-export function roomHasReactionsEnabled(openGroup?: OpenGroupV2Room) {
-  return Boolean(openGroup?.capabilities?.includes('reactions'));
-}
-
 export async function fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl(serverUrl: string) {
   let relatedRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
   if (!relatedRooms || relatedRooms.length === 0) {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index 132570efc..88ab70963 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -7,13 +7,13 @@ import {
 } from '../../../../data/opengroups';
 import { MIME } from '../../../../types';
 import { processNewAttachment } from '../../../../types/MessageAttachment';
+import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface';
 import { getConversationController } from '../../../conversations';
 import { OnionSending } from '../../../onions/onionSend';
 import { allowOnlyOneAtATime } from '../../../utils/Promise';
 import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils';
 import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils';
-import { roomHasBlindEnabled } from './sogsV3Capabilities';
 
 export async function fetchBinaryFromSogsWithOnionV4(sendOptions: {
   serverUrl: string;
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
index b704fd5a0..7759938bd 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
@@ -53,7 +53,7 @@ export function addToMutationCache(entry: SogsV3Mutation) {
     window.log.error('SOGS Mutation Cache: Entry verification on add failed!', entry);
   } else {
     sogsMutationCache.push(entry);
-    window.log.info('SOGS Mutation Cache: Entry added!', entry);
+    window.log.debug('SOGS Mutation Cache: Entry added!', entry);
   }
 }
 
@@ -64,7 +64,7 @@ export function updateMutationCache(entry: SogsV3Mutation, seqno: number) {
     const entryIndex = findIndex(sogsMutationCache, entry);
     if (entryIndex >= 0) {
       sogsMutationCache[entryIndex].seqno = seqno;
-      window.log.info('SOGS Mutation Cache: Entry updated!', sogsMutationCache[entryIndex]);
+      window.log.debug('SOGS Mutation Cache: Entry updated!', sogsMutationCache[entryIndex]);
     } else {
       window.log.error('SOGS Mutation Cache: Updated failed! Cannot find entry', entry);
     }
@@ -84,7 +84,7 @@ export async function processMessagesUsingCache(
     const matchSeqno = roomMatches[i].seqno;
     if (message.seqno && matchSeqno && matchSeqno <= message.seqno) {
       const removedEntry = roomMatches.splice(i, 1)[0];
-      window.log.info(
+      window.log.debug(
         `SOGS Mutation Cache: Entry ignored and removed in ${server}/${room} for message ${message.id}`,
         removedEntry
       );
@@ -108,7 +108,7 @@ export async function processMessagesUsingCache(
         case 'ADD':
           updatedReactions[reaction].you = true;
           updatedReactions[reaction].count += 1;
-          window.log.info(
+          window.log.debug(
             `SOGS Mutation Cache: Added our reaction based on the cache in ${server}/${room} for message ${message.id}`,
             updatedReactions[reaction]
           );
@@ -116,7 +116,7 @@ export async function processMessagesUsingCache(
         case 'REMOVE':
           updatedReactions[reaction].you = false;
           updatedReactions[reaction].count -= 1;
-          window.log.info(
+          window.log.debug(
             `SOGS Mutation Cache: Removed our reaction based on the cache in ${server}/${room} for message ${message.id}`,
             updatedReactions[reaction]
           );
@@ -124,7 +124,7 @@ export async function processMessagesUsingCache(
         case 'CLEAR':
           // tslint:disable-next-line: no-dynamic-delete
           delete updatedReactions[reaction];
-          window.log.info(
+          window.log.debug(
             `SOGS Mutation Cache: Cleared all ${reaction} reactions based on the cache in ${server}/${room} for message ${message.id}`
           );
           break;
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
index 59a452bbe..5f4f340f6 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
@@ -1,13 +1,11 @@
 import AbortController from 'abort-controller';
 import { compact, uniq } from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
+import { capabilitiesListHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 import { OnionSending } from '../../../onions/onionSend';
 import { OpenGroupV2Info } from '../opengroupV2/ApiUtil';
 import { batchGlobalIsSuccess, parseBatchGlobalStatusCode } from './sogsV3BatchPoll';
-import {
-  capabilitiesListHasBlindEnabled,
-  fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl,
-} from './sogsV3Capabilities';
+import { fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl } from './sogsV3Capabilities';
 
 export const getAllRoomInfos = async (roomInfos: OpenGroupV2Room) => {
   const result = await OnionSending.sendJsonViaOnionV4ToSogs({
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts
index 3a7b38a69..8c1f9c7d1 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts
@@ -1,9 +1,9 @@
 import AbortController from 'abort-controller';
 import { OpenGroupData } from '../../../../data/opengroups';
+import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
 import { OnionSending } from '../../../onions/onionSend';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 import { batchGlobalIsSuccess } from './sogsV3BatchPoll';
-import { roomHasBlindEnabled } from './sogsV3Capabilities';
 
 /**
  * Returns the id on which the file is saved, or null
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
index 4f31e35a6..242d45ba8 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
@@ -12,7 +12,6 @@ import { Reactions } from '../../../../util/reactions';
 import { OnionSending } from '../../../onions/onionSend';
 import { ToastUtils, UserUtils } from '../../../utils';
 import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils';
-import { getUsBlindedInThatServer } from './knownBlindedkeys';
 import { batchGlobalIsSuccess, parseBatchGlobalStatusCode } from './sogsV3BatchPoll';
 import {
   addToMutationCache,
@@ -100,7 +99,7 @@ export const sendSogsReactionOnionV4 = async (
   const me = UserUtils.getOurPubKeyStrFromCache();
   await Reactions.handleMessageReaction({
     reaction,
-    sender: blinded ? getUsBlindedInThatServer(conversation) || me : me,
+    sender: blinded ? conversation.getUsInThatConversation() || me : me,
     you: true,
     isOpenGroup: true,
   });
diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts
index c6876188c..c35de180a 100644
--- a/ts/session/apis/snode_api/getNetworkTime.ts
+++ b/ts/session/apis/snode_api/getNetworkTime.ts
@@ -58,7 +58,7 @@ function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: numb
  */
 function getLatestTimestampOffset() {
   if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) {
-    window.log.warn('latestTimestampOffset is not set yet');
+    window.log.debug('latestTimestampOffset is not set yet');
     return 0;
   }
   // window.log.info('latestTimestampOffset is ', latestTimestampOffset);
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 0022ad553..ef920ea43 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -3,7 +3,7 @@ import { Snode } from '../../../data/data';
 import { updateIsOnline } from '../../../state/ducks/onion';
 import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
-import { SnodeNamespaces } from './namespaces';
+import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 
 import {
   RetrieveLegacyClosedGroupSubRequestType,
@@ -46,14 +46,12 @@ async function buildRetrieveRequest(
       }
 
       // all legacy closed group retrieves are unauthenticated and run above.
-      // if we get here, this can only be a retrieve for our own swarm, which needs to be authenticated
+      // if we get here, this can only be a retrieve for our own swarm, which must be authenticated
       if (
-        namespace !== SnodeNamespaces.UserMessages &&
-        namespace !== SnodeNamespaces.UserContacts &&
-        namespace !== SnodeNamespaces.UserProfile &&
-        namespace !== SnodeNamespaces.UserGroups
+        !SnodeNamespace.isUserConfigNamespace(namespace) &&
+        namespace !== SnodeNamespaces.UserMessages
       ) {
-        throw new Error('not a legacy closed group. namespace can only be 0');
+        throw new Error(`not a legacy closed group. namespace can only be 0 and was ${namespace}`);
       }
       if (pubkey !== ourPubkey) {
         throw new Error('not a legacy closed group. pubkey can only be ours');
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index cd9a7b28d..581f62023 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -237,10 +237,9 @@ export class SwarmPolling {
             .map(r => r.messages.messages)
         )
       );
+      const userConfigMessagesMerged = flatten(compact(userConfigMessages));
 
-      if (!isGroup) {
-        const userConfigMessagesMerged = flatten(compact(userConfigMessages));
-
+      if (!isGroup && userConfigMessagesMerged.length) {
         window.log.info(
           `received userConfigMessagesMerged: ${userConfigMessagesMerged.length} for key ${pubkey.key}`
         );
@@ -260,9 +259,11 @@ export class SwarmPolling {
         compact(resultsFromAllNamespaces?.map(m => m.messages.messages))
       );
     }
-    window.log.info(
-      `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
-    );
+    if (allNamespacesWithoutUserConfigIfNeeded.length) {
+      window.log.info(
+        `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
+      );
+    }
 
     // Merge results into one list of unique messages
     const messages = uniqBy(allNamespacesWithoutUserConfigIfNeeded, x => x.hash);
@@ -347,17 +348,18 @@ export class SwarmPolling {
         );
       }
     }
-
-    try {
-      window.log.info(
-        `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession`
-      );
-      await ConfigMessageHandler.handleConfigMessagesViaLibSession(allDecryptedConfigMessages);
-    } catch (e) {
-      const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(',');
-      window.log.warn(
-        `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"`
-      );
+    if (allDecryptedConfigMessages.length) {
+      try {
+        window.log.info(
+          `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession`
+        );
+        await ConfigMessageHandler.handleConfigMessagesViaLibSession(allDecryptedConfigMessages);
+      } catch (e) {
+        const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(',');
+        window.log.warn(
+          `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"`
+        );
+      }
     }
   }
 
@@ -492,6 +494,7 @@ export class SwarmPolling {
           SnodeNamespaces.UserProfile,
           SnodeNamespaces.UserContacts,
           SnodeNamespaces.UserGroups,
+          SnodeNamespaces.ConvoInfoVolatile,
         ]
       : [SnodeNamespaces.UserMessages];
   }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 6c38ff1ef..9e7e2e937 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -9,11 +9,11 @@ import { PubKey } from '../types';
 
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
-import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 import { leaveClosedGroup } from '../group/closed-group';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
+import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
+import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 
 let instance: ConversationController | null;
 
@@ -99,7 +99,10 @@ export class ConversationController {
 
     const create = async () => {
       try {
-        await Data.saveConversation(conversation.attributes);
+        const saveDetails = await Data.saveConversation(conversation.attributes);
+        if (saveDetails) {
+          await conversation.refreshInMemoryDetails(saveDetails);
+        }
       } catch (error) {
         window?.log?.error(
           'Conversation save failed! ',
@@ -222,6 +225,7 @@ export class ConversationController {
     if (conversation.isClosedGroup()) {
       window.log.info(`deleteContact ClosedGroup case: ${id}`);
       await leaveClosedGroup(conversation.id);
+      await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
       // open group v2
     } else if (conversation.isPublic()) {
       window?.log?.info('leaving open group v2', conversation.id);
@@ -238,12 +242,14 @@ export class ConversationController {
       }
       try {
         await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
+        await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
+          conversation.id,
+          conversation.id
+        );
       } catch (e) {
         window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
       }
-    }
-
-    if (conversation.isPrivate()) {
+    } else if (conversation.isPrivate()) {
       // if this conversation is a private conversation it's in fact a `contact` for desktop.
       // we just want to remove everything related to it and set the hidden field to true
       // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation
@@ -255,13 +261,21 @@ export class ConversationController {
       // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
       // await conversation.setIsApproved(false, false);
       await conversation.commit();
+
+      // The note to self cannot be removed from the wrapper I suppose, as it must always be there
+      // TODO I think we want to mark the contacts as hidden instead of removing them, so maybe keep the volatile info too?
+      // if (!isUsFromCache(conversation.id)) {
+      //   await SessionUtilConvoInfoVolatile.remove1o1(conversation.id);
+      // }
       // TODO the call above won't mark the conversation as hidden in the wrapper, it will just stop being updated (which is a bad thing)
-    } else {
-      window.log.info(`deleteContact NOT private, removing convo from DB: ${id}`);
+    }
+
+    if (conversation.isGroup()) {
+      window.log.info(`deleteContact isGroup, removing convo from DB: ${id}`);
       // not a private conversation, so not a contact for the ContactWrapper
       await Data.removeConversation(id);
 
-      window.log.info(`deleteContact NOT private, convo removed from DB: ${id}`);
+      window.log.info(`deleteContact isGroup, convo removed from DB: ${id}`);
 
       // TODO remove group related entries from their corresponding wrappers here
       this.conversations.remove(conversation);
@@ -304,25 +318,27 @@ export class ConversationController {
     const load = async () => {
       try {
         const start = Date.now();
-        const collection = await Data.getAllConversations();
-
-        this.conversations.add(collection.models);
+        const convoModels = await Data.getAllConversations();
+        this.conversations.add(convoModels);
 
         console.time('refreshAllWrapperContactsData');
-        for (let index = 0; index < collection.models.length; index++) {
-          const convo = collection.models[index];
+        // TODO make this a switch so we take care of all wrappers and have compilation errors if we forgot to add one.
+        for (let index = 0; index < convoModels.length; index++) {
+          const convo = convoModels[index];
           if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
             await SessionUtilContact.refreshMappedValue(convo.id, true);
           }
           if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
-            await SessionUtilUserGroups.refreshMappedValue(convo.id, true);
+            await SessionUtilUserGroups.refreshCachedUserGroup(convo.id, true);
           }
           if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
-            await SessionUtilConvoInfoVolatile.refreshMappedValue(
+            await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
               convo.id,
               Boolean(convo.isClosedGroup() && convo.id.startsWith('05')),
               true
             );
+
+            await convo.refreshInMemoryDetails();
           }
         }
         console.timeEnd('refreshAllWrapperContactsData');
diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts
index b6d36698d..9dbffe79f 100644
--- a/ts/session/crypto/DecryptedAttachmentsManager.ts
+++ b/ts/session/crypto/DecryptedAttachmentsManager.ts
@@ -108,7 +108,7 @@ export const getDecryptedMediaUrl = async (
     urlToDecryptingPromise.set(
       url,
       new Promise(async resolve => {
-        window.log.info('about to read and decrypt file :', url, path.isAbsolute(url));
+        // window.log.debug('about to read and decrypt file :', url, path.isAbsolute(url));
         try {
           const absUrl = path.isAbsolute(url) ? url : getAbsoluteAttachmentPath(url);
           const encryptedFileContent = await readFileContent(absUrl);
@@ -126,7 +126,7 @@ export const getDecryptedMediaUrl = async (
                 forceRetain: isAvatar,
               });
             }
-            window.log.info(' file decrypted :', url, ' as ', obj);
+            // window.log.debug(' file decrypted :', url, ' as ', obj);
             urlToDecryptingPromise.delete(url);
             resolve(obj);
             return;
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index ba1a3d9fc..0b0e9fa45 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -176,17 +176,14 @@ export async function addUpdateMessage(
     });
     return outgoingMessage;
   }
+  // addSingleIncomingMessage also takes care of updating the unreadCount
+
   const incomingMessage = await convo.addSingleIncomingMessage({
     sent_at: sentAt,
     group_update: groupUpdate,
     expireTimer: 0,
     source: sender,
   });
-  // update the unreadCount for this convo
-  const unreadCount = await convo.getUnreadCount();
-  convo.set({
-    unreadCount,
-  });
   await convo.commit();
   return incomingMessage;
 }
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index 240b84a3f..eef3b79c7 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -166,7 +166,7 @@ async function queueNewJobIfNeeded() {
     !lastRunConfigSyncJobDumpTimestamp ||
     lastRunConfigSyncJobDumpTimestamp < Date.now() - defaultMsBetweenRetries
   ) {
-    window.log.debug('scheduling conf sync dump job in asap');
+    window.log.debug('Scheduling ConfDumpJob: ASAP');
 
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncDumpRunner.addJob(
@@ -177,7 +177,7 @@ async function queueNewJobIfNeeded() {
     const diff = Math.max(Date.now() - lastRunConfigSyncJobDumpTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
-    window.log.debug(`scheduling conf sync dump job in ${leftBeforeNextTick} ms`);
+    window.log.debug(`Scheduling ConfDumpJob: in ${leftBeforeNextTick} ms`);
 
     await runners.configurationSyncDumpRunner.addJob(
       new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 57e92c625..cab6742bf 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -188,7 +188,8 @@ export const LibSessionUtil = {
   insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
   insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
   insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
-  insertAllConvoInfoVolatileIntoWrapper: SessionUtilConvoInfoVolatile.insertAllConvosIntoWrapper,
+  insertAllConvoInfoVolatileIntoWrapper:
+    SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper,
   removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
   kindToVariant,
   variantToKind,
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index a0cb1b7b8..3676d5904 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,10 +1,6 @@
 import { uniq } from 'lodash';
-import {
-  ConvoInfoVolatile1o1,
-  ConvoInfoVolatileCommunity,
-  ConvoInfoVolatileLegacyGroup,
-  ConvoVolatileType,
-} from 'session_util_wrapper';
+import { BaseConvoInfoVolatile, ConvoVolatileType } from 'session_util_wrapper';
+import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
@@ -16,26 +12,27 @@ import { OpenGroupUtils } from '../../apis/open_group_api/utils';
 import { getConversationController } from '../../conversations';
 import { SessionUtilContact } from './libsession_utils_contacts';
 import { SessionUtilUserGroups } from './libsession_utils_user_groups';
+import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 /**
  * The key of this map is the convoId as stored in the database.
  */
-const mapped1o1WrapperValues = new Map<string, ConvoInfoVolatile1o1>();
+const mapped1o1WrapperValues = new Map<string, BaseConvoInfoVolatile>();
 
 /**
  * The key of this map is the convoId as stored in the database. So the legacy group 05 sessionID
  */
-const mappedLegacyGroupWrapperValues = new Map<string, ConvoInfoVolatileLegacyGroup>();
+const mappedLegacyGroupWrapperValues = new Map<string, BaseConvoInfoVolatile>();
 
 /**
  * The key of this map is the convoId as stored in the database, so withoutpubkey
  */
-const mappedCommunityWrapperValues = new Map<string, ConvoInfoVolatileCommunity>();
+const mappedCommunityWrapperValues = new Map<string, BaseConvoInfoVolatile>();
 
 /**
  * Update the ConvoInfoVolatileWrapper with all the data is cares about from the database.
  */
-async function insertAllConvosIntoWrapper() {
+async function insertAllConvoInfoVolatileIntoWrapper() {
   const convoIdsToInsert = uniq(
     getConversationController()
       .getConversations()
@@ -59,19 +56,23 @@ async function insertAllConvosIntoWrapper() {
  * It actually relies on the two other wrappers to know what to store:
  *    - Usergroups to know which communities and legacy group to store
  *    - Contacts to know which contacts to store
+ *    - UserProfile to keep track of the `unread` state of the Note To Self conversation
  */
 function isConvoToStoreInWrapper(convo: ConversationModel): boolean {
   return (
     SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo) || // this checks for community & legacy group
-    SessionUtilContact.isContactToStoreInContactsWrapper(convo) // this checks for contacts
+    SessionUtilContact.isContactToStoreInContactsWrapper(convo) || // this checks for contacts
+    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id) // this checks for out own pubkey, as we want to keep track of the read state for the Note To Self
   );
 }
 function getConvoType(convo: ConversationModel): ConvoVolatileType {
-  const convoType: ConvoVolatileType = SessionUtilContact.isContactToStoreInContactsWrapper(convo)
-    ? '1o1'
-    : SessionUtilUserGroups.isCommunityToStoreInWrapper(convo)
-    ? 'Community'
-    : 'LegacyGroup';
+  const convoType: ConvoVolatileType =
+    SessionUtilContact.isContactToStoreInContactsWrapper(convo) ||
+    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id)
+      ? '1o1'
+      : SessionUtilUserGroups.isCommunityToStoreInWrapper(convo)
+      ? 'Community'
+      : 'LegacyGroup';
 
   return convoType;
 }
@@ -82,24 +83,29 @@ function getConvoType(convo: ConversationModel): ConvoVolatileType {
  * Same applies for a legacy group.
  */
 async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<void> {
-  const foundConvo = getConversationController().get(convoId);
-  if (!foundConvo) {
+  const foundConvo = await Data.getConversationById(convoId);
+  if (!foundConvo || !isConvoToStoreInWrapper(foundConvo)) {
     return;
   }
 
-  if (!isConvoToStoreInWrapper(foundConvo)) {
-    return;
-  }
+  const isForcedUnread = foundConvo.isMarkedUnread();
+  const lastReadTimestampMessage = foundConvo.getCachedLastReadTimestampMessage() || 0;
 
-  console.info(`inserting into convoInfoVolatile wrapper "${convoId}"...`);
+  console.info(
+    `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadTimestampMessage};forcedUnread:${isForcedUnread}...`
+  );
 
-  console.warn('ConvoInfoVolatileWrapperActions to finish with unread and readAt');
   const convoType = getConvoType(foundConvo);
   switch (convoType) {
     case '1o1':
       try {
-        await ConvoInfoVolatileWrapperActions.set1o1(convoId, 0, false);
-        await refreshMappedValue(convoId, false, false);
+        // this saves the details for contacts and `Note To Self`
+        await ConvoInfoVolatileWrapperActions.set1o1(
+          convoId,
+          lastReadTimestampMessage,
+          isForcedUnread
+        );
+        await refreshConvoVolatileCached(convoId, false, false);
       } catch (e) {
         window.log.warn(
           `ConvoInfoVolatileWrapperActions.set1o1 of ${convoId} failed with ${e.message}`
@@ -108,8 +114,12 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
       break;
     case 'LegacyGroup':
       try {
-        await ConvoInfoVolatileWrapperActions.setLegacyGroup(convoId, 0, false);
-        await refreshMappedValue(convoId, true, false);
+        await ConvoInfoVolatileWrapperActions.setLegacyGroup(
+          convoId,
+          lastReadTimestampMessage,
+          isForcedUnread
+        );
+        await refreshConvoVolatileCached(convoId, true, false);
       } catch (e) {
         window.log.warn(
           `ConvoInfoVolatileWrapperActions.setLegacyGroup of ${convoId} failed with ${e.message}`
@@ -131,10 +141,13 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
           roomDetails.roomId,
           roomDetails.serverPublicKey
         );
-        console.info(`inserting into convoInfoVolatile wrapper "${fullUrlWithPubkey}"...`);
         // this does the create or the update of the matching existing community
-        await ConvoInfoVolatileWrapperActions.setCommunityByFullUrl(fullUrlWithPubkey, 0, false);
-        await refreshMappedValue(convoId, false, false);
+        await ConvoInfoVolatileWrapperActions.setCommunityByFullUrl(
+          fullUrlWithPubkey,
+          lastReadTimestampMessage,
+          isForcedUnread
+        );
+        await refreshConvoVolatileCached(convoId, false, false);
       } catch (e) {
         window.log.warn(
           `ConvoInfoVolatileWrapperActions.setCommunityByFullUrl of ${convoId} failed with ${e.message}`
@@ -154,7 +167,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
  * @param isLegacyGroup we need this to know if the corresponding 05 starting pubkey is associated with a legacy group or not
  * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
  */
-async function refreshMappedValue(
+async function refreshConvoVolatileCached(
   convoId: string,
   isLegacyGroup: boolean,
   duringAppStart: boolean
@@ -175,11 +188,14 @@ async function refreshMappedValue(
       refreshed = true;
     } else if (convoId.startsWith('05')) {
       const fromWrapper = await ConvoInfoVolatileWrapperActions.get1o1(convoId);
+      console.warn(
+        `refreshMappedValues from get1o1 ${fromWrapper?.pubkeyHex} : ${fromWrapper?.unread}`
+      );
       if (fromWrapper) {
         mapped1o1WrapperValues.set(convoId, fromWrapper);
       }
       refreshed = true;
-    }
+    } // TODO handle the new closed groups once we got them ready
 
     if (refreshed && !duringAppStart) {
       getConversationController()
@@ -189,35 +205,9 @@ async function refreshMappedValue(
   } catch (e) {
     window.log.info(`refreshMappedValue for volatile convoID: ${convoId}`, e.message);
   }
-
-  // TODO handle the new closed groups once we got them ready
 }
 
-function get1o1(convoId: string): ConvoInfoVolatile1o1 | undefined {
-  return mapped1o1WrapperValues.get(convoId);
-}
-
-function getAll1o1(): Array<ConvoInfoVolatile1o1> {
-  return [...mapped1o1WrapperValues.values()];
-}
-
-function getCommunityMappedValueByConvoId(convoId: string) {
-  return mappedCommunityWrapperValues.get(convoId);
-}
-
-function getAllCommunities(): Array<ConvoInfoVolatileCommunity> {
-  return [...mappedCommunityWrapperValues.values()];
-}
-
-function getLegacyGroupMappedValueByConvoId(convoId: string) {
-  return mappedLegacyGroupWrapperValues.get(convoId);
-}
-
-function getAllLegacyGroups(): Array<ConvoInfoVolatileLegacyGroup> {
-  return [...mappedLegacyGroupWrapperValues.values()];
-}
-
-function getFromAny(convoId: string) {
+function getVolatileInfoCached(convoId: string): BaseConvoInfoVolatile | undefined {
   return (
     mapped1o1WrapperValues.get(convoId) ||
     mappedLegacyGroupWrapperValues.get(convoId) ||
@@ -225,6 +215,31 @@ function getFromAny(convoId: string) {
   );
 }
 
+/**
+ * Removes the matching community from the wrapper and from the cached list of communities
+ */
+async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutPubkey: string) {
+  try {
+    await ConvoInfoVolatileWrapperActions.eraseCommunityByFullUrl(fullUrlWithOrWithoutPubkey);
+  } catch (e) {
+    window.log.warn('removeCommunityFromWrapper failed with ', e.message);
+  }
+
+  mappedCommunityWrapperValues.delete(convoId);
+}
+
+/**
+ * Removes the matching legacy group from the wrapper and from the cached list of legacy groups
+ */
+async function removeLegacyGroupFromWrapper(convoId: string) {
+  try {
+    await ConvoInfoVolatileWrapperActions.eraseLegacyGroup(convoId);
+  } catch (e) {
+    window.log.warn('removeLegacyGroupFromWrapper failed with ', e.message);
+  }
+  mappedLegacyGroupWrapperValues.delete(convoId);
+}
+
 /**
  * This function can be used where there are things to do for all the types handled by this wrapper.
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
@@ -239,24 +254,18 @@ function getConvoInfoVolatileTypes(): Array<ConvoVolatileType> {
 export const SessionUtilConvoInfoVolatile = {
   // shared
   isConvoToStoreInWrapper,
-  insertAllConvosIntoWrapper,
+  insertAllConvoInfoVolatileIntoWrapper,
   insertConvoFromDBIntoWrapperAndRefresh,
-  refreshMappedValue,
+  refreshConvoVolatileCached,
   getConvoInfoVolatileTypes,
+  getVolatileInfoCached,
 
   // 1o1
-  get1o1,
-  getAll1o1,
-  // removeCommunityFromWrapper,
+  // at the moment, we cannot remove a 1o1 from the conversation volatile info.
 
   // legacy group
-  getLegacyGroupMappedValueByConvoId,
-  getAllLegacyGroups,
-  // removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
+  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
 
   // communities
-  getAllCommunities,
-  getCommunityMappedValueByConvoId,
-  // removeCommunityFromWrapper,
-  getFromAny,
+  removeCommunityFromWrapper,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 354ef0915..2255a3727 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -113,7 +113,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
           wrapperComm.fullUrl,
           wrapperComm.priority
         );
-        await refreshMappedValue(convoId);
+        await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
         // we still let this go through
@@ -135,11 +135,11 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       });
 
       try {
-        console.info(`inserting into usergroup wrapper "${foundConvo.id}"...`);
+        console.info(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
         // this does the create or the update of the matching existing legacy group
 
         await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
-        await refreshMappedValue(convoId);
+        await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
         // we still let this go through
@@ -157,7 +157,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
 /**
  * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
  */
-async function refreshMappedValue(convoId: string, duringAppStart = false) {
+async function refreshCachedUserGroup(convoId: string, duringAppStart = false) {
   try {
     let refreshed = false;
     if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -187,11 +187,11 @@ async function refreshMappedValue(convoId: string, duringAppStart = false) {
   // TODO handle the new closed groups once we got them ready
 }
 
-function getCommunityMappedValueByConvoId(convoId: string) {
+function getCommunityByConvoIdCached(convoId: string) {
   return mappedCommunityWrapperValues.get(convoId);
 }
 
-function getAllCommunities(): Array<CommunityInfo> {
+function getAllCommunitiesCached(): Array<CommunityInfo> {
   return [...mappedCommunityWrapperValues.values()];
 }
 
@@ -209,7 +209,7 @@ async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutP
   mappedCommunityWrapperValues.delete(convoId);
 }
 
-function getLegacyGroupMappedValueByConvoId(convoId: string) {
+function getLegacyGroupCached(convoId: string) {
   return mappedLegacyGroupWrapperValues.get(convoId);
 }
 
@@ -246,18 +246,18 @@ export const SessionUtilUserGroups = {
   isUserGroupToStoreInWrapper,
   insertAllUserGroupsIntoWrapper,
   insertGroupsFromDBIntoWrapperAndRefresh,
-  refreshMappedValue,
+  refreshCachedUserGroup,
   getUserGroupTypes,
 
   // communities
   isCommunityToStoreInWrapper,
-  getAllCommunities,
-  getCommunityMappedValueByConvoId,
+  getAllCommunitiesCached,
+  getCommunityByConvoIdCached,
   removeCommunityFromWrapper,
 
   // legacy group
   isLegacyGroupToStoreInWrapper,
-  getLegacyGroupMappedValueByConvoId,
+  getLegacyGroupCached,
   getAllLegacyGroups,
   removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
 };
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index e38831aac..d5fca234c 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -231,7 +231,6 @@ export interface ReduxConversationType {
    */
   displayNameInProfile?: string;
   nickname?: string;
-  hasNickname?: boolean;
 
   activeAt?: number;
   lastMessage?: LastMessageType;
@@ -268,8 +267,7 @@ export interface ReduxConversationType {
   isApproved?: boolean;
   didApproveMe?: boolean;
 
-  // Should only be present on opengroups - the capabilities we have on this room.
-  capabilities?: Array<string>;
+  isMarkedUnread?: boolean;
 }
 
 export interface NotificationForConvoOption {
@@ -1024,11 +1022,22 @@ export const {
   markConversationInitialLoadingInProgress,
 } = actions;
 
+async function unmarkAsForcedUnread(convoId: string) {
+  const convo = getConversationController().get(convoId);
+  if (convo && convo.isMarkedUnread()) {
+    // we just opened it and it was forced "Unread", so we reset the unread state here
+    await convo.markAsUnread(false);
+  }
+}
+
 export async function openConversationWithMessages(args: {
   conversationKey: string;
   messageId: string | null;
 }) {
   const { conversationKey, messageId } = args;
+
+  await unmarkAsForcedUnread(conversationKey);
+
   const firstUnreadIdOnOpen = await Data.getFirstUnreadMessageIdInConversation(conversationKey);
   const mostRecentMessageIdOnOpen = await Data.getLastMessageIdInConversation(conversationKey);
 
@@ -1053,6 +1062,7 @@ export async function openConversationToSpecificMessage(args: {
   shouldHighlightMessage: boolean;
 }) {
   const { conversationKey, messageIdToNavigateTo, shouldHighlightMessage } = args;
+  await unmarkAsForcedUnread(conversationKey);
 
   const messagesAroundThisMessage = await getMessages({
     conversationKey,
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index a67d3a74c..ce5d91464 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -176,10 +176,6 @@ export const getFirstUnreadMessageId = createSelector(
   }
 );
 
-export const getConversationHasUnread = createSelector(getFirstUnreadMessageId, unreadId => {
-  return Boolean(unreadId);
-});
-
 export type MessagePropsType =
   | 'group-notification'
   | 'group-invitation'
@@ -343,12 +339,12 @@ export const _getLeftPaneLists = (
 ): {
   conversations: Array<ReduxConversationType>;
   contacts: Array<ReduxConversationType>;
-  unreadCount: number;
+  globalUnreadCount: number;
 } => {
   const conversations: Array<ReduxConversationType> = [];
   const directConversations: Array<ReduxConversationType> = [];
 
-  let unreadCount = 0;
+  let globalUnreadCount = 0;
   for (const conversation of sortedConversations) {
     if (
       conversation.activeAt !== undefined &&
@@ -370,12 +366,12 @@ export const _getLeftPaneLists = (
     }
 
     if (
-      unreadCount < 100 &&
+      globalUnreadCount < 100 &&
       conversation.unreadCount &&
       conversation.unreadCount > 0 &&
       conversation.currentNotificationSetting !== 'disabled'
     ) {
-      unreadCount += conversation.unreadCount;
+      globalUnreadCount += conversation.unreadCount;
     }
 
     conversations.push(conversation);
@@ -384,7 +380,7 @@ export const _getLeftPaneLists = (
   return {
     conversations,
     contacts: directConversations,
-    unreadCount,
+    globalUnreadCount,
   };
 };
 
@@ -508,7 +504,7 @@ export const getDirectContacts = createSelector(
   (state: {
     conversations: Array<ReduxConversationType>;
     contacts: Array<ReduxConversationType>;
-    unreadCount: number;
+    globalUnreadCount: number;
   }) => state.contacts
 );
 
@@ -547,8 +543,8 @@ export const getDirectContactsByName = createSelector(
   }
 );
 
-export const getUnreadMessageCount = createSelector(getLeftPaneLists, (state): number => {
-  return state.unreadCount;
+export const getGlobalUnreadMessageCount = createSelector(getLeftPaneLists, (state): number => {
+  return state.globalUnreadCount;
 });
 
 export const getConversationHeaderTitleProps = (
@@ -630,11 +626,6 @@ export const getIsSelectedNoteToSelf = createSelector(
   }
 );
 
-export const getNumberOfPinnedConversations = createSelector(getConversations, (state): number => {
-  const values = Object.values(state.conversationLookup);
-  return values.filter(conversation => conversation.isPinned).length;
-});
-
 export const isMessageDetailView = createSelector(
   getConversations,
   (state: ConversationsStateType): boolean => state.messageDetailProps !== undefined
diff --git a/ts/state/selectors/section.ts b/ts/state/selectors/section.ts
index 5c1b1a2bf..6ef2f0b57 100644
--- a/ts/state/selectors/section.ts
+++ b/ts/state/selectors/section.ts
@@ -11,6 +11,10 @@ export const getFocusedSection = createSelector(
   (state: SectionStateType): SectionType => state.focusedSection
 );
 
+export const getIsMessageSection = (state: StateType) => {
+  return state.section.focusedSection === SectionType.Message;
+};
+
 export const getFocusedSettingsSection = createSelector(
   getSection,
   (state: SectionStateType): SessionSettingCategory | undefined => state.focusedSettingsSection
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index a1474bc35..aa957df80 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -54,20 +54,20 @@ describe('fillConvoAttributesWithDefaults', () => {
     });
   });
 
-  describe('unreadCount', () => {
-    it('initialize unreadCount if not given', () => {
-      expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-        'unreadCount',
-        0
-      );
-    });
+  // describe('unreadCount', () => {
+  //   it('initialize unreadCount if not given', () => {
+  //     expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
+  //       'unreadCount',
+  //       0
+  //     );
+  //   });
 
-    it('do not override unreadCount if given', () => {
-      expect(
-        fillConvoAttributesWithDefaults({ unreadCount: 123 } as ConversationAttributes)
-      ).to.have.deep.property('unreadCount', 123);
-    });
-  });
+  //   it('do not override unreadCount if given', () => {
+  //     expect(
+  //       fillConvoAttributesWithDefaults({ unreadCount: 123 } as ConversationAttributes)
+  //     ).to.have.deep.property('unreadCount', 123);
+  //   });
+  // });
 
   describe('lastJoinedTimestamp', () => {
     it('initialize lastJoinedTimestamp if not given', () => {
@@ -246,22 +246,22 @@ describe('fillConvoAttributesWithDefaults', () => {
     });
   });
 
-  describe('mentionedUs', () => {
-    it('initialize mentionedUs if not given', () => {
-      expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-        'mentionedUs',
-        false
-      );
-    });
+  // describe('mentionedUs', () => {
+  //   it('initialize mentionedUs if not given', () => {
+  //     expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
+  //       'mentionedUs',
+  //       false
+  //     );
+  //   });
 
-    it('do not override mentionedUs if given', () => {
-      expect(
-        fillConvoAttributesWithDefaults({
-          mentionedUs: true,
-        } as ConversationAttributes)
-      ).to.have.deep.property('mentionedUs', true);
-    });
-  });
+  //   it('do not override mentionedUs if given', () => {
+  //     expect(
+  //       fillConvoAttributesWithDefaults({
+  //         mentionedUs: true,
+  //       } as ConversationAttributes)
+  //     ).to.have.deep.property('mentionedUs', true);
+  //   });
+  // });
 
   describe('isKickedFromGroup', () => {
     it('initialize isKickedFromGroup if not given', () => {
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 3265e034e..647bdf96f 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -13,7 +13,7 @@ import { formatRowOfConversation } from '../../../../node/database_utility';
 describe('formatRowOfConversation', () => {
   describe('isTrustedForAttachmentDownload', () => {
     it('initialize isTrustedForAttachmentDownload if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
         'isTrustedForAttachmentDownload',
         false
       );
@@ -21,31 +21,34 @@ describe('formatRowOfConversation', () => {
 
     it('do not override isTrustedForAttachmentDownload if they are set in the row as integer: true', () => {
       expect(
-        formatRowOfConversation({ isTrustedForAttachmentDownload: 1 }, 'test')
+        formatRowOfConversation({ isTrustedForAttachmentDownload: 1 }, 'test', 0, false)
       ).to.have.deep.property('isTrustedForAttachmentDownload', true);
     });
 
     it('do not override isTrustedForAttachmentDownload if they are set in the row as integer: false', () => {
       expect(
-        formatRowOfConversation({ isTrustedForAttachmentDownload: 0 }, 'test')
+        formatRowOfConversation({ isTrustedForAttachmentDownload: 0 }, 'test', 0, false)
       ).to.have.deep.property('isTrustedForAttachmentDownload', false);
     });
   });
 
   describe('isPinned', () => {
     it('initialize isPinned if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isPinned', false);
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
+        'isPinned',
+        false
+      );
     });
 
     it('do not override isPinned if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isPinned: 1 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ isPinned: 1 }, 'test', 0, false)).to.have.deep.property(
         'isPinned',
         true
       );
     });
 
     it('do not override isPinned if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isPinned: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ isPinned: 0 }, 'test', 0, false)).to.have.deep.property(
         'isPinned',
         false
       );
@@ -54,18 +57,21 @@ describe('formatRowOfConversation', () => {
 
   describe('isApproved', () => {
     it('initialize isApproved if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isApproved', false);
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
+        'isApproved',
+        false
+      );
     });
 
     it('do not override isApproved if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isApproved: 1 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ isApproved: 1 }, 'test', 0, false)).to.have.deep.property(
         'isApproved',
         true
       );
     });
 
     it('do not override isApproved if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isApproved: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ isApproved: 0 }, 'test', 0, false)).to.have.deep.property(
         'isApproved',
         false
       );
@@ -74,18 +80,21 @@ describe('formatRowOfConversation', () => {
 
   describe('didApproveMe', () => {
     it('initialize didApproveMe if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('didApproveMe', false);
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
+        'didApproveMe',
+        false
+      );
     });
 
     it('do not override didApproveMe if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ didApproveMe: 1 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ didApproveMe: 1 }, 'test', 0, false)).to.have.deep.property(
         'didApproveMe',
         true
       );
     });
 
     it('do not override didApproveMe if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ didApproveMe: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ didApproveMe: 0 }, 'test', 0, false)).to.have.deep.property(
         'didApproveMe',
         false
       );
@@ -94,38 +103,42 @@ describe('formatRowOfConversation', () => {
 
   describe('is_medium_group', () => {
     it('initialize is_medium_group if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('is_medium_group', false);
-    });
-
-    it('do not override is_medium_group if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ is_medium_group: 1 }, 'test')).to.have.deep.property(
-        'is_medium_group',
-        true
-      );
-    });
-
-    it('do not override is_medium_group if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ is_medium_group: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
         'is_medium_group',
         false
       );
     });
+
+    it('do not override is_medium_group if they are set in the row as integer: true', () => {
+      expect(
+        formatRowOfConversation({ is_medium_group: 1 }, 'test', 0, false)
+      ).to.have.deep.property('is_medium_group', true);
+    });
+
+    it('do not override is_medium_group if they are set in the row as integer: false', () => {
+      expect(
+        formatRowOfConversation({ is_medium_group: 0 }, 'test', 0, false)
+      ).to.have.deep.property('is_medium_group', false);
+    });
   });
 
   describe('mentionedUs', () => {
     it('initialize mentionedUs if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('mentionedUs', false);
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
+        'mentionedUs',
+        false
+      );
     });
 
     it('do not override mentionedUs if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ mentionedUs: 1 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ mentionedUs: 1 }, 'test', 0, false)).to.have.deep.property(
         'mentionedUs',
         true
       );
     });
 
     it('do not override mentionedUs if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ mentionedUs: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({ mentionedUs: 0 }, 'test', 0, false)).to.have.deep.property(
         'mentionedUs',
         false
       );
@@ -134,48 +147,55 @@ describe('formatRowOfConversation', () => {
 
   describe('isKickedFromGroup', () => {
     it('initialize isKickedFromGroup if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('isKickedFromGroup', false);
-    });
-
-    it('do not override isKickedFromGroup if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isKickedFromGroup: 1 }, 'test')).to.have.deep.property(
-        'isKickedFromGroup',
-        true
-      );
-    });
-
-    it('do not override isKickedFromGroup if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isKickedFromGroup: 0 }, 'test')).to.have.deep.property(
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
         'isKickedFromGroup',
         false
       );
     });
+
+    it('do not override isKickedFromGroup if they are set in the row as integer: true', () => {
+      expect(
+        formatRowOfConversation({ isKickedFromGroup: 1 }, 'test', 0, false)
+      ).to.have.deep.property('isKickedFromGroup', true);
+    });
+
+    it('do not override isKickedFromGroup if they are set in the row as integer: false', () => {
+      expect(
+        formatRowOfConversation({ isKickedFromGroup: 0 }, 'test', 0, false)
+      ).to.have.deep.property('isKickedFromGroup', false);
+    });
   });
 
   describe('left', () => {
     it('initialize left if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test')).to.have.deep.property('left', false);
+      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property('left', false);
     });
 
     it('do not override left if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ left: 1 }, 'test')).to.have.deep.property('left', true);
+      expect(formatRowOfConversation({ left: 1 }, 'test', 0, false)).to.have.deep.property(
+        'left',
+        true
+      );
     });
 
     it('do not override left if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ left: 0 }, 'test')).to.have.deep.property('left', false);
+      expect(formatRowOfConversation({ left: 0 }, 'test', 0, false)).to.have.deep.property(
+        'left',
+        false
+      );
     });
   });
 
   describe('row', () => {
     it('row null returns null', () => {
-      expect(formatRowOfConversation(null as any, 'test')).to.be.equal(
+      expect(formatRowOfConversation(null as any, 'test', 0, false)).to.be.equal(
         null,
         'formatRowOfConversation with null should return null'
       );
     });
 
     it('row undefined returns null', () => {
-      expect(formatRowOfConversation(undefined as any, 'test')).to.be.equal(
+      expect(formatRowOfConversation(undefined as any, 'test', 0, false)).to.be.equal(
         null,
         'formatRowOfConversation with undefined should return null'
       );
@@ -184,56 +204,52 @@ describe('formatRowOfConversation', () => {
 
   describe('groupAdmins', () => {
     it('groupAdmins undefined fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: undefined }, 'test')).to.be.have.deep.property(
-        'groupAdmins',
-        []
-      );
+      expect(
+        formatRowOfConversation({ groupAdmins: undefined }, 'test', 0, false)
+      ).to.be.have.deep.property('groupAdmins', []);
     });
 
     it('groupAdmins null fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: null }, 'test')).to.be.have.deep.property(
-        'groupAdmins',
-        []
-      );
+      expect(
+        formatRowOfConversation({ groupAdmins: null }, 'test', 0, false)
+      ).to.be.have.deep.property('groupAdmins', []);
     });
 
     it('groupAdmins [] fills it with []', () => {
-      expect(formatRowOfConversation({ groupAdmins: '[]' }, 'test')).to.be.have.deep.property(
-        'groupAdmins',
-        []
-      );
+      expect(
+        formatRowOfConversation({ groupAdmins: '[]' }, 'test', 0, false)
+      ).to.be.have.deep.property('groupAdmins', []);
     });
 
     it('groupAdmins ["12345"] from db as string', () => {
       expect(
-        formatRowOfConversation({ groupAdmins: '["12345"]' }, 'test')
+        formatRowOfConversation({ groupAdmins: '["12345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('groupAdmins', ['12345']);
     });
 
     it('groupAdmins ["12345", "52345"] fills it with []', () => {
       expect(
-        formatRowOfConversation({ groupAdmins: '["12345", "52345"]' }, 'test')
+        formatRowOfConversation({ groupAdmins: '["12345", "52345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('groupAdmins', ['12345', '52345']);
     });
   });
 
   describe('members', () => {
     it('members undefined fills it with []', () => {
-      expect(formatRowOfConversation({ members: undefined }, 'test')).to.be.have.deep.property(
-        'members',
-        []
-      );
+      expect(
+        formatRowOfConversation({ members: undefined }, 'test', 0, false)
+      ).to.be.have.deep.property('members', []);
     });
 
     it('members null fills it with []', () => {
-      expect(formatRowOfConversation({ members: null }, 'test')).to.be.have.deep.property(
+      expect(formatRowOfConversation({ members: null }, 'test', 0, false)).to.be.have.deep.property(
         'members',
         []
       );
     });
 
     it('members [] fills it with []', () => {
-      expect(formatRowOfConversation({ members: '[]' }, 'test')).to.be.have.deep.property(
+      expect(formatRowOfConversation({ members: '[]' }, 'test', 0, false)).to.be.have.deep.property(
         'members',
         []
       );
@@ -241,34 +257,33 @@ describe('formatRowOfConversation', () => {
 
     it('members ["12345"] from db as string', () => {
       expect(
-        formatRowOfConversation({ members: '["12345"]' }, 'test')
+        formatRowOfConversation({ members: '["12345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('members', ['12345']);
     });
 
     it('members ["12345", "52345"] fills it with []', () => {
       expect(
-        formatRowOfConversation({ members: '["12345", "52345"]' }, 'test')
+        formatRowOfConversation({ members: '["12345", "52345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('members', ['12345', '52345']);
     });
   });
 
   describe('zombies', () => {
     it('zombies undefined fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: undefined }, 'test')).to.be.have.deep.property(
-        'zombies',
-        []
-      );
+      expect(
+        formatRowOfConversation({ zombies: undefined }, 'test', 0, false)
+      ).to.be.have.deep.property('zombies', []);
     });
 
     it('zombies null fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: null }, 'test')).to.be.have.deep.property(
+      expect(formatRowOfConversation({ zombies: null }, 'test', 0, false)).to.be.have.deep.property(
         'zombies',
         []
       );
     });
 
     it('zombies [] fills it with []', () => {
-      expect(formatRowOfConversation({ zombies: '[]' }, 'test')).to.be.have.deep.property(
+      expect(formatRowOfConversation({ zombies: '[]' }, 'test', 0, false)).to.be.have.deep.property(
         'zombies',
         []
       );
@@ -276,26 +291,31 @@ describe('formatRowOfConversation', () => {
 
     it('zombies ["12345"] from db as string', () => {
       expect(
-        formatRowOfConversation({ zombies: '["12345"]' }, 'test')
+        formatRowOfConversation({ zombies: '["12345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('zombies', ['12345']);
     });
 
     it('zombies ["12345", "52345"] fills it with ["12345", "52345"]', () => {
       expect(
-        formatRowOfConversation({ zombies: '["12345", "52345"]' }, 'test')
+        formatRowOfConversation({ zombies: '["12345", "52345"]' }, 'test', 0, false)
       ).to.be.have.deep.property('zombies', ['12345', '52345']);
     });
   });
 
   it('throws an error if a key is not expected', () => {
-    expect(() => formatRowOfConversation({ not_valid: undefined }, 'test')).throws(
+    expect(() => formatRowOfConversation({ not_valid: undefined }, 'test', 0, false)).throws(
       'formatRowOfConversation: an invalid key was given in the record: not_valid'
     );
   });
 
   it('throws an error if a key is not expected but has other valid keys', () => {
     expect(() =>
-      formatRowOfConversation({ triggerNotificationsFor: 'all', not_valid: undefined }, 'test')
+      formatRowOfConversation(
+        { triggerNotificationsFor: 'all', not_valid: undefined },
+        'test',
+        0,
+        false
+      )
     ).throws('formatRowOfConversation: an invalid key was given in the record: not_valid');
   });
 
@@ -312,7 +332,9 @@ describe('formatRowOfConversation', () => {
           avatarInProfile: 'avatarInProfile',
           avatarImageId: 1234,
         } as ConversationAttributes),
-        'test'
+        'test',
+        0,
+        false
       )
     ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
 
@@ -328,7 +350,9 @@ describe('formatRowOfConversation', () => {
           avatarInProfile: 'avatarInProfile',
           avatarImageId: 1234,
         } as ConversationAttributes),
-        'test'
+        'test',
+        0,
+        false
       )
     ).have.deep.property('displayNameInProfile', 'displayNameInProfile');
   });
diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts
index 576581b10..335872cc5 100644
--- a/ts/test/session/unit/onion/OnionErrors_test.ts
+++ b/ts/test/session/unit/onion/OnionErrors_test.ts
@@ -15,11 +15,12 @@ import {
   OXEN_SERVER_ERROR,
 } from '../../../../session/apis/snode_api/onions';
 import AbortController from 'abort-controller';
-import { Snode, SNODE_POOL_ITEM_ID } from '../../../../../ts/data/data';
+import { Snode } from '../../../../../ts/data/data';
 import { pathFailureCount } from '../../../../session/onions/onionPath';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils';
 import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList';
+import { SNODE_POOL_ITEM_ID } from '../../../../data/settings-key';
 
 chai.use(chaiAsPromised as any);
 chai.should();
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index ef230f79e..6586453b5 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -26,7 +26,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          hasNickname: false,
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -55,7 +54,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          hasNickname: false,
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -84,7 +82,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          hasNickname: false,
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -113,7 +110,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          hasNickname: false,
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
@@ -142,7 +138,6 @@ describe('state/selectors/conversations', () => {
           isBlocked: false,
           isKickedFromGroup: false,
           left: false,
-          hasNickname: false,
           isPublic: false,
           expireTimer: 0,
           currentNotificationSetting: 'all',
@@ -200,7 +195,6 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: false,
-          hasNickname: false,
           isPublic: false,
           isHidden: false,
         },
@@ -230,7 +224,6 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: false,
-          hasNickname: false,
           isPublic: false,
           isHidden: false,
         },
@@ -260,7 +253,6 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: true,
-          hasNickname: false,
           isPublic: false,
           isHidden: false,
         },
@@ -289,7 +281,6 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: true,
-          hasNickname: false,
           isPublic: false,
           isHidden: false,
         },
@@ -319,7 +310,6 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           isPinned: false,
-          hasNickname: false,
           isPublic: false,
           isHidden: false,
         },
diff --git a/ts/test/session/unit/sogsv3/ApiUtil_test.ts b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
index e5c1f0df9..888cb82c6 100644
--- a/ts/test/session/unit/sogsv3/ApiUtil_test.ts
+++ b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
@@ -3,7 +3,6 @@
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
-import { ConversationCollection } from '../../../../models/conversation';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import {
   hasExistingOpenGroup,
@@ -82,7 +81,7 @@ describe('APIUtils', () => {
     });
     describe('no matching room', () => {
       beforeEach(async () => {
-        stubData('getAllConversations').resolves(new ConversationCollection([]));
+        stubData('getAllConversations').resolves([]);
         stubData('saveConversation').resolves();
         stubData('getItemById').resolves();
         stubOpenGroupData('getAllV2OpenGroupRooms').resolves();
@@ -129,7 +128,7 @@ describe('APIUtils', () => {
       const convoIdNotOur = getOpenGroupV2ConversationId('open.somethingelse.org', 'fishElse');
 
       beforeEach(async () => {
-        stubData('getAllConversations').resolves(new ConversationCollection([]));
+        stubData('getAllConversations').resolves([]);
         stubData('saveConversation').resolves();
         stubData('getItemById').resolves();
         stubOpenGroupData('getAllV2OpenGroupRooms').resolves();
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 9b09f9c4b..40a259b50 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -1,7 +1,7 @@
 // tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
 import { expect } from 'chai';
 import Sinon from 'sinon';
-import { ConversationCollection } from '../../../../models/conversation';
+import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { getSodiumNode } from '../../../../node/sodiumNode';
 import {
@@ -13,7 +13,6 @@ import {
   getCachedNakedKeyFromBlindedNoServerPubkey,
   isNonBlindedKey,
   isUsAnySogsFromCache,
-  KNOWN_BLINDED_KEYS_ITEM,
   loadKnownBlindedKeys,
   TEST_getCachedBlindedKeys,
   TEST_resetCachedBlindedKeys,
@@ -483,7 +482,7 @@ describe('knownBlindedKeys', () => {
       beforeEach(async () => {
         getConversationController().reset();
 
-        stubData('getAllConversations').resolves(new ConversationCollection([]));
+        stubData('getAllConversations').resolves([]);
         stubData('saveConversation').resolves();
         await getConversationController().load();
       });
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 607636b90..2e804da0f 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -5,7 +5,7 @@ import { describe } from 'mocha';
 import Sinon, * as sinon from 'sinon';
 
 import chaiAsPromised from 'chai-as-promised';
-import { ConversationCollection, ConversationModel } from '../../../../models/conversation';
+import { ConversationModel } from '../../../../models/conversation';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { getSwarmPollingInstance, SnodePool } from '../../../../session/apis/snode_api';
 import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling';
@@ -44,7 +44,7 @@ describe('SwarmPolling', () => {
     // Utils Stubs
     Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
 
-    stubData('getAllConversations').resolves(new ConversationCollection());
+    stubData('getAllConversations').resolves([]);
     getItemByIdStub = TestUtils.stubData('getItemById');
     stubData('saveConversation').resolves();
     stubData('getSwarmNodesForPubkey').resolves();
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index ccc99d969..9ec200211 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -1,31 +1,30 @@
 // tslint:disable: no-implicit-dependencies
 
 import chai from 'chai';
-import { TestUtils } from '../../../test-utils';
-import { MessageUtils, UserUtils } from '../../../../session/utils';
-import { PubKey } from '../../../../session/types';
-import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
+import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
+import { PubKey } from '../../../../session/types';
+import { MessageUtils, UserUtils } from '../../../../session/utils';
+import { TestUtils } from '../../../test-utils';
 
 import chaiAsPromised from 'chai-as-promised';
-chai.use(chaiAsPromised as any);
-import { ClosedGroupEncryptionPairReplyMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
+import { beforeEach } from 'mocha';
+import Sinon from 'sinon';
+import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
+import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { SignalService } from '../../../../protobuf';
+import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
+import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
+import { getConversationController } from '../../../../session/conversations';
 import { ClosedGroupAddedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage';
 import { ClosedGroupEncryptionPairMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage';
+import { ClosedGroupEncryptionPairReplyMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
 import { ClosedGroupNameChangeMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
 import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
-import Sinon from 'sinon';
 import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils';
-import { getConversationController } from '../../../../session/conversations';
 import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
-import { ConversationCollection } from '../../../../models/conversation';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
-import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
-import { beforeEach } from 'mocha';
-import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
-import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
+chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
 
@@ -249,7 +248,7 @@ describe('Message Utils', () => {
     beforeEach(async () => {
       Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').resolves(ourNumber);
       Sinon.stub(UserUtils, 'getOurPubKeyFromCache').resolves(PubKey.cast(ourNumber));
-      stubData('getAllConversations').resolves(new ConversationCollection([]));
+      stubData('getAllConversations').resolves([]);
       stubData('saveConversation').resolves();
       stubOpenGroupData('getAllV2OpenGroupRooms').resolves();
       getConversationController().reset();
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index 2aa7aff76..d2a094676 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -1,501 +1,502 @@
 export type LocalizerKeys =
-  | 'removePassword'
-  | 'classicDarkThemeTitle'
-  | 'userUnbanFailed'
-  | 'changePassword'
-  | 'saved'
-  | 'startedACall'
+  | 'copyErrorAndQuit'
+  | 'unknown'
+  | 'databaseError'
+  | 'mainMenuFile'
+  | 'mainMenuEdit'
+  | 'mainMenuView'
   | 'mainMenuWindow'
-  | 'unblocked'
-  | 'keepDisabled'
-  | 'userAddedToModerators'
-  | 'otherSingular'
-  | 'to'
-  | 'sent'
-  | 'requestsPlaceholder'
-  | 'closedGroupInviteFailMessage'
-  | 'noContactsForGroup'
-  | 'faq'
-  | 'timerOption_2_weeks_abbreviated'
-  | 'linkVisitWarningMessage'
-  | 'messageRequestAcceptedOurs'
-  | 'anonymous'
-  | 'permissionsSettingsTitle'
-  | 'viewMenuZoomOut'
-  | 'dialogClearAllDataDeletionFailedDesc'
-  | 'timerOption_10_seconds_abbreviated'
-  | 'enterDisplayName'
-  | 'connectToServerFail'
-  | 'moreInformation'
-  | 'publicChatExists'
-  | 'noMediaUntilApproved'
-  | 'passwordViewTitle'
-  | 'joinOpenGroupAfterInvitationConfirmationTitle'
-  | 'notificationMostRecentFrom'
-  | 'messageRequestAccepted'
-  | 'timerOption_5_minutes'
-  | 'linkPreviewsConfirmMessage'
-  | 'notificationMostRecent'
-  | 'video'
-  | 'readReceiptSettingDescription'
-  | 'userBanFailed'
-  | 'autoUpdateLaterButtonLabel'
-  | 'maximumAttachments'
-  | 'deviceOnly'
-  | 'reactionPopupTwo'
-  | 'beginYourSession'
-  | 'typingIndicatorsSettingDescription'
-  | 'changePasswordToastDescription'
-  | 'addingContacts'
-  | 'passwordLengthError'
-  | 'typingIndicatorsSettingTitle'
-  | 'maxPasswordAttempts'
-  | 'viewMenuToggleDevTools'
-  | 'fileSizeWarning'
-  | 'openGroupURL'
-  | 'hideMenuBarDescription'
-  | 'pickClosedGroupMember'
-  | 'ByUsingThisService...'
-  | 'startConversation'
-  | 'unableToCallTitle'
-  | 'yourUniqueSessionID'
-  | 'typingAlt'
-  | 'orJoinOneOfThese'
-  | 'members'
-  | 'noMessageRequestsPending'
-  | 'sendRecoveryPhraseMessage'
-  | 'shareBugDetails'
-  | 'timerOption_1_hour'
-  | 'youGotKickedFromGroup'
-  | 'cannotRemoveCreatorFromGroupDesc'
-  | 'contactAvatarAlt'
-  | 'incomingError'
-  | 'notificationsSettingsTitle'
-  | 'conversationsSettingsTitle'
-  | 'tookAScreenshot'
-  | 'reactionListCountPlural'
-  | 'from'
-  | 'requestsSubtitle'
-  | 'thisMonth'
-  | 'chooseAnAction'
-  | 'next'
-  | 'addModerators'
-  | 'sessionMessenger'
-  | 'today'
-  | 'mustBeApproved'
+  | 'mainMenuHelp'
+  | 'appMenuHide'
   | 'appMenuHideOthers'
-  | 'sendFailed'
-  | 'enterNewPassword'
-  | 'expandedReactionsText'
-  | 'openMessageRequestInbox'
-  | 'rateLimitReactMessage'
-  | 'enterPassword'
-  | 'enterSessionIDOfRecipient'
-  | 'join'
-  | 'dialogClearAllDataDeletionFailedMultiple'
-  | 'clearAllReactions'
-  | 'appMenuQuit'
-  | 'windowMenuZoom'
-  | 'allUsersAreRandomly...'
-  | 'cameraPermissionNeeded'
-  | 'notificationsSettingsContent'
-  | 'ringing'
-  | 'closedGroupInviteSuccessTitle'
-  | 'accept'
-  | 'hideBanner'
-  | 'setPasswordTitle'
-  | 'editMenuUndo'
-  | 'pinConversation'
-  | 'lightboxImageAlt'
-  | 'linkDevice'
-  | 'callMissedNotApproved'
-  | 'invalidPubkeyFormat'
-  | 'primaryColorYellow'
-  | 'disappearingMessagesDisabled'
-  | 'spellCheckDescription'
-  | 'clearDataSettingsTitle'
-  | 'autoUpdateNewVersionInstructions'
   | 'appMenuUnhide'
-  | 'timerOption_30_minutes_abbreviated'
-  | 'pruneSettingDescription'
-  | 'audioNotificationsSettingsTitle'
+  | 'appMenuQuit'
+  | 'editMenuUndo'
+  | 'editMenuRedo'
+  | 'editMenuCut'
+  | 'editMenuCopy'
+  | 'editMenuPaste'
+  | 'editMenuDeleteContact'
+  | 'editMenuDeleteGroup'
+  | 'editMenuSelectAll'
+  | 'windowMenuClose'
+  | 'windowMenuMinimize'
+  | 'windowMenuZoom'
+  | 'viewMenuResetZoom'
+  | 'viewMenuZoomIn'
+  | 'viewMenuZoomOut'
+  | 'viewMenuToggleFullScreen'
+  | 'viewMenuToggleDevTools'
+  | 'contextMenuNoSuggestions'
+  | 'openGroupInvitation'
+  | 'joinOpenGroupAfterInvitationConfirmationTitle'
+  | 'joinOpenGroupAfterInvitationConfirmationDesc'
+  | 'couldntFindServerMatching'
+  | 'enterSessionIDOrONSName'
+  | 'startNewConversationBy...'
+  | 'loading'
+  | 'done'
+  | 'youLeftTheGroup'
+  | 'youGotKickedFromGroup'
+  | 'unreadMessages'
+  | 'debugLogExplanation'
+  | 'reportIssue'
+  | 'markAllAsRead'
+  | 'incomingError'
+  | 'media'
+  | 'mediaEmptyState'
+  | 'documents'
+  | 'documentsEmptyState'
+  | 'today'
+  | 'yesterday'
+  | 'thisWeek'
+  | 'thisMonth'
   | 'voiceMessage'
-  | 'primaryColorPink'
-  | 'changePasswordTitle'
-  | 'copyMessage'
+  | 'stagedPreviewThumbnail'
+  | 'previewThumbnail'
+  | 'stagedImageAttachment'
+  | 'oneNonImageAtATimeToast'
+  | 'cannotMixImageAndNonImageAttachments'
+  | 'maximumAttachments'
+  | 'fileSizeWarning'
+  | 'unableToLoadAttachment'
+  | 'offline'
+  | 'debugLog'
+  | 'showDebugLog'
+  | 'shareBugDetails'
+  | 'goToReleaseNotes'
+  | 'goToSupportPage'
+  | 'about'
+  | 'show'
+  | 'sessionMessenger'
+  | 'noSearchResults'
+  | 'conversationsHeader'
+  | 'contactsHeader'
+  | 'messagesHeader'
+  | 'settingsHeader'
+  | 'typingAlt'
+  | 'contactAvatarAlt'
+  | 'downloadAttachment'
+  | 'replyToMessage'
+  | 'replyingToMessage'
+  | 'originalMessageNotFound'
+  | 'you'
+  | 'audioPermissionNeededTitle'
+  | 'audioPermissionNeeded'
+  | 'audio'
+  | 'video'
+  | 'photo'
+  | 'cannotUpdate'
+  | 'cannotUpdateDetail'
+  | 'ok'
+  | 'cancel'
+  | 'close'
+  | 'continue'
+  | 'error'
+  | 'delete'
   | 'messageDeletionForbidden'
   | 'deleteJustForMe'
-  | 'changeAccountPasswordTitle'
-  | 'onionPathIndicatorDescription'
-  | 'mediaPermissionsTitle'
-  | 'replyingToMessage'
-  | 'welcomeToYourSession'
-  | 'createPassword'
-  | 'editMenuCopy'
-  | 'leftTheGroup'
-  | 'timerOption_30_minutes'
-  | 'nameOnly'
-  | 'typeInOldPassword'
-  | 'imageAttachmentAlt'
-  | 'displayNameEmpty'
-  | 'inviteContacts'
-  | 'callMediaPermissionsTitle'
-  | 'couldntFindServerMatching'
-  | 'blocked'
-  | 'hideRequestBannerDescription'
-  | 'noBlockedContacts'
-  | 'reactionNotification'
-  | 'leaveGroupConfirmation'
-  | 'banUserAndDeleteAll'
-  | 'joinOpenGroupAfterInvitationConfirmationDesc'
-  | 'invalidNumberError'
-  | 'contextMenuNoSuggestions'
-  | 'callMediaPermissionsDialogTitle'
-  | 'recoveryPhraseRevealButtonText'
-  | 'banUser'
-  | 'primaryColorBlue'
-  | 'sendMessage'
-  | 'recoveryPhraseRevealMessage'
-  | 'showRecoveryPhrase'
-  | 'autoUpdateSettingDescription'
-  | 'remove'
-  | 'restoreUsingRecoveryPhrase'
-  | 'cannotUpdateDetail'
-  | 'showRecoveryPhrasePasswordRequest'
-  | 'spellCheckDirty'
-  | 'debugLogExplanation'
-  | 'closedGroupInviteFailTitle'
-  | 'areYouSureClearDevice'
-  | 'setAccountPasswordDescription'
-  | 'removeAccountPasswordDescription'
-  | 'establishingConnection'
-  | 'noModeratorsToRemove'
-  | 'youHaveANewFriendRequest'
-  | 'offline'
-  | 'appearanceSettingsTitle'
-  | 'mainMenuView'
-  | 'mainMenuEdit'
-  | 'notificationForConvo_disabled'
-  | 'leaveGroupConfirmationAdmin'
-  | 'notificationForConvo_all'
-  | 'emptyGroupNameError'
-  | 'copyOpenGroupURL'
-  | 'setPasswordInvalid'
-  | 'timerOption_30_seconds_abbreviated'
-  | 'createConversationNewContact'
-  | 'removeResidueMembers'
-  | 'timerOption_1_hour_abbreviated'
-  | 'areYouSureDeleteEntireAccount'
-  | 'noGivenPassword'
-  | 'closedGroupInviteOkText'
-  | 'readReceiptSettingTitle'
-  | 'copySessionID'
-  | 'timerOption_0_seconds'
-  | 'zoomFactorSettingTitle'
-  | 'unableToCall'
-  | 'callMissedTitle'
-  | 'done'
-  | 'videoAttachmentAlt'
-  | 'message'
-  | 'mainMenuHelp'
-  | 'open'
-  | 'nameAndMessage'
-  | 'autoUpdateDownloadedMessage'
-  | 'onionPathIndicatorTitle'
-  | 'unknown'
-  | 'mediaMessage'
-  | 'addAsModerator'
-  | 'closedGroupInviteFailTitlePlural'
-  | 'enterSessionID'
-  | 'editGroup'
-  | 'incomingCallFrom'
-  | 'timerSetOnSync'
-  | 'deleteMessages'
-  | 'searchForContactsOnly'
-  | 'spellCheckTitle'
-  | 'editMenuSelectAll'
-  | 'messageBodyMissing'
-  | 'timerOption_12_hours_abbreviated'
-  | 'onlyAdminCanRemoveMembersDesc'
-  | 'kickedFromTheGroup'
-  | 'windowMenuMinimize'
-  | 'debugLog'
-  | 'timerOption_0_seconds_abbreviated'
-  | 'timerOption_5_minutes_abbreviated'
-  | 'goToReleaseNotes'
-  | 'unpinConversation'
-  | 'viewMenuResetZoom'
-  | 'startInTrayDescription'
-  | 'groupNamePlaceholder'
-  | 'messageRequestPending'
-  | 'stagedPreviewThumbnail'
-  | 'helpUsTranslateSession'
-  | 'editMenuDeleteGroup'
-  | 'unreadMessages'
-  | 'documents'
-  | 'audioPermissionNeededTitle'
-  | 'deleteMessagesQuestion'
-  | 'clickToTrustContact'
-  | 'closedGroupInviteFailMessagePlural'
-  | 'noAudioInputFound'
-  | 'timerOption_10_seconds'
-  | 'helpSettingsTitle'
-  | 'openMessageRequestInboxDescription'
-  | 'notificationPreview'
-  | 'noteToSelf'
-  | 'failedToAddAsModerator'
-  | 'disabledDisappearingMessages'
-  | 'cannotUpdate'
-  | 'primaryColor'
-  | 'device'
-  | 'replyToMessage'
-  | 'messageDeletedPlaceholder'
-  | 'notificationFrom'
-  | 'displayName'
-  | 'clear'
-  | 'invalidSessionId'
-  | 'audioPermissionNeeded'
-  | 'createGroup'
-  | 'add'
-  | 'timerOption_2_weeks'
-  | 'messageRequests'
-  | 'show'
-  | 'cannotMixImageAndNonImageAttachments'
-  | 'viewMenuToggleFullScreen'
-  | 'goToSupportPage'
-  | 'passwordsDoNotMatch'
-  | 'createClosedGroupNamePrompt'
-  | 'audioMessageAutoplayDescription'
-  | 'leaveAndRemoveForEveryone'
-  | 'previewThumbnail'
-  | 'primaryColorPurple'
-  | 'photo'
-  | 'setPassword'
-  | 'editMenuDeleteContact'
-  | 'hideMenuBarTitle'
-  | 'reactionPopupOne'
-  | 'imageCaptionIconAlt'
-  | 'sendRecoveryPhraseTitle'
-  | 'joinACommunity'
-  | 'multipleJoinedTheGroup'
-  | 'messageRequestAcceptedOursNoName'
-  | 'activeMembers'
-  | 'databaseError'
-  | 'resend'
-  | 'copiedToClipboard'
-  | 'closedGroupInviteSuccessTitlePlural'
-  | 'autoUpdateDownloadButtonLabel'
-  | 'groupMembers'
-  | 'primaryColorOrange'
-  | 'dialogClearAllDataDeletionQuestion'
-  | 'oceanDarkThemeTitle'
-  | 'unableToLoadAttachment'
-  | 'cameraPermissionNeededTitle'
-  | 'editMenuRedo'
-  | 'hideRequestBanner'
-  | 'changeNicknameMessage'
-  | 'reactionPopupThree'
-  | 'close'
-  | 'deleteMessageQuestion'
-  | 'newMessage'
-  | 'windowMenuClose'
-  | 'mainMenuFile'
-  | 'confirmNewPassword'
-  | 'callMissed'
-  | 'getStarted'
-  | 'reactionListCountSingular'
-  | 'unblockUser'
-  | 'blockUser'
-  | 'clearAllConfirmationTitle'
-  | 'trustThisContactDialogTitle'
-  | 'received'
-  | 'trimDatabaseConfirmationBody'
-  | 'setPasswordFail'
-  | 'clearNickname'
-  | 'connectToServerSuccess'
-  | 'viewMenuZoomIn'
-  | 'invalidOpenGroupUrl'
-  | 'entireAccount'
-  | 'noContactsToAdd'
-  | 'cancel'
-  | 'decline'
-  | 'originalMessageNotFound'
-  | 'create'
-  | 'autoUpdateRestartButtonLabel'
-  | 'deleteConversationConfirmation'
-  | 'timerOption_6_hours_abbreviated'
-  | 'timerOption_1_week_abbreviated'
-  | 'removePasswordTitle'
-  | 'unblockGroupToSend'
-  | 'otherPlural'
-  | 'enable'
-  | 'notificationSubtitle'
-  | 'youChangedTheTimer'
-  | 'updatedTheGroup'
-  | 'leaveGroup'
-  | 'continueYourSession'
-  | 'invalidGroupNameTooShort'
-  | 'notificationForConvo'
-  | 'noNameOrMessage'
-  | 'classicLightThemeTitle'
-  | 'noSearchResults'
-  | 'reactionPopup'
-  | 'changeNickname'
-  | 'userUnbanned'
-  | 'respondingToRequestWarning'
-  | 'error'
-  | 'clearAllData'
-  | 'createConversationNewGroup'
-  | 'disappearingMessages'
-  | 'autoUpdateNewVersionTitle'
-  | 'linkPreviewDescription'
-  | 'timerOption_1_day'
-  | 'contactsHeader'
-  | 'openGroupInvitation'
-  | 'callMissedCausePermission'
-  | 'mediaPermissionsDescription'
-  | 'tryAgain'
-  | 'clearDevice'
-  | 'media'
-  | 'noMembersInThisGroup'
-  | 'saveLogToDesktop'
-  | 'copyErrorAndQuit'
-  | 'onlyAdminCanRemoveMembers'
-  | 'passwordTypeError'
-  | 'createClosedGroupPlaceholder'
-  | 'editProfileModalTitle'
-  | 'noCameraFound'
-  | 'setAccountPasswordTitle'
-  | 'callMediaPermissionsDescription'
-  | 'recoveryPhraseSecureTitle'
-  | 'yesterday'
-  | 'closedGroupInviteSuccessMessage'
-  | 'youDisabledDisappearingMessages'
-  | 'updateGroupDialogTitle'
-  | 'surveyTitle'
-  | 'userRemovedFromModerators'
-  | 'timerOption_5_seconds'
-  | 'failedToRemoveFromModerator'
-  | 'conversationsHeader'
-  | 'setPasswordToastDescription'
-  | 'audio'
-  | 'startInTrayTitle'
-  | 'cannotRemoveCreatorFromGroup'
-  | 'editMenuCut'
-  | 'markAllAsRead'
-  | 'failedResolveOns'
-  | 'showDebugLog'
-  | 'declineRequestMessage'
-  | 'primaryColorGreen'
-  | 'dialogClearAllDataDeletionFailedTitleQuestion'
-  | 'autoUpdateDownloadInstructions'
-  | 'dialogClearAllDataDeletionFailedTitle'
-  | 'loading'
-  | 'blockedSettingsTitle'
-  | 'appMenuHide'
-  | 'removeAccountPasswordTitle'
-  | 'recoveryPhraseEmpty'
-  | 'noAudioOutputFound'
-  | 'save'
-  | 'privacySettingsTitle'
-  | 'changeAccountPasswordDescription'
-  | 'notificationSettingsDialog'
-  | 'invalidOldPassword'
-  | 'messageBody'
-  | 'audioMessageAutoplayTitle'
-  | 'removePasswordInvalid'
-  | 'password'
-  | 'nicknamePlaceholder'
-  | 'linkPreviewsTitle'
-  | 'continue'
-  | 'learnMore'
-  | 'passwordCharacterError'
-  | 'autoUpdateSettingTitle'
-  | 'documentsEmptyState'
   | 'deleteForEveryone'
-  | 'createSessionID'
-  | 'multipleLeftTheGroup'
-  | 'answeredACall'
-  | 'oceanLightThemeTitle'
-  | 'enterSessionIDOrONSName'
-  | 'quoteThumbnailAlt'
-  | 'timerOption_1_week'
-  | 'deleteContactConfirmation'
-  | 'timerOption_30_seconds'
-  | 'createAccount'
-  | 'timerOption_1_minute_abbreviated'
-  | 'startNewConversationBy...'
-  | 'timerOption_12_hours'
-  | 'unblockToSend'
-  | 'timerOption_1_minute'
-  | 'yourSessionID'
-  | 'deleteAccountWarning'
+  | 'deleteMessagesQuestion'
+  | 'deleteMessageQuestion'
+  | 'deleteMessages'
   | 'deleted'
-  | 'closedGroupMaxSize'
-  | 'messagesHeader'
-  | 'joinOpenGroup'
-  | 'callMediaPermissionsDialogContent'
-  | 'timerOption_1_day_abbreviated'
-  | 'about'
-  | 'clearAllConfirmationBody'
-  | 'ok'
-  | 'multipleKickedFromTheGroup'
-  | 'trimDatabase'
-  | 'clearAll'
-  | 'recoveryPhraseSavePromptMain'
-  | 'editMenuPaste'
-  | 'areYouSureDeleteDeviceOnly'
-  | 'or'
-  | 'removeModerators'
-  | 'destination'
-  | 'invalidGroupNameTooLong'
-  | 'youLeftTheGroup'
-  | 'theyChangedTheTimer'
-  | 'userBanned'
-  | 'addACaption'
-  | 'timerOption_5_seconds_abbreviated'
-  | 'removeFromModerators'
-  | 'enterRecoveryPhrase'
-  | 'support'
-  | 'stagedImageAttachment'
-  | 'thisWeek'
-  | 'savedTheFile'
-  | 'mediaEmptyState'
-  | 'linkVisitWarningTitle'
-  | 'invalidPassword'
-  | 'endCall'
-  | 'connectingToServer'
-  | 'pleaseWaitOpenAndOptimizeDb'
-  | 'settingsHeader'
-  | 'autoUpdateNewVersionMessage'
-  | 'oneNonImageAtATimeToast'
-  | 'reactionPopupMany'
-  | 'timerSetTo'
-  | 'iAmSure'
-  | 'primaryColorRed'
-  | 'selectMessage'
-  | 'enterAnOpenGroupURL'
-  | 'delete'
-  | 'changePasswordInvalid'
-  | 'themesSettingTitle'
-  | 'timerOption_6_hours'
-  | 'confirmPassword'
-  | 'downloadAttachment'
-  | 'trimDatabaseDescription'
-  | 'showUserDetails'
-  | 'titleIsNow'
-  | 'removePasswordToastDescription'
-  | 'recoveryPhrase'
+  | 'messageDeletedPlaceholder'
+  | 'from'
+  | 'to'
+  | 'sent'
+  | 'received'
+  | 'sendMessage'
+  | 'groupMembers'
+  | 'moreInformation'
+  | 'resend'
+  | 'deleteConversationConfirmation'
+  | 'clear'
+  | 'clearAllData'
+  | 'deleteAccountWarning'
   | 'deleteAccountFromLogin'
-  | 'newMessages'
-  | 'you'
+  | 'deleteContactConfirmation'
+  | 'quoteThumbnailAlt'
+  | 'imageAttachmentAlt'
+  | 'videoAttachmentAlt'
+  | 'lightboxImageAlt'
+  | 'imageCaptionIconAlt'
+  | 'addACaption'
+  | 'copySessionID'
+  | 'copyOpenGroupURL'
+  | 'save'
+  | 'saveLogToDesktop'
+  | 'saved'
+  | 'tookAScreenshot'
+  | 'savedTheFile'
+  | 'linkPreviewsTitle'
+  | 'linkPreviewDescription'
+  | 'linkPreviewsConfirmMessage'
+  | 'mediaPermissionsTitle'
+  | 'mediaPermissionsDescription'
+  | 'spellCheckTitle'
+  | 'spellCheckDescription'
+  | 'spellCheckDirty'
+  | 'readReceiptSettingDescription'
+  | 'readReceiptSettingTitle'
+  | 'typingIndicatorsSettingDescription'
+  | 'typingIndicatorsSettingTitle'
+  | 'zoomFactorSettingTitle'
+  | 'themesSettingTitle'
+  | 'primaryColor'
+  | 'primaryColorGreen'
+  | 'primaryColorBlue'
+  | 'primaryColorYellow'
+  | 'primaryColorPink'
+  | 'primaryColorPurple'
+  | 'primaryColorOrange'
+  | 'primaryColorRed'
+  | 'classicDarkThemeTitle'
+  | 'classicLightThemeTitle'
+  | 'oceanDarkThemeTitle'
+  | 'oceanLightThemeTitle'
   | 'pruneSettingTitle'
-  | 'unbanUser'
-  | 'notificationForConvo_mentions_only'
-  | 'trustThisContactDialogDescription'
-  | 'unknownCountry'
-  | 'searchFor...'
-  | 'displayNameTooLong'
+  | 'pruneSettingDescription'
+  | 'enable'
+  | 'keepDisabled'
+  | 'notificationSettingsDialog'
+  | 'nameAndMessage'
+  | 'noNameOrMessage'
+  | 'nameOnly'
+  | 'newMessage'
+  | 'createConversationNewContact'
+  | 'createConversationNewGroup'
+  | 'joinACommunity'
+  | 'chooseAnAction'
+  | 'newMessages'
+  | 'notificationMostRecentFrom'
+  | 'notificationFrom'
+  | 'notificationMostRecent'
+  | 'sendFailed'
+  | 'mediaMessage'
+  | 'messageBodyMissing'
+  | 'messageBody'
+  | 'unblockToSend'
+  | 'unblockGroupToSend'
+  | 'youChangedTheTimer'
+  | 'timerSetOnSync'
+  | 'theyChangedTheTimer'
+  | 'timerOption_0_seconds'
+  | 'timerOption_5_seconds'
+  | 'timerOption_10_seconds'
+  | 'timerOption_30_seconds'
+  | 'timerOption_1_minute'
+  | 'timerOption_5_minutes'
+  | 'timerOption_30_minutes'
+  | 'timerOption_1_hour'
+  | 'timerOption_6_hours'
+  | 'timerOption_12_hours'
+  | 'timerOption_1_day'
+  | 'timerOption_1_week'
+  | 'timerOption_2_weeks'
+  | 'disappearingMessages'
+  | 'changeNickname'
+  | 'clearNickname'
+  | 'nicknamePlaceholder'
+  | 'changeNicknameMessage'
+  | 'timerOption_0_seconds_abbreviated'
+  | 'timerOption_5_seconds_abbreviated'
+  | 'timerOption_10_seconds_abbreviated'
+  | 'timerOption_30_seconds_abbreviated'
+  | 'timerOption_1_minute_abbreviated'
+  | 'timerOption_5_minutes_abbreviated'
+  | 'timerOption_30_minutes_abbreviated'
+  | 'timerOption_1_hour_abbreviated'
+  | 'timerOption_6_hours_abbreviated'
+  | 'timerOption_12_hours_abbreviated'
+  | 'timerOption_1_day_abbreviated'
+  | 'timerOption_1_week_abbreviated'
+  | 'timerOption_2_weeks_abbreviated'
+  | 'disappearingMessagesDisabled'
+  | 'disabledDisappearingMessages'
+  | 'youDisabledDisappearingMessages'
+  | 'timerSetTo'
+  | 'noteToSelf'
+  | 'hideMenuBarTitle'
+  | 'hideMenuBarDescription'
+  | 'startConversation'
+  | 'invalidNumberError'
+  | 'failedResolveOns'
+  | 'autoUpdateSettingTitle'
+  | 'autoUpdateSettingDescription'
+  | 'autoUpdateNewVersionTitle'
+  | 'autoUpdateNewVersionMessage'
+  | 'autoUpdateNewVersionInstructions'
+  | 'autoUpdateRestartButtonLabel'
+  | 'autoUpdateLaterButtonLabel'
+  | 'autoUpdateDownloadButtonLabel'
+  | 'autoUpdateDownloadedMessage'
+  | 'autoUpdateDownloadInstructions'
+  | 'leftTheGroup'
+  | 'multipleLeftTheGroup'
+  | 'updatedTheGroup'
+  | 'titleIsNow'
   | 'joinedTheGroup'
+  | 'multipleJoinedTheGroup'
+  | 'kickedFromTheGroup'
+  | 'multipleKickedFromTheGroup'
+  | 'blockUser'
+  | 'unblockUser'
+  | 'unblocked'
+  | 'blocked'
+  | 'blockedSettingsTitle'
+  | 'conversationsSettingsTitle'
+  | 'unbanUser'
+  | 'userUnbanned'
+  | 'userUnbanFailed'
+  | 'banUser'
+  | 'banUserAndDeleteAll'
+  | 'userBanned'
+  | 'userBanFailed'
+  | 'leaveGroup'
+  | 'leaveAndRemoveForEveryone'
+  | 'leaveGroupConfirmation'
+  | 'leaveGroupConfirmationAdmin'
+  | 'cannotRemoveCreatorFromGroup'
+  | 'cannotRemoveCreatorFromGroupDesc'
+  | 'noContactsForGroup'
+  | 'failedToAddAsModerator'
+  | 'failedToRemoveFromModerator'
+  | 'copyMessage'
+  | 'selectMessage'
+  | 'editGroup'
   | 'editGroupName'
-  | 'reportIssue';
+  | 'updateGroupDialogTitle'
+  | 'showRecoveryPhrase'
+  | 'yourSessionID'
+  | 'setAccountPasswordTitle'
+  | 'setAccountPasswordDescription'
+  | 'changeAccountPasswordTitle'
+  | 'changeAccountPasswordDescription'
+  | 'removeAccountPasswordTitle'
+  | 'removeAccountPasswordDescription'
+  | 'enterPassword'
+  | 'confirmPassword'
+  | 'enterNewPassword'
+  | 'confirmNewPassword'
+  | 'showRecoveryPhrasePasswordRequest'
+  | 'recoveryPhraseSavePromptMain'
+  | 'invalidOpenGroupUrl'
+  | 'copiedToClipboard'
+  | 'passwordViewTitle'
+  | 'password'
+  | 'setPassword'
+  | 'changePassword'
+  | 'createPassword'
+  | 'removePassword'
+  | 'maxPasswordAttempts'
+  | 'typeInOldPassword'
+  | 'invalidOldPassword'
+  | 'invalidPassword'
+  | 'noGivenPassword'
+  | 'passwordsDoNotMatch'
+  | 'setPasswordInvalid'
+  | 'changePasswordInvalid'
+  | 'removePasswordInvalid'
+  | 'setPasswordTitle'
+  | 'changePasswordTitle'
+  | 'removePasswordTitle'
+  | 'setPasswordToastDescription'
+  | 'changePasswordToastDescription'
+  | 'removePasswordToastDescription'
+  | 'publicChatExists'
+  | 'connectToServerFail'
+  | 'connectingToServer'
+  | 'connectToServerSuccess'
+  | 'setPasswordFail'
+  | 'passwordLengthError'
+  | 'passwordTypeError'
+  | 'passwordCharacterError'
+  | 'remove'
+  | 'invalidSessionId'
+  | 'invalidPubkeyFormat'
+  | 'emptyGroupNameError'
+  | 'editProfileModalTitle'
+  | 'groupNamePlaceholder'
+  | 'inviteContacts'
+  | 'addModerators'
+  | 'removeModerators'
+  | 'addAsModerator'
+  | 'removeFromModerators'
+  | 'add'
+  | 'addingContacts'
+  | 'noContactsToAdd'
+  | 'noMembersInThisGroup'
+  | 'noModeratorsToRemove'
+  | 'onlyAdminCanRemoveMembers'
+  | 'onlyAdminCanRemoveMembersDesc'
+  | 'createAccount'
+  | 'startInTrayTitle'
+  | 'startInTrayDescription'
+  | 'yourUniqueSessionID'
+  | 'allUsersAreRandomly...'
+  | 'getStarted'
+  | 'createSessionID'
+  | 'recoveryPhrase'
+  | 'enterRecoveryPhrase'
+  | 'displayName'
+  | 'anonymous'
+  | 'removeResidueMembers'
+  | 'enterDisplayName'
+  | 'continueYourSession'
+  | 'linkDevice'
+  | 'restoreUsingRecoveryPhrase'
+  | 'or'
+  | 'ByUsingThisService...'
+  | 'beginYourSession'
+  | 'welcomeToYourSession'
+  | 'searchFor...'
+  | 'searchForContactsOnly'
+  | 'enterSessionID'
+  | 'enterSessionIDOfRecipient'
+  | 'message'
+  | 'appearanceSettingsTitle'
+  | 'privacySettingsTitle'
+  | 'notificationsSettingsTitle'
+  | 'audioNotificationsSettingsTitle'
+  | 'notificationsSettingsContent'
+  | 'notificationPreview'
+  | 'recoveryPhraseEmpty'
+  | 'displayNameEmpty'
+  | 'displayNameTooLong'
+  | 'members'
+  | 'activeMembers'
+  | 'join'
+  | 'joinOpenGroup'
+  | 'createGroup'
+  | 'create'
+  | 'createClosedGroupNamePrompt'
+  | 'createClosedGroupPlaceholder'
+  | 'openGroupURL'
+  | 'enterAnOpenGroupURL'
+  | 'next'
+  | 'invalidGroupNameTooShort'
+  | 'invalidGroupNameTooLong'
+  | 'pickClosedGroupMember'
+  | 'closedGroupMaxSize'
+  | 'noBlockedContacts'
+  | 'userAddedToModerators'
+  | 'userRemovedFromModerators'
+  | 'orJoinOneOfThese'
+  | 'helpUsTranslateSession'
+  | 'closedGroupInviteFailTitle'
+  | 'closedGroupInviteFailTitlePlural'
+  | 'closedGroupInviteFailMessage'
+  | 'closedGroupInviteFailMessagePlural'
+  | 'closedGroupInviteOkText'
+  | 'closedGroupInviteSuccessTitlePlural'
+  | 'closedGroupInviteSuccessTitle'
+  | 'closedGroupInviteSuccessMessage'
+  | 'notificationForConvo'
+  | 'notificationForConvo_all'
+  | 'notificationForConvo_disabled'
+  | 'notificationForConvo_mentions_only'
+  | 'onionPathIndicatorTitle'
+  | 'onionPathIndicatorDescription'
+  | 'unknownCountry'
+  | 'device'
+  | 'destination'
+  | 'learnMore'
+  | 'linkVisitWarningTitle'
+  | 'linkVisitWarningMessage'
+  | 'open'
+  | 'audioMessageAutoplayTitle'
+  | 'audioMessageAutoplayDescription'
+  | 'clickToTrustContact'
+  | 'trustThisContactDialogTitle'
+  | 'trustThisContactDialogDescription'
+  | 'pinConversation'
+  | 'unpinConversation'
+  | 'markUnread'
+  | 'showUserDetails'
+  | 'sendRecoveryPhraseTitle'
+  | 'sendRecoveryPhraseMessage'
+  | 'dialogClearAllDataDeletionFailedTitle'
+  | 'dialogClearAllDataDeletionFailedDesc'
+  | 'dialogClearAllDataDeletionFailedTitleQuestion'
+  | 'dialogClearAllDataDeletionFailedMultiple'
+  | 'dialogClearAllDataDeletionQuestion'
+  | 'clearDevice'
+  | 'tryAgain'
+  | 'areYouSureClearDevice'
+  | 'deviceOnly'
+  | 'entireAccount'
+  | 'areYouSureDeleteDeviceOnly'
+  | 'areYouSureDeleteEntireAccount'
+  | 'iAmSure'
+  | 'recoveryPhraseSecureTitle'
+  | 'recoveryPhraseRevealMessage'
+  | 'recoveryPhraseRevealButtonText'
+  | 'notificationSubtitle'
+  | 'surveyTitle'
+  | 'faq'
+  | 'support'
+  | 'clearAll'
+  | 'clearDataSettingsTitle'
+  | 'messageRequests'
+  | 'requestsSubtitle'
+  | 'requestsPlaceholder'
+  | 'hideRequestBannerDescription'
+  | 'incomingCallFrom'
+  | 'ringing'
+  | 'establishingConnection'
+  | 'accept'
+  | 'decline'
+  | 'endCall'
+  | 'permissionsSettingsTitle'
+  | 'helpSettingsTitle'
+  | 'cameraPermissionNeededTitle'
+  | 'cameraPermissionNeeded'
+  | 'unableToCall'
+  | 'unableToCallTitle'
+  | 'callMissed'
+  | 'callMissedTitle'
+  | 'noCameraFound'
+  | 'noAudioInputFound'
+  | 'noAudioOutputFound'
+  | 'callMediaPermissionsTitle'
+  | 'callMissedCausePermission'
+  | 'callMissedNotApproved'
+  | 'callMediaPermissionsDescription'
+  | 'callMediaPermissionsDialogContent'
+  | 'callMediaPermissionsDialogTitle'
+  | 'startedACall'
+  | 'answeredACall'
+  | 'trimDatabase'
+  | 'trimDatabaseDescription'
+  | 'trimDatabaseConfirmationBody'
+  | 'pleaseWaitOpenAndOptimizeDb'
+  | 'messageRequestPending'
+  | 'messageRequestAccepted'
+  | 'messageRequestAcceptedOurs'
+  | 'messageRequestAcceptedOursNoName'
+  | 'declineRequestMessage'
+  | 'respondingToRequestWarning'
+  | 'hideRequestBanner'
+  | 'openMessageRequestInbox'
+  | 'noMessageRequestsPending'
+  | 'noMediaUntilApproved'
+  | 'mustBeApproved'
+  | 'youHaveANewFriendRequest'
+  | 'clearAllConfirmationTitle'
+  | 'clearAllConfirmationBody'
+  | 'hideBanner'
+  | 'openMessageRequestInboxDescription'
+  | 'clearAllReactions'
+  | 'expandedReactionsText'
+  | 'reactionNotification'
+  | 'rateLimitReactMessage'
+  | 'otherSingular'
+  | 'otherPlural'
+  | 'reactionPopup'
+  | 'reactionPopupOne'
+  | 'reactionPopupTwo'
+  | 'reactionPopupThree'
+  | 'reactionPopupMany'
+  | 'reactionListCountSingular'
+  | 'reactionListCountPlural';
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 4d2c2467b..914457b7e 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,6 +1,7 @@
 import { from_hex } from 'libsodium-wrappers-sumo';
 import { isArray, isEmpty, isEqual } from 'lodash';
 import { ContactInfo, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
+import { OpenGroupV2Room } from '../data/opengroups';
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { fromHexToArray } from '../session/utils/String';
@@ -95,6 +96,12 @@ export type AttachmentDownloadMessageDetails = {
   openGroupV2Details: OpenGroupRequestCommonType | undefined;
 };
 
+export type SaveConversationReturn = {
+  unreadCount: number;
+  mentionedUs: boolean;
+  lastReadTimestampMessage: number | null;
+} | null;
+
 /**
  * This function returns a contactInfo for the wrapper to understand from the DB values.
  * Created in this file so we can reuse it during the migration (node side), and from the renderer side
@@ -220,7 +227,6 @@ export function getLegacyGroupInfoFromDBValues({
     encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
   };
 
-  console.warn('legacyGroup', legacyGroup);
   return legacyGroup;
 }
 
@@ -232,3 +238,15 @@ export function assertUnreachable(_x: never, message: string): never {
   console.info(`assertUnreachable: Didn't expect to get here with "${message}"`);
   throw new Error("Didn't expect to get here");
 }
+
+export function roomHasBlindEnabled(openGroup?: OpenGroupV2Room) {
+  return capabilitiesListHasBlindEnabled(openGroup?.capabilities);
+}
+
+export function capabilitiesListHasBlindEnabled(caps?: Array<string> | null) {
+  return Boolean(caps?.includes('blind'));
+}
+
+export function roomHasReactionsEnabled(openGroup?: OpenGroupV2Room) {
+  return Boolean(openGroup?.capabilities?.includes('reactions'));
+}
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index ff3fe7a35..3708e4147 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -238,11 +238,11 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
   let quality = 0.95;
   const startI = 4;
   let i = startI;
-  const start = Date.now();
+  // const start = Date.now();
   do {
     i -= 1;
     if (DEBUG_ATTACHMENTS_SCALE) {
-      window.log.info(`autoscale iteration: [${i}] for:`, attachment);
+      // window.log.info(`autoscale iteration: [${i}] for:`, attachment);
     }
     const tempBlob = await canvasToBlob(canvas.image as HTMLCanvasElement, 'image/jpeg', quality);
 
@@ -260,7 +260,7 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
   if (readAndResizedBlob.size > maxSize) {
     throw new Error('Cannot add this attachment even after trying to scale it down.');
   }
-  window.log.debug(`[perf] autoscale took ${Date.now() - start}ms `);
+  // window.log.debug(`[perf] autoscale took ${Date.now() - start}ms `);
 
   return {
     contentType: attachment.contentType,
diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts
index a0445b24a..bc686b7e0 100644
--- a/ts/util/reactions.ts
+++ b/ts/util/reactions.ts
@@ -2,10 +2,7 @@ import { isEmpty } from 'lodash';
 import { Data } from '../data/data';
 import { MessageModel } from '../models/message';
 import { SignalService } from '../protobuf';
-import {
-  getUsBlindedInThatServer,
-  isUsAnySogsFromCache,
-} from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { ToastUtils, UserUtils } from '../session/utils';
 
 import { Action, OpenGroupReactionList, ReactionList, RecentReactions } from '../types/Reaction';
@@ -96,7 +93,7 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
     if (found.get('isPublic')) {
       if (found.get('serverId')) {
         id = found.get('serverId') || id;
-        me = getUsBlindedInThatServer(conversationModel) || me;
+        me = conversationModel.getUsInThatConversation();
       } else {
         window.log.warn(`Server Id was not found in message ${messageId} for opengroup reaction`);
         return;
@@ -303,7 +300,7 @@ const handleOpenGroupMessageReactions = async (
           const conversationModel = originalMessage?.getConversation();
           if (conversationModel) {
             const me =
-              getUsBlindedInThatServer(conversationModel) || UserUtils.getOurPubKeyStrFromCache();
+              conversationModel.getUsInThatConversation() || UserUtils.getOurPubKeyStrFromCache();
             reactions[key].reactors = [me, ...reactorsWithoutMe];
           }
         }
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index c5a95d469..d16a08809 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -300,6 +300,11 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
       unread,
     ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['setLegacyGroup']>>,
 
+  eraseLegacyGroup: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'eraseLegacyGroup', pubkeyHex]) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['eraseLegacyGroup']>
+    >,
+
   // communities
   getCommunity: async (communityFullUrl: string) =>
     callLibSessionWorker(['ConvoInfoVolatileConfig', 'getCommunity', communityFullUrl]) as Promise<
@@ -319,6 +324,13 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
       lastRead,
       unread,
     ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['setCommunityByFullUrl']>>,
+
+  eraseCommunityByFullUrl: async (fullUrlWithOrWithoutPubkey: string) =>
+    callLibSessionWorker([
+      'ConvoInfoVolatileConfig',
+      'eraseCommunityByFullUrl',
+      fullUrlWithOrWithoutPubkey,
+    ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['eraseCommunityByFullUrl']>>,
 };
 
 const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {

From 1c50aacc3407b84847fab54040eadf60a2ca1703 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 16 Mar 2023 14:31:52 +1100
Subject: [PATCH 046/178] chore: remove groupModerators sogs from the db, store
 in redux only

---
 .../message/message-content/MessageAvatar.tsx |  2 +-
 .../leftpane/LeftPaneMessageSection.tsx       |  2 +-
 .../leftpane/LeftPaneSectionHeader.tsx        | 17 ++--
 .../ConversationListItem.tsx                  | 52 ++++++------
 .../conversation-list-item/MessageItem.tsx    |  6 +-
 .../overlay/OverlayMessageRequest.tsx         |  8 +-
 ts/components/search/SearchResults.tsx        |  2 -
 ts/hooks/useParamSelector.ts                  | 16 +++-
 ts/interactions/conversationInteractions.ts   |  6 +-
 .../conversations/unsendingInteractions.ts    |  4 +-
 ts/models/conversation.ts                     | 85 ++++++-------------
 ts/models/conversationAttributes.ts           | 36 ++++----
 ts/models/message.ts                          |  8 +-
 ts/node/database_utility.ts                   |  9 --
 ts/node/migration/sessionMigrations.ts        |  3 +
 ts/node/sql.ts                                |  6 --
 ts/receiver/closedGroups.ts                   |  2 +-
 ts/receiver/configMessage.ts                  |  2 +-
 ts/receiver/contentMessage.ts                 |  2 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  5 +-
 .../conversations/ConversationController.ts   |  8 --
 ts/session/group/closed-group.ts              | 14 +--
 ts/session/utils/Groups.ts                    |  4 +-
 .../libsession_utils_convo_info_volatile.ts   |  2 +-
 ts/session/utils/sync/syncUtils.ts            |  2 +-
 ts/state/ducks/conversations.ts               |  1 -
 ts/state/ducks/sogsRoomInfo.tsx               | 48 ++++++++++-
 ts/state/selectors/conversations.ts           | 14 +--
 ts/state/selectors/section.ts                 |  7 ++
 ts/state/selectors/sogsRoomInfo.ts            | 26 +++++-
 .../unit/models/ConversationModels_test.ts    | 34 --------
 .../models/formatRowOfConversation_test.ts    | 21 -----
 .../unit/selectors/conversations_test.ts      | 12 ---
 ts/types/MessageAttachment.ts                 |  2 +-
 34 files changed, 206 insertions(+), 262 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 501e8b5e9..62728c906 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -81,7 +81,7 @@ export const MessageAvatar = (props: Props) => {
     }
 
     if (isPublic && !isTypingEnabled) {
-      window.log.info('onMessageAvatarClick: no typing enabled. Dropping...');
+      window.log.info('onMessageAvatarClick: typing is disabled...');
       return;
     }
 
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index a04cb402e..1d0ac4e49 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -104,7 +104,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
     const length = conversations.length;
 
     // Note: conversations is not a known prop for List, but it is required to ensure that
-    //   it re-renders when our conversation data changes. Otherwise it would just render
+    //   it re-renders when our conversations data changes. Otherwise it would just render
     //   on startup and scroll.
 
     return (
diff --git a/ts/components/leftpane/LeftPaneSectionHeader.tsx b/ts/components/leftpane/LeftPaneSectionHeader.tsx
index 4a9f2b1c9..34789c14c 100644
--- a/ts/components/leftpane/LeftPaneSectionHeader.tsx
+++ b/ts/components/leftpane/LeftPaneSectionHeader.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import styled from 'styled-components';
 import { useDispatch, useSelector } from 'react-redux';
-import { disableRecoveryPhrasePrompt } from '../../state/ducks/userConfig';
-import { getShowRecoveryPhrasePrompt } from '../../state/selectors/userConfig';
+import styled from 'styled-components';
 import { recoveryPhraseModal } from '../../state/ducks/modalDialog';
-import { Flex } from '../basic/Flex';
-import { getFocusedSection, getOverlayMode } from '../../state/selectors/section';
 import { SectionType } from '../../state/ducks/section';
-import { SessionButton } from '../basic/SessionButton';
+import { disableRecoveryPhrasePrompt } from '../../state/ducks/userConfig';
+import { getFocusedSection, getIsMessageRequestOverlayShown } from '../../state/selectors/section';
+import { getShowRecoveryPhrasePrompt } from '../../state/selectors/userConfig';
 import { isSignWithRecoveryPhrase } from '../../util/storage';
+import { Flex } from '../basic/Flex';
+import { SessionButton } from '../basic/SessionButton';
 import { MenuButton } from '../button/MenuButton';
 
 const SectionTitle = styled.h1`
@@ -110,19 +110,18 @@ export const LeftPaneBanner = () => {
 export const LeftPaneSectionHeader = () => {
   const showRecoveryPhrasePrompt = useSelector(getShowRecoveryPhrasePrompt);
   const focusedSection = useSelector(getFocusedSection);
-  const overlayMode = useSelector(getOverlayMode);
+  const isMessageRequestOverlayShown = useSelector(getIsMessageRequestOverlayShown);
 
   let label: string | undefined;
 
   const isMessageSection = focusedSection === SectionType.Message;
-  const isMessageRequestOverlay = overlayMode && overlayMode === 'message-requests';
 
   switch (focusedSection) {
     case SectionType.Settings:
       label = window.i18n('settingsHeader');
       break;
     case SectionType.Message:
-      label = isMessageRequestOverlay
+      label = isMessageRequestOverlayShown
         ? window.i18n('messageRequests')
         : window.i18n('messagesHeader');
       break;
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index 3b8205a40..af4889925 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -1,32 +1,35 @@
-import React, { useCallback, useContext } from 'react';
 import classNames from 'classnames';
+import React, { useCallback, useContext } from 'react';
 import { contextMenu } from 'react-contexify';
 
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
 
 import { createPortal } from 'react-dom';
+import { useDispatch } from 'react-redux';
 import {
   openConversationWithMessages,
   ReduxConversationType,
 } from '../../../state/ducks/conversations';
-import { useDispatch } from 'react-redux';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
+import _ from 'lodash';
+import { useSelector } from 'react-redux';
 import {
   useAvatarPath,
   useConversationUsername,
+  useHasUnread,
+  useIsBlocked,
   useIsPrivate,
+  useIsSelectedConversation,
+  useMentionedUs,
 } from '../../../hooks/useParamSelector';
+import { isSearching } from '../../../state/selectors/search';
 import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu';
 import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
-import _ from 'lodash';
 
 // tslint:disable-next-line: no-empty-interface
-export type ConversationListItemProps = Pick<
-  ReduxConversationType,
-  'id' | 'isSelected' | 'isBlocked' | 'mentionedUs' | 'unreadCount' | 'displayNameInProfile'
->;
+export type ConversationListItemProps = Pick<ReduxConversationType, 'id'>;
 
 /**
  * This React context is used to share deeply in the tree of the ConversationListItem what is the ID we are currently rendering.
@@ -36,7 +39,6 @@ export const ContextConversationId = React.createContext('');
 
 type PropsHousekeeping = {
   style?: Object;
-  isMessageRequest?: boolean;
 };
 // tslint:disable: use-simple-attributes
 
@@ -74,19 +76,23 @@ const AvatarItem = () => {
   );
 };
 
-// tslint:disable: max-func-body-length
 const ConversationListItem = (props: Props) => {
-  const {
-    unreadCount,
-    id: conversationId,
-    isSelected,
-    isBlocked,
-    style,
-    mentionedUs,
-    isMessageRequest,
-  } = props;
+  const { id: conversationId, style } = props;
   const key = `conversation-item-${conversationId}`;
 
+  const hasUnread = useHasUnread(conversationId);
+
+  let hasUnreadMentionedUs = useMentionedUs(conversationId);
+  let isBlocked = useIsBlocked(conversationId);
+  const isSearch = useSelector(isSearching);
+  const isSelectedConvo = useIsSelectedConversation(conversationId);
+
+  if (isSearch) {
+    // force isBlocked and hasUnreadMentionedUs to be false, we just want to display the row without any special style when showing search results
+    hasUnreadMentionedUs = false;
+    isBlocked = false;
+  }
+
   const triggerId = `${key}-ctxmenu`;
 
   const openConvo = useCallback(
@@ -118,18 +124,16 @@ const ConversationListItem = (props: Props) => {
           style={style}
           className={classNames(
             'module-conversation-list-item',
-            unreadCount && unreadCount > 0 ? 'module-conversation-list-item--has-unread' : null,
-            unreadCount && unreadCount > 0 && mentionedUs
-              ? 'module-conversation-list-item--mentioned-us'
-              : null,
-            isSelected ? 'module-conversation-list-item--is-selected' : null,
+            hasUnread ? 'module-conversation-list-item--has-unread' : null,
+            hasUnreadMentionedUs ? 'module-conversation-list-item--mentioned-us' : null,
+            isSelectedConvo ? 'module-conversation-list-item--is-selected' : null,
             isBlocked ? 'module-conversation-list-item--is-blocked' : null
           )}
         >
           <AvatarItem />
           <div className="module-conversation-list-item__content">
             <ConversationListItemHeaderItem />
-            <MessageItem isMessageRequest={Boolean(isMessageRequest)} />
+            <MessageItem />
           </div>
         </div>
         <Portal>
diff --git a/ts/components/leftpane/conversation-list-item/MessageItem.tsx b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
index f4905910c..ba50e0147 100644
--- a/ts/components/leftpane/conversation-list-item/MessageItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
@@ -13,6 +13,7 @@ import { TypingAnimation } from '../../conversation/TypingAnimation';
 import { ContextConversationId } from './ConversationListItem';
 import { useSelector } from 'react-redux';
 import { isSearching } from '../../../state/selectors/search';
+import { getIsMessageRequestOverlayShown } from '../../../state/selectors/section';
 
 function useLastMessageFromConvo(convoId: string) {
   const convoProps = useConversationPropsById(convoId);
@@ -22,13 +23,14 @@ function useLastMessageFromConvo(convoId: string) {
   return convoProps.lastMessage;
 }
 
-export const MessageItem = (props: { isMessageRequest: boolean }) => {
+export const MessageItem = () => {
   const conversationId = useContext(ContextConversationId);
   const lastMessage = useLastMessageFromConvo(conversationId);
   const isGroup = !useIsPrivate(conversationId);
 
   const hasUnread = useHasUnread(conversationId);
   const isConvoTyping = useIsTyping(conversationId);
+  const isMessageRequest = useSelector(getIsMessageRequestOverlayShown);
 
   const isSearchingMode = useSelector(isSearching);
 
@@ -55,7 +57,7 @@ export const MessageItem = (props: { isMessageRequest: boolean }) => {
           <MessageBody text={text} disableJumbomoji={true} disableLinks={true} isGroup={isGroup} />
         )}
       </div>
-      {!isSearchingMode && lastMessage && lastMessage.status && !props.isMessageRequest ? (
+      {!isSearchingMode && lastMessage && lastMessage.status && !isMessageRequest ? (
         <OutgoingMessageStatus status={lastMessage.status} />
       ) : null}
     </div>
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 95793b669..36fe4e00f 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -41,13 +41,7 @@ const MessageRequestList = () => {
   return (
     <MessageRequestListContainer>
       {conversationRequests.map(conversation => {
-        return (
-          <MemoConversationListItemWithDetails
-            key={conversation.id}
-            isMessageRequest={true}
-            {...conversation}
-          />
-        );
+        return <MemoConversationListItemWithDetails key={conversation.id} {...conversation} />;
       })}
     </MessageRequestListContainer>
   );
diff --git a/ts/components/search/SearchResults.tsx b/ts/components/search/SearchResults.tsx
index 9e6484e4b..be7aea4a3 100644
--- a/ts/components/search/SearchResults.tsx
+++ b/ts/components/search/SearchResults.tsx
@@ -54,8 +54,6 @@ export const SearchResults = (props: SearchResultsProps) => {
           {contactsAndGroups.map(contactOrGroup => (
             <MemoConversationListItemWithDetails
               {...contactOrGroup}
-              mentionedUs={false}
-              isBlocked={false}
               key={`search-result-convo-${contactOrGroup.id}`}
             />
           ))}
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index ef57f7ff5..33b608a05 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,10 +1,13 @@
-import { isEmpty, pick } from 'lodash';
+import { isEmpty, isNil, pick } from 'lodash';
 import { useSelector } from 'react-redux';
 import { ConversationModel } from '../models/conversation';
 import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
 import { StateType } from '../state/reducer';
-import { getMessageReactsProps } from '../state/selectors/conversations';
+import {
+  getMessageReactsProps,
+  getSelectedConversationKey,
+} from '../state/selectors/conversations';
 
 export function useAvatarPath(convoId: string | undefined) {
   const convoProps = useConversationPropsById(convoId);
@@ -202,13 +205,13 @@ export function useIsForcedUnreadWithoutUnreadMsg(conversationId?: string): bool
   return convoProps?.isMarkedUnread || false;
 }
 
-function useMentionedUsNoUnread(conversationId?: string) {
+function useMentionedUsUnread(conversationId?: string) {
   const convoProps = useConversationPropsById(conversationId);
   return convoProps?.mentionedUs || false;
 }
 
 export function useMentionedUs(conversationId?: string): boolean {
-  const hasMentionedUs = useMentionedUsNoUnread(conversationId);
+  const hasMentionedUs = useMentionedUsUnread(conversationId);
   const hasUnread = useHasUnread(conversationId);
 
   return hasMentionedUs && hasUnread;
@@ -217,3 +220,8 @@ export function useMentionedUs(conversationId?: string): boolean {
 export function useIsTyping(conversationId?: string): boolean {
   return useConversationPropsById(conversationId)?.isTyping || false;
 }
+
+export function useIsSelectedConversation(conversation?: string): boolean {
+  const selectedConvo = useSelector(getSelectedConversationKey);
+  return !isNil(selectedConvo) && !isNil(conversation) && selectedConvo === conversation;
+}
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 1f8e13d02..98ec27e62 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -157,7 +157,7 @@ export const declineConversationWithoutConfirm = async (
 
 export async function showUpdateGroupNameByConvoId(conversationId: string) {
   const conversation = getConversationController().get(conversationId);
-  if (conversation.isMediumGroup()) {
+  if (conversation.isClosedGroup()) {
     // make sure all the members' convo exists so we can add or remove them
     await Promise.all(
       conversation
@@ -170,7 +170,7 @@ export async function showUpdateGroupNameByConvoId(conversationId: string) {
 
 export async function showUpdateGroupMembersByConvoId(conversationId: string) {
   const conversation = getConversationController().get(conversationId);
-  if (conversation.isMediumGroup()) {
+  if (conversation.isClosedGroup()) {
     // make sure all the members' convo exists so we can add or remove them
     await Promise.all(
       conversation
@@ -192,7 +192,7 @@ export function showLeaveGroupByConvoId(conversationId: string) {
   const message = window.i18n('leaveGroupConfirmation');
   const ourPK = UserUtils.getOurPubKeyStrFromCache();
   const isAdmin = (conversation.get('groupAdmins') || []).includes(ourPK);
-  const isClosedGroup = conversation.get('is_medium_group') || false;
+  const isClosedGroup = conversation.isClosedGroup() || false;
 
   // if this is not a closed group, or we are not admin, we can just show a confirmation dialog
   if (!isClosedGroup || (isClosedGroup && !isAdmin)) {
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 6f42572b5..4776abe7b 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -126,7 +126,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally(
   conversation: ConversationModel,
   messages: Array<MessageModel>
 ) {
-  if (conversation.isMediumGroup()) {
+  if (conversation.isClosedGroup()) {
     window.log.info('Cannot delete message from a closed group swarm, so we just complete delete.');
     await Promise.all(
       messages.map(async message => {
@@ -162,7 +162,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally(
   conversation: ConversationModel,
   messages: Array<MessageModel>
 ) {
-  if (conversation.isMediumGroup()) {
+  if (conversation.isClosedGroup()) {
     window.log.info('Cannot delete messages from a closed group swarm, so we just markDeleted.');
     await Promise.all(
       messages.map(async message => {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index ad0d10a3c..7f5cf5061 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -111,6 +111,7 @@ import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_u
 import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo';
 import {
   getCanWriteOutsideRedux,
+  getModeratorsOutsideRedux,
   getSubscriberCountOutsideRedux,
 } from '../state/selectors/sogsRoomInfo';
 
@@ -120,6 +121,11 @@ type InMemoryConvoInfos = {
   lastReadTimestampMessage: number | null;
 };
 
+// TODO decide it it makes sense to move this to a redux slice?
+/**
+ * Some fields are not stored in the database, but are kept in memory.
+ * We use this map to keep track of them. The key is the conversation id.
+ */
 const inMemoryConvoInfos: Map<string, InMemoryConvoInfos> = new Map();
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
@@ -222,10 +228,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public isOpenGroupV2(): boolean {
     return OpenGroupUtils.isOpenGroupV2(this.id);
   }
-  public isClosedGroup() {
-    return (
-      (this.get('type') === ConversationTypeEnum.GROUP && !this.isPublic()) ||
-      this.get('type') === ConversationTypeEnum.GROUPV3
+  public isClosedGroup(): boolean {
+    return Boolean(
+      (this.get('type') === ConversationTypeEnum.GROUP && this.id.startsWith('05')) ||
+        (this.get('type') === ConversationTypeEnum.GROUPV3 && this.id.startsWith('03'))
     );
   }
   public isPrivate() {
@@ -242,17 +248,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return false;
     }
 
-    if (this.isPrivate() || this.isClosedGroup() || this.isMediumGroup()) {
+    if (this.isPrivate() || this.isClosedGroup()) {
       return BlockedNumberController.isBlocked(this.id);
     }
 
     return false;
   }
 
-  public isMediumGroup() {
-    return this.get('is_medium_group');
-  }
-
   /**
    * Returns true if this conversation is active
    * i.e. the conversation is visibie on the left pane. (Either we or another user created this convo).
@@ -277,21 +279,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return groupAdmins && groupAdmins?.length > 0 ? groupAdmins : [];
   }
 
-  /**
-   * Get the list of moderators in that room, or an empty array
-   * Only to be called for opengroup conversations.
-   * This makes no sense for a private chat or an closed group, as closed group admins must be stored with getGroupAdmins
-   * @returns the list of moderators for the conversation if the conversation is public, or []
-   */
-  public getGroupModerators(): Array<string> {
-    const groupModerators = this.get('groupModerators') as Array<string> | undefined;
-
-    return this.isPublic() && groupModerators && groupModerators?.length > 0 ? groupModerators : [];
-  }
-
   // tslint:disable-next-line: cyclomatic-complexity max-func-body-length
   public getConversationModelProps(): ReduxConversationType {
-    const groupModerators = this.getGroupModerators();
     const isPublic = this.isPublic();
 
     const zombies = this.isClosedGroup() ? this.get('zombies') : [];
@@ -429,10 +418,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (foundCommunity.priority > 0) {
         toRet.isPinned = true; // TODO priority also handles sorting
       }
-
-      if (groupModerators?.length) {
-        toRet.groupModerators = uniq(groupModerators);
-      }
     }
 
     if (foundVolatileInfo) {
@@ -481,6 +466,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return toRet;
   }
 
+  /**
+   *
+   * @param groupAdmins the Array of group admins, where, if we are a group admin, we are present unblinded.
+   * @param shouldCommit set this to true to auto commit changes
+   * @returns true if the groupAdmins where not the same (and thus updated)
+   */
   public async updateGroupAdmins(groupAdmins: Array<string>, shouldCommit: boolean) {
     const sortedExistingAdmins = uniq(sortBy(this.getGroupAdmins()));
     const sortedNewAdmins = uniq(sortBy(groupAdmins));
@@ -495,23 +486,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return true;
   }
 
-  public async updateGroupModerators(groupModerators: Array<string>, shouldCommit: boolean) {
-    if (!this.isPublic()) {
-      throw new Error('group moderators are only possible on SOGS');
-    }
-    const existingModerators = uniq(sortBy(this.getGroupModerators()));
-    const newModerators = uniq(sortBy(groupModerators));
-
-    if (isEqual(existingModerators, newModerators)) {
-      return false;
-    }
-    this.set({ groupModerators: newModerators });
-    if (shouldCommit) {
-      await this.commit();
-    }
-    return true;
-  }
-
   /**
    * Fetches from the Database an update of what are the memory only informations like mentionedUs and the unreadCount, etc
    */
@@ -736,7 +710,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         return;
       }
 
-      if (this.isMediumGroup()) {
+      if (this.isClosedGroup()) {
         const chatMessageMediumGroup = new VisibleMessage(chatMessageParams);
         const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({
           chatMessage: chatMessageMediumGroup,
@@ -751,10 +725,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         return;
       }
 
-      if (this.isClosedGroup()) {
-        throw new Error('Legacy group are not supported anymore. You need to recreate this group.');
-      }
-
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       await message.saveErrors(e);
@@ -856,7 +826,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         return;
       }
 
-      if (this.isMediumGroup()) {
+      if (this.isClosedGroup()) {
         const chatMessageMediumGroup = new VisibleMessage(chatMessageParams);
         const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({
           chatMessage: chatMessageMediumGroup,
@@ -876,10 +846,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         return;
       }
 
-      if (this.isClosedGroup()) {
-        throw new Error('Legacy group are not supported anymore. You need to recreate this group.');
-      }
-
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       window.log.error(`Reaction job failed id:${reaction.id} error:`, e);
@@ -1470,7 +1436,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return false;
     }
 
-    const groupModerators = this.getGroupModerators();
+    const groupModerators = getModeratorsOutsideRedux(this.id as string);
     return Array.isArray(groupModerators) && groupModerators.includes(pubKey);
   }
 
@@ -2154,11 +2120,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         uniq(localModsOrAdmins)
       );
 
-      const moderatorsOrAdminsChanged =
-        type === 'admins'
-          ? await this.updateGroupAdmins(replacedWithOurRealSessionId, false)
-          : await this.updateGroupModerators(replacedWithOurRealSessionId, false);
-      return moderatorsOrAdminsChanged;
+      if (type === 'admins') {
+        return await this.updateGroupAdmins(replacedWithOurRealSessionId, false);
+      }
+
+      ReduxSogsRoomInfos.setModeratorsOutsideRedux(this.id, replacedWithOurRealSessionId);
+      return false;
     }
     return false;
   }
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index f6f5f00e8..8aaf49814 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -55,10 +55,7 @@ export interface ConversationAttributes {
   // 0 means inactive (undefined and null too but we try to get rid of them and only have 0 = inactive)
   active_at: number;
 
-  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin TODO to remove
-  left: boolean;
   lastMessageStatus: LastMessageStatusType;
-
   /**
    * lastMessage is actually just a preview of the last message text, shortened to 60 chars.
    * This is to avoid filling the redux store with a huge last message when it's only used in the
@@ -66,24 +63,26 @@ export interface ConversationAttributes {
    * The shortening is made in sql.ts directly.
    */
   lastMessage: string | null;
-  lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group
-  groupModerators: Array<string>; // for sogs only, this is the moderators in that room.
-  isKickedFromGroup: boolean;
 
-  is_medium_group: boolean;
+  avatarImageId?: number; // SOGS ONLY: avatar imageID is currently used only for sogs. It's the fileID of the image uploaded and set as the sogs avatar
+
+  left: boolean; // GROUPS ONLY: if we left the group (communities are removed right away so it not relevant to communities)
+  isKickedFromGroup: boolean; // GROUPS ONLY: if we got kicked from the group (communities just stop polling and a message sent get rejected, so not relevant to communities)
 
   avatarInProfile?: string; // this is the avatar path locally once downloaded and stored in the application attachments folder
-  avatarImageId?: number; // avatar imageID is currently used only for sogs. It's the fileID of the image uploaded and set as the sogs avatar
 
   isTrustedForAttachmentDownload: boolean;
 
-  /** The community chat this conversation originated from (relevant to **blinded** message requests) */
-  conversationIdOrigin?: string;
+  conversationIdOrigin?: string; // Blinded message requests ONLY: The community from which this conversation originated from
+
+  // TODO those two items are only used for legacy closed groups and will be removed when we get rid of the legacy closed groups support
+  lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group // TODO to remove after legacy closed group are dropped
+  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin // TODO to remove after legacy closed group are dropped
 
   // ===========================================================================
   // All of the items below are duplicated one way or the other with libsession.
   // It would be nice to at some point be able to only rely on libsession dumps
-  // for those so there is no need to keep them in sync.
+  // for those so there is no need to keep them in sync, but just have them in the dumps
 
   displayNameInProfile?: string; // no matter the type of conversation, this is the real name as set by the user/name of the open or closed group
   nickname?: string; // this is the name WE gave to that user (only applicable to private chats, not closed group neither opengroups)
@@ -92,18 +91,16 @@ export interface ConversationAttributes {
   avatarPointer?: string; // this is the url of the avatar on the file server v2. we use this to detect if we need to redownload the avatar from someone (not used for opengroups)
   expireTimer: number;
 
-  members: Array<string>; // members are all members for this group. zombies excluded
-  groupAdmins: Array<string>; // for sogs and closed group: the admins of that group.
+  members: Array<string>; // groups only members are all members for this group. zombies excluded (not used for communities)
+  groupAdmins: Array<string>; // for sogs and closed group: the unique admins of that group
 
   isPinned: boolean;
-  isApproved: boolean;
-  didApproveMe: boolean;
 
-  // Force the conversation as unread even if all the messages are read. Used to highlight a conversation the user wants to check again later, synced.
-  markedAsUnread: boolean;
+  isApproved: boolean; // if we sent a message request or sent a message to this contact, we approve them. If isApproved & didApproveMe, a message request becomes a contact
+  didApproveMe: boolean; // if our message request was approved already (or they've sent us a message request/message themselves). If isApproved & didApproveMe, a message request becomes a contact
 
-  // hides a conversation, but keep it the history and nicknames, etc.
-  hidden: boolean;
+  markedAsUnread: boolean; // Force the conversation as unread even if all the messages are read. Used to highlight a conversation the user wants to check again later, synced.
+  hidden: boolean; // hides a conversation, but keep it the history and nicknames, etc. Currently only supported for contacts
 }
 
 /**
@@ -133,7 +130,6 @@ export const fillConvoAttributesWithDefaults = (
     isPinned: false,
     isApproved: false,
     didApproveMe: false,
-    is_medium_group: false,
     isKickedFromGroup: false,
     left: false,
     hidden: true,
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 902cb3c04..995773848 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -943,12 +943,12 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         );
       }
 
-      // Here, the convo is neither an open group, a private convo or ourself. It can only be a medium group.
-      // For a medium group, retry send only means trigger a send again to all recipients
+      // Here, the convo is neither an open group, a private convo or ourself. It can only be a closed group.
+      // For a closed group, retry send only means trigger a send again to all recipients
       // as they are all polling from the same group swarm pubkey
-      if (!conversation.isMediumGroup()) {
+      if (!conversation.isClosedGroup()) {
         throw new Error(
-          'We should only end up with a medium group here. Anything else is an error'
+          'We should only end up with a closed group here. Anything else is an error'
         );
       }
 
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 52cdcaf4b..b63b0d69b 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -48,14 +48,12 @@ export function toSqliteBoolean(val: boolean): number {
 // this is used to make sure when storing something in the database you remember to add the wrapping for it in formatRowOfConversation
 const allowedKeysFormatRowOfConversation = [
   'groupAdmins',
-  'groupModerators',
   'members',
   'zombies',
   'isTrustedForAttachmentDownload',
   'isPinned',
   'isApproved',
   'didApproveMe',
-  'is_medium_group',
   'mentionedUs',
   'isKickedFromGroup',
   'left',
@@ -115,10 +113,6 @@ export function formatRowOfConversation(
     row.groupAdmins?.length && row.groupAdmins.length > minLengthNoParsing
       ? jsonToArray(row.groupAdmins)
       : [];
-  convo.groupModerators =
-    row.groupModerators?.length && row.groupModerators.length > minLengthNoParsing
-      ? jsonToArray(row.groupModerators)
-      : [];
 
   convo.members =
     row.members?.length && row.members.length > minLengthNoParsing ? jsonToArray(row.members) : [];
@@ -130,7 +124,6 @@ export function formatRowOfConversation(
   convo.isPinned = Boolean(convo.isPinned);
   convo.isApproved = Boolean(convo.isApproved);
   convo.didApproveMe = Boolean(convo.didApproveMe);
-  convo.is_medium_group = Boolean(convo.is_medium_group);
   convo.isKickedFromGroup = Boolean(convo.isKickedFromGroup);
   convo.left = Boolean(convo.left);
   convo.markedAsUnread = Boolean(convo.markedAsUnread);
@@ -173,14 +166,12 @@ export function formatRowOfConversation(
 
 const allowedKeysOfConversationAttributes = [
   'groupAdmins',
-  'groupModerators',
   'members',
   'zombies',
   'isTrustedForAttachmentDownload',
   'isPinned',
   'isApproved',
   'didApproveMe',
-  'is_medium_group',
   'isKickedFromGroup',
   'left',
   'lastMessage',
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 11ddd3769..cebd37d83 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1397,6 +1397,9 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN writeCapability;
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN uploadCapability;
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN subscriberCount;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN is_medium_group;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN groupModerators;
+
       `);
     // mark every "active" private chats as not hidden
     db.prepare(
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 76ffd5df3..bc6cd9b23 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -431,9 +431,7 @@ function saveConversation(data: ConversationAttributes): SaveConversationReturn
     lastMessage,
     lastJoinedTimestamp,
     groupAdmins,
-    groupModerators,
     isKickedFromGroup,
-    is_medium_group,
     avatarPointer,
     avatarImageId,
     triggerNotificationsFor,
@@ -483,11 +481,7 @@ function saveConversation(data: ConversationAttributes): SaveConversationReturn
 
       lastJoinedTimestamp,
       groupAdmins: groupAdmins && groupAdmins.length ? arrayStrToJson(groupAdmins) : '[]',
-      groupModerators:
-        groupModerators && groupModerators.length ? arrayStrToJson(groupModerators) : '[]',
       isKickedFromGroup: toSqliteBoolean(isKickedFromGroup),
-
-      is_medium_group: toSqliteBoolean(is_medium_group),
       avatarPointer,
       avatarImageId,
       triggerNotificationsFor,
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 28b6698f1..8ef8b222f 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -392,7 +392,7 @@ async function handleClosedGroupEncryptionKeyPair(
     await removeFromCache(envelope);
     return;
   }
-  if (!groupConvo.isMediumGroup()) {
+  if (!groupConvo.isClosedGroup()) {
     window?.log?.warn(
       `Ignoring closed group encryption key pair for nonexistent medium group. ${groupPublicKey}`
     );
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 8fb0d1e8c..0520a1a72 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -477,10 +477,10 @@ async function handleConvoInfoVolatileUpdate(
           const foundConvo = getConversationController().get(fromWrapper.pubkeyHex);
           // TODO should we create the conversation if the conversation does not exist locally? Or assume that it should be coming from a contacts update?
           if (foundConvo) {
-            // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
             console.warn(
               `fromWrapper from getAll1o1: ${fromWrapper.pubkeyHex}: ${fromWrapper.unread}`
             );
+            // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
             await foundConvo.markReadFromConfigMessage(fromWrapper.lastRead);
             // this commits to the DB, if needed
             await foundConvo.markAsUnread(fromWrapper.unread, true);
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index ba7f169cb..bcd455c9f 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -53,7 +53,7 @@ async function decryptForClosedGroup(envelope: EnvelopePlus) {
   window?.log?.info('received closed group message');
   try {
     const hexEncodedGroupPublicKey = envelope.source;
-    if (!GroupUtils.isMediumGroup(PubKey.cast(hexEncodedGroupPublicKey))) {
+    if (!GroupUtils.isClosedGroup(PubKey.cast(hexEncodedGroupPublicKey))) {
       window?.log?.warn('received medium group message but not for an existing medium group');
       throw new Error('Invalid group public key'); // invalidGroupPublicKey
     }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 581f62023..043cbc456 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -454,10 +454,7 @@ export class SwarmPolling {
 
     const closedGroupsOnly = convos.filter(
       (c: ConversationModel) =>
-        (c.isMediumGroup() || PubKey.isClosedGroupV3(c.id)) &&
-        !c.isBlocked() &&
-        !c.get('isKickedFromGroup') &&
-        !c.get('left')
+        c.isClosedGroup() && !c.isBlocked() && !c.get('isKickedFromGroup') && !c.get('left')
     );
 
     closedGroupsOnly.forEach((c: any) => {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 9e7e2e937..70994c9e3 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -145,14 +145,6 @@ export class ConversationController {
     return conversation.getContactProfileNameOrShortenedPubKey();
   }
 
-  public isMediumGroup(hexEncodedGroupPublicKey: string): boolean {
-    const convo = this.conversations.get(hexEncodedGroupPublicKey);
-    if (convo) {
-      return !!convo.isMediumGroup();
-    }
-    return false;
-  }
-
   public async getOrCreateAndWait(
     id: string | PubKey,
     type: ConversationTypeEnum
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 0b0e9fa45..37cb54c65 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -73,10 +73,6 @@ export async function initiateClosedGroupUpdate(
     isGroupV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP
   );
 
-  if (!convo.isMediumGroup()) {
-    throw new Error('Legacy group are not supported anymore.');
-  }
-
   // do not give an admins field here. We don't want to be able to update admins and
   // updateOrCreateClosedGroup() will update them if given the choice.
   const groupDetails: GroupInfo = {
@@ -227,7 +223,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     | 'type'
     | 'members'
     | 'displayNameInProfile'
-    | 'is_medium_group'
     | 'active_at'
     | 'left'
     | 'lastJoinedTimestamp'
@@ -236,7 +231,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     displayNameInProfile: details.name,
     members: details.members,
     type: ConversationTypeEnum.GROUP,
-    is_medium_group: true,
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
@@ -246,7 +240,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
   conversation.set(updates);
 
   const isBlocked = details.blocked || false;
-  if (conversation.isClosedGroup() || conversation.isMediumGroup()) {
+  if (conversation.isClosedGroup()) {
     await BlockedNumberController.setBlocked(conversation.id as string, isBlocked);
   }
 
@@ -272,7 +266,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
 export async function leaveClosedGroup(groupId: string) {
   const convo = getConversationController().get(groupId);
 
-  if (!convo || !convo.isMediumGroup()) {
+  if (!convo || !convo.isClosedGroup()) {
     window?.log?.error('Cannot leave non-existing group');
     return;
   }
@@ -296,7 +290,7 @@ export async function leaveClosedGroup(groupId: string) {
     admins = convo.get('groupAdmins') || [];
   }
   convo.set({ members });
-  convo.set({ groupAdmins: admins });
+  await convo.updateGroupAdmins(admins, false);
   await convo.commit();
 
   const source = UserUtils.getOurPubKeyStrFromCache();
@@ -468,7 +462,7 @@ async function generateAndSendNewEncryptionKeyPair(
     );
     return;
   }
-  if (!groupConvo.isMediumGroup()) {
+  if (!groupConvo.isClosedGroup()) {
     window?.log?.warn(
       'generateAndSendNewEncryptionKeyPair: conversation not a closed group',
       groupPublicKey
diff --git a/ts/session/utils/Groups.ts b/ts/session/utils/Groups.ts
index f6639414d..8b22c350c 100644
--- a/ts/session/utils/Groups.ts
+++ b/ts/session/utils/Groups.ts
@@ -13,14 +13,14 @@ export function getGroupMembers(groupId: PubKey): Array<PubKey> {
   return groupMembers.map(PubKey.cast);
 }
 
-export function isMediumGroup(groupId: PubKey): boolean {
+export function isClosedGroup(groupId: PubKey): boolean {
   const conversation = getConversationController().get(groupId.key);
 
   if (!conversation) {
     return false;
   }
 
-  return Boolean(conversation.isMediumGroup());
+  return Boolean(conversation.isClosedGroup());
 }
 
 export function encodeGroupPubKeyFromHex(hexGroupPublicKey: string | PubKey) {
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 3676d5904..255d22070 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -189,7 +189,7 @@ async function refreshConvoVolatileCached(
     } else if (convoId.startsWith('05')) {
       const fromWrapper = await ConvoInfoVolatileWrapperActions.get1o1(convoId);
       console.warn(
-        `refreshMappedValues from get1o1 ${fromWrapper?.pubkeyHex} : ${fromWrapper?.unread}`
+        `refreshConvoVolatileCached from get1o1 ${fromWrapper?.pubkeyHex} : ${fromWrapper?.unread}`
       );
       if (fromWrapper) {
         mapped1o1WrapperValues.set(convoId, fromWrapper);
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 277c164a9..f353441a6 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -138,7 +138,7 @@ const getValidClosedGroups = async (convos: Array<ConversationModel>) => {
   const closedGroupModels = convos.filter(
     c =>
       !!c.get('active_at') &&
-      c.isMediumGroup() &&
+      c.isClosedGroup() &&
       c.get('members')?.includes(ourPubKey) &&
       !c.get('left') &&
       !c.get('isKickedFromGroup') &&
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index d5fca234c..4c1ec3c8e 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -253,7 +253,6 @@ export interface ReduxConversationType {
   left?: boolean;
   avatarPath?: string | null; // absolute filepath to the avatar
   groupAdmins?: Array<string>; // admins for closed groups and admins for open groups
-  groupModerators?: Array<string>; // only for opengroups: moderators
   members?: Array<string>; // members for closed groups only
   zombies?: Array<string>; // members for closed groups only
 
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
index 8be4d6ec6..32612ae79 100644
--- a/ts/state/ducks/sogsRoomInfo.tsx
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -1,8 +1,15 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { sortBy, uniq } from 'lodash';
+import {
+  getCanWriteOutsideRedux,
+  getCurrentSubscriberCountOutsideRedux,
+  getModeratorsOutsideRedux,
+} from '../selectors/sogsRoomInfo';
 
 type RoomInfo = {
   canWrite: boolean;
   subscriberCount: number;
+  moderators: Array<string>;
 };
 
 export type SogsRoomInfoState = {
@@ -15,7 +22,7 @@ export const initialSogsRoomInfoState: SogsRoomInfoState = {
 
 function addEmptyEntryIfNeeded(state: any, convoId: string) {
   if (!state.rooms[convoId]) {
-    state.rooms[convoId] = { canWrite: true, subscriberCount: 0 };
+    state.rooms[convoId] = { canWrite: true, subscriberCount: 0, moderators: [] };
   }
 }
 
@@ -23,6 +30,9 @@ function addEmptyEntryIfNeeded(state: any, convoId: string) {
  * This slice is the one holding the memory-only infos of sogs room. This includes
  * - writeCapability
  * - subscriberCount
+ * - moderators
+ *
+ * Note: moderators are almost never used for sogs. We mostly rely on admins, which are tracked through the conversationModel.groupAdmins attributes (and saved to DB)
  */
 const sogsRoomInfosSlice = createSlice({
   name: 'sogsRoomInfos',
@@ -39,24 +49,58 @@ const sogsRoomInfosSlice = createSlice({
       addEmptyEntryIfNeeded(state, action.payload.convoId);
       state.rooms[action.payload.convoId].canWrite = !!action.payload.canWrite;
 
+      return state;
+    },
+    setModerators(state, action: PayloadAction<{ convoId: string; moderators: Array<string> }>) {
+      addEmptyEntryIfNeeded(state, action.payload.convoId);
+
+      state.rooms[action.payload.convoId].moderators = sortBy(uniq(action.payload.moderators));
+
       return state;
     },
   },
 });
 
 const { actions, reducer } = sogsRoomInfosSlice;
-const { setSubscriberCount, setCanWrite } = actions;
+const { setSubscriberCount, setCanWrite, setModerators } = actions;
 
 export const ReduxSogsRoomInfos = {
   setSubscriberCountOutsideRedux,
   setCanWriteOutsideRedux,
+  setModeratorsOutsideRedux,
   sogsRoomInfoReducer: reducer,
 };
 
 function setSubscriberCountOutsideRedux(convoId: string, subscriberCount: number) {
+  if (subscriberCount === getCurrentSubscriberCountOutsideRedux(convoId)) {
+    return;
+  }
   window.inboxStore?.dispatch(setSubscriberCount({ convoId, subscriberCount }));
 }
 
 function setCanWriteOutsideRedux(convoId: string, canWrite: boolean) {
+  if (getCanWriteOutsideRedux(convoId) === canWrite) {
+    return;
+  }
   window.inboxStore?.dispatch(setCanWrite({ convoId, canWrite }));
 }
+
+/**
+ *
+ * @param convoId the convoId of the room to set the moderators
+ * @param moderators the updated list of moderators
+ * Note: if we are a moderator that room and the room is blinded, this update needs to contain our unblinded pubkey, NOT the blinded one
+ */
+function setModeratorsOutsideRedux(convoId: string, moderators: Array<string>) {
+  const currentMods = getModeratorsOutsideRedux(convoId);
+  if (sortBy(uniq(currentMods)) === sortBy(uniq(moderators))) {
+    return;
+  }
+  window.inboxStore?.dispatch(
+    setModerators({
+      convoId,
+      moderators,
+    })
+  );
+  return undefined;
+}
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index ce5d91464..29c4ae35c 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -37,7 +37,7 @@ import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversa
 
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { filter, isEmpty, pick, sortBy } from 'lodash';
-import { getCanWrite, getSubscriberCount } from './sogsRoomInfo';
+import { getCanWrite, getModeratorsOutsideRedux, getSubscriberCount } from './sogsRoomInfo';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
@@ -808,14 +808,14 @@ export const isFirstUnreadMessageIdAbove = createSelector(
 
 const getMessageId = (_whatever: any, id: string) => id;
 
+// tslint:disable: cyclomatic-complexity
+
 export const getMessagePropsByMessageId = createSelector(
-  getConversations,
   getSortedMessagesOfSelectedConversation,
   getConversationLookup,
   getMessageId,
-  // tslint:disable-next-line: cyclomatic-complexity
+
   (
-    _convoState,
     messages: Array<SortedMessageModelProps>,
     conversations,
     id
@@ -829,6 +829,7 @@ export const getMessagePropsByMessageId = createSelector(
     }
     const sender = foundMessageProps?.propsForMessage?.sender;
 
+    // foundMessageConversation is the conversation this message is
     const foundMessageConversation = conversations[foundMessageProps.propsForMessage.convoId];
     if (!foundMessageConversation || !sender) {
       return undefined;
@@ -846,8 +847,9 @@ export const getMessagePropsByMessageId = createSelector(
     const groupAdmins = (isGroup && foundMessageConversation.groupAdmins) || [];
     const weAreAdmin = groupAdmins.includes(ourPubkey) || false;
 
-    const groupModerators = (isGroup && foundMessageConversation.groupModerators) || [];
-    const weAreModerator = groupModerators.includes(ourPubkey) || false;
+    const weAreModerator =
+      (isPublic && getModeratorsOutsideRedux(foundMessageConversation.id).includes(ourPubkey)) ||
+      false;
     // A message is deletable if
     // either we sent it,
     // or the convo is not a public one (in this case, we will only be able to delete for us)
diff --git a/ts/state/selectors/section.ts b/ts/state/selectors/section.ts
index 6ef2f0b57..05154c406 100644
--- a/ts/state/selectors/section.ts
+++ b/ts/state/selectors/section.ts
@@ -29,3 +29,10 @@ export const getOverlayMode = createSelector(
   getSection,
   (state: SectionStateType): OverlayMode | undefined => state.overlayMode
 );
+
+export const getIsMessageRequestOverlayShown = (state: StateType) => {
+  const focusedSection = getFocusedSection(state);
+  const overlayMode = getOverlayMode(state);
+
+  return focusedSection === SectionType.Message && overlayMode === 'message-requests';
+};
diff --git a/ts/state/selectors/sogsRoomInfo.ts b/ts/state/selectors/sogsRoomInfo.ts
index 34b61be69..9dc0527f1 100644
--- a/ts/state/selectors/sogsRoomInfo.ts
+++ b/ts/state/selectors/sogsRoomInfo.ts
@@ -1,4 +1,4 @@
-import { isNil } from 'lodash';
+import { isEmpty, isNil } from 'lodash';
 import { SogsRoomInfoState } from '../ducks/sogsRoomInfo';
 import { StateType } from '../reducer';
 
@@ -24,13 +24,33 @@ export function getSubscriberCount(state: StateType, selectedConvo?: string): nu
   return isNil(subscriberCount) ? 0 : subscriberCount;
 }
 
-export function getSubscriberCountOutsideRedux(convoId: string) {
+export function getModerators(state: StateType, selectedConvo?: string): Array<string> {
+  if (!selectedConvo) {
+    return [];
+  }
+
+  const moderators = getSogsRoomInfoState(state).rooms[selectedConvo]?.moderators;
+
+  return isEmpty(moderators) ? [] : moderators;
+}
+
+export function getSubscriberCountOutsideRedux(convoId: string): number {
   const state = window.inboxStore?.getState();
 
   return state ? getSubscriberCount(state, convoId) : 0;
 }
 
-export function getCanWriteOutsideRedux(convoId: string) {
+export function getCanWriteOutsideRedux(convoId: string): boolean {
   const state = window.inboxStore?.getState();
   return state ? getCanWrite(state, convoId) : false;
 }
+
+export function getModeratorsOutsideRedux(convoId: string): Array<string> {
+  const state = window.inboxStore?.getState();
+  return state ? getModerators(state, convoId) : [];
+}
+
+export const getCurrentSubscriberCountOutsideRedux = (convoId?: string): number | undefined => {
+  const state = window.inboxStore?.getState();
+  return getSubscriberCount(state, convoId);
+};
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index aa957df80..67d9e12a8 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -229,40 +229,6 @@ describe('fillConvoAttributesWithDefaults', () => {
     });
   });
 
-  describe('is_medium_group', () => {
-    it('initialize is_medium_group if not given', () => {
-      expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-        'is_medium_group',
-        false
-      );
-    });
-
-    it('do not override is_medium_group if given', () => {
-      expect(
-        fillConvoAttributesWithDefaults({
-          is_medium_group: true,
-        } as ConversationAttributes)
-      ).to.have.deep.property('is_medium_group', true);
-    });
-  });
-
-  // describe('mentionedUs', () => {
-  //   it('initialize mentionedUs if not given', () => {
-  //     expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-  //       'mentionedUs',
-  //       false
-  //     );
-  //   });
-
-  //   it('do not override mentionedUs if given', () => {
-  //     expect(
-  //       fillConvoAttributesWithDefaults({
-  //         mentionedUs: true,
-  //       } as ConversationAttributes)
-  //     ).to.have.deep.property('mentionedUs', true);
-  //   });
-  // });
-
   describe('isKickedFromGroup', () => {
     it('initialize isKickedFromGroup if not given', () => {
       expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 647bdf96f..29ab360f7 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -101,27 +101,6 @@ describe('formatRowOfConversation', () => {
     });
   });
 
-  describe('is_medium_group', () => {
-    it('initialize is_medium_group if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
-        'is_medium_group',
-        false
-      );
-    });
-
-    it('do not override is_medium_group if they are set in the row as integer: true', () => {
-      expect(
-        formatRowOfConversation({ is_medium_group: 1 }, 'test', 0, false)
-      ).to.have.deep.property('is_medium_group', true);
-    });
-
-    it('do not override is_medium_group if they are set in the row as integer: false', () => {
-      expect(
-        formatRowOfConversation({ is_medium_group: 0 }, 'test', 0, false)
-      ).to.have.deep.property('is_medium_group', false);
-    });
-  });
-
   describe('mentionedUs', () => {
     it('initialize mentionedUs if they are not given', () => {
       expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 6586453b5..8cb1c0712 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -34,7 +34,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
@@ -59,10 +58,8 @@ describe('state/selectors/conversations', () => {
           weAreAdmin: false,
           isGroup: false,
           isPrivate: false,
-
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
@@ -87,10 +84,8 @@ describe('state/selectors/conversations', () => {
           weAreAdmin: false,
           isGroup: false,
           isPrivate: false,
-
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
@@ -118,7 +113,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           expireTimer: 0,
           lastMessage: undefined,
           members: [],
@@ -147,7 +141,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: false,
@@ -191,7 +184,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: false,
@@ -220,7 +212,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: false,
@@ -249,7 +240,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: true,
@@ -277,7 +267,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: true,
@@ -306,7 +295,6 @@ describe('state/selectors/conversations', () => {
 
           avatarPath: '',
           groupAdmins: [],
-          groupModerators: [],
           lastMessage: undefined,
           members: [],
           isPinned: false,
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index a997f2425..be00c445a 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -225,7 +225,7 @@ export async function deleteExternalFilesOfConversation(
 
   const { avatarInProfile } = conversationAttributes;
 
-  if (isString(avatarInProfile)) {
+  if (isString(avatarInProfile) && avatarInProfile.length) {
     await deleteOnDisk(avatarInProfile);
   }
 }

From c3a9d1988260e4eeec27af3bc3055aa2d6ce1d39 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 16 Mar 2023 16:08:50 +1100
Subject: [PATCH 047/178] chore: cleanup the lastMessage update logic

---
 ts/models/conversation.ts           | 41 ++++++++++++++++-------------
 ts/models/conversationAttributes.ts |  5 ++--
 ts/types/Conversation.ts            | 26 ------------------
 3 files changed, 25 insertions(+), 47 deletions(-)
 delete mode 100644 ts/types/Conversation.ts

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 7f5cf5061..6a8aa4c99 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -79,7 +79,6 @@ import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libses
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import { getOurProfile } from '../session/utils/User';
-import { createLastMessageUpdate } from '../types/Conversation';
 import {
   deleteExternalFilesOfConversation,
   getAbsoluteAttachmentPath,
@@ -1847,7 +1846,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   private async bouncyUpdateLastMessage() {
-    if (!this.id || !this.get('active_at')) {
+    if (!this.id || !this.get('active_at') || this.isHidden()) {
       return;
     }
     const messages = await Data.getLastMessagesByConversation(this.id, 1, true);
@@ -1856,34 +1855,38 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return;
     }
     const lastMessageModel = messages.at(0);
-    const lastMessageStatusModel = lastMessageModel
-      ? lastMessageModel.getMessagePropStatus()
-      : undefined;
-    const lastMessageUpdate = createLastMessageUpdate({
-      lastMessageStatus: lastMessageStatusModel,
-      lastMessageNotificationText: lastMessageModel
-        ? lastMessageModel.getNotificationText()
-        : undefined,
-    });
+    const lastMessageStatus = lastMessageModel?.getMessagePropStatus() || undefined;
+    const lastMessageNotificationText = lastMessageModel?.getNotificationText() || undefined;
+    // we just want to set the `status` to `undefined` if there are no `lastMessageNotificationText`
+    const lastMessageUpdate =
+      !!lastMessageNotificationText && !isEmpty(lastMessageNotificationText)
+        ? {
+            lastMessage: lastMessageNotificationText || '',
+            lastMessageStatus,
+          }
+        : { lastMessage: '', lastMessageStatus: undefined };
+    const existingLastMessageAttribute = this.get('lastMessage');
+    const existingLastMessageStatus = this.get('lastMessageStatus');
 
     if (
-      lastMessageUpdate.lastMessage !== this.get('lastMessage') ||
-      lastMessageUpdate.lastMessageStatus !== this.get('lastMessageStatus')
+      lastMessageUpdate.lastMessage !== existingLastMessageAttribute ||
+      lastMessageUpdate.lastMessageStatus !== existingLastMessageStatus
     ) {
-      const lastMessageAttribute = this.get('lastMessage');
       if (
-        lastMessageUpdate.lastMessageStatus === this.get('lastMessageStatus') &&
+        lastMessageUpdate.lastMessageStatus === existingLastMessageStatus &&
         lastMessageUpdate.lastMessage &&
         lastMessageUpdate.lastMessage.length > 40 &&
-        lastMessageAttribute &&
-        lastMessageAttribute.length > 40 &&
-        lastMessageUpdate.lastMessage.startsWith(lastMessageAttribute)
+        existingLastMessageAttribute &&
+        existingLastMessageAttribute.length > 40 &&
+        lastMessageUpdate.lastMessage.startsWith(existingLastMessageAttribute)
       ) {
         // if status is the same, and text has a long length which starts with the db status, do not trigger an update.
         // we only store the first 60 chars in the db for the lastMessage attributes (see sql.ts)
         return;
       }
-      this.set(lastMessageUpdate);
+      this.set({
+        ...lastMessageUpdate,
+      });
       await this.commit();
     }
   }
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 8aaf49814..451d026b5 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -71,7 +71,7 @@ export interface ConversationAttributes {
 
   avatarInProfile?: string; // this is the avatar path locally once downloaded and stored in the application attachments folder
 
-  isTrustedForAttachmentDownload: boolean;
+  isTrustedForAttachmentDownload: boolean; // not synced accross devices, this field is used if we should auto download attachments from this conversation or not
 
   conversationIdOrigin?: string; // Blinded message requests ONLY: The community from which this conversation originated from
 
@@ -82,7 +82,8 @@ export interface ConversationAttributes {
   // ===========================================================================
   // All of the items below are duplicated one way or the other with libsession.
   // It would be nice to at some point be able to only rely on libsession dumps
-  // for those so there is no need to keep them in sync, but just have them in the dumps
+  // for those so there is no need to keep them in sync, but just have them in the dumps.
+  // Note: If we do remove them, we also need to add some logic to the wrappers. For instance, we can currently search by nickname or display name and that works through the DB.
 
   displayNameInProfile?: string; // no matter the type of conversation, this is the real name as set by the user/name of the open or closed group
   nickname?: string; // this is the name WE gave to that user (only applicable to private chats, not closed group neither opengroups)
diff --git a/ts/types/Conversation.ts b/ts/types/Conversation.ts
deleted file mode 100644
index 0a60af6fa..000000000
--- a/ts/types/Conversation.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { LastMessageStatusType } from '../state/ducks/conversations';
-
-interface ConversationLastMessageUpdate {
-  lastMessage: string;
-  lastMessageStatus: LastMessageStatusType;
-}
-
-export const createLastMessageUpdate = ({
-  lastMessageStatus,
-  lastMessageNotificationText,
-}: {
-  lastMessageStatus?: LastMessageStatusType;
-  lastMessageNotificationText?: string;
-}): ConversationLastMessageUpdate => {
-  if (!lastMessageNotificationText) {
-    return {
-      lastMessage: '',
-      lastMessageStatus: undefined,
-    };
-  }
-
-  return {
-    lastMessage: lastMessageNotificationText || '',
-    lastMessageStatus: lastMessageStatus || undefined,
-  };
-};

From c3e9d503e44d7aa46d05202ebd3d5ee429dffc01 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 24 Mar 2023 14:39:30 +1100
Subject: [PATCH 048/178] fix: unread count and forced unread is synced

---
 preload.js                                    |   4 +
 .../message-content/OutgoingMessageStatus.tsx |   4 +-
 .../message/message-item/MessageDetail.tsx    |   4 +-
 ts/models/conversation.ts                     |  23 +---
 ts/models/message.ts                          |  32 +----
 ts/models/messageType.ts                      |  11 +-
 ts/node/migration/sessionMigrations.ts        |  10 +-
 ts/receiver/configMessage.ts                  | 114 +++++++++++++-----
 .../opengroupV2/OpenGroupServerPoller.ts      |   1 -
 .../conversations/ConversationController.ts   |  24 ++--
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   8 +-
 .../utils/libsession/libsession_utils.ts      |   1 +
 .../libsession/libsession_utils_contacts.ts   |   4 +-
 .../libsession_utils_convo_info_volatile.ts   |  75 +++++++-----
 ts/state/ducks/conversations.ts               |   5 +-
 ts/util/logging.ts                            |   3 +
 ts/window.d.ts                                |   1 +
 17 files changed, 187 insertions(+), 137 deletions(-)

diff --git a/preload.js b/preload.js
index f43747571..9ede62bd2 100644
--- a/preload.js
+++ b/preload.js
@@ -3,6 +3,8 @@ const { Storage } = require('./ts/util/storage');
 
 const url = require('url');
 
+const _ = require('lodash');
+
 const config = url.parse(window.location.toString(), true).query;
 const configAny = config;
 
@@ -29,6 +31,7 @@ window.sessionFeatureFlags = {
   useTestNet: Boolean(
     process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('testnet')
   ),
+  useDebugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
   useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
   useSharedUtilForUserConfig: true,
   debug: {
@@ -234,6 +237,7 @@ const { setupi18n } = require('./ts/util/i18n');
 window.Signal = data.initData();
 
 const { getConversationController } = require('./ts/session/conversations/ConversationController');
+const { isEmpty } = require('lodash');
 window.getConversationController = getConversationController;
 // Linux seems to periodically let the event loop stop, so this is a global workaround
 setInterval(() => {
diff --git a/ts/components/conversation/message/message-content/OutgoingMessageStatus.tsx b/ts/components/conversation/message/message-content/OutgoingMessageStatus.tsx
index f0d0c847d..c71d4097e 100644
--- a/ts/components/conversation/message/message-content/OutgoingMessageStatus.tsx
+++ b/ts/components/conversation/message/message-content/OutgoingMessageStatus.tsx
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import React from 'react';
 import styled from 'styled-components';
-import { MessageDeliveryStatus } from '../../../../models/messageType';
+import { LastMessageStatusType } from '../../../../state/ducks/conversations';
 import { SessionIcon } from '../../../icon';
 
 const MessageStatusSendingContainer = styled.div`
@@ -56,7 +56,7 @@ const MessageStatusError = ({ dataTestId }: { dataTestId?: string }) => {
 };
 
 export const OutgoingMessageStatus = (props: {
-  status?: MessageDeliveryStatus | null;
+  status: LastMessageStatusType | null;
   dataTestId?: string;
 }) => {
   const { status, dataTestId } = props;
diff --git a/ts/components/conversation/message/message-item/MessageDetail.tsx b/ts/components/conversation/message/message-item/MessageDetail.tsx
index e88190cee..eb1f9b33c 100644
--- a/ts/components/conversation/message/message-item/MessageDetail.tsx
+++ b/ts/components/conversation/message/message-item/MessageDetail.tsx
@@ -62,14 +62,14 @@ const ContactItem = (props: { contact: ContactPropsMessageDetail }) => {
   const { contact } = props;
   const errors = contact.errors || [];
 
-  const statusComponent = !contact.isOutgoingKeyError ? (
+  const statusComponent = (
     <div
       className={classNames(
         'module-message-detail__contact__status-icon',
         `module-message-detail__contact__status-icon--${contact.status}`
       )}
     />
-  ) : null;
+  );
 
   return (
     <div key={contact.pubkey} className="module-message-detail__contact">
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 6a8aa4c99..615b0c7d9 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -117,7 +117,6 @@ import {
 type InMemoryConvoInfos = {
   mentionedUs: boolean;
   unreadCount: number;
-  lastReadTimestampMessage: number | null;
 };
 
 // TODO decide it it makes sense to move this to a redux slice?
@@ -275,7 +274,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public getGroupAdmins(): Array<string> {
     const groupAdmins = this.get('groupAdmins');
 
-    return groupAdmins && groupAdmins?.length > 0 ? groupAdmins : [];
+    return groupAdmins && groupAdmins.length > 0 ? groupAdmins : [];
   }
 
   // tslint:disable-next-line: cyclomatic-complexity max-func-body-length
@@ -291,8 +290,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const weAreModerator = this.isModerator(ourNumber); // only used for sogs
     const isMe = this.isMe();
     const isTyping = !!this.typingTimer;
-    // const unreadCount = this.get('unreadCount') || undefined;
-    // const mentionedUs = this.get('mentionedUs') || undefined;
     const isKickedFromGroup = !!this.get('isKickedFromGroup');
     const left = !!this.get('left');
     const currentNotificationSetting = this.get('triggerNotificationsFor');
@@ -337,7 +334,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.avatarPath = avatarPath;
     }
 
-    const foundContact = SessionUtilContact.getMappedValue(this.id);
+    const foundContact = SessionUtilContact.getContactCached(this.id);
     const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
     const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
     const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
@@ -498,13 +495,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       inMemoryConvoInfos.delete(this.id);
       return;
     }
-    console.warn('memoryDetails', memoryDetails);
-
     if (!inMemoryConvoInfos.get(this.id)) {
       inMemoryConvoInfos.set(this.id, {
         mentionedUs: false,
         unreadCount: 0,
-        lastReadTimestampMessage: null,
       });
     }
 
@@ -517,10 +511,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       existing.unreadCount = memoryDetails.unreadCount;
       changes = true;
     }
-    if (existing.lastReadTimestampMessage !== memoryDetails.lastReadTimestampMessage) {
-      existing.lastReadTimestampMessage = memoryDetails.lastReadTimestampMessage;
-      changes = true;
-    }
+
     if (existing.mentionedUs !== memoryDetails.mentionedUs) {
       existing.mentionedUs = memoryDetails.mentionedUs;
       changes = true;
@@ -531,10 +522,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
-  public getCachedLastReadTimestampMessage() {
-    return inMemoryConvoInfos.get(this.id)?.lastReadTimestampMessage || null;
-  }
-
   public async queueJob(callback: () => Promise<void>) {
     // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
@@ -1855,8 +1842,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       return;
     }
     const lastMessageModel = messages.at(0);
-    const lastMessageStatus = lastMessageModel?.getMessagePropStatus() || undefined;
-    const lastMessageNotificationText = lastMessageModel?.getNotificationText() || undefined;
+    const lastMessageStatus = lastMessageModel.getMessagePropStatus() || undefined;
+    const lastMessageNotificationText = lastMessageModel.getNotificationText() || undefined;
     // we just want to set the `status` to `undefined` if there are no `lastMessageNotificationText`
     const lastMessageUpdate =
       !!lastMessageNotificationText && !isEmpty(lastMessageNotificationText)
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 995773848..a98522403 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -713,7 +713,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     // We include numbers we didn't successfully send to so we can display errors.
     // Older messages don't have the recipients included on the message, so we fall
     //   back to the conversation's current recipients
-    const phoneNumbers: Array<string> = this.isIncoming()
+    const contacts: Array<string> = this.isIncoming()
       ? [this.get('source')]
       : this.get('sent_to') || [];
 
@@ -727,30 +727,21 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const errors = reject(allErrors, error => Boolean(error.number));
     const errorsGroupedById = groupBy(allErrors, 'number');
     const finalContacts = await Promise.all(
-      (phoneNumbers || []).map(async id => {
+      (contacts || []).map(async id => {
         const errorsForContact = errorsGroupedById[id];
-        const isOutgoingKeyError = false;
 
         const contact = this.findAndFormatContact(id);
         return {
           ...contact,
-          // fallback to the message status if we do not have a status with a user
-          // this is useful for medium groups.
-          status: this.getStatus(id) || this.getMessagePropStatus(),
+          status: this.getMessagePropStatus(),
           errors: errorsForContact,
-          isOutgoingKeyError,
-          isPrimaryDevice: true,
           profileName: contact.profileName,
         };
       })
     );
 
-    // The prefix created here ensures that contacts with errors are listed
-    //   first; otherwise it's alphabetical
-    const sortedContacts = sortBy(
-      finalContacts,
-      contact => `${contact.isPrimaryDevice ? '0' : '1'}${contact.pubkey}`
-    );
+    // sort by pubkey
+    const sortedContacts = sortBy(finalContacts, contact => contact.pubkey);
 
     const toRet: MessagePropsDetails = {
       sentAt: this.get('sent_at') || 0,
@@ -1013,19 +1004,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return lodashSize(this.get('errors')) > 0;
   }
 
-  public getStatus(pubkey: string) {
-    const readBy = this.get('read_by') || [];
-    if (readBy.indexOf(pubkey) >= 0) {
-      return 'read';
-    }
-    const sentTo = this.get('sent_to') || [];
-    if (sentTo.indexOf(pubkey) >= 0) {
-      return 'sent';
-    }
-
-    return null;
-  }
-
   public async updateMessageHash(messageHash: string) {
     if (!messageHash) {
       window?.log?.error('Message hash not provided to update message hash');
diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index 3cc6b7d7d..6057ba5ca 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -1,11 +1,14 @@
 import { defaultsDeep } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import { CallNotificationType, PropsForMessageWithConvoProps } from '../state/ducks/conversations';
+import {
+  CallNotificationType,
+  LastMessageStatusType,
+  PropsForMessageWithConvoProps,
+} from '../state/ducks/conversations';
 import { AttachmentTypeWithPath } from '../types/Attachment';
 import { Reaction, ReactionList, SortedReactionList } from '../types/Reaction';
 
 export type MessageModelType = 'incoming' | 'outgoing';
-export type MessageDeliveryStatus = 'sending' | 'sent' | 'read' | 'error';
 
 export interface MessageAttributes {
   // the id of the message
@@ -48,7 +51,7 @@ export interface MessageAttributes {
    * timestamp is the sent_at timestamp, which is the envelope.timestamp
    */
   timestamp?: number;
-  status?: MessageDeliveryStatus;
+  status?: LastMessageStatusType;
   sent_to: Array<string>;
   sent: boolean;
 
@@ -196,7 +199,7 @@ export interface MessageAttributesOptionals {
   unread?: number;
   group?: any;
   timestamp?: number;
-  status?: MessageDeliveryStatus;
+  status?: LastMessageStatusType;
   sent_to?: Array<string>;
   sent?: boolean;
   serverId?: number;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index cebd37d83..6a9ae8fcb 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -19,6 +19,7 @@ import {
   CONVERSATIONS_TABLE,
   dropFtsAndTriggers,
   GUARD_NODE_TABLE,
+  jsonToObject,
   LAST_HASHES_TABLE,
   MESSAGES_TABLE,
   NODES_FOR_PUBKEY_TABLE,
@@ -1486,11 +1487,16 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
        * Setup up the User profile wrapper with what is stored in our own conversation
        */
 
-      const ourConversation = sqlNode.getConversationById(publicKeyHex, db);
-      if (!ourConversation) {
+      const ourConvoRow = db.prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`).get({
+        id: publicKeyHex,
+      });
+
+      if (!ourConvoRow) {
         throw new Error('Failed to find our logged in conversation while migrating');
       }
 
+      const ourConversation = jsonToObject(ourConvoRow);
+
       // Insert the user profile into the userWrappoer
       const ourDbName = ourConversation.displayNameInProfile || '';
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 0520a1a72..09944bd57 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -309,7 +309,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   const legacyGroupsToLeaveInDB = allLegacyGroupsInDb.filter(m => {
     return !allLegacyGroupsIdsInWrapper.includes(m.id);
   });
-
+  // TODO we need to store the encryption keypair if needed
   window.log.info(
     `we have to join ${legacyGroupsToJoinInDB.length} legacy groups in DB compared to what is in the wrapper`
   );
@@ -456,6 +456,39 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<Incom
   return result;
 }
 
+async function applyConvoVolatileUpdateFromWrapper(
+  convoId: string,
+  forcedUnread: boolean,
+  lastReadMessageTimestamp: number
+) {
+  const foundConvo = getConversationController().get(convoId);
+  if (foundConvo) {
+    try {
+      window.log.debug(
+        `applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
+      );
+      // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
+      await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
+      // this commits to the DB, if needed
+      await foundConvo.markAsUnread(forcedUnread, true);
+
+      if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
+        await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
+          foundConvo.id,
+          foundConvo.isClosedGroup(),
+          false
+        );
+
+        await foundConvo.refreshInMemoryDetails();
+      }
+    } catch (e) {
+      window.log.warn(
+        `applyConvoVolatileUpdateFromWrapper of "${convoId}" failed with error ${e.message}`
+      );
+    }
+  }
+}
+
 async function handleConvoInfoVolatileUpdate(
   result: IncomingConfResult
 ): Promise<IncomingConfResult> {
@@ -463,50 +496,71 @@ async function handleConvoInfoVolatileUpdate(
   // if (!result.needsDump) {
   //   return result;
   // }
-  console.error('handleConvoInfoVolatileUpdate : TODO ');
 
   const types = SessionUtilConvoInfoVolatile.getConvoInfoVolatileTypes();
   for (let typeIndex = 0; typeIndex < types.length; typeIndex++) {
     const type = types[typeIndex];
     switch (type) {
       case '1o1':
-        // Note: "Note to Self" comes here too
-        const privateChats = await ConvoInfoVolatileWrapperActions.getAll1o1();
-        for (let index = 0; index < privateChats.length; index++) {
-          const fromWrapper = privateChats[index];
-          const foundConvo = getConversationController().get(fromWrapper.pubkeyHex);
-          // TODO should we create the conversation if the conversation does not exist locally? Or assume that it should be coming from a contacts update?
-          if (foundConvo) {
-            console.warn(
-              `fromWrapper from getAll1o1: ${fromWrapper.pubkeyHex}: ${fromWrapper.unread}`
+        try {
+          // Note: "Note to Self" comes here too
+          const wrapper1o1s = await ConvoInfoVolatileWrapperActions.getAll1o1();
+          for (let index = 0; index < wrapper1o1s.length; index++) {
+            const fromWrapper = wrapper1o1s[index];
+            await applyConvoVolatileUpdateFromWrapper(
+              fromWrapper.pubkeyHex,
+              fromWrapper.unread,
+              fromWrapper.lastRead
             );
-            // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
-            await foundConvo.markReadFromConfigMessage(fromWrapper.lastRead);
-            // this commits to the DB, if needed
-            await foundConvo.markAsUnread(fromWrapper.unread, true);
-
-            if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
-              await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
-                foundConvo.id,
-                foundConvo.isClosedGroup(),
-                false
-              );
-
-              await foundConvo.refreshInMemoryDetails();
-            }
           }
+        } catch (e) {
+          window.log.warn('handleConvoInfoVolatileUpdate of "1o1" failed with error: ', e.message);
         }
-        console.warn('handleConvoInfoVolatileUpdate: privateChats', privateChats);
 
         break;
       case 'Community':
-        const comms = await ConvoInfoVolatileWrapperActions.getAllCommunities();
-        console.warn('handleConvoInfoVolatileUpdate: comms', comms);
+        try {
+          const wrapperComms = await ConvoInfoVolatileWrapperActions.getAllCommunities();
+          for (let index = 0; index < wrapperComms.length; index++) {
+            const fromWrapper = wrapperComms[index];
+
+            const convoId = getOpenGroupV2ConversationId(
+              fromWrapper.baseUrl,
+              fromWrapper.roomCasePreserved
+            );
+
+            await applyConvoVolatileUpdateFromWrapper(
+              convoId,
+              fromWrapper.unread,
+              fromWrapper.lastRead
+            );
+          }
+        } catch (e) {
+          window.log.warn(
+            'handleConvoInfoVolatileUpdate of "Community" failed with error: ',
+            e.message
+          );
+        }
         break;
 
       case 'LegacyGroup':
-        const legacyGroup = await ConvoInfoVolatileWrapperActions.getAllLegacyGroups();
-        console.warn('handleConvoInfoVolatileUpdate: legacyGroup', legacyGroup);
+        try {
+          const legacyGroups = await ConvoInfoVolatileWrapperActions.getAllLegacyGroups();
+          for (let index = 0; index < legacyGroups.length; index++) {
+            const fromWrapper = legacyGroups[index];
+
+            await applyConvoVolatileUpdateFromWrapper(
+              fromWrapper.pubkeyHex,
+              fromWrapper.unread,
+              fromWrapper.lastRead
+            );
+          }
+        } catch (e) {
+          window.log.warn(
+            'handleConvoInfoVolatileUpdate of "LegacyGroup" failed with error: ',
+            e.message
+          );
+        }
         break;
 
       default:
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index cb45e8788..4a5ad3c4a 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -380,7 +380,6 @@ export const getRoomAndUpdateLastFetchTimestamp = async (
   if (!newMessages.length) {
     // if we got no new messages, just write our last update timestamp to the db
     roomInfos.lastFetchTimestamp = Date.now();
-    window?.log?.info();
     await OpenGroupData.saveV2OpenGroupRoom(roomInfos);
     return null;
   }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 70994c9e3..51cae1494 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -221,17 +221,7 @@ export class ConversationController {
       // open group v2
     } else if (conversation.isPublic()) {
       window?.log?.info('leaving open group v2', conversation.id);
-      const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
-      if (roomInfos) {
-        getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
-      }
-
-      // remove the roomInfos locally for this open group room
-      try {
-        await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
-      } catch (e) {
-        window?.log?.info('removeV2OpenGroupRoom failed:', e);
-      }
+      // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
       try {
         await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
         await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
@@ -241,6 +231,18 @@ export class ConversationController {
       } catch (e) {
         window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
       }
+
+      const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
+      if (roomInfos) {
+        getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
+      }
+
+      // remove the roomInfos locally for this open group room including the pubkey
+      try {
+        await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
+      } catch (e) {
+        window?.log?.info('removeV2OpenGroupRoom failed:', e);
+      }
     } else if (conversation.isPrivate()) {
       // if this conversation is a private conversation it's in fact a `contact` for desktop.
       // we just want to remove everything related to it and set the hidden field to true
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index c3875c583..48d1f6494 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -130,11 +130,7 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
   for (let i = 0; i < changes.length; i++) {
     const change = changes[i];
     const variant = LibSessionUtil.kindToVariant(change.message.kind);
-    console.warn(
-      `ConfigurationSyncJob.saveDumpToDB: "${variant}" updatedHash: "${
-        change.updatedHash
-      }:${change.message.seqno.toNumber()}"`
-    );
+
     const needsDump = await LibSessionUtil.markAsPushed(
       variant,
       change.publicKey,
@@ -302,11 +298,13 @@ async function queueNewJobIfNeeded() {
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() })
     );
+    window.log.debug('Scheduling ConfSyncJob: ASAP');
   } else {
     // if we did run at t=100, and it is currently t=110, diff is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
+    window.log.debug('Scheduling ConfSyncJob: LATER');
 
     // TODO we need to make the addJob wait for the previous addJob to be done before it can be called.
     await runners.configurationSyncRunner.addJob(
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index cab6742bf..3d56f9212 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -112,6 +112,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
     const variant = dump.variant;
     const needsPush = await GenericWrapperActions.needsPush(variant);
     if (!needsPush) {
+      console.info('needsPush false for ', variant);
       continue;
     }
 
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 0e86318e2..5d668df62 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -126,7 +126,7 @@ function setMappedValue(info: ContactInfo) {
   mappedContactWrapperValues.set(info.id, info);
 }
 
-function getMappedValue(id: string) {
+function getContactCached(id: string) {
   return mappedContactWrapperValues.get(id);
 }
 
@@ -134,6 +134,6 @@ export const SessionUtilContact = {
   isContactToStoreInContactsWrapper,
   insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
-  getMappedValue,
+  getContactCached,
   refreshMappedValue,
 };
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 255d22070..8f840320c 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,4 +1,4 @@
-import { uniq } from 'lodash';
+import { isEmpty, uniq } from 'lodash';
 import { BaseConvoInfoVolatile, ConvoVolatileType } from 'session_util_wrapper';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
@@ -87,12 +87,12 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
   if (!foundConvo || !isConvoToStoreInWrapper(foundConvo)) {
     return;
   }
-
   const isForcedUnread = foundConvo.isMarkedUnread();
-  const lastReadTimestampMessage = foundConvo.getCachedLastReadTimestampMessage() || 0;
+  const lastReadMessageTimestamp =
+    (await Data.fetchConvoMemoryDetails(convoId))?.lastReadTimestampMessage || 0;
 
   console.info(
-    `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadTimestampMessage};forcedUnread:${isForcedUnread}...`
+    `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadMessageTimestamp};forcedUnread:${isForcedUnread}...`
   );
 
   const convoType = getConvoType(foundConvo);
@@ -102,7 +102,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
         // this saves the details for contacts and `Note To Self`
         await ConvoInfoVolatileWrapperActions.set1o1(
           convoId,
-          lastReadTimestampMessage,
+          lastReadMessageTimestamp,
           isForcedUnread
         );
         await refreshConvoVolatileCached(convoId, false, false);
@@ -116,7 +116,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
       try {
         await ConvoInfoVolatileWrapperActions.setLegacyGroup(
           convoId,
-          lastReadTimestampMessage,
+          lastReadMessageTimestamp,
           isForcedUnread
         );
         await refreshConvoVolatileCached(convoId, true, false);
@@ -124,14 +124,13 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
         window.log.warn(
           `ConvoInfoVolatileWrapperActions.setLegacyGroup of ${convoId} failed with ${e.message}`
         );
-        // we stil let this go through
       }
       break;
     case 'Community':
       try {
         const asOpengroup = foundConvo.toOpenGroupV2();
         const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(asOpengroup);
-        if (!roomDetails) {
+        if (!roomDetails || isEmpty(roomDetails.serverPublicKey)) {
           return;
         }
 
@@ -141,18 +140,19 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
           roomDetails.roomId,
           roomDetails.serverPublicKey
         );
+
         // this does the create or the update of the matching existing community
         await ConvoInfoVolatileWrapperActions.setCommunityByFullUrl(
           fullUrlWithPubkey,
-          lastReadTimestampMessage,
+          lastReadMessageTimestamp,
           isForcedUnread
         );
+
         await refreshConvoVolatileCached(convoId, false, false);
       } catch (e) {
         window.log.warn(
           `ConvoInfoVolatileWrapperActions.setCommunityByFullUrl of ${convoId} failed with ${e.message}`
         );
-        // we still let this go through
       }
       break;
     default:
@@ -173,29 +173,46 @@ async function refreshConvoVolatileCached(
   duringAppStart: boolean
 ) {
   try {
+    let convoType: ConvoVolatileType = '1o1';
     let refreshed = false;
+
     if (OpenGroupUtils.isOpenGroupV2(convoId)) {
-      const fromWrapper = await ConvoInfoVolatileWrapperActions.getCommunity(convoId);
-      if (fromWrapper && fromWrapper.fullUrlWithPubkey) {
-        mappedCommunityWrapperValues.set(convoId, fromWrapper);
-      }
-      refreshed = true;
+      convoType = 'Community';
     } else if (convoId.startsWith('05') && isLegacyGroup) {
-      const fromWrapper = await ConvoInfoVolatileWrapperActions.getLegacyGroup(convoId);
-      if (fromWrapper) {
-        mappedLegacyGroupWrapperValues.set(convoId, fromWrapper);
-      }
-      refreshed = true;
+      convoType = 'LegacyGroup';
     } else if (convoId.startsWith('05')) {
-      const fromWrapper = await ConvoInfoVolatileWrapperActions.get1o1(convoId);
-      console.warn(
-        `refreshConvoVolatileCached from get1o1 ${fromWrapper?.pubkeyHex} : ${fromWrapper?.unread}`
-      );
-      if (fromWrapper) {
-        mapped1o1WrapperValues.set(convoId, fromWrapper);
-      }
-      refreshed = true;
-    } // TODO handle the new closed groups once we got them ready
+      convoType = '1o1';
+    }
+
+    switch (convoType) {
+      case '1o1':
+        const fromWrapper1o1 = await ConvoInfoVolatileWrapperActions.get1o1(convoId);
+        if (fromWrapper1o1) {
+          mapped1o1WrapperValues.set(convoId, fromWrapper1o1);
+        }
+        refreshed = true;
+        break;
+      case 'LegacyGroup':
+        const fromWrapperLegacyGroup = await ConvoInfoVolatileWrapperActions.getLegacyGroup(
+          convoId
+        );
+        if (fromWrapperLegacyGroup) {
+          mappedLegacyGroupWrapperValues.set(convoId, fromWrapperLegacyGroup);
+        }
+        refreshed = true;
+        break;
+      case 'Community':
+        const fromWrapperCommunity = await ConvoInfoVolatileWrapperActions.getCommunity(convoId);
+        if (fromWrapperCommunity && fromWrapperCommunity.fullUrlWithPubkey) {
+          mappedCommunityWrapperValues.set(convoId, fromWrapperCommunity);
+        }
+        refreshed = true;
+        break;
+
+      default:
+        assertUnreachable(convoType, `refreshConvoVolatileCached unhandled case "${convoType}"`);
+    }
+    // TODO handle the new closed groups once we got them ready
 
     if (refreshed && !duringAppStart) {
       getConversationController()
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 4c1ec3c8e..a9d6a1ddb 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -2,7 +2,6 @@ import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { getConversationController } from '../../session/conversations';
 import { Data } from '../../data/data';
 import {
-  MessageDeliveryStatus,
   MessageModelType,
   PropsForDataExtractionNotification,
   PropsForMessageRequestResponse,
@@ -45,8 +44,6 @@ export type ContactPropsMessageDetail = {
   name?: string | null;
   profileName?: string | null;
   avatarPath?: string | null;
-  isOutgoingKeyError: boolean;
-
   errors?: Array<Error>;
 };
 
@@ -60,7 +57,7 @@ export type MessagePropsDetails = {
   direction: MessageModelType;
 };
 
-export type LastMessageStatusType = MessageDeliveryStatus | undefined;
+export type LastMessageStatusType = 'sending' | 'sent' | 'read' | 'error' | undefined;
 
 export type FindAndFormatContactType = {
   pubkey: string;
diff --git a/ts/util/logging.ts b/ts/util/logging.ts
index 659a8495f..63a3ca016 100644
--- a/ts/util/logging.ts
+++ b/ts/util/logging.ts
@@ -110,6 +110,9 @@ const development = window && window?.getEnvironment && window?.getEnvironment()
 
 // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
 function logAtLevel(level: string, prefix: string, ...args: any) {
+  if (prefix === 'DEBUG' && window.sessionFeatureFlags.useDebugLogging) {
+    return;
+  }
   if (development) {
     const fn = `_${level}`;
     (console as any)[fn](prefix, now(), ...args);
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 664e85c5f..a0bad52c3 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -43,6 +43,7 @@ declare global {
         debugNonSnodeRequests: boolean;
         debugOnionRequests: boolean;
       };
+      useDebugLogging: boolean;
     };
     SessionSnodeAPI: SessionSnodeAPI;
     onLogin: (pw: string) => Promise<void>;

From 00503524701b5cc12b3dba514498768fb1237bc8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 24 Mar 2023 16:48:50 +1100
Subject: [PATCH 049/178] chore: move selected convo selectors to another file

---
 .../calling/DraggableCallContainer.tsx        |   4 +-
 .../conversation/ConversationHeader.tsx       |  60 +++---
 .../ConversationRequestButtons.tsx            |  16 +-
 .../conversation/ConversationRequestInfo.tsx  |  10 +-
 .../conversation/SessionMessagesList.tsx      |  10 +-
 .../SessionMessagesListContainer.tsx          |   6 +-
 .../conversation/SessionRightPanel.tsx        |  85 ++++----
 .../conversation/StagedAttachmentList.tsx     |  22 +--
 .../composition/CompositionBox.tsx            |  15 +-
 .../media-gallery/DocumentListItem.tsx        |  11 +-
 .../message-content/MessageAuthorText.tsx     |  13 +-
 .../message/message-content/MessageAvatar.tsx |  16 +-
 .../message-content/MessageReactions.tsx      |  21 +-
 .../message/message-content/Quote.tsx         |  16 +-
 .../message/message-item/ReadableMessage.tsx  |   4 +-
 .../notification-bubble/CallNotification.tsx  |  15 +-
 .../message/reactions/Reaction.tsx            |   2 +-
 ts/components/dialog/ReactListModal.tsx       |   6 +-
 .../ConversationListItem.tsx                  |  11 +-
 .../overlay/OverlayMessageRequest.tsx         |  10 +-
 ts/components/lightbox/LightboxGallery.tsx    |  12 +-
 ts/components/menu/ConversationHeaderMenu.tsx |   5 +-
 ts/hooks/useParamSelector.ts                  |  12 +-
 ts/hooks/useVideoEventListener.ts             |   4 +-
 ts/interactions/conversationInteractions.ts   |   5 +-
 ts/models/message.ts                          |   4 +-
 ts/receiver/configMessage.ts                  | 105 ++++------
 .../conversations/ConversationController.ts   |  36 ++--
 ts/state/selectors/call.ts                    |   3 +-
 ts/state/selectors/conversations.ts           | 171 +---------------
 ts/state/selectors/search.ts                  |   3 +-
 ts/state/selectors/selectedConversation.ts    | 185 ++++++++++++++++++
 ts/state/selectors/stagedAttachments.ts       |   2 +-
 ts/state/smart/SessionConversation.ts         |  14 +-
 34 files changed, 467 insertions(+), 447 deletions(-)
 create mode 100644 ts/state/selectors/selectedConversation.ts

diff --git a/ts/components/calling/DraggableCallContainer.tsx b/ts/components/calling/DraggableCallContainer.tsx
index 0e44059a3..67564682e 100644
--- a/ts/components/calling/DraggableCallContainer.tsx
+++ b/ts/components/calling/DraggableCallContainer.tsx
@@ -3,7 +3,6 @@ import { useSelector } from 'react-redux';
 import Draggable, { DraggableData, DraggableEvent } from 'react-draggable';
 
 import styled from 'styled-components';
-import { getSelectedConversationKey } from '../../state/selectors/conversations';
 import { getHasOngoingCall, getHasOngoingCallWith } from '../../state/selectors/call';
 import { openConversationWithMessages } from '../../state/ducks/conversations';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
@@ -11,6 +10,7 @@ import { useVideoCallEventsListener } from '../../hooks/useVideoEventListener';
 import { VideoLoadingSpinner } from './InConversationCallContainer';
 import { getSection } from '../../state/selectors/section';
 import { SectionType } from '../../state/ducks/section';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 
 export const DraggableCallWindow = styled.div`
   position: absolute;
@@ -58,7 +58,7 @@ const CenteredAvatarInDraggable = styled.div`
 
 export const DraggableCallContainer = () => {
   const ongoingCallProps = useSelector(getHasOngoingCallWith);
-  const selectedConversationKey = useSelector(getSelectedConversationKey);
+  const selectedConversationKey = useSelectedConversationKey();
   const hasOngoingCall = useSelector(getHasOngoingCall);
   const selectedSection = useSelector(getSection);
 
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 9404bf774..9a62986ff 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -6,15 +6,6 @@ import { contextMenu } from 'react-contexify';
 import styled from 'styled-components';
 import { ConversationNotificationSettingType } from '../../models/conversationAttributes';
 import {
-  getConversationHeaderTitleProps,
-  getCurrentNotificationSettingText,
-  getCurrentSubscriberCount,
-  getIsSelectedActive,
-  getIsSelectedBlocked,
-  getIsSelectedNoteToSelf,
-  getIsSelectedPrivate,
-  getSelectedConversationIsPublic,
-  getSelectedConversationKey,
   getSelectedMessageIds,
   isMessageDetailView,
   isMessageSelectionMode,
@@ -50,6 +41,19 @@ import { SessionIconButton } from '../icon';
 import { ConversationHeaderMenu } from '../menu/ConversationHeaderMenu';
 import { Flex } from '../basic/Flex';
 import { ExpirationTimerOptions } from '../../util/expiringMessages';
+import {
+  useSelectedConversationKey,
+  useSelectedIsActive,
+  useSelectedIsBlocked,
+  useSelectedIsGroup,
+  useSelectedIsKickedFromGroup,
+  useSelectedisNoteToSelf,
+  useSelectedIsPrivate,
+  useSelectedIsPublic,
+  useSelectedMembers,
+  useSelectedNotificationSetting,
+  useSelectedSubscriberCount,
+} from '../../state/selectors/selectedConversation';
 
 export interface TimerOption {
   name: string;
@@ -58,8 +62,8 @@ export interface TimerOption {
 
 const SelectionOverlay = () => {
   const selectedMessageIds = useSelector(getSelectedMessageIds);
-  const selectedConversationKey = useSelector(getSelectedConversationKey);
-  const isPublic = useSelector(getSelectedConversationIsPublic);
+  const selectedConversationKey = useSelectedConversationKey();
+  const isPublic = useSelectedIsPublic();
   const dispatch = useDispatch();
 
   const { i18n } = window;
@@ -200,11 +204,11 @@ const BackButton = (props: { onGoBack: () => void; showBackButton: boolean }) =>
 };
 
 const CallButton = () => {
-  const isPrivate = useSelector(getIsSelectedPrivate);
-  const isBlocked = useSelector(getIsSelectedBlocked);
-  const activeAt = useSelector(getIsSelectedActive);
-  const isMe = useSelector(getIsSelectedNoteToSelf);
-  const selectedConvoKey = useSelector(getSelectedConversationKey);
+  const isPrivate = useSelectedIsPrivate();
+  const isBlocked = useSelectedIsBlocked();
+  const activeAt = useSelectedIsActive();
+  const isMe = useSelectedisNoteToSelf();
+  const selectedConvoKey = useSelectedConversationKey();
 
   const hasIncomingCall = useSelector(getHasIncomingCall);
   const hasOngoingCall = useSelector(getHasOngoingCall);
@@ -266,18 +270,22 @@ export const ConversationHeaderSubtitle = (props: { text?: string | null }): JSX
 const ConversationHeaderTitle = () => {
   const dispatch = useDispatch();
 
-  const headerTitleProps = useSelector(getConversationHeaderTitleProps);
-  const notificationSetting = useSelector(getCurrentNotificationSettingText);
+  const notificationSetting = useSelectedNotificationSetting();
   const isRightPanelOn = useSelector(isRightPanelShowing);
-  const convoName = useConversationUsername(headerTitleProps?.conversationKey);
-  const subscriberCount = useSelector(getCurrentSubscriberCount);
+  const subscriberCount = useSelectedSubscriberCount();
+  const selectedConvoKey = useSelectedConversationKey();
+  const convoName = useConversationUsername(selectedConvoKey);
 
-  if (!headerTitleProps) {
+  const isPublic = useSelectedIsPublic();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const isMe = useSelectedisNoteToSelf();
+  const isGroup = useSelectedIsGroup();
+  const members = useSelectedMembers();
+
+  if (!selectedConvoKey) {
     return null;
   }
 
-  const { isGroup, isPublic, members, isMe, isKickedFromGroup } = headerTitleProps;
-
   const { i18n } = window;
 
   if (isMe) {
@@ -331,15 +339,15 @@ const ConversationHeaderTitle = () => {
 export const ConversationHeaderWithDetails = () => {
   const isSelectionMode = useSelector(isMessageSelectionMode);
   const isMessageDetailOpened = useSelector(isMessageDetailView);
-  const selectedConvoKey = useSelector(getSelectedConversationKey);
+  const selectedConvoKey = useSelectedConversationKey();
   const dispatch = useDispatch();
+  const isKickedFromGroup = useIsKickedFromGroup(selectedConvoKey);
+  const expireTimerSetting = useExpireTimer(selectedConvoKey);
 
   if (!selectedConvoKey) {
     return null;
   }
 
-  const isKickedFromGroup = useIsKickedFromGroup(selectedConvoKey);
-  const expireTimerSetting = useExpireTimer(selectedConvoKey);
   const expirationSettingName = expireTimerSetting
     ? ExpirationTimerOptions.getName(expireTimerSetting || 0)
     : undefined;
diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx
index 1e08f65b3..911eb598b 100644
--- a/ts/components/conversation/ConversationRequestButtons.tsx
+++ b/ts/components/conversation/ConversationRequestButtons.tsx
@@ -7,10 +7,8 @@ import {
   declineConversationWithConfirm,
 } from '../../interactions/conversationInteractions';
 import { getConversationController } from '../../session/conversations';
-import {
-  getSelectedConversation,
-  hasSelectedConversationIncomingMessages,
-} from '../../state/selectors/conversations';
+import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../basic/SessionButton';
 
 const handleDeclineConversationRequest = (convoId: string) => {
@@ -44,12 +42,12 @@ const ConversationBannerRow = styled.div`
 `;
 
 export const ConversationMessageRequestButtons = () => {
-  const selectedConversation = useSelector(getSelectedConversation);
+  const selectedConvoId = useSelectedConversationKey();
 
   const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
-  const isIncomingMessageRequest = useIsRequest(selectedConversation?.id);
+  const isIncomingMessageRequest = useIsRequest(selectedConvoId);
 
-  if (!selectedConversation || !hasIncomingMessages) {
+  if (!selectedConvoId || !hasIncomingMessages) {
     return null;
   }
 
@@ -62,7 +60,7 @@ export const ConversationMessageRequestButtons = () => {
       <ConversationBannerRow>
         <SessionButton
           onClick={async () => {
-            await handleAcceptConversationRequest(selectedConversation.id);
+            await handleAcceptConversationRequest(selectedConvoId);
           }}
           text={window.i18n('accept')}
           dataTestId="accept-message-request"
@@ -71,7 +69,7 @@ export const ConversationMessageRequestButtons = () => {
           buttonColor={SessionButtonColor.Danger}
           text={window.i18n('decline')}
           onClick={() => {
-            handleDeclineConversationRequest(selectedConversation.id);
+            handleDeclineConversationRequest(selectedConvoId);
           }}
           dataTestId="decline-message-request"
         />
diff --git a/ts/components/conversation/ConversationRequestInfo.tsx b/ts/components/conversation/ConversationRequestInfo.tsx
index d9853e787..15972ac81 100644
--- a/ts/components/conversation/ConversationRequestInfo.tsx
+++ b/ts/components/conversation/ConversationRequestInfo.tsx
@@ -2,10 +2,8 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { useIsRequest } from '../../hooks/useParamSelector';
-import {
-  getSelectedConversation,
-  hasSelectedConversationIncomingMessages,
-} from '../../state/selectors/conversations';
+import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 
 const ConversationRequestTextBottom = styled.div`
   display: flex;
@@ -22,8 +20,8 @@ const ConversationRequestTextInner = styled.div`
 `;
 
 export const ConversationRequestinfo = () => {
-  const selectedConversation = useSelector(getSelectedConversation);
-  const isIncomingMessageRequest = useIsRequest(selectedConversation?.id);
+  const selectedConversation = useSelectedConversationKey();
+  const isIncomingMessageRequest = useIsRequest(selectedConversation);
 
   const showMsgRequestUI = selectedConversation && isIncomingMessageRequest;
   const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx
index 6feb5d4dd..457c705d2 100644
--- a/ts/components/conversation/SessionMessagesList.tsx
+++ b/ts/components/conversation/SessionMessagesList.tsx
@@ -15,19 +15,19 @@ import {
 import {
   getOldBottomMessageId,
   getOldTopMessageId,
-  getSelectedConversationKey,
   getSortedMessagesTypesOfSelectedConversation,
 } from '../../state/selectors/conversations';
-import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage';
-import { MessageRequestResponse } from './message/message-item/MessageRequestResponse';
 import { MessageDateBreak } from './message/message-item/DateBreak';
 import { GroupInvitation } from './message/message-item/GroupInvitation';
+import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage';
 import { Message } from './message/message-item/Message';
+import { MessageRequestResponse } from './message/message-item/MessageRequestResponse';
 import { CallNotification } from './message/message-item/notification-bubble/CallNotification';
 
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
+import { DataExtractionNotification } from './message/message-item/DataExtractionNotification';
 import { SessionLastSeenIndicator } from './SessionLastSeenIndicator';
 import { TimerNotification } from './TimerNotification';
-import { DataExtractionNotification } from './message/message-item/DataExtractionNotification';
 
 function isNotTextboxEvent(e: KeyboardEvent) {
   return (e?.target as any)?.type === undefined;
@@ -46,7 +46,7 @@ export const SessionMessagesList = (props: {
   onEndPressed: () => void;
 }) => {
   const messagesProps = useSelector(getSortedMessagesTypesOfSelectedConversation);
-  const convoKey = useSelector(getSelectedConversationKey);
+  const convoKey = useSelectedConversationKey();
 
   const [didScroll, setDidScroll] = useState(false);
   const oldTopMessageId = useSelector(getOldTopMessageId);
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 5d97d2ea4..23effa227 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -17,12 +17,14 @@ import {
 import { StateType } from '../../state/reducer';
 import {
   getQuotedMessageToAnimate,
-  getSelectedConversation,
-  getSelectedConversationKey,
   getSortedMessagesOfSelectedConversation,
 } from '../../state/selectors/conversations';
 import { TypingBubble } from './TypingBubble';
 import styled from 'styled-components';
+import {
+  getSelectedConversation,
+  getSelectedConversationKey,
+} from '../../state/selectors/selectedConversation';
 
 export type SessionMessageListProps = {
   messageContainerRef: React.RefObject<HTMLDivElement>;
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 2927fbe89..3e48cb468 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -17,11 +17,7 @@ import {
 } from '../../interactions/conversationInteractions';
 import { Constants } from '../../session';
 import { closeRightPanel } from '../../state/ducks/conversations';
-import {
-  getCurrentSubscriberCount,
-  getSelectedConversation,
-  isRightPanelShowing,
-} from '../../state/selectors/conversations';
+import { isRightPanelShowing } from '../../state/selectors/conversations';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
 import { AttachmentTypeWithPath } from '../../types/Attachment';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
@@ -32,6 +28,18 @@ import { MediaItemType } from '../lightbox/LightboxGallery';
 import { MediaGallery } from './media-gallery/MediaGallery';
 import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
 import styled from 'styled-components';
+import {
+  useSelectedConversationKey,
+  useSelectedDisplayNameInProfile,
+  useSelectedIsActive,
+  useSelectedIsBlocked,
+  useSelectedIsGroup,
+  useSelectedIsKickedFromGroup,
+  useSelectedIsLeft,
+  useSelectedIsPublic,
+  useSelectedSubscriberCount,
+  useSelectedWeAreAdmin,
+} from '../../state/selectors/selectedConversation';
 
 async function getMediaGalleryProps(
   conversationId: string
@@ -107,13 +115,16 @@ async function getMediaGalleryProps(
 }
 
 const HeaderItem = () => {
-  const selectedConversation = useSelector(getSelectedConversation);
+  const selectedConvoKey = useSelectedConversationKey();
   const dispatch = useDispatch();
+  const isBlocked = useSelectedIsBlocked();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const left = useSelectedIsLeft();
+  const isGroup = useSelectedIsGroup();
 
-  if (!selectedConversation) {
+  if (!selectedConvoKey) {
     return null;
   }
-  const { id, isGroup, isKickedFromGroup, isBlocked, left } = selectedConversation;
 
   const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked && !left;
 
@@ -129,14 +140,14 @@ const HeaderItem = () => {
         style={{ position: 'absolute' }}
         dataTestId="back-button-conversation-options"
       />
-      <Avatar size={AvatarSize.XL} pubkey={id} />
+      <Avatar size={AvatarSize.XL} pubkey={selectedConvoKey} />
       {showInviteContacts && (
         <SessionIconButton
           iconType="addUser"
           iconSize="medium"
           onClick={() => {
-            if (selectedConversation) {
-              showInviteContactByConvoId(selectedConversation.id);
+            if (selectedConvoKey) {
+              showInviteContactByConvoId(selectedConvoKey);
             }
           }}
           dataTestId="add-user-button"
@@ -191,15 +202,24 @@ export const SessionRightPanelWithDetails = () => {
   const [documents, setDocuments] = useState<Array<MediaItemType>>([]);
   const [media, setMedia] = useState<Array<MediaItemType>>([]);
 
-  const selectedConversation = useSelector(getSelectedConversation);
+  const selectedConvoKey = useSelectedConversationKey();
   const isShowing = useSelector(isRightPanelShowing);
-  const subscriberCount = useSelector(getCurrentSubscriberCount);
+  const subscriberCount = useSelectedSubscriberCount();
+
+  const isActive = useSelectedIsActive();
+  const displayNameInProfile = useSelectedDisplayNameInProfile();
+  const isBlocked = useSelectedIsBlocked();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const left = useSelectedIsLeft();
+  const isGroup = useSelectedIsGroup();
+  const isPublic = useSelectedIsPublic();
+  const weAreAdmin = useSelectedWeAreAdmin();
 
   useEffect(() => {
     let isRunning = true;
 
-    if (isShowing && selectedConversation) {
-      void getMediaGalleryProps(selectedConversation.id).then(results => {
+    if (isShowing && selectedConvoKey) {
+      void getMediaGalleryProps(selectedConvoKey).then(results => {
         if (isRunning) {
           if (!_.isEqual(documents, results.documents)) {
             setDocuments(results.documents);
@@ -216,11 +236,11 @@ export const SessionRightPanelWithDetails = () => {
       isRunning = false;
       return;
     };
-  }, [isShowing, selectedConversation?.id]);
+  }, [isShowing, selectedConvoKey]);
 
   useInterval(async () => {
-    if (isShowing && selectedConversation) {
-      const results = await getMediaGalleryProps(selectedConversation.id);
+    if (isShowing && selectedConvoKey) {
+      const results = await getMediaGalleryProps(selectedConvoKey);
       if (results.documents.length !== documents.length || results.media.length !== media.length) {
         setDocuments(results.documents);
         setMedia(results.media);
@@ -228,23 +248,12 @@ export const SessionRightPanelWithDetails = () => {
     }
   }, 10000);
 
-  if (!selectedConversation) {
+  if (!selectedConvoKey) {
     return null;
   }
 
-  const {
-    id,
-    displayNameInProfile,
-    isKickedFromGroup,
-    left,
-    isPublic,
-    weAreAdmin,
-    isBlocked,
-    isGroup,
-    activeAt,
-  } = selectedConversation;
   const showMemberCount = !!(subscriberCount && subscriberCount > 0);
-  const commonNoShow = isKickedFromGroup || left || isBlocked || !activeAt;
+  const commonNoShow = isKickedFromGroup || left || isBlocked || !isActive;
   const hasDisappearingMessages = !isPublic && !commonNoShow;
   const leaveGroupString = isPublic
     ? window.i18n('leaveGroup')
@@ -260,7 +269,7 @@ export const SessionRightPanelWithDetails = () => {
     return {
       content: option.name,
       onClick: () => {
-        void setDisappearingMessagesByConvoId(id, option.value);
+        void setDisappearingMessagesByConvoId(selectedConvoKey, option.value);
       },
     };
   });
@@ -272,10 +281,10 @@ export const SessionRightPanelWithDetails = () => {
 
   const deleteConvoAction = isPublic
     ? () => {
-        deleteAllMessagesByConvoIdWithConfirmation(id);
+        deleteAllMessagesByConvoIdWithConfirmation(selectedConvoKey); // TODO this does not delete the public group and showLeaveGroupByConvoId is not only working for closed groups
       }
     : () => {
-        showLeaveGroupByConvoId(id);
+        showLeaveGroupByConvoId(selectedConvoKey);
       };
   return (
     <div className="group-settings">
@@ -295,7 +304,7 @@ export const SessionRightPanelWithDetails = () => {
           className="group-settings-item"
           role="button"
           onClick={async () => {
-            await showUpdateGroupNameByConvoId(id);
+            await showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -307,7 +316,7 @@ export const SessionRightPanelWithDetails = () => {
             className="group-settings-item"
             role="button"
             onClick={() => {
-              showAddModeratorsByConvoId(id);
+              showAddModeratorsByConvoId(selectedConvoKey);
             }}
           >
             {window.i18n('addModerators')}
@@ -316,7 +325,7 @@ export const SessionRightPanelWithDetails = () => {
             className="group-settings-item"
             role="button"
             onClick={() => {
-              showRemoveModeratorsByConvoId(id);
+              showRemoveModeratorsByConvoId(selectedConvoKey);
             }}
           >
             {window.i18n('removeModerators')}
@@ -329,7 +338,7 @@ export const SessionRightPanelWithDetails = () => {
           className="group-settings-item"
           role="button"
           onClick={async () => {
-            await showUpdateGroupMembersByConvoId(id);
+            await showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
diff --git a/ts/components/conversation/StagedAttachmentList.tsx b/ts/components/conversation/StagedAttachmentList.tsx
index ebd2c7aa6..e2c280818 100644
--- a/ts/components/conversation/StagedAttachmentList.tsx
+++ b/ts/components/conversation/StagedAttachmentList.tsx
@@ -1,21 +1,21 @@
 import React from 'react';
 
-import { isImageTypeSupported, isVideoTypeSupported } from '../../util/GoogleChrome';
-import { Image } from './Image';
-import { StagedGenericAttachment } from './StagedGenericAttachment';
-import { StagedPlaceholderAttachment } from './StagedPlaceholderAttachment';
+import { useDispatch } from 'react-redux';
+import {
+  removeAllStagedAttachmentsInConversation,
+  removeStagedAttachmentInConversation,
+} from '../../state/ducks/stagedAttachments';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import {
   areAllAttachmentsVisual,
   AttachmentType,
   getUrl,
   isVideoAttachment,
 } from '../../types/Attachment';
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  removeAllStagedAttachmentsInConversation,
-  removeStagedAttachmentInConversation,
-} from '../../state/ducks/stagedAttachments';
-import { getSelectedConversationKey } from '../../state/selectors/conversations';
+import { isImageTypeSupported, isVideoTypeSupported } from '../../util/GoogleChrome';
+import { Image } from './Image';
+import { StagedGenericAttachment } from './StagedGenericAttachment';
+import { StagedPlaceholderAttachment } from './StagedPlaceholderAttachment';
 
 type Props = {
   attachments: Array<AttachmentType>;
@@ -30,7 +30,7 @@ export const StagedAttachmentList = (props: Props) => {
   const { attachments, onAddAttachment, onClickAttachment } = props;
 
   const dispatch = useDispatch();
-  const conversationKey = useSelector(getSelectedConversationKey);
+  const conversationKey = useSelectedConversationKey();
 
   const onRemoveAllStaged = () => {
     if (!conversationKey) {
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 448c3f437..2a18a6b50 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -31,13 +31,7 @@ import { ToastUtils } from '../../../session/utils';
 import { ReduxConversationType } from '../../../state/ducks/conversations';
 import { removeAllStagedAttachmentsInConversation } from '../../../state/ducks/stagedAttachments';
 import { StateType } from '../../../state/reducer';
-import {
-  getIsTypingEnabled,
-  getMentionsInput,
-  getQuotedMessage,
-  getSelectedConversation,
-  getSelectedConversationKey,
-} from '../../../state/selectors/conversations';
+import { getMentionsInput, getQuotedMessage } from '../../../state/selectors/conversations';
 import { AttachmentUtil } from '../../../util';
 import { Flex } from '../../basic/Flex';
 import { CaptionEditor } from '../../CaptionEditor';
@@ -57,6 +51,11 @@ import { renderEmojiQuickResultRow, searchEmojiForQuery } from './EmojiQuickResu
 import { LinkPreviews } from '../../../util/linkPreviews';
 import styled from 'styled-components';
 import { FixedBaseEmoji } from '../../../types/Reaction';
+import {
+  getSelectedCanWrite,
+  getSelectedConversation,
+  getSelectedConversationKey,
+} from '../../../state/selectors/selectedConversation';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -1084,7 +1083,7 @@ const mapStateToProps = (state: StateType) => {
     quotedMessageProps: getQuotedMessage(state),
     selectedConversation: getSelectedConversation(state),
     selectedConversationKey: getSelectedConversationKey(state),
-    typingEnabled: getIsTypingEnabled(state),
+    typingEnabled: getSelectedCanWrite(state),
   };
 };
 
diff --git a/ts/components/conversation/media-gallery/DocumentListItem.tsx b/ts/components/conversation/media-gallery/DocumentListItem.tsx
index 72b22dbc8..20cdfb249 100644
--- a/ts/components/conversation/media-gallery/DocumentListItem.tsx
+++ b/ts/components/conversation/media-gallery/DocumentListItem.tsx
@@ -1,13 +1,12 @@
-import React, { useCallback } from 'react';
 import classNames from 'classnames';
+import React, { useCallback } from 'react';
 
 import moment from 'moment';
 // tslint:disable-next-line:match-default-export-name
 import formatFileSize from 'filesize';
-import { useSelector } from 'react-redux';
-import { getSelectedConversationKey } from '../../../state/selectors/conversations';
 import { saveAttachmentToDisk } from '../../../util/attachmentsUtil';
 import { MediaItemType } from '../../lightbox/LightboxGallery';
+import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 
 type Props = {
   // Required
@@ -24,7 +23,11 @@ export const DocumentListItem = (props: Props) => {
   const { shouldShowSeparator, fileName, fileSize, timestamp } = props;
 
   const defaultShowSeparator = shouldShowSeparator === undefined ? true : shouldShowSeparator;
-  const selectedConversationKey = useSelector(getSelectedConversationKey) as string;
+  const selectedConversationKey = useSelectedConversationKey();
+
+  if (!selectedConversationKey) {
+    throw new Error('DocumentListItem: selectedConversationKey was not set');
+  }
 
   const saveAttachmentCallback = useCallback(() => {
     void saveAttachmentToDisk({
diff --git a/ts/components/conversation/message/message-content/MessageAuthorText.tsx b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
index 69fb0bedb..b7a390507 100644
--- a/ts/components/conversation/message/message-content/MessageAuthorText.tsx
+++ b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
@@ -3,11 +3,11 @@ import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { PubKey } from '../../../../session/types';
+import { getMessageAuthorProps } from '../../../../state/selectors/conversations';
 import {
-  getMessageAuthorProps,
-  getSelectedConversationIsGroup,
-  isPublicGroupConversation,
-} from '../../../../state/selectors/conversations';
+  useSelectedIsGroup,
+  useSelectedIsPublic,
+} from '../../../../state/selectors/selectedConversation';
 import { Flex } from '../../../basic/Flex';
 import { ContactName } from '../../ContactName';
 
@@ -27,8 +27,9 @@ const StyledAuthorContainer = styled(Flex)`
 export const MessageAuthorText = (props: Props) => {
   const selected = useSelector(state => getMessageAuthorProps(state as any, props.messageId));
 
-  const isPublic = useSelector(isPublicGroupConversation);
-  const isGroup = useSelector(getSelectedConversationIsGroup);
+  const isPublic = useSelectedIsPublic();
+  const isGroup = useSelectedIsGroup();
+
   if (!selected) {
     return null;
   }
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 62728c906..bd06b5b78 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -8,12 +8,12 @@ import { getSodiumRenderer } from '../../../../session/crypto';
 import { PubKey } from '../../../../session/types';
 import { openConversationWithMessages } from '../../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../../state/ducks/modalDialog';
+import { getMessageAvatarProps } from '../../../../state/selectors/conversations';
 import {
-  getIsTypingEnabled,
-  getMessageAvatarProps,
-  getSelectedConversationIsGroup,
-  getSelectedConversationKey,
-} from '../../../../state/selectors/conversations';
+  getSelectedCanWrite,
+  useSelectedConversationKey,
+  useSelectedIsGroup,
+} from '../../../../state/selectors/selectedConversation';
 import { Avatar, AvatarSize, CrownIcon } from '../../../avatar/Avatar';
 // tslint:disable: use-simple-attributes
 
@@ -37,10 +37,10 @@ export const MessageAvatar = (props: Props) => {
 
   const dispatch = useDispatch();
   const avatarProps = useSelector(state => getMessageAvatarProps(state as any, messageId));
-  const selectedConvoKey = useSelector(getSelectedConversationKey);
-  const isSelectedGroup = useSelector(getSelectedConversationIsGroup);
+  const selectedConvoKey = useSelectedConversationKey();
+  const isSelectedGroup = useSelectedIsGroup();
 
-  const isTypingEnabled = useSelector(getIsTypingEnabled);
+  const isTypingEnabled = useSelector(getSelectedCanWrite);
 
   if (!avatarProps) {
     return null;
diff --git a/ts/components/conversation/message/message-content/MessageReactions.tsx b/ts/components/conversation/message/message-content/MessageReactions.tsx
index 9f7cf3299..404211d53 100644
--- a/ts/components/conversation/message/message-content/MessageReactions.tsx
+++ b/ts/components/conversation/message/message-content/MessageReactions.tsx
@@ -1,16 +1,15 @@
+import { isEmpty, isEqual } from 'lodash';
 import React, { ReactElement, useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { MessageRenderingProps } from '../../../../models/messageType';
-import { isEmpty, isEqual } from 'lodash';
-import { SortedReactionList } from '../../../../types/Reaction';
-import { StyledPopupContainer } from '../reactions/ReactionPopup';
-import { Flex } from '../../../basic/Flex';
-import { nativeEmojiData } from '../../../../util/emoji';
-import { Reaction, ReactionProps } from '../reactions/Reaction';
-import { SessionIcon } from '../../../icon';
 import { useMessageReactsPropsById } from '../../../../hooks/useParamSelector';
-import { getSelectedConversationIsGroup } from '../../../../state/selectors/conversations';
-import { useSelector } from 'react-redux';
+import { MessageRenderingProps } from '../../../../models/messageType';
+import { useSelectedIsGroup } from '../../../../state/selectors/selectedConversation';
+import { SortedReactionList } from '../../../../types/Reaction';
+import { nativeEmojiData } from '../../../../util/emoji';
+import { Flex } from '../../../basic/Flex';
+import { SessionIcon } from '../../../icon';
+import { Reaction, ReactionProps } from '../reactions/Reaction';
+import { StyledPopupContainer } from '../reactions/ReactionPopup';
 
 export const popupXDefault = -81;
 export const popupYDefault = -90;
@@ -164,7 +163,7 @@ export const MessageReactions = (props: Props): ReactElement => {
 
   const msgProps = useMessageReactsPropsById(messageId);
 
-  const inGroup = useSelector(getSelectedConversationIsGroup);
+  const inGroup = useSelectedIsGroup();
 
   useEffect(() => {
     if (msgProps?.sortedReacts && !isEqual(reactions, msgProps?.sortedReacts)) {
diff --git a/ts/components/conversation/message/message-content/Quote.tsx b/ts/components/conversation/message/message-content/Quote.tsx
index 53cc63b9f..7b8fb5b14 100644
--- a/ts/components/conversation/message/message-content/Quote.tsx
+++ b/ts/components/conversation/message/message-content/Quote.tsx
@@ -1,22 +1,19 @@
-import React, { useState } from 'react';
 import classNames from 'classnames';
+import React, { useState } from 'react';
 
 import * as MIME from '../../../../../ts/types/MIME';
 import * as GoogleChrome from '../../../../../ts/util/GoogleChrome';
 
-import { useSelector } from 'react-redux';
-
 import { noop } from 'lodash';
 import { useDisableDrag } from '../../../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../../../hooks/useEncryptedFileFetch';
 import { PubKey } from '../../../../session/types';
 import {
-  getSelectedConversationKey,
-  isPublicGroupConversation,
-} from '../../../../state/selectors/conversations';
+  useSelectedIsPrivate,
+  useSelectedIsPublic,
+} from '../../../../state/selectors/selectedConversation';
 import { ContactName } from '../../ContactName';
 import { MessageBody } from './MessageBody';
-import { useIsPrivate } from '../../../../hooks/useParamSelector';
 
 export type QuotePropsWithoutListener = {
   attachment?: QuotedAttachmentType;
@@ -229,8 +226,7 @@ export const QuoteText = (
 ) => {
   const { text, attachment, isIncoming } = props;
 
-  const convoId = useSelector(getSelectedConversationKey);
-  const isGroup = !useIsPrivate(convoId);
+  const isGroup = !useSelectedIsPrivate();
 
   if (text) {
     return (
@@ -345,7 +341,7 @@ export const Quote = (props: QuotePropsWithListener) => {
     setImageBroken(true);
   };
 
-  const isPublic = useSelector(isPublicGroupConversation);
+  const isPublic = useSelectedIsPublic();
 
   if (!validateQuote(props)) {
     return null;
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index 4d4927720..e6241c70b 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -17,11 +17,11 @@ import {
   getMostRecentMessageId,
   getOldestMessageId,
   getQuotedMessageToAnimate,
-  getSelectedConversationKey,
   getShowScrollButton,
   getYoungestMessageId,
 } from '../../../../state/selectors/conversations';
 import { getIsAppFocused } from '../../../../state/selectors/section';
+import { useSelectedConversationKey } from '../../../../state/selectors/selectedConversation';
 import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
 
 type ReadableMessageProps = {
@@ -63,7 +63,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   const isAppFocused = useSelector(getIsAppFocused);
   const dispatch = useDispatch();
 
-  const selectedConversationKey = useSelector(getSelectedConversationKey);
+  const selectedConversationKey = useSelectedConversationKey();
   const loadedMessagesLength = useSelector(getLoadedMessagesLength);
   const mostRecentMessageId = useSelector(getMostRecentMessageId);
   const oldestMessageId = useSelector(getOldestMessageId);
diff --git a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
index e1d8f73ec..c5313f1bc 100644
--- a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
+++ b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import { PubKey } from '../../../../../session/types';
 
 import {
   CallNotificationType,
   PropsForCallNotification,
 } from '../../../../../state/ducks/conversations';
-import { getSelectedConversation } from '../../../../../state/selectors/conversations';
+import {
+  useSelectedConversationKey,
+  useSelectedDisplayNameInProfile,
+  useSelectedNickname,
+} from '../../../../../state/selectors/selectedConversation';
 import { LocalizerKeys } from '../../../../../types/LocalizerKeys';
 import { SessionIconType } from '../../../../icon';
 import { ReadableMessage } from '../ReadableMessage';
@@ -37,13 +40,13 @@ const style: StyleType = {
 
 export const CallNotification = (props: PropsForCallNotification) => {
   const { messageId, receivedAt, isUnread, notificationType } = props;
+  const selectedConvoId = useSelectedConversationKey();
 
-  const selectedConvoProps = useSelector(getSelectedConversation);
+  const displayNameInProfile = useSelectedDisplayNameInProfile();
+  const nickname = useSelectedNickname();
 
   const displayName =
-    selectedConvoProps?.nickname ||
-    selectedConvoProps?.displayNameInProfile ||
-    (selectedConvoProps?.id && PubKey.shorten(selectedConvoProps?.id));
+    nickname || displayNameInProfile || (selectedConvoId && PubKey.shorten(selectedConvoId));
 
   const styleItem = style[notificationType];
   const notificationText = window.i18n(styleItem.notificationTextKey, [displayName || 'Unknown']);
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 60dad8207..146eae004 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -76,7 +76,7 @@ export const Reaction = (props: ReactionProps): ReactElement => {
   const reactionRef = useRef<HTMLDivElement>(null);
   const { docX, elW } = useMouse(reactionRef);
 
-  const gutterWidth = 380;
+  const gutterWidth = 380; // TODO make this a variable which can be shared in CSS and JS
   const tooltipMidPoint = POPUP_WIDTH / 2; // px
   const [tooltipPosition, setTooltipPosition] = useState<TipPosition>('center');
 
diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx
index c384d8331..b57a71fe8 100644
--- a/ts/components/dialog/ReactListModal.tsx
+++ b/ts/components/dialog/ReactListModal.tsx
@@ -1,6 +1,6 @@
 import { isEmpty, isEqual } from 'lodash';
 import React, { ReactElement, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
 import { useMessageReactsPropsById, useWeAreModerator } from '../../hooks/useParamSelector';
@@ -11,7 +11,7 @@ import {
   updateReactListModal,
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
-import { getSelectedConversationIsPublic } from '../../state/selectors/conversations';
+import { useSelectedIsPublic } from '../../state/selectors/selectedConversation';
 import { SortedReactionList } from '../../types/Reaction';
 import { nativeEmojiData } from '../../util/emoji';
 import { Reactions } from '../../util/reactions';
@@ -228,7 +228,7 @@ export const ReactListModal = (props: Props): ReactElement => {
   const [senders, setSenders] = useState<Array<string>>([]);
 
   const msgProps = useMessageReactsPropsById(messageId);
-  const isPublic = useSelector(getSelectedConversationIsPublic);
+  const isPublic = useSelectedIsPublic();
   const weAreModerator = useWeAreModerator(msgProps?.convoId);
   const me = UserUtils.getOurPubKeyStrFromCache();
 
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index af4889925..2158a3197 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -5,25 +5,24 @@ import { contextMenu } from 'react-contexify';
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
 
 import { createPortal } from 'react-dom';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   openConversationWithMessages,
   ReduxConversationType,
 } from '../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
-import _ from 'lodash';
-import { useSelector } from 'react-redux';
+import _, { isNil } from 'lodash';
 import {
   useAvatarPath,
   useConversationUsername,
   useHasUnread,
   useIsBlocked,
   useIsPrivate,
-  useIsSelectedConversation,
   useMentionedUs,
 } from '../../../hooks/useParamSelector';
 import { isSearching } from '../../../state/selectors/search';
+import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu';
 import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
@@ -85,7 +84,9 @@ const ConversationListItem = (props: Props) => {
   let hasUnreadMentionedUs = useMentionedUs(conversationId);
   let isBlocked = useIsBlocked(conversationId);
   const isSearch = useSelector(isSearching);
-  const isSelectedConvo = useIsSelectedConversation(conversationId);
+  const selectedConvo = useSelectedConversationKey();
+
+  const isSelectedConvo = conversationId === selectedConvo && !isNil(selectedConvo);
 
   if (isSearch) {
     // force isBlocked and hasUnreadMentionedUs to be false, we just want to display the row without any special style when showing search results
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 36fe4e00f..cb3f09163 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -3,10 +3,7 @@ import React from 'react';
 
 import { SpacerLG } from '../../basic/Text';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  getConversationRequests,
-  getSelectedConversation,
-} from '../../../state/selectors/conversations';
+import { getConversationRequests } from '../../../state/selectors/conversations';
 import { MemoConversationListItemWithDetails } from '../conversation-list-item/ConversationListItem';
 import styled from 'styled-components';
 import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
@@ -20,6 +17,7 @@ import {
   resetConversationExternal,
 } from '../../../state/ducks/conversations';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
+import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 
 const MessageRequestListPlaceholder = styled.div`
   color: var(--conversation-tab-text-color);
@@ -55,7 +53,7 @@ export const OverlayMessageRequest = () => {
   }
   const convoRequestCount = useSelector(getConversationRequests).length;
   const messageRequests = useSelector(getConversationRequests);
-  const selectedConversation = useSelector(getSelectedConversation);
+  const selectedConvoId = useSelectedConversationKey();
 
   const buttonText = window.i18n('clearAll');
 
@@ -94,7 +92,7 @@ export const OverlayMessageRequest = () => {
               await convoModel.setIsApproved(false);
 
               // if we're looking at the convo to decline, close the convo
-              if (selectedConversation?.id === id) {
+              if (selectedConvoId === id) {
                 dispatch(resetConversationExternal());
               }
               return true;
diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx
index ce3fa47ef..f4441b95d 100644
--- a/ts/components/lightbox/LightboxGallery.tsx
+++ b/ts/components/lightbox/LightboxGallery.tsx
@@ -6,12 +6,12 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Lightbox } from './Lightbox';
 
 // tslint:disable-next-line: no-submodule-imports
+import { useDispatch } from 'react-redux';
 import useKey from 'react-use/lib/useKey';
-import { AttachmentTypeWithPath } from '../../types/Attachment';
-import { useDispatch, useSelector } from 'react-redux';
 import { showLightBox } from '../../state/ducks/conversations';
-import { getSelectedConversationKey } from '../../state/selectors/conversations';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { MIME } from '../../types';
+import { AttachmentTypeWithPath } from '../../types/Attachment';
 import { saveAttachmentToDisk } from '../../util/attachmentsUtil';
 
 export interface MediaItemType {
@@ -33,7 +33,11 @@ type Props = {
 export const LightboxGallery = (props: Props) => {
   const { media } = props;
   const [currentIndex, setCurrentIndex] = useState(-1);
-  const selectedConversation = useSelector(getSelectedConversationKey) as string;
+  const selectedConversation = useSelectedConversationKey();
+
+  if (!selectedConversation) {
+    throw new Error('LightboxGallery: selectedConversation is undefined');
+  }
 
   const dispatch = useDispatch();
 
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 6ee07b4b3..adbb2212f 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -24,9 +24,8 @@ import {
 } from './Menu';
 import _ from 'lodash';
 import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
-import { getSelectedConversationKey } from '../../state/selectors/conversations';
-import { useSelector } from 'react-redux';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 
 export type PropsConversationHeaderMenu = {
   triggerId: string;
@@ -35,7 +34,7 @@ export type PropsConversationHeaderMenu = {
 export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
   const { triggerId } = props;
 
-  const selectedConversation = useSelector(getSelectedConversationKey);
+  const selectedConversation = useSelectedConversationKey();
 
   if (!selectedConversation) {
     throw new Error('selectedConversation must be set for a header to be visible!');
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 33b608a05..7587cf757 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,13 +1,10 @@
-import { isEmpty, isNil, pick } from 'lodash';
+import { isEmpty, pick } from 'lodash';
 import { useSelector } from 'react-redux';
 import { ConversationModel } from '../models/conversation';
 import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
 import { StateType } from '../state/reducer';
-import {
-  getMessageReactsProps,
-  getSelectedConversationKey,
-} from '../state/selectors/conversations';
+import { getMessageReactsProps } from '../state/selectors/conversations';
 
 export function useAvatarPath(convoId: string | undefined) {
   const convoProps = useConversationPropsById(convoId);
@@ -220,8 +217,3 @@ export function useMentionedUs(conversationId?: string): boolean {
 export function useIsTyping(conversationId?: string): boolean {
   return useConversationPropsById(conversationId)?.isTyping || false;
 }
-
-export function useIsSelectedConversation(conversation?: string): boolean {
-  const selectedConvo = useSelector(getSelectedConversationKey);
-  return !isNil(selectedConvo) && !isNil(conversation) && selectedConvo === conversation;
-}
diff --git a/ts/hooks/useVideoEventListener.ts b/ts/hooks/useVideoEventListener.ts
index 515be62d7..b9231207c 100644
--- a/ts/hooks/useVideoEventListener.ts
+++ b/ts/hooks/useVideoEventListener.ts
@@ -9,11 +9,11 @@ import {
   InputItem,
   removeVideoEventsListener,
 } from '../session/utils/calling/CallManager';
-import { getSelectedConversationKey } from '../state/selectors/conversations';
 import { getCallIsInFullScreen, getHasOngoingCallWithPubkey } from '../state/selectors/call';
+import { useSelectedConversationKey } from '../state/selectors/selectedConversation';
 
 export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
-  const selectedConversationKey = useSelector(getSelectedConversationKey);
+  const selectedConversationKey = useSelectedConversationKey();
   const ongoingCallPubkey = useSelector(getHasOngoingCallWithPubkey);
   const isFullScreen = useSelector(getCallIsInFullScreen);
 
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 98ec27e62..d2f2129dd 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -190,8 +190,9 @@ export function showLeaveGroupByConvoId(conversationId: string) {
 
   const title = window.i18n('leaveGroup');
   const message = window.i18n('leaveGroupConfirmation');
-  const ourPK = UserUtils.getOurPubKeyStrFromCache();
-  const isAdmin = (conversation.get('groupAdmins') || []).includes(ourPK);
+  const isAdmin = (conversation.get('groupAdmins') || []).includes(
+    UserUtils.getOurPubKeyStrFromCache()
+  );
   const isClosedGroup = conversation.isClosedGroup() || false;
 
   // if this is not a closed group, or we are not admin, we can just show a confirmation dialog
diff --git a/ts/models/message.ts b/ts/models/message.ts
index a98522403..2e88fbbfe 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1296,8 +1296,8 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         return window.i18n('titleIsNow', [groupUpdate.name]);
       }
       if (groupUpdate.joined && groupUpdate.joined.length) {
-        const names = groupUpdate.joined.map((pubKey: string) =>
-          getConversationController().getContactProfileNameOrShortenedPubKey(pubKey)
+        const names = groupUpdate.joined.map(
+          getConversationController().getContactProfileNameOrShortenedPubKey
         );
 
         if (names.length > 1) {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 09944bd57..c2f4eae9b 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -143,43 +143,43 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       continue;
     }
 
-    const existingConvo = await getConversationController().getOrCreateAndWait(
+    const contactConvo = await getConversationController().getOrCreateAndWait(
       wrapperConvo.id,
       ConversationTypeEnum.PRIVATE
     );
-    if (wrapperConvo.id && existingConvo) {
+    if (wrapperConvo.id && contactConvo) {
       let changes = false;
 
       // the display name set is handled in `updateProfileOfContact`
-      if (wrapperConvo.nickname !== existingConvo.getNickname()) {
-        await existingConvo.setNickname(wrapperConvo.nickname || null, false);
+      if (wrapperConvo.nickname !== contactConvo.getNickname()) {
+        await contactConvo.setNickname(wrapperConvo.nickname || null, false);
         changes = true;
       }
 
-      if (!wrapperConvo.hidden && !existingConvo.isHidden()) {
-        existingConvo.set({ hidden: false });
+      if (!wrapperConvo.hidden && !contactConvo.isHidden()) {
+        contactConvo.set({ hidden: false });
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approved) !== Boolean(existingConvo.isApproved())) {
-        await existingConvo.setIsApproved(Boolean(wrapperConvo.approved), false);
+      if (Boolean(wrapperConvo.approved) !== Boolean(contactConvo.isApproved())) {
+        await contactConvo.setIsApproved(Boolean(wrapperConvo.approved), false);
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approvedMe) !== Boolean(existingConvo.didApproveMe())) {
-        await existingConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
+      if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
+        await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approvedMe) !== Boolean(existingConvo.didApproveMe())) {
-        await existingConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
+      if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
+        await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
         changes = true;
       }
 
       //TODO priority means more than just isPinned but has an order logic in it too
       const shouldBePinned = wrapperConvo.priority > 0;
-      if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
-        await existingConvo.setIsPinned(shouldBePinned, false);
+      if (shouldBePinned !== Boolean(contactConvo.isPinned())) {
+        await contactConvo.setIsPinned(shouldBePinned, false);
         changes = true;
       }
 
@@ -188,12 +188,12 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
 
       // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
       if (changes) {
-        await existingConvo.commit();
+        await contactConvo.commit();
       }
 
       // we still need to handle the `name` (synchronous) and the `profilePicture` (asynchronous)
       await ProfileManager.updateProfileOfContact(
-        existingConvo.id,
+        contactConvo.id,
         wrapperConvo.name,
         wrapperConvo.profilePicture?.url || null,
         wrapperConvo.profilePicture?.key || null
@@ -273,20 +273,20 @@ async function handleCommunitiesUpdate() {
       fromWrapper.roomCasePreserved
     );
 
-    const existingConvo = getConversationController().get(convoId);
-    if (fromWrapper && existingConvo) {
+    const communityConvo = getConversationController().get(convoId);
+    if (fromWrapper && communityConvo) {
       let changes = false;
 
       //TODO priority means more than just isPinned but has an order logic in it too
       const shouldBePinned = fromWrapper.priority > 0;
-      if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
-        await existingConvo.setIsPinned(shouldBePinned, false);
+      if (shouldBePinned !== Boolean(communityConvo.isPinned())) {
+        await communityConvo.setIsPinned(shouldBePinned, false);
         changes = true;
       }
 
       // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
       if (changes) {
-        await existingConvo.commit();
+        await communityConvo.commit();
       }
     }
   }
@@ -340,8 +340,8 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   for (let index = 0; index < allLegacyGroupsInWrapper.length; index++) {
     const fromWrapper = allLegacyGroupsInWrapper[index];
 
-    const convo = getConversationController().get(fromWrapper.pubkeyHex);
-    if (!convo) {
+    const legacyGroupConvo = getConversationController().get(fromWrapper.pubkeyHex);
+    if (!legacyGroupConvo) {
       // this should not happen as we made sure to create them before
       window.log.warn(
         'could not find legacy group which should already be there:',
@@ -360,8 +360,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       members,
       admins,
       activeAt:
-        !!convo.get('active_at') && convo.get('active_at') < latestEnvelopeTimestamp
-          ? convo.get('active_at')
+        !!legacyGroupConvo.get('active_at') &&
+        legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp
+          ? legacyGroupConvo.get('active_at')
           : latestEnvelopeTimestamp,
       weWereJustAdded: false, // TODO to remove
     };
@@ -369,16 +370,16 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
 
     let changes = false;
-    if (convo.isPinned() !== fromWrapper.priority > 0) {
-      await convo.setIsPinned(fromWrapper.priority > 0, false);
+    if (legacyGroupConvo.isPinned() !== fromWrapper.priority > 0) {
+      await legacyGroupConvo.setIsPinned(fromWrapper.priority > 0, false);
       changes = true;
     }
-    if (!!convo.isHidden() !== !!fromWrapper.hidden) {
-      convo.set({ hidden: !!fromWrapper.hidden });
+    if (!!legacyGroupConvo.isHidden() !== !!fromWrapper.hidden) {
+      legacyGroupConvo.set({ hidden: !!fromWrapper.hidden });
       changes = true;
     }
-    if (convo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
-      await convo.updateExpireTimer(
+    if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
+      await legacyGroupConvo.updateExpireTimer(
         fromWrapper.disappearingTimerSeconds,
         undefined,
         latestEnvelopeTimestamp,
@@ -390,45 +391,23 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     }
 
     if (changes) {
-      await convo.commit();
+      await legacyGroupConvo.commit();
     }
 
     // save the encryption keypair if needed
     if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
-      const inWrapperKeypair: HexKeyPair = {
-        publicHex: toHex(fromWrapper.encPubkey),
-        privateHex: toHex(fromWrapper.encSeckey),
-      };
+      try {
+        const inWrapperKeypair: HexKeyPair = {
+          publicHex: toHex(fromWrapper.encPubkey),
+          privateHex: toHex(fromWrapper.encSeckey),
+        };
 
-      await addKeyPairToCacheAndDBIfNeeded(fromWrapper.pubkeyHex, inWrapperKeypair);
+        await addKeyPairToCacheAndDBIfNeeded(fromWrapper.pubkeyHex, inWrapperKeypair);
+      } catch (e) {
+        window.log.warn('failed to save keypair for legacugroup', fromWrapper.pubkeyHex);
+      }
     }
   }
-
-  // // if the convos already exists, make sure to update the fields if needed
-  // for (let index = 0; index < allCommunitiesInWrapper.length; index++) {
-  //   const fromWrapper = allCommunitiesInWrapper[index];
-  //   const convoId = OpenGroupUtils.getOpenGroupV2ConversationId(
-  //     fromWrapper.baseUrl,
-  //     fromWrapper.roomCasePreserved
-  //   );
-
-  //   const existingConvo = getConversationController().get(convoId);
-  //   if (fromWrapper && existingConvo) {
-  //     let changes = false;
-
-  //     //TODO priority means more than just isPinned but has an order logic in it too
-  //     const shouldBePinned = fromWrapper.priority > 0;
-  //     if (shouldBePinned !== Boolean(existingConvo.isPinned())) {
-  //       await existingConvo.setIsPinned(shouldBePinned, false);
-  //       changes = true;
-  //     }
-
-  //     // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
-  //     if (changes) {
-  //       await existingConvo.commit();
-  //     }
-  //   }
-  // }
 }
 
 async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 51cae1494..02b8fdc65 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -87,22 +87,19 @@ export class ConversationController {
       throw new Error('getConversationController().get() needs complete initial fetch');
     }
 
-    let conversation = this.conversations.get(id);
-    if (conversation) {
-      return conversation;
+    if (this.conversations.get(id)) {
+      return this.conversations.get(id) as ConversationModel;
     }
 
-    conversation = this.conversations.add({
+    const conversation = this.conversations.add({
       id,
       type,
     });
 
     const create = async () => {
       try {
-        const saveDetails = await Data.saveConversation(conversation.attributes);
-        if (saveDetails) {
-          await conversation.refreshInMemoryDetails(saveDetails);
-        }
+        // this saves to DB and to the required wrapper
+        await conversation.commit();
       } catch (error) {
         window?.log?.error(
           'Conversation save failed! ',
@@ -114,25 +111,22 @@ export class ConversationController {
         throw error;
       }
 
-      return conversation;
-    };
+      window?.inboxStore?.dispatch(
+        conversationActions.conversationAdded({
+          id: conversation.id,
+          data: conversation.getConversationModelProps(),
+        })
+      );
 
-    conversation.initialPromise = create();
-    conversation.initialPromise.then(() => {
-      if (window?.inboxStore) {
-        window.inboxStore?.dispatch(
-          conversationActions.conversationAdded({
-            id: conversation.id,
-            data: conversation.getConversationModelProps(),
-          })
-        );
-      }
       if (!conversation.isPublic() && conversation.isActive()) {
         // NOTE: we request snodes updating the cache, but ignore the result
 
         void getSwarmFor(id);
       }
-    });
+      return conversation;
+    };
+
+    conversation.initialPromise = create();
 
     return conversation;
   }
diff --git a/ts/state/selectors/call.ts b/ts/state/selectors/call.ts
index cb4db0357..f6b32e30d 100644
--- a/ts/state/selectors/call.ts
+++ b/ts/state/selectors/call.ts
@@ -2,7 +2,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import { CallStateType, CallStatusEnum } from '../ducks/call';
 import { ConversationsStateType, ReduxConversationType } from '../ducks/conversations';
 import { StateType } from '../reducer';
-import { getConversations, getSelectedConversationKey } from './conversations';
+import { getConversations } from './conversations';
+import { getSelectedConversationKey } from './selectedConversation';
 
 const getCallState = (state: StateType): CallStateType => state.call;
 
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 29c4ae35c..39e07e0f8 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1,6 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import { StateType } from '../reducer';
 import {
   ConversationLookupType,
   ConversationsStateType,
@@ -11,12 +10,8 @@ import {
   ReduxConversationType,
   SortedMessageModelProps,
 } from '../ducks/conversations';
+import { StateType } from '../reducer';
 
-import { getIntl } from './user';
-import { BlockedNumberController } from '../../util';
-import { ConversationModel } from '../../models/conversation';
-import { LocalizerType } from '../../types/Util';
-import { ConversationHeaderTitleProps } from '../../components/conversation/ConversationHeader';
 import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox';
 import { MessageAttachmentSelectorProps } from '../../components/conversation/message/message-content/MessageAttachment';
 import { MessageAuthorSelectorProps } from '../../components/conversation/message/message-content/MessageAuthorText';
@@ -30,14 +25,19 @@ import { MessageStatusSelectorProps } from '../../components/conversation/messag
 import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText';
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
+import { ConversationModel } from '../../models/conversation';
+import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
 import { UserUtils } from '../../session/utils';
+import { LocalizerType } from '../../types/Util';
+import { BlockedNumberController } from '../../util';
 import { Storage } from '../../util/storage';
-import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
+import { getIntl } from './user';
 
-import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { filter, isEmpty, pick, sortBy } from 'lodash';
-import { getCanWrite, getModeratorsOutsideRedux, getSubscriberCount } from './sogsRoomInfo';
+import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
+import { getModeratorsOutsideRedux } from './sogsRoomInfo';
+import { getSelectedConversation, getSelectedConversationKey } from './selectedConversation';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
@@ -52,80 +52,6 @@ export const getConversationsCount = createSelector(getConversationLookup, (stat
   return Object.values(state).length;
 });
 
-export const getSelectedConversationKey = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | undefined => {
-    return state.selectedConversation;
-  }
-);
-
-export const getSelectedConversation = createSelector(
-  getConversations,
-  (state: ConversationsStateType): ReduxConversationType | undefined => {
-    return state.selectedConversation
-      ? state.conversationLookup[state.selectedConversation]
-      : undefined;
-  }
-);
-
-export const getSelectedConversationIsPublic = createSelector(
-  getSelectedConversation,
-  (state: ReduxConversationType | undefined): boolean => {
-    return state?.isPublic || false;
-  }
-);
-
-export function getIsTypingEnabled(state: StateType) {
-  const selectedConvoPubkey = getSelectedConversationKey(state);
-  if (!selectedConvoPubkey) {
-    return false;
-  }
-  const selectedConvo = state.conversations.conversationLookup[selectedConvoPubkey];
-  if (!selectedConvo) {
-    return false;
-  }
-  const canWrite = getCanWrite(state, selectedConvoPubkey);
-  const { isBlocked, isKickedFromGroup, left, isPublic } = selectedConvo;
-
-  return !(isBlocked || isKickedFromGroup || left || (isPublic && !canWrite));
-}
-
-/**
- * Returns true if the current conversation selected is a group conversation.
- * Returns false if the current conversation selected is not a group conversation, or none are selected
- */
-export const getSelectedConversationIsGroup = createSelector(
-  getSelectedConversation,
-  (state: ReduxConversationType | undefined): boolean => {
-    const type = state?.type;
-    return type ? isOpenOrClosedGroup(type) : false;
-  }
-);
-
-/**
- * Returns true if the current conversation selected is a closed group and false otherwise.
- */
-export const isClosedGroupConversation = createSelector(
-  getSelectedConversation,
-  (state: ReduxConversationType | undefined): boolean => {
-    return (
-      (state?.type === ConversationTypeEnum.GROUP && !state.isPublic) ||
-      state?.type === ConversationTypeEnum.GROUPV3 ||
-      false
-    );
-  }
-);
-
-/**
- * Returns true if the current conversation selected is a public group and false otherwise.
- */
-export const isPublicGroupConversation = createSelector(
-  getSelectedConversation,
-  (state: ReduxConversationType | undefined): boolean => {
-    return (state?.type === ConversationTypeEnum.GROUP && state.isPublic) || false;
-  }
-);
-
 export const getOurPrimaryConversation = createSelector(
   getConversations,
   (state: ConversationsStateType): ReduxConversationType =>
@@ -547,85 +473,6 @@ export const getGlobalUnreadMessageCount = createSelector(getLeftPaneLists, (sta
   return state.globalUnreadCount;
 });
 
-export const getConversationHeaderTitleProps = (
-  state: StateType
-): ConversationHeaderTitleProps | undefined => {
-  const convo = getSelectedConversation(state);
-  if (!convo) {
-    return undefined;
-  }
-
-  return {
-    isKickedFromGroup: !!convo.isKickedFromGroup,
-    conversationKey: convo.id,
-    isMe: !!convo.isMe,
-    members: convo.members || [],
-    isPublic: !!convo.isPublic,
-    isGroup: isOpenOrClosedGroup(convo.type),
-    currentNotificationSetting: convo.currentNotificationSetting,
-  };
-};
-
-export const getCurrentSubscriberCount = (state: StateType): number | undefined => {
-  const convo = getSelectedConversation(state);
-  if (!convo) {
-    return undefined;
-  }
-  return getSubscriberCount(state, convo.id);
-};
-
-/**
- * Returns the formatted text for notification setting.
- */
-export const getCurrentNotificationSettingText = createSelector(getSelectedConversation, (state):
-  | string
-  | undefined => {
-  if (!state) {
-    return undefined;
-  }
-  switch (state.currentNotificationSetting) {
-    case 'all':
-      return window.i18n('notificationForConvo_all');
-    case 'mentions_only':
-      return window.i18n('notificationForConvo_mentions_only');
-    case 'disabled':
-      return window.i18n('notificationForConvo_disabled');
-    default:
-      return window.i18n('notificationForConvo_all');
-  }
-});
-
-export const getIsSelectedPrivate = createSelector(
-  getSelectedConversation,
-  (selectedProps): boolean => {
-    return selectedProps?.isPrivate || false;
-  }
-);
-
-export const getIsSelectedBlocked = createSelector(
-  getSelectedConversation,
-  (selectedProps): boolean => {
-    return selectedProps?.isBlocked || false;
-  }
-);
-
-/**
- * Returns true if the currently selected conversation is active (has an active_at field > 0)
- */
-export const getIsSelectedActive = createSelector(
-  getSelectedConversation,
-  (selectedProps): boolean => {
-    return Boolean(selectedProps?.activeAt);
-  }
-);
-
-export const getIsSelectedNoteToSelf = createSelector(
-  getSelectedConversation,
-  (selectedProps): boolean => {
-    return selectedProps?.isMe || false;
-  }
-);
-
 export const isMessageDetailView = createSelector(
   getConversations,
   (state: ConversationsStateType): boolean => state.messageDetailProps !== undefined
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index e688c662b..45206f698 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -4,8 +4,9 @@ import { createSelector } from '@reduxjs/toolkit';
 import { StateType } from '../reducer';
 
 import { SearchStateType } from '../ducks/search';
-import { getConversationLookup, getSelectedConversationKey } from './conversations';
+import { getConversationLookup } from './conversations';
 import { ConversationLookupType } from '../ducks/conversations';
+import { getSelectedConversationKey } from './selectedConversation';
 
 export const getSearch = (state: StateType): SearchStateType => state.search;
 
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
new file mode 100644
index 000000000..7aad23448
--- /dev/null
+++ b/ts/state/selectors/selectedConversation.ts
@@ -0,0 +1,185 @@
+import { useSelector } from 'react-redux';
+import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
+import { ReduxConversationType } from '../ducks/conversations';
+import { StateType } from '../reducer';
+import { getCanWrite, getSubscriberCount } from './sogsRoomInfo';
+
+/**
+ * Returns the formatted text for notification setting.
+ */
+const getCurrentNotificationSettingText = (state: StateType): string | undefined => {
+  if (!state) {
+    return undefined;
+  }
+  const currentNotificationSetting = getSelectedConversation(state)?.currentNotificationSetting;
+  switch (currentNotificationSetting) {
+    case 'all':
+      return window.i18n('notificationForConvo_all');
+    case 'mentions_only':
+      return window.i18n('notificationForConvo_mentions_only');
+    case 'disabled':
+      return window.i18n('notificationForConvo_disabled');
+    default:
+      return window.i18n('notificationForConvo_all');
+  }
+};
+
+const getIsSelectedPrivate = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.isPrivate) || false;
+};
+
+const getIsSelectedBlocked = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.isBlocked) || false;
+};
+
+/**
+ * Returns true if the currently selected conversation is active (has an active_at field > 0)
+ */
+const getIsSelectedActive = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.activeAt) || false;
+};
+
+const getIsSelectedNoteToSelf = (state: StateType): boolean => {
+  return getSelectedConversation(state)?.isMe || false;
+};
+
+export const getSelectedConversationKey = (state: StateType): string | undefined => {
+  return state.conversations.selectedConversation;
+};
+
+export const getSelectedConversation = (state: StateType): ReduxConversationType | undefined => {
+  const selected = getSelectedConversationKey(state);
+  return selected ? state.conversations.conversationLookup[selected] : undefined;
+};
+
+/**
+ * Returns true if the current conversation selected is a public group and false otherwise.
+ */
+export const getSelectedConversationIsPublic = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.isPublic) || false;
+};
+
+/**
+ * Returns true if the current conversation selected can be typed into
+ */
+export function getSelectedCanWrite(state: StateType) {
+  const selectedConvoPubkey = getSelectedConversationKey(state);
+  if (!selectedConvoPubkey) {
+    return false;
+  }
+  const selectedConvo = getSelectedConversation(state);
+  if (!selectedConvo) {
+    return false;
+  }
+  const canWrite = getCanWrite(state, selectedConvoPubkey);
+  const { isBlocked, isKickedFromGroup, left, isPublic } = selectedConvo;
+
+  return !(isBlocked || isKickedFromGroup || left || (isPublic && !canWrite));
+}
+
+/**
+ * Returns true if the current conversation selected is a group conversation.
+ * Returns false if the current conversation selected is not a group conversation, or none are selected
+ */
+const getSelectedConversationIsGroup = (state: StateType): boolean => {
+  const selected = getSelectedConversation(state);
+  if (!selected || !selected.type) {
+    return false;
+  }
+  return selected.type ? isOpenOrClosedGroup(selected.type) : false;
+};
+
+/**
+ * Returns true if the current conversation selected is a closed group and false otherwise.
+ */
+export const isClosedGroupConversation = (state: StateType): boolean => {
+  const selected = getSelectedConversation(state);
+  if (!selected) {
+    return false;
+  }
+  return (
+    (selected.type === ConversationTypeEnum.GROUP && !selected.isPublic) ||
+    selected.type === ConversationTypeEnum.GROUPV3 ||
+    false
+  );
+};
+
+const getGroupMembers = (state: StateType): Array<string> => {
+  const selected = getSelectedConversation(state);
+  if (!selected) {
+    return [];
+  }
+  return selected.members || [];
+};
+
+const getSelectedSubscriberCount = (state: StateType): number | undefined => {
+  const convo = getSelectedConversation(state);
+  if (!convo) {
+    return undefined;
+  }
+  return getSubscriberCount(state, convo.id);
+};
+
+// ============== SELECTORS RELEVANT TO SELECTED/OPENED CONVERSATION ==============
+
+export function useSelectedConversationKey() {
+  return useSelector(getSelectedConversationKey);
+}
+
+export function useSelectedIsGroup() {
+  return useSelector(getSelectedConversationIsGroup);
+}
+
+export function useSelectedIsPublic() {
+  return useSelector(getSelectedConversationIsPublic);
+}
+
+export function useSelectedIsPrivate() {
+  return useSelector(getIsSelectedPrivate);
+}
+
+export function useSelectedIsBlocked() {
+  return useSelector(getIsSelectedBlocked);
+}
+
+export function useSelectedIsActive() {
+  return useSelector(getIsSelectedActive);
+}
+
+export function useSelectedisNoteToSelf() {
+  return useSelector(getIsSelectedNoteToSelf);
+}
+
+export function useSelectedMembers() {
+  return useSelector(getGroupMembers);
+}
+
+export function useSelectedSubscriberCount() {
+  return useSelector(getSelectedSubscriberCount);
+}
+
+export function useSelectedNotificationSetting() {
+  return useSelector(getCurrentNotificationSettingText);
+}
+
+export function useSelectedIsKickedFromGroup() {
+  return useSelector(
+    (state: StateType) => Boolean(getSelectedConversation(state)?.isKickedFromGroup) || false
+  );
+}
+
+export function useSelectedIsLeft() {
+  return useSelector((state: StateType) => Boolean(getSelectedConversation(state)?.left) || false);
+}
+
+export function useSelectedNickname() {
+  return useSelector((state: StateType) => getSelectedConversation(state)?.nickname);
+}
+
+export function useSelectedDisplayNameInProfile() {
+  return useSelector((state: StateType) => getSelectedConversation(state)?.displayNameInProfile);
+}
+
+export function useSelectedWeAreAdmin() {
+  return useSelector((state: StateType) => getSelectedConversation(state)?.weAreAdmin || false);
+}
diff --git a/ts/state/selectors/stagedAttachments.ts b/ts/state/selectors/stagedAttachments.ts
index ad48d459f..eedbe881c 100644
--- a/ts/state/selectors/stagedAttachments.ts
+++ b/ts/state/selectors/stagedAttachments.ts
@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox';
 import { StagedAttachmentsStateType } from '../ducks/stagedAttachments';
 import { StateType } from '../reducer';
-import { getSelectedConversationKey } from './conversations';
+import { getSelectedConversationKey } from './selectedConversation';
 
 export const getStagedAttachmentsState = (state: StateType): StagedAttachmentsStateType =>
   state.stagedAttachments;
diff --git a/ts/state/smart/SessionConversation.ts b/ts/state/smart/SessionConversation.ts
index ca9692a6c..c5850f2f1 100644
--- a/ts/state/smart/SessionConversation.ts
+++ b/ts/state/smart/SessionConversation.ts
@@ -1,21 +1,23 @@
 import { connect } from 'react-redux';
+import { SessionConversation } from '../../components/conversation/SessionConversation';
 import { mapDispatchToProps } from '../actions';
 import { StateType } from '../reducer';
-import { getTheme } from '../selectors/theme';
+import { getHasOngoingCallWithFocusedConvo } from '../selectors/call';
 import {
   getIsSelectedConvoInitialLoadingInProgress,
   getLightBoxOptions,
-  getSelectedConversation,
-  getSelectedConversationKey,
   getSelectedMessageIds,
   getSortedMessagesOfSelectedConversation,
   isMessageDetailView,
   isRightPanelShowing,
 } from '../selectors/conversations';
-import { getOurNumber } from '../selectors/user';
+import {
+  getSelectedConversation,
+  getSelectedConversationKey,
+} from '../selectors/selectedConversation';
 import { getStagedAttachmentsForCurrentConversation } from '../selectors/stagedAttachments';
-import { getHasOngoingCallWithFocusedConvo } from '../selectors/call';
-import { SessionConversation } from '../../components/conversation/SessionConversation';
+import { getTheme } from '../selectors/theme';
+import { getOurNumber } from '../selectors/user';
 
 const mapStateToProps = (state: StateType) => {
   return {

From 554b445a3e2fce35195c4813b0ce71b198c45e1d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 28 Mar 2023 14:44:41 +1100
Subject: [PATCH 050/178] feat: lookup for shared config message on link device

---
 ts/components/conversation/Timestamp.tsx      | 25 ++++------
 ts/models/conversation.ts                     |  4 +-
 ts/models/message.ts                          | 10 ++--
 ts/node/sql.ts                                |  1 -
 ts/receiver/configMessage.ts                  | 48 ++++++++++++-------
 ts/session/apis/snode_api/swarmPolling.ts     |  2 +-
 .../conversations/ConversationController.ts   | 32 +++++++------
 .../libsession_utils_convo_info_volatile.ts   |  8 +++-
 ts/util/expiringMessages.ts                   |  2 +-
 ts/util/storage.ts                            |  1 +
 10 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx
index c89d447ad..87967d177 100644
--- a/ts/components/conversation/Timestamp.tsx
+++ b/ts/components/conversation/Timestamp.tsx
@@ -1,9 +1,10 @@
-import React, { useCallback, useState } from 'react';
+import React from 'react';
 import moment from 'moment';
 
 // tslint:disable-next-line: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
+import useUpdate from 'react-use/lib/useUpdate';
 
 type Props = {
   timestamp?: number;
@@ -31,13 +32,7 @@ const TimestampContainerListItem = styled(TimestampContainerNotListItem)`
 `;
 
 export const Timestamp = (props: Props) => {
-  const [_lastUpdated, setLastUpdated] = useState(Date.now());
-  // this is kind of a hack, but we use lastUpdated just to trigger a refresh.
-  // formatRelativeTime() will print the correct moment.
-  const update = useCallback(() => {
-    setLastUpdated(Date.now());
-  }, [setLastUpdated]);
-
+  const update = useUpdate();
   useInterval(update, UPDATE_FREQUENCY);
 
   const { timestamp, momentFromNow } = props;
@@ -47,14 +42,14 @@ export const Timestamp = (props: Props) => {
   }
 
   const momentValue = moment(timestamp);
-  let dateString: string = '';
-  if (momentFromNow) {
-    dateString = momentValue.fromNow();
-  } else {
-    dateString = momentValue.format('lll');
-  }
+  // this is a hack to make the date string shorter, looks like moment does not have a localized way of doing this for now.
 
-  dateString = dateString.replace('minutes', 'mins').replace('minute', 'min');
+  const dateString = momentFromNow
+    ? momentValue
+        .fromNow()
+        .replace('minutes', 'mins')
+        .replace('minute', 'min')
+    : momentValue.format('lll');
 
   const title = moment(timestamp).format('llll');
   if (props.isConversationListItem) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 615b0c7d9..a855c0b6c 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1162,9 +1162,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async commit() {
-    perfStart(`conversationCommit-${this.attributes.id}`);
+    perfStart(`conversationCommit-${this.id}`);
     await commitConversationAndRefreshWrapper(this.id);
-    perfEnd(`conversationCommit-${this.attributes.id}`, 'conversationCommit');
+    perfEnd(`conversationCommit-${this.id}`, 'conversationCommit');
   }
 
   public async addSingleOutgoingMessage(
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 2e88fbbfe..412af54c9 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -118,10 +118,10 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const filledAttrs = fillMessageAttributesWithDefaults(attributes);
     super(filledAttrs);
 
-    if (!this.attributes.id) {
+    if (!this.id) {
       throw new Error('A message always needs to have an id.');
     }
-    if (!this.attributes.conversationId) {
+    if (!this.get('conversationId')) {
       throw new Error('A message always needs to have an conversationId.');
     }
 
@@ -1084,17 +1084,17 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
   }
 
   public async commit(triggerUIUpdate = true) {
-    if (!this.attributes.id) {
+    if (!this.id) {
       throw new Error('A message always needs an id');
     }
 
-    perfStart(`messageCommit-${this.attributes.id}`);
+    perfStart(`messageCommit-${this.id}`);
     // because the saving to db calls _cleanData which mutates the field for cleaning, we need to save a copy
     const id = await Data.saveMessage(cloneDeep(this.attributes));
     if (triggerUIUpdate) {
       this.dispatchMessageUpdate();
     }
-    perfEnd(`messageCommit-${this.attributes.id}`, 'messageCommit');
+    perfEnd(`messageCommit-${this.id}`, 'messageCommit');
 
     return id;
   }
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index bc6cd9b23..5e95c1377 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1368,7 +1368,6 @@ function getFirstUnreadMessageIdInConversation(conversationId: string) {
 }
 
 /**
- *
  * Returns the last read message timestamp in the specific conversation (the columns `serverTimestamp` || `sent_at`)
  */
 function getLastMessageReadInConversation(conversationId: string): number | null {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index c2f4eae9b..739226bb1 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { compact, isEmpty } from 'lodash';
+import _, { compact, isEmpty, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -118,7 +118,9 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
 
   const updatedProfilePicture = await UserConfigWrapperActions.getProfilePicture();
   const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
-  await ProfileManager.updateOurProfileSync(
+
+  await updateOurProfileLegacyOrViaLibSession(
+    result.latestEnvelopeTimestamp,
     updatedUserName,
     picUpdate ? updatedProfilePicture.url : null,
     picUpdate ? updatedProfilePicture.key : null
@@ -156,8 +158,8 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (!wrapperConvo.hidden && !contactConvo.isHidden()) {
-        contactConvo.set({ hidden: false });
+      if (Boolean(wrapperConvo.hidden) !== Boolean(contactConvo.isHidden())) {
+        contactConvo.set({ hidden: !!wrapperConvo.hidden });
         changes = true;
       }
 
@@ -635,6 +637,23 @@ async function handleConfigMessagesViaLibSession(
   await processMergingResults(incomingMergeResult);
 }
 
+async function updateOurProfileLegacyOrViaLibSession(
+  sentAt: number,
+  displayName: string,
+  profileUrl: string | null,
+  profileKey: Uint8Array | null
+) {
+  await ProfileManager.updateOurProfileSync(displayName, profileUrl, profileKey);
+
+  await setLastProfileUpdateTimestamp(toNumber(sentAt));
+  // do not trigger a signin by linking if the display name is empty
+  if (!isEmpty(displayName)) {
+    trigger(configurationMessageReceived, displayName);
+  } else {
+    window?.log?.warn('Got a configuration message but the display name is empty');
+  }
+}
+
 async function handleOurProfileUpdateLegacy(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
@@ -650,15 +669,12 @@ async function handleOurProfileUpdateLegacy(
     );
     const { profileKey, profilePicture, displayName } = configMessage;
 
-    await ProfileManager.updateOurProfileSync(displayName, profilePicture, profileKey);
-
-    await setLastProfileUpdateTimestamp(_.toNumber(sentAt));
-    // do not trigger a signin by linking if the display name is empty
-    if (displayName) {
-      trigger(configurationMessageReceived, displayName);
-    } else {
-      window?.log?.warn('Got a configuration message but the display name is empty');
-    }
+    await updateOurProfileLegacyOrViaLibSession(
+      toNumber(sentAt),
+      displayName,
+      profilePicture,
+      profileKey
+    );
   }
 }
 
@@ -669,7 +685,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     return;
   }
-  const envelopeTimestamp = _.toNumber(envelope.timestamp);
+  const envelopeTimestamp = toNumber(envelope.timestamp);
   const lastConfigUpdate = await Data.getItemById(hasSyncedInitialConfigurationItem);
   const lastConfigTimestamp = lastConfigUpdate?.timestamp;
   const isNewerConfig =
@@ -789,14 +805,14 @@ const handleContactFromConfigLegacy = async (
 
     const existingActiveAt = contactConvo.get('active_at');
     if (!existingActiveAt || existingActiveAt === 0) {
-      contactConvo.set('active_at', _.toNumber(envelope.timestamp));
+      contactConvo.set('active_at', toNumber(envelope.timestamp));
     }
 
     // checking for existence of field on protobuf
     if (contactReceived.isApproved === true) {
       if (!contactConvo.isApproved()) {
         await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
-        await contactConvo.addOutgoingApprovalMessage(_.toNumber(envelope.timestamp));
+        await contactConvo.addOutgoingApprovalMessage(toNumber(envelope.timestamp));
       }
 
       if (contactReceived.didApproveMe === true) {
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 043cbc456..fca4d5f09 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -145,7 +145,7 @@ export class SwarmPolling {
   public async pollForAllKeys() {
     if (!window.getGlobalOnlineStatus()) {
       window?.log?.error('pollForAllKeys: offline');
-      // Important to set up a new polling
+      // Very important to set up a new polling call so we do retry at some point
       setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE);
       return;
     }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 02b8fdc65..903f12650 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -305,20 +305,21 @@ export class ConversationController {
 
     const load = async () => {
       try {
-        const start = Date.now();
+        const startLoad = Date.now();
         const convoModels = await Data.getAllConversations();
         this.conversations.add(convoModels);
 
-        console.time('refreshAllWrapperContactsData');
+        const start = Date.now();
         // TODO make this a switch so we take care of all wrappers and have compilation errors if we forgot to add one.
+        // also keep in mind that the convo volatile one need to run for each convo.
         for (let index = 0; index < convoModels.length; index++) {
           const convo = convoModels[index];
           if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
             await SessionUtilContact.refreshMappedValue(convo.id, true);
-          }
-          if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+          } else if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
             await SessionUtilUserGroups.refreshCachedUserGroup(convo.id, true);
           }
+          // we actually want to run the convo volatile check and fetch even if one of the cases above is already true
           if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
             await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
               convo.id,
@@ -329,21 +330,22 @@ export class ConversationController {
             await convo.refreshInMemoryDetails();
           }
         }
-        console.timeEnd('refreshAllWrapperContactsData');
+        console.info(`refreshAllWrappersMappedValues took ${Date.now() - start}ms`);
 
         this._initialFetchComplete = true;
-        this.conversations.forEach((conversation: ConversationModel) => {
-          if (
-            conversation.isActive() &&
-            !conversation.isHidden() &&
-            !conversation.get('lastMessage')
-          ) {
-            conversation.updateLastMessage();
-          }
-        });
+        // TODO do we really need to do this?
+        // this.conversations.forEach((conversation: ConversationModel) => {
+        //   if (
+        //     conversation.isActive() &&
+        //     !conversation.isHidden() &&
+        //     !conversation.get('lastMessage')
+        //   ) {
+        //     conversation.updateLastMessage();
+        //   }
+        // });
 
         window?.log?.info(
-          `ConversationController: done with initial fetch in ${Date.now() - start}ms.`
+          `ConversationController: done with initial fetch in ${Date.now() - startLoad}ms.`
         );
       } catch (error) {
         window?.log?.error(
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 8f840320c..ba3f8696b 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -65,6 +65,7 @@ function isConvoToStoreInWrapper(convo: ConversationModel): boolean {
     SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id) // this checks for out own pubkey, as we want to keep track of the read state for the Note To Self
   );
 }
+
 function getConvoType(convo: ConversationModel): ConvoVolatileType {
   const convoType: ConvoVolatileType =
     SessionUtilContact.isContactToStoreInContactsWrapper(convo) ||
@@ -88,8 +89,13 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
     return;
   }
   const isForcedUnread = foundConvo.isMarkedUnread();
+  const timestampFromDbMs = (await Data.fetchConvoMemoryDetails(convoId))?.lastReadTimestampMessage;
+
+  // TODO not having a last read timestamp fallsback to 0, which keeps the existing value in the wrapper if it is already set (as done in src/convo_info_volatile_config.cpp)
   const lastReadMessageTimestamp =
-    (await Data.fetchConvoMemoryDetails(convoId))?.lastReadTimestampMessage || 0;
+    !!timestampFromDbMs && isFinite(timestampFromDbMs) && timestampFromDbMs > 0
+      ? timestampFromDbMs
+      : 0;
 
   console.info(
     `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadMessageTimestamp};forcedUnread:${isForcedUnread}...`
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 31e1381d5..4bd10be5f 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -45,7 +45,7 @@ async function destroyExpiredMessages() {
       conversationKey: string;
       messageId: string;
     }> = messages.map(m => ({
-      conversationKey: m.attributes.conversationId,
+      conversationKey: m.get('conversationId'),
       messageId: m.id,
     }));
 
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index 853325dc6..97e446871 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -126,6 +126,7 @@ export function getLastProfileUpdateTimestamp() {
 }
 
 export async function setLastProfileUpdateTimestamp(lastUpdateTimestamp: number) {
+  // TODO get rid of this once we remove the feature flag altogether
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     return;
   }

From c623e2e49e71b2b9c7e2b4272571ef41764ee111 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 28 Mar 2023 17:00:05 +1100
Subject: [PATCH 051/178] fix: make the ConfSyncJob fetch be per destination

---
 ts/session/sending/MessageSender.ts           |  10 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 142 ++++++++----------
 .../utils/libsession/libsession_utils.ts      |   2 -
 3 files changed, 66 insertions(+), 88 deletions(-)

diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 372484749..0830d5ca9 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -183,7 +183,7 @@ async function send(
 async function sendMessagesDataToSnode(
   params: Array<StoreOnNodeParamsNoSig>,
   destination: string,
-  oldMessageHashes: Set<string> | null
+  messagesHashesToDelete: Set<string> | null
 ): Promise<NotEmptyArrayOfBatchResults> {
   const rightDestination = params.filter(m => m.pubkey === destination);
   const swarm = await getSwarmFor(destination);
@@ -215,10 +215,10 @@ async function sendMessagesDataToSnode(
   );
 
   const signedDeleteOldHashesRequest =
-    oldMessageHashes && oldMessageHashes.size
+    messagesHashesToDelete && messagesHashesToDelete.size
       ? await SnodeSignature.getSnodeSignatureByHashesParams({
           method: 'delete' as const,
-          messages: [...oldMessageHashes],
+          messages: [...messagesHashesToDelete],
           pubkey: destination,
         })
       : null;
@@ -354,7 +354,7 @@ async function encryptMessagesAndWrap(
 async function sendMessagesToSnode(
   params: Array<StoreOnNodeMessage>,
   destination: string,
-  oldMessageHashes: Set<string> | null
+  messagesHashesToDelete: Set<string> | null
 ): Promise<NotEmptyArrayOfBatchResults | null> {
   try {
     const recipient = PubKey.cast(destination);
@@ -397,7 +397,7 @@ async function sendMessagesToSnode(
             namespace: wrapped.namespace,
           })),
           recipient.key,
-          oldMessageHashes
+          messagesHashesToDelete
         );
       },
       {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 48d1f6494..c107829a3 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,4 +1,4 @@
-import { compact, groupBy, isArray, isEmpty, isNumber, isString } from 'lodash';
+import { compact, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
@@ -27,14 +27,12 @@ const defaultMaxAttempts = 3;
 let lastRunConfigSyncJobTimestamp: number | null = null;
 
 export type SingleDestinationChanges = {
-  destination: string;
   messages: Array<OutgoingConfResult>;
   allOldHashes: Array<string>;
 };
 
 type SuccessfulChange = {
   message: SharedConfigMessage;
-  publicKey: string;
   updatedHash: string;
 };
 
@@ -42,33 +40,22 @@ type SuccessfulChange = {
  * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call.
  * To make this easier, this function prebuilds and merges together all the changes for each pubkey.
  */
-async function retrieveSingleDestinationChanges(): Promise<Array<SingleDestinationChanges>> {
-  const outgoingConfResults = await LibSessionUtil.pendingChangesForPubkey(
-    UserUtils.getOurPubKeyStrFromCache()
-  );
+async function retrieveSingleDestinationChanges(
+  destination: string
+): Promise<SingleDestinationChanges> {
+  const outgoingConfResults = await LibSessionUtil.pendingChangesForPubkey(destination);
 
-  const groupedByDestination = groupBy(outgoingConfResults, m => m.destination);
+  const compactedHashes = compact(outgoingConfResults.map(m => m.oldMessageHashes)).flat();
 
-  const singleDestChanges: Array<SingleDestinationChanges> = Object.keys(groupedByDestination).map(
-    destination => {
-      const messages = groupedByDestination[destination];
-      // the delete hashes sub request can be done accross namespaces, so we can do a single one of it with all the hashes to remove (per pubkey)
-      const hashes = compact(messages.map(m => m.oldMessageHashes)).flat();
-
-      return { allOldHashes: hashes, destination, messages };
-    }
-  );
-
-  return singleDestChanges;
+  return { messages: outgoingConfResults, allOldHashes: compactedHashes };
 }
 
 /**
  * This function is run once we get the results from the multiple batch-send.
- * For each results, it checks wha
  */
 function resultsToSuccessfulChange(
-  allResults: Array<PromiseSettledResult<NotEmptyArrayOfBatchResults | null>>,
-  requests: Array<SingleDestinationChanges>
+  result: NotEmptyArrayOfBatchResults | null,
+  request: SingleDestinationChanges
 ): Array<SuccessfulChange> {
   const successfulChanges: Array<SuccessfulChange> = [];
 
@@ -82,58 +69,44 @@ function resultsToSuccessfulChange(
    */
 
   try {
-    for (let i = 0; i < allResults.length; i++) {
-      const result = allResults[i];
+    if (!result?.length) {
+      return successfulChanges;
+    }
 
-      // the batch send was rejected. Let's skip handling those results altogether. Another job will handle the retry logic.
-      if (result.status !== 'fulfilled') {
-        continue;
-      }
+    for (let j = 0; j < result.length; j++) {
+      const batchResult = result[j];
+      const messagePostedHashes = batchResult?.body?.hash;
 
-      const resultValue = result.value;
-      if (!resultValue) {
-        continue;
-      }
-
-      const request = requests?.[i];
-      if (!result) {
-        continue;
-      }
-
-      for (let j = 0; j < resultValue.length; j++) {
-        const batchResult = resultValue[j];
-        const messagePostedHashes = batchResult?.body?.hash;
-
-        if (
-          batchResult.code === 200 &&
-          isString(messagePostedHashes) &&
-          request.messages?.[j].message &&
-          request.destination
-        ) {
-          // the library keeps track of the hashes to push and pushed using the hashes now
-          successfulChanges.push({
-            publicKey: request.destination,
-            updatedHash: messagePostedHashes,
-            message: request.messages?.[j].message,
-          });
-        }
+      if (
+        batchResult.code === 200 &&
+        isString(messagePostedHashes) &&
+        request.messages?.[j].message
+      ) {
+        // the library keeps track of the hashes to push and pushed using the hashes now
+        successfulChanges.push({
+          updatedHash: messagePostedHashes,
+          message: request.messages?.[j].message,
+        });
       }
     }
+
+    return successfulChanges;
   } catch (e) {
     throw e;
   }
-
-  return successfulChanges;
 }
 
-async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<void> {
+async function buildAndSaveDumpsToDB(
+  changes: Array<SuccessfulChange>,
+  destination: string
+): Promise<void> {
   for (let i = 0; i < changes.length; i++) {
     const change = changes[i];
     const variant = LibSessionUtil.kindToVariant(change.message.kind);
 
     const needsDump = await LibSessionUtil.markAsPushed(
       variant,
-      change.publicKey,
+      destination,
       change.message.seqno.toNumber(),
       change.updatedHash
     );
@@ -144,7 +117,7 @@ async function buildAndSaveDumpsToDB(changes: Array<SuccessfulChange>): Promise<
     const dump = await GenericWrapperActions.dump(variant);
     await ConfigDumpData.saveConfigDump({
       data: dump,
-      publicKey: change.publicKey,
+      publicKey: destination,
       variant,
     });
   }
@@ -207,44 +180,51 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         }
       }
 
-      const singleDestChanges = await retrieveSingleDestinationChanges();
+      // TODO add a way to have a few configuration sync jobs running at the same time, but only a single one per pubkey
+      const thisJobDestination = us;
+
+      const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination);
 
       // If there are no pending changes then the job can just complete (next time something
       // is updated we want to try and run immediately so don't scuedule another run in this case)
-
-      if (isEmpty(singleDestChanges)) {
+      if (isEmpty(singleDestChanges?.messages)) {
         return RunJobResult.Success;
       }
+      const oldHashesToDelete = new Set(singleDestChanges.allOldHashes);
+      const msgs = singleDestChanges.messages.map(item => {
+        return {
+          namespace: item.namespace,
+          pubkey: thisJobDestination,
+          timestamp: item.message.timestamp,
+          ttl: item.message.ttl(),
+          message: item.message,
+        };
+      });
 
-      const allResults = await Promise.allSettled(
-        singleDestChanges.map(async dest => {
-          const msgs = dest.messages.map(item => {
-            return {
-              namespace: item.namespace,
-              pubkey: item.destination,
-              timestamp: item.message.timestamp,
-              ttl: item.message.ttl(),
-              message: item.message,
-            };
-          });
-          const asSet = new Set(dest.allOldHashes);
-          return MessageSender.sendMessagesToSnode(msgs, dest.destination, asSet);
-        })
+      const result = await MessageSender.sendMessagesToSnode(
+        msgs,
+        thisJobDestination,
+        oldHashesToDelete
       );
 
+      const expectedReplyLength =
+        singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0);
       // we do a sequence call here. If we do not have the right expected number of results, consider it a failure
-      if (!isArray(allResults) || allResults.length !== singleDestChanges.length) {
+      if (!isArray(result) || result.length !== expectedReplyLength) {
+        window.log.info(
+          `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}`
+        );
         return RunJobResult.RetryJobIfPossible;
       }
 
-      const changes = resultsToSuccessfulChange(allResults, singleDestChanges);
+      const changes = resultsToSuccessfulChange(result, singleDestChanges);
       if (isEmpty(changes)) {
         return RunJobResult.RetryJobIfPossible;
       }
       // Now that we have the successful changes, we need to mark them as pushed and
       // generate any config dumps which need to be stored
 
-      await buildAndSaveDumpsToDB(changes);
+      await buildAndSaveDumpsToDB(changes, thisJobDestination);
       return RunJobResult.Success;
     } catch (e) {
       throw e;
@@ -300,7 +280,7 @@ async function queueNewJobIfNeeded() {
     );
     window.log.debug('Scheduling ConfSyncJob: ASAP');
   } else {
-    // if we did run at t=100, and it is currently t=110, diff is 10
+    // if we did run at t=100, and it is currently t=110, the difference is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 3d56f9212..8244652d8 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -35,7 +35,6 @@ export type IncomingConfResult = {
 export type OutgoingConfResult = {
   message: SharedConfigMessage;
   namespace: SnodeNamespaces;
-  destination: string;
   oldMessageHashes: Array<string>;
 };
 
@@ -121,7 +120,6 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
     const kind = variantToKind(variant);
     const namespace = await GenericWrapperActions.storageNamespace(variant);
     results.push({
-      destination: pubkey,
       message: new SharedConfigMessage({
         data,
         kind,

From 1dcee5bc935e00439361cdf4535a3441230e7c48 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 28 Mar 2023 17:40:29 +1100
Subject: [PATCH 052/178] feat: wait for confSyncJob to be done before deleting
 account

---
 protos/SignalService.proto                    | 22 ++++++++---------
 .../jobs/ConfigurationSyncDumpJob.ts          |  2 ++
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  8 +++++++
 ts/session/utils/sync/syncUtils.ts            | 24 +++++++++++++++++--
 ts/shims/events.ts                            |  1 +
 5 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 3db7416d7..0bbfcf659 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -180,16 +180,16 @@ message DataMessage {
   message ClosedGroupControlMessage {
 
     enum Type {
-      NEW                           = 1;  // TODO: should get rid of this once closed group redesign has been released for a while
-      ENCRYPTION_KEY_PAIR           = 3;  // TODO: should get rid of this once closed group redesign has been released for a while
-      NAME_CHANGE                   = 4;  // TODO: should get rid of this once closed group redesign has been released for a while
-      MEMBERS_ADDED                 = 5;  // TODO: should get rid of this once closed group redesign has been released for a while
-      MEMBERS_REMOVED               = 6;  // TODO: should get rid of this once closed group redesign has been released for a while
+      NEW                           = 1;
+      ENCRYPTION_KEY_PAIR           = 3;
+      NAME_CHANGE                   = 4;
+      MEMBERS_ADDED                 = 5;
+      MEMBERS_REMOVED               = 6;
       MEMBER_LEFT                   = 7;
-      ENCRYPTION_KEY_PAIR_REQUEST   = 8;  // TODO: should get rid of this once closed group redesign has been released for a while
+      ENCRYPTION_KEY_PAIR_REQUEST   = 8;
     }
 
-    // TODO:  should get rid of this once closed group redesign has been released for a while
+
     message KeyPairWrapper {
       // @required
       required bytes publicKey        = 1; // The public key of the user the key pair is meant for
@@ -201,11 +201,11 @@ message DataMessage {
     required Type           type              = 1;
     optional bytes          publicKey         = 2;
     optional string         name              = 3;
-    optional KeyPair        encryptionKeyPair = 4; // TODO:  should get rid of this once closed group redesign has been released for a while
+    optional KeyPair        encryptionKeyPair = 4;
     repeated bytes          members           = 5;
-    repeated bytes          admins            = 6; // TODO: should get rid of this once closed group redesign has been released for a while
-    repeated KeyPairWrapper wrappers          = 7; // TODO: should get rid of this once closed group redesign has been released for a while
-    optional uint32         expireTimer       = 8; // TODO: should get rid of this once closed group redesign has been released for a while
+    repeated bytes          admins            = 6;
+    repeated KeyPairWrapper wrappers          = 7;
+    optional uint32         expireTimer       = 8;
   }
 
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index eef3b79c7..dd8f67c33 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -95,6 +95,8 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       // so when we call needsDump(), we know for sure that we are up to date
       console.time('ConfigurationSyncDumpJob insertAll');
 
+      // TODO we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
+
       for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index c107829a3..492ddef62 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -2,6 +2,7 @@ import { compact, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
+import { ConfigurationSyncJobDone } from '../../../../shims/events';
 import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes';
@@ -148,6 +149,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   public async run(): Promise<RunJobResult> {
     try {
       if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+        this.triggerConfSyncJobDone();
         return RunJobResult.Success;
       }
       window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
@@ -188,6 +190,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       // If there are no pending changes then the job can just complete (next time something
       // is updated we want to try and run immediately so don't scuedule another run in this case)
       if (isEmpty(singleDestChanges?.messages)) {
+        this.triggerConfSyncJobDone();
         return RunJobResult.Success;
       }
       const oldHashesToDelete = new Set(singleDestChanges.allOldHashes);
@@ -225,6 +228,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       // generate any config dumps which need to be stored
 
       await buildAndSaveDumpsToDB(changes, thisJobDestination);
+      this.triggerConfSyncJobDone();
       return RunJobResult.Success;
     } catch (e) {
       throw e;
@@ -260,6 +264,10 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   private updateLastTickTimestamp() {
     lastRunConfigSyncJobTimestamp = Date.now();
   }
+
+  private triggerConfSyncJobDone() {
+    window.Whisper.events.trigger(ConfigurationSyncJobDone);
+  }
 }
 
 /**
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index f353441a6..3d401e86e 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -7,6 +7,7 @@ import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
 import { SignalService } from '../../../protobuf';
 import { ECKeyPair } from '../../../receiver/keypairs';
+import { ConfigurationSyncJobDone } from '../../../shims/events';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { DURATION } from '../../constants';
 import { getConversationController } from '../../conversations';
@@ -78,10 +79,29 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
   new Promise(resolve => {
     // TODO  this should check for feature flag and queue a ConfigurationSyncJob
     const allConvos = getConversationController().getConversations();
-    // if we hang for more than 10sec, force resolve this promise.
+    // if we hang for more than 20sec, force resolve this promise.
     setTimeout(() => {
       resolve(false);
-    }, 10000);
+    }, 20000);
+
+    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      void ConfigurationDumpSync.queueNewJobIfNeeded()
+        .then(ConfigurationSync.queueNewJobIfNeeded)
+        .catch(e => {
+          window.log.warn(
+            'forceSyncConfigurationNowIfNeeded scheduling of jobs failed with',
+            e.message
+          );
+        });
+      if (waitForMessageSent) {
+        window.Whisper.events.once(ConfigurationSyncJobDone, () => {
+          debugger;
+          resolve(true);
+        });
+      }
+
+      return;
+    }
 
     void getCurrentConfigurationMessage(allConvos)
       .then(configMessage => {
diff --git a/ts/shims/events.ts b/ts/shims/events.ts
index b54e3f083..b5e93d876 100644
--- a/ts/shims/events.ts
+++ b/ts/shims/events.ts
@@ -4,3 +4,4 @@ export function trigger(name: string, param1?: any, param2?: any) {
 }
 
 export const configurationMessageReceived = 'configurationMessageReceived';
+export const ConfigurationSyncJobDone = 'ConfigurationSyncJobDone';

From 88b5446c6e56cbc60dc29c0904fd927dca77b136 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 29 Mar 2023 09:29:40 +1100
Subject: [PATCH 053/178] fix: remove reference to local folder from
 package.json

---
 package.json | 2 +-
 yarn.lock    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 0273d4e89..244295f2e 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
-    "session_util_wrapper": "/home/audric/pro/contribs/libsession-util-nodejs",
+    "session_util_wrapper": "https://github.com/oxen-io/libsession-util-nodejs/",
     "styled-components": "5.1.1",
     "uuid": "8.3.2"
   },
diff --git a/yarn.lock b/yarn.lock
index 006523619..3c138c332 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8404,14 +8404,9 @@ serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-session_util_wrapper@/home/audric/pro/contribs/libsession-util-nodejs:
-  version "0.1.0"
-  dependencies:
-    nan "^2.17.0"
-    node-gyp "^9.3.0"
-
-"session_util_wrapper@file:../libsession-util-nodejs":
+"session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs/":
   version "0.1.0"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/#14b17dec2cdc86c3792314ebda8fbe696308ce38"
   dependencies:
     nan "^2.17.0"
     node-gyp "^9.3.0"

From 8a0074d2bdcef7cd47dfd766ea8672ba74b6eb45 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 29 Mar 2023 14:30:35 +1100
Subject: [PATCH 054/178] feat: add convo volatile info during migrations for
 each convo tracked

---
 ts/models/conversation.ts                     |  40 ++-
 ts/node/migration/sessionMigrations.ts        | 260 +++++++++++++-----
 ts/node/sql.ts                                |   5 +
 .../conversations/ConversationController.ts   |  16 +-
 .../libsession_utils_convo_info_volatile.ts   |   5 +-
 ts/session/utils/sync/syncUtils.ts            |   1 -
 6 files changed, 217 insertions(+), 110 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index a855c0b6c..e63ecf58a 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1531,7 +1531,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       ReduxSogsRoomInfos.setCanWriteOutsideRedux(this.id, !!write);
     }
 
-    const adminChanged = await this.handleModsOrAdminsChanges({
+    const adminChanged = await this.handleSogsModsOrAdminsChanges({
       modsOrAdmins: details.admins,
       hiddenModsOrAdmins: details.hidden_admins,
       type: 'admins',
@@ -1539,7 +1539,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     hasChange = hasChange || adminChanged;
 
-    const modsChanged = await this.handleModsOrAdminsChanges({
+    const modsChanged = await this.handleSogsModsOrAdminsChanges({
       modsOrAdmins: details.moderators,
       hiddenModsOrAdmins: details.hidden_moderators,
       type: 'mods',
@@ -2045,33 +2045,24 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   private sendTypingMessage(isTyping: boolean) {
-    if (!this.isPrivate()) {
+    // we can only send typing messages to approved contacts
+    if (!this.isPrivate() || this.isMe() || !this.isApproved()) {
       return;
     }
 
-    const recipientId = this.id;
+    const recipientId = this.id as string;
 
-    if (!recipientId) {
+    if (isEmpty(recipientId)) {
       throw new Error('Need to provide either recipientId');
     }
 
-    if (!this.isApproved()) {
-      return;
-    }
-
-    if (this.isMe()) {
-      // note to self
-      return;
-    }
-
     const typingParams = {
-      timestamp: Date.now(),
+      timestamp: GetNetworkTime.getNowWithNetworkOffset(),
       isTyping,
-      typingTimestamp: Date.now(),
+      typingTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
     };
     const typingMessage = new TypingMessage(typingParams);
 
-    // send the message to a single recipient if this is a session chat
     const device = new PubKey(recipientId);
     getMessageQueue()
       .sendToPubKey(device, typingMessage, SnodeNamespaces.UserMessages)
@@ -2091,7 +2082,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return replacedWithOurRealSessionId;
   }
 
-  private async handleModsOrAdminsChanges({
+  private async handleSogsModsOrAdminsChanges({
     modsOrAdmins,
     hiddenModsOrAdmins,
     type,
@@ -2110,12 +2101,15 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         uniq(localModsOrAdmins)
       );
 
-      if (type === 'admins') {
-        return await this.updateGroupAdmins(replacedWithOurRealSessionId, false);
+      switch (type) {
+        case 'admins':
+          return this.updateGroupAdmins(replacedWithOurRealSessionId, false);
+        case 'mods':
+          ReduxSogsRoomInfos.setModeratorsOutsideRedux(this.id, replacedWithOurRealSessionId);
+          return false;
+        default:
+          assertUnreachable(type, `handleSogsModsOrAdminsChanges: unhandled switch case: ${type}`);
       }
-
-      ReduxSogsRoomInfos.setModeratorsOutsideRedux(this.id, replacedWithOurRealSessionId);
-      return false;
     }
     return false;
   }
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 6a9ae8fcb..74605cad5 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,7 +1,8 @@
 import * as BetterSqlite3 from 'better-sqlite3';
-import { compact, isArray, isEmpty, isString, map, pick } from 'lodash';
+import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
 import {
   ContactsConfigWrapperInsideWorker,
+  ConvoInfoVolatileWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
@@ -19,7 +20,6 @@ import {
   CONVERSATIONS_TABLE,
   dropFtsAndTriggers,
   GUARD_NODE_TABLE,
-  jsonToObject,
   LAST_HASHES_TABLE,
   MESSAGES_TABLE,
   NODES_FOR_PUBKEY_TABLE,
@@ -1205,66 +1205,96 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-function insertContactIntoWrapper(
+function insertContactIntoContactWrapper(
   contact: any,
   blockedNumbers: Array<string>,
-  contactsConfigWrapper: ContactsConfigWrapperInsideWorker
+  contactsConfigWrapper: ContactsConfigWrapperInsideWorker | null, // set this to null to only insert into the convo volatile wrapper (i.e. for ourConvo case)
+  volatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
+  db: BetterSqlite3.Database
 ) {
-  const dbApproved = !!contact.isApproved || false;
-  const dbApprovedMe = !!contact.didApproveMe || false;
-  const dbBlocked = blockedNumbers.includes(contact.id);
-  const hidden = contact.hidden || false;
-  const isPinned = contact.isPinned;
+  if (contactsConfigWrapper !== null) {
+    const dbApproved = !!contact.isApproved || false;
+    const dbApprovedMe = !!contact.didApproveMe || false;
+    const dbBlocked = blockedNumbers.includes(contact.id);
+    const hidden = contact.hidden || false;
+    const isPinned = contact.isPinned;
 
-  const wrapperContact = getContactInfoFromDBValues({
-    id: contact.id,
-    dbApproved,
-    dbApprovedMe,
-    dbBlocked,
-    dbName: contact.displayNameInProfile || undefined,
-    dbNickname: contact.nickname || undefined,
-    dbProfileKey: contact.profileKey || undefined,
-    dbProfileUrl: contact.avatarPointer || undefined,
-    isPinned,
-    hidden,
-  });
+    const wrapperContact = getContactInfoFromDBValues({
+      id: contact.id,
+      dbApproved,
+      dbApprovedMe,
+      dbBlocked,
+      dbName: contact.displayNameInProfile || undefined,
+      dbNickname: contact.nickname || undefined,
+      dbProfileKey: contact.profileKey || undefined,
+      dbProfileUrl: contact.avatarPointer || undefined,
+      isPinned,
+      hidden,
+    });
+
+    try {
+      console.info('Inserting contact into wrapper: ', wrapperContact);
+      contactsConfigWrapper.set(wrapperContact);
+    } catch (e) {
+      console.error(
+        `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}`
+      );
+      // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
+      try {
+        console.info('Inserting edited contact into wrapper: ', contact.id);
+        contactsConfigWrapper.set(
+          getContactInfoFromDBValues({
+            id: contact.id,
+            dbApproved,
+            dbApprovedMe,
+            dbBlocked,
+            dbName: undefined,
+            dbNickname: undefined,
+            dbProfileKey: undefined,
+            dbProfileUrl: undefined,
+            isPinned: false,
+            hidden,
+          })
+        );
+      } catch (e) {
+        // there is nothing else we can do here
+        console.error(
+          `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}. Skipping contact entirely`
+        );
+      }
+    }
+  }
 
   try {
-    console.info('Inserting contact into wrapper: ', wrapperContact);
-    contactsConfigWrapper.set(wrapperContact);
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: contact.id,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`);
+    volatileConfigWrapper.set1o1(contact.id, lastRead, false);
   } catch (e) {
     console.error(
-      `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}`
+      `volatileConfigWrapper.set1o1 during migration failed with ${e.message} for id: ${contact.id}. skipping`
     );
-    // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
-    try {
-      console.info('Inserting edited contact into wrapper: ', contact.id);
-      contactsConfigWrapper.set(
-        getContactInfoFromDBValues({
-          id: contact.id,
-          dbApproved,
-          dbApprovedMe,
-          dbBlocked,
-          dbName: undefined,
-          dbNickname: undefined,
-          dbProfileKey: undefined,
-          dbProfileUrl: undefined,
-          isPinned: false,
-          hidden,
-        })
-      );
-    } catch (e) {
-      // there is nothing else we can do here
-      console.error(
-        `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}. Skipping contact entirely`
-      );
-    }
   }
 }
 
 function insertCommunityIntoWrapper(
   community: { id: string; isPinned: boolean },
   userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
+  volatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
   db: BetterSqlite3.Database
 ) {
   const isPinned = community.isPinned;
@@ -1301,8 +1331,26 @@ function insertCommunityIntoWrapper(
   });
 
   try {
-    console.info('Inserting community into wrapper: ', wrapperComm);
+    console.info('Inserting community into group wrapper: ', wrapperComm);
     userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority);
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(serverTimestamp, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: convoId,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher serverTimestamp timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    console.info(`Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`);
+    volatileConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, lastRead, false);
   } catch (e) {
     console.error(
       `userGroupConfigWrapper.set during migration failed with ${e.message} for fullUrl: "${wrapperComm.fullUrl}". Skipping community entirely`
@@ -1316,6 +1364,7 @@ function insertLegacyGroupIntoWrapper(
     'hidden' | 'id' | 'isPinned' | 'expireTimer' | 'displayNameInProfile'
   > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
   userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
+  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
   db: BetterSqlite3.Database
 ) {
   const {
@@ -1348,6 +1397,25 @@ function insertLegacyGroupIntoWrapper(
   try {
     console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
     userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup);
+
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: id,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`);
+    volatileInfoConfigWrapper.setLegacyGroup(id, lastRead, false);
   } catch (e) {
     console.error(
       `userGroupConfigWrapper.set during migration failed with ${e.message} for legacyGroup.id: "${legacyGroup.id}". Skipping that legacy group entirely`
@@ -1394,13 +1462,18 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
     );
     // drop unused readCapability & uploadCapability columns. Also move `writeCapability` to memory only value.
     db.exec(`
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN readCapability;
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN writeCapability;
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN uploadCapability;
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN subscriberCount;
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN is_medium_group;
-      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN groupModerators;
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN readCapability; -- stored in a redux slice now
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN writeCapability; -- stored in a redux slice now
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN uploadCapability; -- stored in a redux slice now
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN subscriberCount; -- stored in a redux slice now
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN groupModerators; -- stored in a redux slice now
 
+      ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN is_medium_group; -- a medium group starts with 05 and has a type of group. We cache everything renderer side so there is no need for that field
+      `);
+
+    // Didn't find any reference to this serverTimestamp in the unprocessed table needed, so let's clean it up
+    db.exec(`
+      ALTER TABLE unprocessed DROP COLUMN serverTimestamp;
       `);
     // mark every "active" private chats as not hidden
     db.prepare(
@@ -1478,26 +1551,32 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       if (!userAlreadyCreated) {
         throw new Error('privateEd25519 was empty. Considering no users are logged in');
       }
+      const blockedNumbers = getBlockedNumbersDuringMigration(db);
+
       const { privateEd25519, publicKeyHex } = keys;
       const userProfileWrapper = new UserConfigWrapperInsideWorker(privateEd25519, null);
       const contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(privateEd25519, null);
       const userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(privateEd25519, null);
+      const volatileInfoConfigWrapper = new ConvoInfoVolatileWrapperInsideWorker(
+        privateEd25519,
+        null
+      );
 
       /**
        * Setup up the User profile wrapper with what is stored in our own conversation
        */
 
-      const ourConvoRow = db.prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`).get({
-        id: publicKeyHex,
-      });
+      const ourConversation = db
+        .prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`)
+        .get({
+          id: publicKeyHex,
+        }) as Record<string, any> | undefined;
 
-      if (!ourConvoRow) {
+      if (!ourConversation) {
         throw new Error('Failed to find our logged in conversation while migrating');
       }
 
-      const ourConversation = jsonToObject(ourConvoRow);
-
-      // Insert the user profile into the userWrappoer
+      // Insert the user profile into the userWrapper
       const ourDbName = ourConversation.displayNameInProfile || '';
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
@@ -1508,6 +1587,13 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       } else {
         userProfileWrapper.setProfilePicture('', new Uint8Array());
       }
+      insertContactIntoContactWrapper(
+        ourConversation,
+        blockedNumbers,
+        null,
+        volatileInfoConfigWrapper,
+        db
+      );
 
       // dump the user wrapper content and save it to the DB
       const userDump = userProfileWrapper.dump();
@@ -1531,7 +1617,6 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       /**
        * Setup up the Contacts Wrapper with all the contact details which needs to be stored in it.
        */
-      const blockedNumbers = getBlockedNumbersDuringMigration(db);
 
       // this filter is based on the `isContactToStoreInContactsWrapper` function.
       const contactsToWriteInWrapper = db
@@ -1553,7 +1638,13 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         );
 
         contactsToWriteInWrapper.forEach(contact => {
-          insertContactIntoWrapper(contact, blockedNumbers, contactsConfigWrapper);
+          insertContactIntoContactWrapper(
+            contact,
+            blockedNumbers,
+            contactsConfigWrapper,
+            volatileInfoConfigWrapper,
+            db
+          );
         });
 
         console.info('===================== Done with contact inserting =======================');
@@ -1595,7 +1686,12 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         communitiesToWriteInWrapper.forEach(community => {
           try {
             console.info('Writing community: ', JSON.stringify(community));
-            insertCommunityIntoWrapper(community, userGroupsConfigWrapper, db);
+            insertCommunityIntoWrapper(
+              community,
+              userGroupsConfigWrapper,
+              volatileInfoConfigWrapper,
+              db
+            );
           } catch (e) {
             console.info(`failed to insert community with ${e.message}`, community);
           }
@@ -1622,7 +1718,12 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
           try {
             console.info('Writing legacy group: ', JSON.stringify(legacyGroup));
 
-            insertLegacyGroupIntoWrapper(legacyGroup, userGroupsConfigWrapper, db);
+            insertLegacyGroupIntoWrapper(
+              legacyGroup,
+              userGroupsConfigWrapper,
+              volatileInfoConfigWrapper,
+              db
+            );
           } catch (e) {
             console.info(`failed to insert legacy group with ${e.message}`, legacyGroup);
           }
@@ -1632,7 +1733,6 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
           '===================== Done with legacy group inserting ======================='
         );
       }
-      // TODO we need to do the same for new groups once they are available
 
       const userGroupsDump = userGroupsConfigWrapper.dump();
 
@@ -1652,25 +1752,35 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         data: userGroupsDump,
       });
 
-      // TODO add the conversation volatile one with handling of contacts and note to self and reference to `isConvoToStoreInWrapper`
+      const convoVolatileDump = volatileInfoConfigWrapper.dump();
+
+      db.prepare(
+        `INSERT OR REPLACE INTO ${CONFIG_DUMP_TABLE} (
+              publicKey,
+              variant,
+              data
+          ) values (
+            $publicKey,
+            $variant,
+            $data
+          );`
+      ).run({
+        publicKey: publicKeyHex,
+        variant: 'ConvoInfoVolatileConfig',
+        data: convoVolatileDump,
+      });
 
       // TODO we've just created the initial dumps. We have to add an initial SyncJob to the database so it is run on the next app start/
       // or find another way of adding one on the next start (store an another item in the DB and check for it on app start?)
+      // or just start a conf sync job on app start
     } catch (e) {
       console.error(`failed to create initial wrapper: `, e.stack);
+      throw e;
     }
 
-    // db.exec(`ALTER TABLE conversations
-    //   ADD COLUMN lastReadTimestampMs INTEGER;
-    //   ;
-    //     `);
-
     // for manually flagging conversations as :unread"
     db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN markedAsUnread BOOLEAN;`);
 
-    // Didn't find any reference to this serverTimestamp in the unprocessed table needed, so let's clean it up
-    db.exec(`ALTER TABLE unprocessed DROP COLUMN serverTimestamp;`);
-
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 5e95c1377..7270dc543 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -504,6 +504,11 @@ function fetchConvoMemoryDetails(convoId: string): SaveConversationReturn {
   const unreadCount = getUnreadCountByConversation(convoId);
   const lastReadTimestampMessageSentTimestamp = getLastMessageReadInConversation(convoId);
 
+  // TODO it would be nice to be able to remove the lastMessage and lastMessageStatus from the conversation table, and just return it when saving the conversation
+  // and saving it in memory only.
+  // But we'd need to update a bunch of things as we do some logic before setting the lastUpdate text and status mostly in `getMessagePropStatus` and `getNotificationText()`
+  // const lastMessages = getLastMessagesByConversation(convoId, 1) as Array:Record<string, any>>;
+
   return {
     mentionedUs: hasMentionedUsUnread,
     unreadCount,
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 903f12650..44d5dfa65 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -14,6 +14,7 @@ import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJo
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
+import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
 
 let instance: ConversationController | null;
 
@@ -207,12 +208,12 @@ export class ConversationController {
     await deleteAllMessagesByConvoIdNoConfirmation(id);
     window.log.info(`deleteContact messages destroyed: ${id}`);
 
-    // Closed/Medium group leaving
+    // Legacy group leaving
     if (conversation.isClosedGroup()) {
       window.log.info(`deleteContact ClosedGroup case: ${id}`);
       await leaveClosedGroup(conversation.id);
       await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
-      // open group v2
+      await SessionUtilUserGroups.removeLegacyGroupFromWrapper(conversation.id);
     } else if (conversation.isPublic()) {
       window?.log?.info('leaving open group v2', conversation.id);
       // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
@@ -248,7 +249,7 @@ export class ConversationController {
       });
       // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
       // await conversation.setIsApproved(false, false);
-      await conversation.commit();
+      await conversation.commit(); // this updates the wrappers content to reflect the hidden state
 
       // The note to self cannot be removed from the wrapper I suppose, as it must always be there
       // TODO I think we want to mark the contacts as hidden instead of removing them, so maybe keep the volatile info too?
@@ -281,6 +282,7 @@ export class ConversationController {
 
     if (!fromSyncMessage) {
       await ConfigurationSync.queueNewJobIfNeeded();
+      await ConfigurationDumpSync.queueNewJobIfNeeded();
     }
   }
 
@@ -294,10 +296,6 @@ export class ConversationController {
     return this.conversations.models;
   }
 
-  public unsafeDelete(convo: ConversationModel) {
-    this.conversations.remove(convo);
-  }
-
   public async load() {
     if (this.conversations.length) {
       throw new Error('ConversationController: Already loaded!');
@@ -311,7 +309,7 @@ export class ConversationController {
 
         const start = Date.now();
         // TODO make this a switch so we take care of all wrappers and have compilation errors if we forgot to add one.
-        // also keep in mind that the convo volatile one need to run for each convo.
+        // also keep in mind that the convo volatile one need to run for each convo so it must be outside of a `else`
         for (let index = 0; index < convoModels.length; index++) {
           const convo = convoModels[index];
           if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
@@ -330,7 +328,7 @@ export class ConversationController {
             await convo.refreshInMemoryDetails();
           }
         }
-        console.info(`refreshAllWrappersMappedValues took ${Date.now() - start}ms`);
+        window.log.info(`refreshAllWrappersMappedValues took ${Date.now() - start}ms`);
 
         this._initialFetchComplete = true;
         // TODO do we really need to do this?
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index ba3f8696b..c0fda689d 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -62,7 +62,7 @@ function isConvoToStoreInWrapper(convo: ConversationModel): boolean {
   return (
     SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo) || // this checks for community & legacy group
     SessionUtilContact.isContactToStoreInContactsWrapper(convo) || // this checks for contacts
-    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id) // this checks for out own pubkey, as we want to keep track of the read state for the Note To Self
+    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id) // this checks for our own pubkey, as we want to keep track of the read state for the Note To Self
   );
 }
 
@@ -91,7 +91,8 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
   const isForcedUnread = foundConvo.isMarkedUnread();
   const timestampFromDbMs = (await Data.fetchConvoMemoryDetails(convoId))?.lastReadTimestampMessage;
 
-  // TODO not having a last read timestamp fallsback to 0, which keeps the existing value in the wrapper if it is already set (as done in src/convo_info_volatile_config.cpp)
+  // Note: not having a last read timestamp fallsback to 0, which keeps the existing value in the wrapper if it is already set (as done in src/convo_info_volatile_config.cpp)
+  // we actually do the max() of whatever is inside the wrapper and the value from the DB
   const lastReadMessageTimestamp =
     !!timestampFromDbMs && isFinite(timestampFromDbMs) && timestampFromDbMs > 0
       ? timestampFromDbMs
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 3d401e86e..2e663a6a4 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -95,7 +95,6 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
         });
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
-          debugger;
           resolve(true);
         });
       }

From 51df7d80bb87aa13a863bfc420a2071bae5e8afb Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 29 Mar 2023 16:29:09 +1100
Subject: [PATCH 055/178] chore: remove parcel completely and grunt

---
 CONTRIBUTING.md                        |    2 +-
 Gruntfile.js                           |   41 -
 build/grunt.js                         |    2 -
 build/updateLocalConfig.js             |   33 +
 package.json                           |   35 +-
 sass.config.js                         |   41 +
 stylesheets/manifest.scss              |   12 +-
 ts/node/migration/sessionMigrations.ts |    2 +-
 yarn.lock                              | 1721 ++----------------------
 9 files changed, 193 insertions(+), 1696 deletions(-)
 delete mode 100644 Gruntfile.js
 delete mode 100644 build/grunt.js
 create mode 100644 build/updateLocalConfig.js
 create mode 100644 sass.config.js

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c7bd78e4..89aa3676e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,7 +76,7 @@ is no automatic restart mechanism. Alternatively, keep the developer tools open
 
 ```
 yarn build-everything:watch # runs until you stop it, re-generating built assets on file changes
-# Once this command is waiting for changes, you will need to run in another terminal `yarn parcel-util-worker` to fix the "exports undefined" error on start.
+# Once this command is waiting for changes, you will need to run in another terminal `yarn worker:utils && yarn worker:libsession` to fix the "exports undefined" error on start.
 # If you do change the sass while this command is running, it won't pick it up. You need to either run `yarn sass` or have `yarn sass:watch` running in a separate terminal.
 ```
 
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index c92975922..000000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* eslint-disable more/no-then, no-console  */
-
-module.exports = grunt => {
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    gitinfo: {}, // to be populated by grunt gitinfo
-  });
-
-  Object.keys(grunt.config.get('pkg').devDependencies).forEach(key => {
-    if (/^grunt(?!(-cli)?$)/.test(key)) {
-      // ignore grunt and grunt-cli
-      grunt.loadNpmTasks(key);
-    }
-  });
-
-  function updateLocalConfig(update) {
-    const environment = process.env.SIGNAL_ENV || 'production';
-    const configPath = `config/local-${environment}.json`;
-    let localConfig;
-    try {
-      localConfig = grunt.file.readJSON(configPath);
-    } catch (e) {
-      //
-    }
-    localConfig = {
-      ...localConfig,
-      ...update,
-    };
-    grunt.file.write(configPath, `${JSON.stringify(localConfig)}\n`);
-  }
-
-  grunt.registerTask('getCommitHash', () => {
-    grunt.task.requires('gitinfo');
-    const gitinfo = grunt.config.get('gitinfo');
-    const hash = gitinfo.local.branch.current.SHA;
-    updateLocalConfig({ commitHash: hash });
-  });
-
-  grunt.registerTask('date', ['gitinfo']);
-  grunt.registerTask('default', ['date', 'getCommitHash']);
-};
diff --git a/build/grunt.js b/build/grunt.js
deleted file mode 100644
index e60487fb7..000000000
--- a/build/grunt.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// because grunt.cmd is totally flakey on windows
-require('grunt').cli();
diff --git a/build/updateLocalConfig.js b/build/updateLocalConfig.js
new file mode 100644
index 000000000..7b0faf89e
--- /dev/null
+++ b/build/updateLocalConfig.js
@@ -0,0 +1,33 @@
+var fs = require('fs');
+var _ = require('lodash');
+var execSync = require('child_process').execSync;
+
+const updateLocalConfig = () => {
+  var environment = process.env.SIGNAL_ENV || 'production';
+  var configPath = `config/local-${environment}.json`;
+  var localConfig;
+
+  var hash = '';
+  try {
+    // TODO make sure that this works well on windows and macOS builds
+    var stdout = execSync('git rev-parse HEAD').toString();
+    console.info('"git rev-parse HEAD" result: ', stdout && stdout.trim());
+
+    if (!_.isEmpty(stdout)) {
+      hash = stdout.trim();
+    }
+    var rawdata = fs.readFileSync(configPath);
+    localConfig = JSON.parse(rawdata);
+  } catch (e) {
+    console.error('updateLocalConfig failed with', e.message);
+  }
+
+  localConfig = {
+    ...localConfig,
+    commitHash: hash,
+  };
+  var toWrite = `${JSON.stringify(localConfig)}\n`;
+  fs.writeFileSync(configPath, toWrite);
+};
+
+updateLocalConfig();
diff --git a/package.json b/package.json
index 244295f2e..470ab2d98 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,6 @@
     "url": "https://github.com/oxen-io/session-desktop.git"
   },
   "main": "ts/mains/main_node.js",
-  "targets": {
-    "sass": {
-      "source": "stylesheets/manifest.scss",
-      "distDir": "stylesheets/dist/",
-      "optimize": true,
-      "sourceMap": true
-    }
-  },
   "resolutions": {
     "minimist": "^1.2.6",
     "getobject": "^1.0.0",
@@ -39,12 +31,11 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
-    "build-everything": "yarn clean && yarn protobuf && grunt && yarn sass && tsc && yarn worker:utils && yarn worker:libsession",
-    "build-everything:watch": "yarn clean && yarn protobuf && grunt && yarn sass && yarn worker:utils && yarn worker:libsession && tsc -w",
-    "watch": "yarn clean && yarn protobuf && grunt && concurrently 'yarn build-everything:watch' 'yarn sass:watch'",
+    "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn worker:utils && yarn worker:libsession",
+    "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn worker:utils && yarn worker:libsession && tsc -w",
+    "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
-    "sass": "rimraf 'stylesheets/dist/' && parcel build --target sass --no-autoinstall --no-cache",
-    "sass:watch": "rimraf 'stylesheets/dist/' && parcel watch --target sass --no-autoinstall --no-cache",
+    "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
     "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
@@ -68,6 +59,7 @@
     "ready": "yarn build-everything && yarn lint-full && yarn test",
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps && yarn rebuild-curve25519-js",
     "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../",
+    "update-git-info": "node ./build/updateLocalConfig.js",
     "worker:utils": "webpack  --config=./utils.worker.config.js",
     "worker:libsession": "webpack  --config=./libsession.worker.config.js"
   },
@@ -102,13 +94,11 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "jsbn": "1.1.0",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
-    "minimist": "^1.2.6",
     "moment": "^2.29.4",
     "mustache": "2.3.0",
     "nan": "2.14.2",
@@ -145,7 +135,6 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@parcel/transformer-sass": "2.5.0",
     "@playwright/test": "1.16.3",
     "@types/backbone": "1.4.2",
     "@types/better-sqlite3": "7.4.0",
@@ -205,20 +194,13 @@
     "eslint-plugin-more": "^1.0.5",
     "events": "^3.3.0",
     "file-loader": "^6.2.0",
-    "grunt": "1.5.3",
-    "grunt-cli": "1.4.3",
-    "grunt-contrib-concat": "2.1.0",
-    "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-watch": "1.1.0",
-    "grunt-exec": "3.0.0",
-    "grunt-gitinfo": "0.1.9",
     "jsdom": "^19.0.0",
     "jsdom-global": "^3.0.2",
+    "mini-css-extract-plugin": "^2.7.5",
     "mocha": "10.0.0",
     "node-gyp": "9.0.0",
     "node-loader": "^2.0.0",
     "nyc": "^15.1.0",
-    "parcel": "2.5.0",
     "patch-package": "^6.4.7",
     "playwright": "1.16.3",
     "postcss-loader": "^7.0.2",
@@ -226,7 +208,8 @@
     "prettier": "1.19.0",
     "process": "^0.11.10",
     "run-script-os": "^1.1.6",
-    "sass-loader": "^13.2.0",
+    "sass": "^1.60.0",
+    "sass-loader": "^13.2.2",
     "sinon": "9.0.2",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
@@ -235,7 +218,7 @@
     "tslint-microsoft-contrib": "6.0.0",
     "tslint-react": "3.6.0",
     "typescript": "^4.6.3",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.3",
     "webpack-cli": "^5.0.1"
   },
   "engines": {
diff --git a/sass.config.js b/sass.config.js
new file mode 100644
index 000000000..9c689eb4e
--- /dev/null
+++ b/sass.config.js
@@ -0,0 +1,41 @@
+const path = require('path');
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const sass = require('sass'); // Prefer `dart-sass`
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+module.exports = {
+  output: {
+    path: path.resolve(__dirname, 'stylesheets', 'dist'),
+  },
+  entry: './stylesheets/manifest.scss',
+  mode: 'production',
+
+  module: {
+    rules: [
+      {
+        test: /\.s[ac]ss$/i,
+        use: [
+          // Creates `main.css` compiling all of the compiled css files
+          MiniCssExtractPlugin.loader,
+          // Translates CSS into CommonJS
+          'css-loader',
+          // Compiles Sass to CSS
+          {
+            loader: 'sass-loader',
+            options: {
+              implementation: sass,
+            },
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [].concat(
+    new MiniCssExtractPlugin({
+      filename: 'manifest.css',
+    })
+  ),
+};
diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss
index 65e16951a..02ba94536 100644
--- a/stylesheets/manifest.scss
+++ b/stylesheets/manifest.scss
@@ -1,11 +1,11 @@
 // Modules
-@import '../node_modules/react-h5-audio-player/lib/styles.css';
-@import '../node_modules/react-contexify/dist/ReactContexify.min.css';
-@import '../node_modules/react-toastify/dist/ReactToastify.css';
+@import 'react-h5-audio-player/lib/styles.css';
+@import 'react-contexify/dist/ReactContexify.min.css';
+@import 'react-toastify/dist/ReactToastify.css';
 
-@import '../node_modules/sanitize.css/sanitize.css';
-@import '../node_modules/sanitize.css/forms.css';
-@import '../node_modules/sanitize.css/typography.css';
+@import 'sanitize.css/sanitize.css';
+@import 'sanitize.css/forms.css';
+@import 'sanitize.css/typography.css';
 
 // Global Settings and Mixins
 @import 'session_constants';
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 74605cad5..29ded3106 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1775,7 +1775,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       // or just start a conf sync job on app start
     } catch (e) {
       console.error(`failed to create initial wrapper: `, e.stack);
-      throw e;
+      // if we get an exception here, most likely no users are logged in yet. We can just continue the transaction and the wrappers will be created when a user creates a new account.
     }
 
     // for manually flagging conversations as :unread"
diff --git a/yarn.lock b/yarn.lock
index 3c138c332..c60e82d79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -840,57 +840,6 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@lezer/common@^0.15.0", "@lezer/common@^0.15.7":
-  version "0.15.12"
-  resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.15.12.tgz#2f21aec551dd5fd7d24eb069f90f54d5bc6ee5e9"
-  integrity sha512-edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig==
-
-"@lezer/lr@^0.15.4":
-  version "0.15.8"
-  resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.15.8.tgz#1564a911e62b0a0f75ca63794a6aa8c5dc63db21"
-  integrity sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==
-  dependencies:
-    "@lezer/common" "^0.15.0"
-
-"@mischnic/json-sourcemap@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz#38af657be4108140a548638267d02a2ea3336507"
-  integrity sha512-dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA==
-  dependencies:
-    "@lezer/common" "^0.15.7"
-    "@lezer/lr" "^0.15.4"
-    json5 "^2.2.1"
-
-"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.0.2.tgz#01e3669b8b2dc01f6353f2c87e1ec94faf52c587"
-  integrity sha512-FMX5i7a+ojIguHpWbzh5MCsCouJkwf4z4ejdUY/fsgB9Vkdak4ZnoIEskOyOUMMB4lctiZFGszFQJXUeFL8tRg==
-
-"@msgpackr-extract/msgpackr-extract-darwin-x64@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.0.2.tgz#5ca32f16e6f1b7854001a1a2345b61d4e26a0931"
-  integrity sha512-DznYtF3lHuZDSRaIOYeif4JgO0NtO2Xf8DsngAugMx/bUdTFbg86jDTmkVJBNmV+cxszz6OjGvinnS8AbJ342g==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm64@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.0.2.tgz#ff629f94379981bf476dffb1439a7c1d3dba2d72"
-  integrity sha512-b0jMEo566YdM2K+BurSed7bswjo3a6bcdw5ETqoIfSuxKuRLPfAiOjVbZyZBgx3J/TAM/QrvEQ/VN89A0ZAxSg==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.0.2.tgz#5f6fd30d266c4a90cf989049c7f2e50e5d4fcd4c"
-  integrity sha512-Gy9+c3Wj+rUlD3YvCZTi92gs+cRX7ZQogtwq0IhRenloTTlsbpezNgk6OCkt59V4ATEWSic9rbU92H/l7XsRvA==
-
-"@msgpackr-extract/msgpackr-extract-linux-x64@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.0.2.tgz#167faa553b9dbffac8b03bf27de9b6f846f0e1bc"
-  integrity sha512-zrBHaePwcv4cQXxzYgNj0+A8I1uVN97E7/3LmkRocYZ+rMwUsnPpp4RuTAHSRoKlTQV3nSdCQW4Qdt4MXw/iHw==
-
-"@msgpackr-extract/msgpackr-extract-win32-x64@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.0.2.tgz#baea7764b1adf201ce4a792fe971fd7211dad2e4"
-  integrity sha512-fpnI00dt+yO1cKx9qBXelKhPBdEgvc8ZPav1+0r09j0woYQU2N79w/jcGawSY5UGlgQ3vjaJsFHnGbGvvqdLzg==
-
 "@npmcli/fs@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
@@ -907,627 +856,6 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@parcel/bundler-default@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/bundler-default/-/bundler-default-2.5.0.tgz#1f0b6d4893bb1a24f49fc7254a423134fb03741e"
-  integrity sha512-7CJzE17SirCXjcRgBcnqWO/5EOA1raq/3OIKtT4cxbjpDQGHZpjpEEZiMNRpEpdNMxDSlsG8mAkXTYGL2VVWRw==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/cache@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.5.0.tgz#957620b1b26bfd4f9bd7256ea25ef86e7d6f2816"
-  integrity sha512-3kOO3cZQv0FAKhrMHGLdb4Qtzpmy78Q6jPN3u8eCY4yqeDTnyQBZvWNHoyCm5WlmL8y6Q6REYMbETLxSH1ggAQ==
-  dependencies:
-    "@parcel/fs" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    lmdb "2.2.4"
-
-"@parcel/codeframe@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.5.0.tgz#de73dcd69a36e9d0fed1f4361cabfd83df13244a"
-  integrity sha512-qafqL8Vu2kr932cCWESoDEEoAeKVi7/xdzTBuhzEJng1AfmRT0rCbt/P4ao3RjiDyozPSjXsHOqM6GDZcto4eQ==
-  dependencies:
-    chalk "^4.1.0"
-
-"@parcel/compressor-raw@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/compressor-raw/-/compressor-raw-2.5.0.tgz#8675d7474b84920e1e4682a5bbd9b417ebfc0bc5"
-  integrity sha512-I5Zs+2f1ue4sTPdfT8BNsLfTZl48sMWLk2Io3elUJjH/SS9kO7ut5ChkuJtt77ZS35m0OF+ZCt3ICTJdnDG8eA==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-
-"@parcel/config-default@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/config-default/-/config-default-2.5.0.tgz#31caa12f6d37f3ae1df68e639dc276039f927603"
-  integrity sha512-r30V61958SONvP9I8KV8s44ZOFq0H219VyFjPysraSabHjZ+KMaCTQOuqaDtUMa272sHUQkBcZxKYj5jYPJlZg==
-  dependencies:
-    "@parcel/bundler-default" "2.5.0"
-    "@parcel/compressor-raw" "2.5.0"
-    "@parcel/namer-default" "2.5.0"
-    "@parcel/optimizer-css" "2.5.0"
-    "@parcel/optimizer-htmlnano" "2.5.0"
-    "@parcel/optimizer-image" "2.5.0"
-    "@parcel/optimizer-svgo" "2.5.0"
-    "@parcel/optimizer-terser" "2.5.0"
-    "@parcel/packager-css" "2.5.0"
-    "@parcel/packager-html" "2.5.0"
-    "@parcel/packager-js" "2.5.0"
-    "@parcel/packager-raw" "2.5.0"
-    "@parcel/packager-svg" "2.5.0"
-    "@parcel/reporter-dev-server" "2.5.0"
-    "@parcel/resolver-default" "2.5.0"
-    "@parcel/runtime-browser-hmr" "2.5.0"
-    "@parcel/runtime-js" "2.5.0"
-    "@parcel/runtime-react-refresh" "2.5.0"
-    "@parcel/runtime-service-worker" "2.5.0"
-    "@parcel/transformer-babel" "2.5.0"
-    "@parcel/transformer-css" "2.5.0"
-    "@parcel/transformer-html" "2.5.0"
-    "@parcel/transformer-image" "2.5.0"
-    "@parcel/transformer-js" "2.5.0"
-    "@parcel/transformer-json" "2.5.0"
-    "@parcel/transformer-postcss" "2.5.0"
-    "@parcel/transformer-posthtml" "2.5.0"
-    "@parcel/transformer-raw" "2.5.0"
-    "@parcel/transformer-react-refresh-wrap" "2.5.0"
-    "@parcel/transformer-svg" "2.5.0"
-
-"@parcel/core@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/core/-/core-2.5.0.tgz#13f60be9124a6a3e33aff32715acfc5ebade9dd2"
-  integrity sha512-dygDmPsfAYJKTnUftcbEzjCik7AAaPbFvJW8ETYz8diyjkAG9y6hvCAZIrJE5pNOjFzg32en4v4UWv8Sqlzl9g==
-  dependencies:
-    "@mischnic/json-sourcemap" "^0.1.0"
-    "@parcel/cache" "2.5.0"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/events" "2.5.0"
-    "@parcel/fs" "2.5.0"
-    "@parcel/graph" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/package-manager" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    "@parcel/workers" "2.5.0"
-    abortcontroller-polyfill "^1.1.9"
-    base-x "^3.0.8"
-    browserslist "^4.6.6"
-    clone "^2.1.1"
-    dotenv "^7.0.0"
-    dotenv-expand "^5.1.0"
-    json5 "^2.2.0"
-    msgpackr "^1.5.4"
-    nullthrows "^1.1.1"
-    semver "^5.7.1"
-
-"@parcel/css-darwin-arm64@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.8.3.tgz#cd74e2441c89743b22ab61e88e8151222dad591c"
-  integrity sha512-qh/Ig6GfVjGoiGSWjIYDo6Ghwmyy/9BXvYS1l3R+Bp50F300cq84Czfl6wxaL+aFmghdHzhjJuGfWmZlcYliPA==
-
-"@parcel/css-darwin-x64@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.8.3.tgz#4f11b3e35fc3ef14b608fef324f6b1eff902d671"
-  integrity sha512-gTUIoRgwyYr4UuH7sSn3gOuMlIshJBOJLmjL+E/mR5lqdYabguiKiRORvkrnb/gHBmOUF9re0RcTaFmJ2VOAlg==
-
-"@parcel/css-linux-arm-gnueabihf@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.8.3.tgz#f176838487b686da5734d9f52bb56c051dda610e"
-  integrity sha512-4P1r0BvL9dPz70py2xLg/jEvWJmKNyokPgafyrDP+GbpPTfH5NYJJkVRGo/TkKsp3Rv8SJhV9fdlpFKC6BI92A==
-
-"@parcel/css-linux-arm64-gnu@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.8.3.tgz#8a9cbacf3bd730400ceb2a6736c5e1741986ba2b"
-  integrity sha512-1fUy94eaqdzum+C7bsYVF2AgxjLGR/qppArn/4HTQyydHR5QeV+Uoyqo5vdnO5Vclj8eQwlgR9OyAOlmzXxFDA==
-
-"@parcel/css-linux-arm64-musl@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.8.3.tgz#35c5f1128469458d71b675b42cbd2f06ddfe5797"
-  integrity sha512-ct1QRK5gAP8sO22NZ7RULZQB7dbHpou+WMa4z0LJb+Fho13a1JNw931vNHbeI5cRr1fCTDq76pz/+Valgetzcw==
-
-"@parcel/css-linux-x64-gnu@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.8.3.tgz#fa87fd53aa0481e028f6da0ecad94794f58207aa"
-  integrity sha512-pg/mahoogzjbaZcW76rrTZ64tEu8Wok4Gm0sW/dXHJEJD2QVJ6GxLP4UVNBuhaV0GrNFHggp9pcdhTtLGkKl/g==
-
-"@parcel/css-linux-x64-musl@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.8.3.tgz#b0df1a3f2edbcf77c056ad03fc78f3cf9449caf1"
-  integrity sha512-4Iwawy28HQ2yAgbuyR60bgO+8oE+OiWpE02eNjbgqnDpTsfmXFMt4l5OYgZwJJ7DlaZqm+/yO8RPMd+EzwtNzg==
-
-"@parcel/css-win32-x64-msvc@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.8.3.tgz#8719e890a5c0969ca26968b15ffa8e2a20dbe10a"
-  integrity sha512-vnHUdzIVjqONa5ALFzMJ3ZHt6NiaYTHW/lqzP+AR4l+bq+UTXD2Q75/RgirY5NYwdfy1VPy/jI82jAtLOCymkw==
-
-"@parcel/css@^1.8.1":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.8.3.tgz#9f06319011a957568e98ede0cf657cb38ea24247"
-  integrity sha512-6qUN4iicr8f9Q6UUZttwwHMzrb65BRX46PHWq0icA4KEmvmfR9cSYlp/hJH8F4stg3Wncx12Bnw+EuPf5OAEPQ==
-  dependencies:
-    detect-libc "^1.0.3"
-  optionalDependencies:
-    "@parcel/css-darwin-arm64" "1.8.3"
-    "@parcel/css-darwin-x64" "1.8.3"
-    "@parcel/css-linux-arm-gnueabihf" "1.8.3"
-    "@parcel/css-linux-arm64-gnu" "1.8.3"
-    "@parcel/css-linux-arm64-musl" "1.8.3"
-    "@parcel/css-linux-x64-gnu" "1.8.3"
-    "@parcel/css-linux-x64-musl" "1.8.3"
-    "@parcel/css-win32-x64-msvc" "1.8.3"
-
-"@parcel/diagnostic@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.5.0.tgz#8c6891924e04b625d50176aae141d24dc8dddf87"
-  integrity sha512-KiMGGRpEV7wl5gjcxBKcgX84a+cG+IEn94gwy5LK3lENR09nuKShqqgKGAmj/17CobJgw1QNP94/H4Md+oxIWg==
-  dependencies:
-    "@mischnic/json-sourcemap" "^0.1.0"
-    nullthrows "^1.1.1"
-
-"@parcel/events@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.5.0.tgz#5e108a01a5aa3075038d2a2081fde0432d2559e7"
-  integrity sha512-Gc2LPwL1H34Ony5MENbKZg7wvCscZ4x9y7Fu92sfbdWpLo3K13hVtsX3TMIIgYt3B7R7OmO8yR880U2T+JfVkQ==
-
-"@parcel/fs-search@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.5.0.tgz#d96b7c46c2326398e52c9c14cdd07559d598436d"
-  integrity sha512-uBONkz9ZCNSOqbPGWJY3MNl+pqBTfvzHH9+4UhzHEHPArvK2oD0+syYPVE60+zGrxybXTESYMCJp4bHvH6Z2hA==
-  dependencies:
-    detect-libc "^1.0.3"
-
-"@parcel/fs@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.5.0.tgz#2bcb6ccf43826f2bfca9e1ca644be3bf5252c400"
-  integrity sha512-YYr14BWtx/bJ+hu6PPQQ6G/3omOTWgVqEw+UFI3iQH3P6+e0LRXW/Ja1yAcJeepGcTwIP0opnXZBQOm8PBQ2SA==
-  dependencies:
-    "@parcel/fs-search" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    "@parcel/watcher" "^2.0.0"
-    "@parcel/workers" "2.5.0"
-
-"@parcel/graph@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/graph/-/graph-2.5.0.tgz#bd8898d555366a4b261766e22c8652ad869efaff"
-  integrity sha512-qa2VtG08dJyTaWrxYAkMIlkoDRSPoiqLDNxxHKplkcxAjXBUw0/AkWaz82VO5r1G6jfOj+nM30ajH9uygZYwbw==
-  dependencies:
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/hash@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.5.0.tgz#f2a05f7090f8f27ce8b53afd6272183763101ba7"
-  integrity sha512-47JL0XpB7UvIW6Ijf8vv+yVMt9dLvB/lRlBHFmAkmovisueVMVbYD7smxVZnCSehD8UH8BcymKbMzyL5dimgoQ==
-  dependencies:
-    detect-libc "^1.0.3"
-    xxhash-wasm "^0.4.2"
-
-"@parcel/logger@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.5.0.tgz#c618b780b80984d821c5bc53f27527fd540f4d0f"
-  integrity sha512-pT1L3ceH6trL1N3I3r2HawPjz/PCubOo/Kazu7IeXsMsKVjj1a6AeieZHzkNZIbhiGPtm/cHbBNLz2zTWDLeOA==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/events" "2.5.0"
-
-"@parcel/markdown-ansi@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.5.0.tgz#e0751d6c8fcd0aa4c8ee0a08d27e9d4d64705410"
-  integrity sha512-ixkNF3KWIqxMlfxTe9Gb2cp/uNmklQev8VEUxujMVxmUfGyQs4859zdJIQlIinabWYhArhsXATkVf3MzCUN6TQ==
-  dependencies:
-    chalk "^4.1.0"
-
-"@parcel/namer-default@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/namer-default/-/namer-default-2.5.0.tgz#1e1950a74aca825a753c9aa8e8c37dfb46ef7ef3"
-  integrity sha512-ahGQqHJzsWE5Qux8zXMAU+lyNBOl+ZpcOFzRGE2DWOsmAlytsHl7DBVCQvzUyNBFg1/HmIj+7D4efv2kjR7rTg==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/node-resolver-core@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/node-resolver-core/-/node-resolver-core-2.5.0.tgz#4aaf5c8eb57b56d1257ca02cae5b88be790be6bd"
-  integrity sha512-XQvpguiIwQcu75cscLDFOVhjsjuPzXbuMaaZ7XxxUEl0PscIgu/GfKYxTfTruN3cRl+CaQH6qBAMfjLaFng6lQ==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/optimizer-css@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/optimizer-css/-/optimizer-css-2.5.0.tgz#4f64bd0aa29727802b29eaea31aedfbb15ead5e9"
-  integrity sha512-J00bLF+4SsnKc+YbYrNuBr44/zz3cg++CoXteXhH27PxP1rScGQx36Rui8WORgil5mlX2VYN79DuqJC7V3Ynbg==
-  dependencies:
-    "@parcel/css" "^1.8.1"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    browserslist "^4.6.6"
-    nullthrows "^1.1.1"
-
-"@parcel/optimizer-htmlnano@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.5.0.tgz#ffd8b3ef16300f957209cf20e7908a81d6f5b4af"
-  integrity sha512-Fr0zPqgxoNaOVdROAjNGDWCts3+wByNQ82Mxhu8Tzc25A2cPjcr1H2sa/TE3hf79c92DxdKf2FaC1ZOgR5YPdg==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    htmlnano "^2.0.0"
-    nullthrows "^1.1.1"
-    posthtml "^0.16.5"
-    svgo "^2.4.0"
-
-"@parcel/optimizer-image@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/optimizer-image/-/optimizer-image-2.5.0.tgz#c80a463bf1dd82782a1f80504c8d660ec7917bc0"
-  integrity sha512-nbo2pdnAt21WLGjzTpsE8ZEL0xNoP7c3wBj9y70Pysmasg1SrRVCbfE8jTy+lHBQwq2yjC6lV/Usv+9lfA7S/w==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    "@parcel/workers" "2.5.0"
-    detect-libc "^1.0.3"
-
-"@parcel/optimizer-svgo@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/optimizer-svgo/-/optimizer-svgo-2.5.0.tgz#b1c809aa2fbf9229dc3cb62bab399b4576fd8b35"
-  integrity sha512-pgZqwU0RLc/wr4WcQY/W1GJmddnEANDEpz1mdppUOqBz1EfTQ7zh5NgUA3hV1i05Hbecp3mHSvXJPV0mhNOl5Q==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    svgo "^2.4.0"
-
-"@parcel/optimizer-terser@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/optimizer-terser/-/optimizer-terser-2.5.0.tgz#16b3320b34135edac69751ab2f3537a346133086"
-  integrity sha512-PZ3UHBGfjE49/Jloopsd38Hxg4qzsrdepWP53mCuVP7Aw605Y4QtYuB1ho3VV0oXfKQVq+uI7lVIBsuW4K6vqA==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-    terser "^5.2.0"
-
-"@parcel/package-manager@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.5.0.tgz#9c82236e4e0fa158008b5bc5298def1085913b30"
-  integrity sha512-zTuF55/lITUjw9dUU/X0HiF++589xbPXw/zUiG9T6s8BQThLvrxAhYP89S719pw7cTqDimGkTxnIuK+a0djEkg==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/fs" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    "@parcel/workers" "2.5.0"
-    semver "^5.7.1"
-
-"@parcel/packager-css@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/packager-css/-/packager-css-2.5.0.tgz#54e36cfee9b32a8be05db7e3a2c37b28f26fa0d1"
-  integrity sha512-c0mGBFdVSPhAxaX3+zN8KEIqOOUhkIPKbZex1pnGYfy03Qe2/Mb4nyt5DAGlw9gjka1UCHIN/wszLmKC8YyUeg==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/packager-html@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/packager-html/-/packager-html-2.5.0.tgz#c390ca232753d6df73cdae7eff6f96ab6c973600"
-  integrity sha512-ZFGUPRMWKrm8kQHdkEJ5S22C05qpSymx+o+57EfuNjCrGyj3M59WyGYYXYJ175bFYZ/jp5yy+VxMh6fZefe+Pw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-    posthtml "^0.16.5"
-
-"@parcel/packager-js@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/packager-js/-/packager-js-2.5.0.tgz#3a696207587f57bf5e0c93b2e36db0758f896bea"
-  integrity sha512-aJAKOTgXdxO3V9O7+2DCVOtne128WwXmUAOVThnMRo7f3zMVSAR7Mxc9pEsuTzPfj8UBXgFBRfdJUSCgsMxiSw==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    globals "^13.2.0"
-    nullthrows "^1.1.1"
-
-"@parcel/packager-raw@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/packager-raw/-/packager-raw-2.5.0.tgz#ce0103c26667c93e5c04eda92691363e93aecb1a"
-  integrity sha512-aHV0oogeiqxhxS1lsttw15EvG3DDWK3FV7+F+7hoaAy+xg89K56NTp6j43Jtw9iyU1/HnZRGBE2hF3C7N73oKw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-
-"@parcel/packager-svg@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/packager-svg/-/packager-svg-2.5.0.tgz#c6c62cc534ca4107bb724d81dc872ed64faa304d"
-  integrity sha512-XSMFn30K/kpjcPpQqt88GmPJsNUSVL3RNeigXkIAcLpfO6Tb2eV4iOt4yVCagaDrRJ19alXut0TxjMm5bm41/g==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    posthtml "^0.16.4"
-
-"@parcel/plugin@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.5.0.tgz#ae24d9a709581483e0d494a9e09100f0e40956cf"
-  integrity sha512-obtb6/Gql6YFQ86bdv75A2Noabx8679reFZeyfKKf0L7Lppx4DFQetXwM9XVy7Gx6hJ1Ekm3UMuuIyVJk33YHQ==
-  dependencies:
-    "@parcel/types" "2.5.0"
-
-"@parcel/reporter-cli@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/reporter-cli/-/reporter-cli-2.5.0.tgz#f64ab15f5faef9c017ea67bf3378343684f267f3"
-  integrity sha512-miJt2YbRJBmYSVeoUWUj8YL85Pwj1CmGQB0/btqhulGLH/Fvkbv6T4sJ4gl4l5xIt9mJQsZ70pOWwa8BId3rWw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    chalk "^4.1.0"
-    term-size "^2.2.1"
-
-"@parcel/reporter-dev-server@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/reporter-dev-server/-/reporter-dev-server-2.5.0.tgz#043daa2116358d8f806a89d4a7385fe9555a089f"
-  integrity sha512-wvxAiW42AxJ3B8jtvowJcP4/cTV8zY48SfKg61YKYu1yUO+TtyJIjHQzDW2XuT34cIGFY97Gr0i+AVu44RyUuQ==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-
-"@parcel/resolver-default@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/resolver-default/-/resolver-default-2.5.0.tgz#b107c59b4f8bbb013091916f349f5fc58e5dfab9"
-  integrity sha512-39PkZpVr/+iYS11u+lA84vIsKm/yisltTVmUjlYsDnExiuV1c8OSbSdYZ3JMx+7CYPE0bWbosX2AGilIwIMWpQ==
-  dependencies:
-    "@parcel/node-resolver-core" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-
-"@parcel/runtime-browser-hmr@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.5.0.tgz#5da8b803cc6bd8a0aac143521ea709f2d13a403f"
-  integrity sha512-oPAo8Zf06gXCpt41nyvK7kv2HH1RrHAGgOqttyjStwAFlm5MZKs7BgtJzO58LfJN8g3sMY0cNdG17fB/4f8q6Q==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-
-"@parcel/runtime-js@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/runtime-js/-/runtime-js-2.5.0.tgz#270369beef008f72e2c0814022f573817a12dba1"
-  integrity sha512-gPC2PbNAiooULP71wF5twe4raekuXsR1Hw/ahITDoqsZdXHzG3CkoCjYL3CkmBGiKQgMMocCyN1E2oBzAH8Kyw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/runtime-react-refresh@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.5.0.tgz#fc74342d77848ea61f364246df70673e83b5430f"
-  integrity sha512-+8RuDKFdFYIQTrXG4MRhG9XqkkYEHn0zxKyOJ/IkDDfSEhY0na+EyhrneFUwIvDX63gLPkxceXAg0gwBqXPK/Q==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    react-refresh "^0.9.0"
-
-"@parcel/runtime-service-worker@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/runtime-service-worker/-/runtime-service-worker-2.5.0.tgz#609ea02b27cae378f7d9f54820384f7e3494a749"
-  integrity sha512-STuDlU0fPXeWpAmbayY7o04F0eHy6FTOFeT5KQ0PTxtdEa3Ey8QInP/NVE52Yv0aVQtesWukGrNEFCERlkbFRw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/source-map@^2.0.0":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@parcel/source-map/-/source-map-2.0.5.tgz#7dabcea0890914c390b8cf32e208d3f667e1ff38"
-  integrity sha512-DRVlCFKLpqBSIbMxUoVlHgfiv12HTW/U7nnhzw52YgzDVXUX9OA41dXS1PU0pJ1si+D1k8msATUC+AoldN43mg==
-  dependencies:
-    detect-libc "^1.0.3"
-
-"@parcel/transformer-babel@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-babel/-/transformer-babel-2.5.0.tgz#f7f7563a2be9e8bccf7ef48dc61ef8b7be1c0ff0"
-  integrity sha512-EFb866C9jCoBHIcebWF7goAcYj1wkObx0GDxshlazFtvym1RM27xSWWjRYyqb5+HNOxB3voaNvQOVjcD+DXjCA==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    browserslist "^4.6.6"
-    json5 "^2.2.0"
-    nullthrows "^1.1.1"
-    semver "^5.7.0"
-
-"@parcel/transformer-css@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-css/-/transformer-css-2.5.0.tgz#8cbe2bd7299a8ef7a965b315da488dcbba1c43d3"
-  integrity sha512-p8FOvKWWSbS6H8PbD9a0KZqyaKNpSD2BUTzSRYnNj3TBUv7/ZXaP6Om295XTQ/MPht1o7XTQzvfpF/7yEhr02Q==
-  dependencies:
-    "@parcel/css" "^1.8.1"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    browserslist "^4.6.6"
-    nullthrows "^1.1.1"
-
-"@parcel/transformer-html@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-html/-/transformer-html-2.5.0.tgz#665fecbcb05cf1a4148e752ab99bfaeabfa31051"
-  integrity sha512-iEjNyAF0wQmY3DMw7FS+UzoOMng76UsSngh+WWA1E5lv5XyqrP8Mk2QLTJp1nWetUhSLhZr58LGmPYBTB4l9ZQ==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    nullthrows "^1.1.1"
-    posthtml "^0.16.5"
-    posthtml-parser "^0.10.1"
-    posthtml-render "^3.0.0"
-    semver "^5.7.1"
-
-"@parcel/transformer-image@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-image/-/transformer-image-2.5.0.tgz#c0523ea88fb4b6ae18fc7c65b08a5ba6dcd23abd"
-  integrity sha512-vVEXTHZl8m/9yopgK0dWHLOQX2zOnghq6pZnWdWVG6fsvXZln7kP1YN5iwWDoADQYkiKzP+Ymn6UwP9pZpHFzA==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/workers" "2.5.0"
-    nullthrows "^1.1.1"
-
-"@parcel/transformer-js@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-js/-/transformer-js-2.5.0.tgz#268a6d34898d7c6515c5a64bae535d2c1a7f57a0"
-  integrity sha512-Cp8Ic+Au3OcskCRZszmo47z3bqcZ7rfPv2xZYXpXY2TzEc3IV0bKje57bZektoY8LW9LkYM9iBO/WhkVoT6LIg==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/utils" "2.5.0"
-    "@parcel/workers" "2.5.0"
-    "@swc/helpers" "^0.3.6"
-    browserslist "^4.6.6"
-    detect-libc "^1.0.3"
-    nullthrows "^1.1.1"
-    regenerator-runtime "^0.13.7"
-    semver "^5.7.1"
-
-"@parcel/transformer-json@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-json/-/transformer-json-2.5.0.tgz#9406b8f0cdd58e65f20fd381a75ece64d346858d"
-  integrity sha512-661sByA7TkR6Lmxt+hqV4h2SAt+7lgc58DzmUYArpEl1fQnMuQuaB0kQeHzi6fDD2+2G6o7EC+DuwBZKa479TA==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    json5 "^2.2.0"
-
-"@parcel/transformer-postcss@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-postcss/-/transformer-postcss-2.5.0.tgz#bff3a36d5a1eb1af4b8c73b9fe5dc50804e449fa"
-  integrity sha512-IPNlWElekdQHMTBqhdwJNBCQomuYyo7xgNBdnTrt9VJ+R5ihy6n7ZJSWIAJXAH9VZxETTtunfrzRtgkmtjTeZQ==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    clone "^2.1.1"
-    nullthrows "^1.1.1"
-    postcss-value-parser "^4.2.0"
-    semver "^5.7.1"
-
-"@parcel/transformer-posthtml@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-posthtml/-/transformer-posthtml-2.5.0.tgz#d4c6558b0443ce94ec5ca823c265ebdf05f3af08"
-  integrity sha512-AZxg1XD8OXOS4bEGEmBBR+X9T9qoFdVsbVUg498zzejYSka1ZQHF7TgLI/+pUnE+ZVYNIp7/G0xXqsRVKMKmdQ==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    nullthrows "^1.1.1"
-    posthtml "^0.16.5"
-    posthtml-parser "^0.10.1"
-    posthtml-render "^3.0.0"
-    semver "^5.7.1"
-
-"@parcel/transformer-raw@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-raw/-/transformer-raw-2.5.0.tgz#5561945e2fd220ac38c0a21aad72175377d048bc"
-  integrity sha512-I3zjE1u9+Wj90Qqs1V2FTm6iC6SAyOVUthwVZkZey+qbQG/ok682Ez2XjLu7MyQCo9BJNwF/nfOa1hHr3MaJEQ==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-
-"@parcel/transformer-react-refresh-wrap@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.5.0.tgz#e1ef71218efb21a78677e8770fb6bcf753caf35c"
-  integrity sha512-VPqVBxhTN4OQwcjsdyxrv+smjAm4s6dbSWAplgPwdOITMv+a0tjhhJU37WnRC+xxTrbEqRcOt96JvGOkPb8i7g==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    react-refresh "^0.9.0"
-
-"@parcel/transformer-sass@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-sass/-/transformer-sass-2.5.0.tgz#bc3f84b84a8c05946cc6981ef6b873cf30638541"
-  integrity sha512-tio+LcQvP2RUt2SqBPpxGvEJGeYyLjT87xKPuvYRmQ38h/FjG2j7WgvcHgii02YkZNyajCmMIoGwVYgovm5+bw==
-  dependencies:
-    "@parcel/plugin" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    sass "^1.38.0"
-
-"@parcel/transformer-svg@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-svg/-/transformer-svg-2.5.0.tgz#78fd321e395923f720a886cb5b5c4fae7101c6b3"
-  integrity sha512-zCGJcrCpICFe0Q/dgjQZfW7sYFkbJEC7NGT4zEJnMo8Cm/kq8Qh6+2ApX6c+vv5Q0WZn5Ic+N0OvxIMkvgdC/w==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/plugin" "2.5.0"
-    nullthrows "^1.1.1"
-    posthtml "^0.16.5"
-    posthtml-parser "^0.10.1"
-    posthtml-render "^3.0.0"
-    semver "^5.7.1"
-
-"@parcel/types@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.5.0.tgz#e3818d4358f849ac2593605b98366b8e156ab533"
-  integrity sha512-bA0fhG6aXSGYEVo5Dt96x6lseUQHeVZVzgmiRdZsvb614Gvx22ItfaKhPmAVbM9vzbObZDHl9l9G2Ovw8Xve4g==
-  dependencies:
-    "@parcel/cache" "2.5.0"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/fs" "2.5.0"
-    "@parcel/package-manager" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/workers" "2.5.0"
-    utility-types "^3.10.0"
-
-"@parcel/utils@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.5.0.tgz#96d2c7e7226128cc84418ba41770b38aff23ca20"
-  integrity sha512-kaLGXtQuOOH55KZqXdYDvczhh3mk2eeTVqrrXuuihGjbLKYFlUW2tFDm+5r2s9nCPwTQxOO43ZEOCKSnia+e4w==
-  dependencies:
-    "@parcel/codeframe" "2.5.0"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/hash" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/markdown-ansi" "2.5.0"
-    "@parcel/source-map" "^2.0.0"
-    chalk "^4.1.0"
-
-"@parcel/watcher@^2.0.0":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.5.tgz#f913a54e1601b0aac972803829b0eece48de215b"
-  integrity sha512-x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw==
-  dependencies:
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
-"@parcel/workers@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.5.0.tgz#c7f1a4bcd491c7422212724dedbcf7d1e980146e"
-  integrity sha512-/Ow5OKJWs+9OzV3Jy4J++VnbNx0j3ls/M1CGVBLiBWyCada9DMtquYoBQ4Sk6Uam50BKkIFYetGOeXPNQyyMjg==
-  dependencies:
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/types" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    chrome-trace-event "^1.0.2"
-    nullthrows "^1.1.1"
-
 "@playwright/test@1.16.3":
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.16.3.tgz#99439d07af6a355586393b463fd88315f32d2a57"
@@ -1671,13 +999,6 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@swc/helpers@^0.3.6":
-  version "0.3.15"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.3.15.tgz#02abb377c91c39e0a6034f1161870c18621b9129"
-  integrity sha512-rpZHDdzwhfe06gF98SUAi7TfI344zKb1Pd2D9gxUMTNnhMobDHrv2UiVVcbDXmkx84U5AaXJmBrmfT9g1TPasQ==
-  dependencies:
-    tslib "^2.4.0"
-
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -1690,11 +1011,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@types/backbone@1.4.2":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.4.2.tgz#2af5ca6536d4cd510842eea6eeea11a42fa704b9"
@@ -1928,7 +1244,7 @@
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
   integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8":
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -2400,11 +1716,6 @@ abort-controller@3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-abortcontroller-polyfill@^1.1.9:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5"
-  integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==
-
 acorn-globals@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
@@ -2469,11 +1780,25 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -2484,6 +1809,16 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 ansi-align@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
@@ -2603,11 +1938,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
-
 array-includes@^3.1.4:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
@@ -2619,11 +1949,6 @@ array-includes@^3.1.4:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
 array.prototype.flat@^1.2.5:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
@@ -2664,7 +1989,7 @@ async-exit-hook@^2.0.1:
   resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
   integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==
 
-async@^2.6.0, async@^2.6.4, async@^3.2.3, async@~0.9.0, async@~3.2.0:
+async@^2.6.4, async@^3.2.3:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
@@ -2729,13 +2054,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base-x@^3.0.8:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320"
-  integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2799,21 +2117,6 @@ blueimp-load-image@5.14.0:
   resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6"
   integrity sha512-g5l+4dCOESBG8HkPLdGnBx8dhEwpQHaOZ0en623sl54o3bGhGMLYGc54L5cWfGmPvfKUjbsY7LOAmcW/xlkBSA==
 
-body@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==
-  dependencies:
-    continuable-cache "^0.3.1"
-    error "^7.0.0"
-    raw-body "~1.1.0"
-    safe-json-parse "~1.0.1"
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
 boolean@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
@@ -2875,7 +2178,7 @@ browserslist@^4.14.5:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
-browserslist@^4.20.2, browserslist@^4.6.6:
+browserslist@^4.20.2:
   version "4.20.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
   integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
@@ -2962,11 +2265,6 @@ bytebuffer@^5.0.1:
   dependencies:
     long "~3"
 
-bytes@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
-
 cacache@^16.1.0:
   version "16.1.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.0.tgz#87a6bae558a511c9cb2a13768073e240ca76153a"
@@ -3082,7 +2380,7 @@ chai@^4.3.4:
     pathval "^1.1.1"
     type-detect "^4.0.5"
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
@@ -3110,7 +2408,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3221,11 +2519,6 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
 clsx@^1.0.4, clsx@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
@@ -3286,11 +2579,6 @@ colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3308,11 +2596,6 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.0.0, commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 commander@^8.2.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
@@ -3416,11 +2699,6 @@ console-control-strings@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-continuable-cache@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
-
 convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
@@ -3456,17 +2734,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmiconfig@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
 country-code-lookup@^0.0.19:
   version "0.0.19"
   resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6"
@@ -3539,17 +2806,6 @@ css-loader@^6.7.2:
     postcss-value-parser "^4.2.0"
     semver "^7.3.8"
 
-css-select@^4.1.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
 css-to-react-native@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
@@ -3559,7 +2815,7 @@ css-to-react-native@^3.0.0:
     css-color-keywords "^1.0.0"
     postcss-value-parser "^4.0.2"
 
-css-tree@^1.1.2, css-tree@^1.1.3:
+css-tree@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
   integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
@@ -3567,23 +2823,11 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
 cssom@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
@@ -3624,11 +2868,6 @@ date-fns@^2.29.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-dateformat@~3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-
 debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -3643,7 +2882,7 @@ debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.7:
+debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -3734,16 +2973,6 @@ depd@^1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -3808,20 +3037,6 @@ dom-helpers@^5.0.1, dom-helpers@^5.1.3:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
 domexception@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
@@ -3829,27 +3044,11 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
 dompurify@^2.0.7:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
   integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
 
-domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -3862,11 +3061,6 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
-
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
@@ -4038,16 +3232,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-entities@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
-  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
-
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -4077,13 +3261,6 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-error@^7.0.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
-  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
-  dependencies:
-    string-template "~0.2.1"
-
 es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
@@ -4487,11 +3664,6 @@ event-target-shim@^5.0.0:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
-eventemitter2@~0.4.13:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
-  integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=
-
 events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -4512,18 +3684,6 @@ execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-exit@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 expect@=27.2.5:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd"
@@ -4536,11 +3696,6 @@ expect@=27.2.5:
     jest-message-util "^27.2.5"
     jest-regex-util "^27.0.6"
 
-extend@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 extract-zip@^1.0.3:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
@@ -4592,13 +3747,6 @@ fastest-stable-stringify@^2.0.2:
   resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
   integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==
 
-faye-websocket@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -4629,11 +3777,6 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-file-sync-cmp@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
-  integrity sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=
-
 file-type@^10.10.0:
   version "10.11.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
@@ -4702,44 +3845,11 @@ find-yarn-workspace-root@^2.0.0:
   dependencies:
     micromatch "^4.0.2"
 
-findup-sync@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
-  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^4.0.2"
-    resolve-dir "^1.0.1"
-
-findup-sync@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
-  integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=
-  dependencies:
-    glob "~5.0.0"
-
-fined@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
 firstline@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae"
   integrity sha1-uIZzxCAJ+IIfrCkm6ZcgrO6ST64=
 
-flagged-respawn@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -4758,18 +3868,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
 foreground-child@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
@@ -4904,13 +4002,6 @@ gauge@^4.0.3:
     strip-ansi "^6.0.1"
     wide-align "^1.1.5"
 
-gaze@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4940,11 +4031,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-port@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
-  integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -4960,7 +4046,7 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-getobject@^1.0.0, getobject@~0.1.0, getobject@~1.0.0:
+getobject@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45"
   integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg==
@@ -5042,29 +4128,6 @@ glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@~5.0.0:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@~7.1.1, glob@~7.1.6:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -5084,26 +4147,6 @@ global-dirs@^2.0.1:
   dependencies:
     ini "1.3.7"
 
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
 global-tunnel-ng@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
@@ -5119,7 +4162,7 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0, globals@^13.2.0:
+globals@^13.15.0:
   version "13.15.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
   integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
@@ -5133,15 +4176,6 @@ globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
-globule@^1.0.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
-  integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 got@^11.8.5, got@^9.6.0:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -5164,114 +4198,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-grunt-cli@1.4.3, grunt-cli@~1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff"
-  integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==
-  dependencies:
-    grunt-known-options "~2.0.0"
-    interpret "~1.1.0"
-    liftup "~3.0.1"
-    nopt "~4.0.1"
-    v8flags "~3.2.0"
-
-grunt-contrib-concat@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz#9ac62117a18b48d1bfccb3eef46c960bbd163d75"
-  integrity sha512-Vnl95JIOxfhEN7bnYIlCgQz41kkbi7tsZ/9a4usZmxNxi1S2YAIOy8ysFmO8u4MN26Apal1O106BwARdaNxXQw==
-  dependencies:
-    chalk "^4.1.2"
-    source-map "^0.5.3"
-
-grunt-contrib-copy@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573"
-  integrity sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=
-  dependencies:
-    chalk "^1.1.1"
-    file-sync-cmp "^0.1.0"
-
-grunt-contrib-watch@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz#c143ca5b824b288a024b856639a5345aedb78ed4"
-  integrity sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==
-  dependencies:
-    async "^2.6.0"
-    gaze "^1.1.0"
-    lodash "^4.17.10"
-    tiny-lr "^1.1.1"
-
-grunt-exec@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-exec/-/grunt-exec-3.0.0.tgz#881f868d64098788fddaf22fa25d8572a9d64dc7"
-  integrity sha512-cgAlreXf3muSYS5LzW0Cc4xHK03BjFOYk0MqCQ/MZ3k1Xz2GU7D+IAJg4UKicxpO+XdONJdx/NJ6kpy2wI+uHg==
-
-grunt-gitinfo@0.1.9:
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/grunt-gitinfo/-/grunt-gitinfo-0.1.9.tgz#299601084e5638cff0e3e4d36093beb5cec9b9ba"
-  integrity sha512-nAyUZQrLkgHZuqepTgkA3jn9CX4kyrNcWzjENxo/nOwYjZPEWDJeaxWcYrAzB5OcBk5gYJmTA0r3XCgczxtbPg==
-  dependencies:
-    async "~0.9.0"
-    getobject "~0.1.0"
-    lodash "^4.17.14"
-
-grunt-known-options@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c"
-  integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==
-
-grunt-legacy-log-utils@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef"
-  integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==
-  dependencies:
-    chalk "~4.1.0"
-    lodash "~4.17.19"
-
-grunt-legacy-log@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4"
-  integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==
-  dependencies:
-    colors "~1.1.2"
-    grunt-legacy-log-utils "~2.1.0"
-    hooker "~0.2.3"
-    lodash "~4.17.19"
-
-grunt-legacy-util@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255"
-  integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==
-  dependencies:
-    async "~3.2.0"
-    exit "~0.1.2"
-    getobject "~1.0.0"
-    hooker "~0.2.3"
-    lodash "~4.17.21"
-    underscore.string "~3.3.5"
-    which "~2.0.2"
-
-grunt@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.5.3.tgz#3214101d11257b7e83cf2b38ea173b824deab76a"
-  integrity sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==
-  dependencies:
-    dateformat "~3.0.3"
-    eventemitter2 "~0.4.13"
-    exit "~0.1.2"
-    findup-sync "~0.3.0"
-    glob "~7.1.6"
-    grunt-cli "~1.4.3"
-    grunt-known-options "~2.0.0"
-    grunt-legacy-log "~3.0.0"
-    grunt-legacy-util "~2.0.1"
-    iconv-lite "~0.4.13"
-    js-yaml "~3.14.0"
-    minimatch "~3.0.4"
-    mkdirp "~1.0.4"
-    nopt "~3.0.6"
-    rimraf "~3.0.2"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -5350,18 +4276,6 @@ hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-
   dependencies:
     react-is "^16.7.0"
 
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hooker@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959"
-  integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -5386,35 +4300,11 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-htmlnano@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/htmlnano/-/htmlnano-2.0.2.tgz#3e3170941e2446a86211196d740272ebca78f878"
-  integrity sha512-+ZrQFS4Ub+zd+/fWwfvoYCEGNEa0/zrpys6CyXxvZDwtL7Pl+pOtRkiujyvBQ7Lmfp7/iEPxtOFgxWA16Gkj3w==
-  dependencies:
-    cosmiconfig "^7.0.1"
-    posthtml "^0.16.5"
-    timsort "^0.3.0"
-
-htmlparser2@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5"
-  integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.2"
-    domutils "^2.8.0"
-    entities "^3.0.1"
-
 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-parser-js@>=0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd"
-  integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==
-
 http-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@@ -5578,11 +4468,6 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-interpret@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
-
 invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -5607,14 +4492,6 @@ ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
   integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -5703,11 +4580,6 @@ is-installed-globally@^0.3.1:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
 
-is-json@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-json/-/is-json-2.0.1.tgz#6be166d144828a131d686891b983df62c39491ff"
-  integrity sha1-a+Fm0USCihMdaGiRuYPfYsOUkf8=
-
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -5750,7 +4622,7 @@ is-plain-obj@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -5770,13 +4642,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -5808,13 +4673,6 @@ is-typedarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@@ -5827,7 +4685,7 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-windows@^1.0.1, is-windows@^1.0.2:
+is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -5864,7 +4722,7 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
@@ -6025,7 +4883,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@~3.14.0:
+js-yaml@^3.13.1, js-yaml@^3.14.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -6033,11 +4891,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@~3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha1-sBMHyym2GKHtJux56RH4A8TaAEA=
-
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
@@ -6096,6 +4949,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -6118,7 +4976,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
+json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -6174,11 +5032,16 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.4, klona@^2.0.5:
+klona@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
+klona@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
+
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -6233,20 +5096,6 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.0"
 
-liftup@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce"
-  integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==
-  dependencies:
-    extend "^3.0.2"
-    findup-sync "^4.0.0"
-    fined "^1.2.0"
-    flagged-respawn "^1.0.1"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.1"
-    rechoir "^0.7.0"
-    resolve "^1.19.0"
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -6259,22 +5108,6 @@ linkify-it@3.0.2:
   dependencies:
     uc.micro "^1.0.1"
 
-livereload-js@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
-  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
-
-lmdb@2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.2.4.tgz#6494d5a1d1db152e0be759edcfa06893e4cbdb53"
-  integrity sha512-gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ==
-  dependencies:
-    msgpackr "^1.5.4"
-    nan "^2.14.2"
-    node-gyp-build "^4.2.3"
-    ordered-binary "^1.2.4"
-    weak-lru-cache "^1.2.2"
-
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -6341,12 +5174,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1, lodash@~4.17.10, lodash@~4.17.19, lodash@~4.17.21:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6429,13 +5257,6 @@ make-fetch-happen@^10.0.3:
     socks-proxy-agent "^6.1.1"
     ssri "^9.0.0"
 
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
 map-age-cleaner@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6443,11 +5264,6 @@ map-age-cleaner@^0.1.3:
   dependencies:
     p-defer "^1.0.0"
 
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -6526,6 +5342,13 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
+mini-css-extract-plugin@^2.7.5:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
+  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+  dependencies:
+    schema-utils "^4.0.0"
+
 "minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -6547,13 +5370,6 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@~3.0.2, minimatch@~3.0.4:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
-  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
@@ -6620,7 +5436,7 @@ mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -6673,27 +5489,6 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-msgpackr-extract@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.0.2.tgz#201a8d7ade47e99b3ba277c45736b00e195d4670"
-  integrity sha512-coskCeJG2KDny23zWeu+6tNy7BLnAiOGgiwzlgdm4oeSsTpqEJJPguHIuKZcCdB7tzhZbXNYSg6jZAXkZErkJA==
-  dependencies:
-    node-gyp-build-optional-packages "5.0.2"
-  optionalDependencies:
-    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.0.2"
-    "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.0.2"
-    "@msgpackr-extract/msgpackr-extract-linux-arm" "2.0.2"
-    "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.0.2"
-    "@msgpackr-extract/msgpackr-extract-linux-x64" "2.0.2"
-    "@msgpackr-extract/msgpackr-extract-win32-x64" "2.0.2"
-
-msgpackr@^1.5.4:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.6.1.tgz#4f3c94d6a5b819b838ffc736eddaf60eba436d20"
-  integrity sha512-Je+xBEfdjtvA4bKaOv8iRhjC8qX2oJwpYH4f7JrG4uMVJVmnmkAT4pjKdbztKprGj3iwjcxPzb5umVZ02Qq3tA==
-  optionalDependencies:
-    msgpackr-extract "^2.0.2"
-
 mustache@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
@@ -6713,7 +5508,7 @@ nan@2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nan@^2.14.0, nan@^2.14.2:
+nan@^2.14.0:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
@@ -6783,11 +5578,6 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
-node-addon-api@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
 node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -6795,16 +5585,6 @@ node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp-build-optional-packages@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.2.tgz#3de7d30bd1f9057b5dfbaeab4a4442b7fe9c5901"
-  integrity sha512-PiN4NWmlQPqvbEFcH/omQsswWQbe5Z9YK/zdB23irp5j2XibaA2IrGvpSWmVVG4qMZdmPdwPctSy4a86rOMn6g==
-
-node-gyp-build@^4.2.3, node-gyp-build@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"
-  integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==
-
 node-gyp@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
@@ -6875,21 +5655,6 @@ nopt@^6.0.0:
   dependencies:
     abbrev "^1.0.0"
 
-nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
-
-nopt@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6935,18 +5700,6 @@ npmlog@^6.0.0:
     gauge "^4.0.3"
     set-blocking "^2.0.0"
 
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-nullthrows@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
-  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -6985,7 +5738,7 @@ nyc@^15.1.0:
     test-exclude "^6.0.0"
     yargs "^15.0.2"
 
-object-assign@4.x, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@4.x, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7010,16 +5763,6 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
 object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
@@ -7029,21 +5772,6 @@ object.entries@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.map@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-object.pick@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
 object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
@@ -7108,12 +5836,7 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-ordered-binary@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.2.5.tgz#6208c45067eae9d14b8f44791a1d7037adad9147"
-  integrity sha512-djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA==
-
-os-homedir@1.0.2, os-homedir@^1.0.0:
+os-homedir@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -7127,19 +5850,11 @@ os-locale@5.0.0:
     lcid "^3.0.0"
     mem "^5.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -7249,26 +5964,6 @@ package-json@^6.3.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-parcel@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/parcel/-/parcel-2.5.0.tgz#b6f01c665b6085e4eb58957ff11bc8f4027bd8f7"
-  integrity sha512-er0mj/BaMjWyzQ/jedLUi/LNAuQcFT8lCvoNqANF+jTaX9rohaBwxIvKVJVAZgyCnmyfbbldp496wPMW0R0+CA==
-  dependencies:
-    "@parcel/config-default" "2.5.0"
-    "@parcel/core" "2.5.0"
-    "@parcel/diagnostic" "2.5.0"
-    "@parcel/events" "2.5.0"
-    "@parcel/fs" "2.5.0"
-    "@parcel/logger" "2.5.0"
-    "@parcel/package-manager" "2.5.0"
-    "@parcel/reporter-cli" "2.5.0"
-    "@parcel/reporter-dev-server" "2.5.0"
-    "@parcel/utils" "2.5.0"
-    chalk "^4.1.0"
-    commander "^7.0.0"
-    get-port "^4.2.0"
-    v8-compile-cache "^2.0.0"
-
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -7276,15 +5971,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-json@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -7295,11 +5981,6 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
 parse5@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
@@ -7354,18 +6035,6 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-to-regexp@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
@@ -7525,35 +6194,6 @@ postcss@^8.4.18:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-posthtml-parser@^0.10.1:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.2.tgz#df364d7b179f2a6bf0466b56be7b98fd4e97c573"
-  integrity sha512-PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg==
-  dependencies:
-    htmlparser2 "^7.1.1"
-
-posthtml-parser@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.11.0.tgz#25d1c7bf811ea83559bc4c21c189a29747a24b7a"
-  integrity sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==
-  dependencies:
-    htmlparser2 "^7.1.1"
-
-posthtml-render@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-3.0.0.tgz#97be44931496f495b4f07b99e903cc70ad6a3205"
-  integrity sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==
-  dependencies:
-    is-json "^2.0.1"
-
-posthtml@^0.16.4, posthtml@^0.16.5:
-  version "0.16.6"
-  resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.16.6.tgz#e2fc407f67a64d2fa3567afe770409ffdadafe59"
-  integrity sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==
-  dependencies:
-    posthtml-parser "^0.11.0"
-    posthtml-render "^3.0.0"
-
 postinstall-prepare@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/postinstall-prepare/-/postinstall-prepare-1.0.1.tgz#dac9b5d91b054389141b13c0192eb68a0aa002b5"
@@ -7695,13 +6335,6 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
 
-qs@^6.4.0:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
-  dependencies:
-    side-channel "^1.0.4"
-
 queue-promise@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/queue-promise/-/queue-promise-2.2.1.tgz#8de03fb79ba458efcb5ebf76368ab029d2669752"
@@ -7731,14 +6364,6 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-raw-body@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
-  dependencies:
-    bytes "1"
-    string_decoder "0.10"
-
 rc-align@^2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.5.tgz#c941a586f59d1017f23a428f0b468663fb7102ab"
@@ -7914,11 +6539,6 @@ react-redux@8.0.4:
     react-is "^18.0.0"
     use-sync-external-store "^1.0.0"
 
-react-refresh@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf"
-  integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ==
-
 react-toastify@^6.0.9:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-6.2.0.tgz#f2d76747c70b9de91f71f253d9feae6b53dc836c"
@@ -8028,13 +6648,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
-  dependencies:
-    resolve "^1.9.0"
-
 rechoir@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
@@ -8086,7 +6699,7 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
@@ -8131,6 +6744,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -8158,14 +6776,6 @@ resolve-cwd@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -8176,7 +6786,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.10.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -8216,7 +6826,7 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2, rimraf@~3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -8261,7 +6871,7 @@ rxjs@^7.0.0:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8271,11 +6881,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-json-parse@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
-
 safe-json-stringify@~1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
@@ -8298,18 +6903,18 @@ sanitize.css@^12.0.1:
   resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-12.0.1.tgz#f20369357557ba2b41d7278eeb3ea691a3bee514"
   integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw==
 
-sass-loader@^13.2.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.0.tgz#80195050f58c9aac63b792fa52acb6f5e0f6bdc3"
-  integrity sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==
+sass-loader@^13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9"
+  integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==
   dependencies:
-    klona "^2.0.4"
+    klona "^2.0.6"
     neo-async "^2.6.2"
 
-sass@^1.38.0:
-  version "1.52.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.1.tgz#554693da808543031f9423911d62c60a1acf7889"
-  integrity sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==
+sass@^1.60.0:
+  version "1.60.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.60.0.tgz#657f0c23a302ac494b09a5ba8497b739fb5b5a81"
+  integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -8344,6 +6949,16 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 screenfull@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba"
@@ -8361,7 +6976,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8553,7 +7168,7 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@^0.5.3, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -8563,13 +7178,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.8.0-beta.0:
-  version "0.8.0-beta.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
-  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
-  dependencies:
-    whatwg-url "^7.0.0"
-
 sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -8618,7 +7226,7 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
-sprintf-js@^1.1.1, sprintf-js@^1.1.2:
+sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -8635,11 +7243,6 @@ ssri@^9.0.0:
   dependencies:
     minipass "^3.1.1"
 
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
 stack-generator@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
@@ -8681,11 +7284,6 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
-string-template@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -8713,11 +7311,6 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-string_decoder@0.10:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -8843,19 +7436,6 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-svgo@^2.4.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
-
 symbol-observable@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -8891,7 +7471,7 @@ temp-file@^3.3.7:
     async-exit-hook "^2.0.1"
     fs-extra "^10.0.0"
 
-term-size@^2.1.0, term-size@^2.2.1:
+term-size@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
@@ -8917,16 +7497,6 @@ terser@^5.14.1:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.2.0:
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799"
-  integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==
-  dependencies:
-    acorn "^8.5.0"
-    commander "^2.20.0"
-    source-map "~0.8.0-beta.0"
-    source-map-support "~0.5.20"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -8946,23 +7516,6 @@ throttle-debounce@^3.0.1:
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
   integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
 
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
-tiny-lr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
-  dependencies:
-    body "^5.1.0"
-    debug "^3.1.0"
-    faye-websocket "~0.10.0"
-    livereload-js "^2.3.0"
-    object-assign "^4.1.0"
-    qs "^6.4.0"
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -8996,13 +7549,6 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
-  dependencies:
-    punycode "^2.1.0"
-
 tr46@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
@@ -9062,7 +7608,7 @@ tslib@^1.8.0, tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.1.0, tslib@^2.4.0:
+tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
@@ -9185,19 +7731,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
-underscore.string@~3.3.5:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
-  integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
-  dependencies:
-    sprintf-js "^1.1.1"
-    util-deprecate "^1.0.2"
-
 underscore@>=1.8.3:
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
@@ -9293,28 +7826,16 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-utility-types@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b"
-  integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==
-
 uuid@8.3.2, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.0, v8-compile-cache@^2.0.3:
+v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8flags@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -9352,21 +7873,11 @@ watchpack@^2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-weak-lru-cache@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz#fdbb6741f36bae9540d12f480ce8254060dccd19"
-  integrity sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
 webidl-conversions@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
@@ -9404,10 +7915,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.75.0:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.76.3:
+  version "5.76.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489"
+  integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -9434,20 +7945,6 @@ webpack@^5.75.0:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
 whatwg-encoding@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
@@ -9484,15 +7981,6 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -9509,14 +7997,14 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.14, which@^1.2.9:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2, which@~2.0.2:
+which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -9610,11 +8098,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xxhash-wasm@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz#752398c131a4dd407b5132ba62ad372029be6f79"
-  integrity sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA==
-
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"

From 796ccf058287cbdd3d858930f3b1f2363f89b5d7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 30 Mar 2023 14:15:59 +1100
Subject: [PATCH 056/178] feat: add handling and setting of the expireTimer for
 contacts

---
 .../conversation/SessionRightPanel.tsx        |  2 +-
 .../message/message-item/ReadableMessage.tsx  | 17 ++---
 .../message/reactions/Reaction.tsx            |  2 +-
 ts/components/leftpane/ActionsPanel.tsx       |  2 +-
 ts/mains/main_renderer.tsx                    |  4 +-
 ts/models/conversation.ts                     | 22 +++---
 ts/models/conversationAttributes.ts           | 14 ++--
 ts/node/migration/sessionMigrations.ts        |  7 +-
 ts/node/sql.ts                                |  8 +--
 ts/receiver/configMessage.ts                  | 14 ++--
 .../open_group_api/sogsv3/sogsV3FetchFile.ts  |  2 +-
 ts/session/apis/snode_api/SNodeAPI.ts         |  2 +-
 .../conversations/ConversationController.ts   | 69 ++++++++++---------
 ts/session/group/open-group.ts                |  6 +-
 ts/session/utils/AttachmentsDownload.ts       |  2 +-
 .../jobs/ConfigurationSyncDumpJob.ts          |  2 +-
 .../utils/libsession/libsession_utils.ts      |  4 +-
 .../libsession/libsession_utils_contacts.ts   |  2 +
 .../libsession_utils_convo_info_volatile.ts   |  5 +-
 .../libsession_utils_user_groups.ts           |  6 +-
 ts/session/utils/sync/syncUtils.ts            |  1 -
 .../crypto/OpenGroupAuthentication_test.ts    | 29 --------
 ts/types/attachments/VisualAttachment.ts      |  2 +-
 ts/types/sqlSharedTypes.ts                    | 21 ++++--
 ts/util/storage.ts                            |  1 -
 .../browser/libsession_worker_interface.ts    | 28 --------
 26 files changed, 117 insertions(+), 157 deletions(-)

diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 3e48cb468..543366a40 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -281,7 +281,7 @@ export const SessionRightPanelWithDetails = () => {
 
   const deleteConvoAction = isPublic
     ? () => {
-        deleteAllMessagesByConvoIdWithConfirmation(selectedConvoKey); // TODO this does not delete the public group and showLeaveGroupByConvoId is not only working for closed groups
+        deleteAllMessagesByConvoIdWithConfirmation(selectedConvoKey); // TODOLATER this does not delete the public group and showLeaveGroupByConvoId is not only working for closed groups
       }
     : () => {
         showLeaveGroupByConvoId(selectedConvoKey);
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index e6241c70b..848d1c2ed 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -98,14 +98,17 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   const onVisible = useCallback(
     // tslint:disable-next-line: cyclomatic-complexity
     async (inView: boolean | Object) => {
+      if (!selectedConversationKey) {
+        return;
+      }
       // we are the most recent message
-      if (mostRecentMessageId === messageId && selectedConversationKey) {
+      if (mostRecentMessageId === messageId) {
         // make sure the app is focused, because we mark message as read here
         if (inView === true && isAppFocused) {
           dispatch(showScrollToBottomButton(false));
           getConversationController()
             .get(selectedConversationKey)
-            ?.markConversationRead(receivedAt || 0); // TODO this should be `sentAt || serverTimestamp` I believe?
+            ?.markConversationRead(receivedAt || 0); // TODOLATER this should be `sentAt || serverTimestamp` I think
 
           dispatch(markConversationFullyRead(selectedConversationKey));
         } else if (inView === false) {
@@ -117,8 +120,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
         inView === true &&
         isAppFocused &&
         oldestMessageId === messageId &&
-        !fetchingMoreInProgress &&
-        selectedConversationKey
+        !fetchingMoreInProgress
       ) {
         debouncedTriggerLoadMoreTop(selectedConversationKey, oldestMessageId);
       }
@@ -127,8 +129,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
         inView === true &&
         isAppFocused &&
         youngestMessageId === messageId &&
-        !fetchingMoreInProgress &&
-        selectedConversationKey
+        !fetchingMoreInProgress
       ) {
         debouncedTriggerLoadMoreBottom(selectedConversationKey, youngestMessageId);
       }
@@ -140,7 +141,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
         isAppFocused
       ) {
         if (isUnread) {
-          // TODO this is pretty expensive and should instead use values from the redux store
+          // TODOLATER this is pretty expensive and should instead use values from the redux store
           const found = await Data.getMessageById(messageId);
 
           if (found && Boolean(found.get('unread'))) {
@@ -149,7 +150,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
             // this would be part of an redesign of the sending pipeline
             // mark the whole conversation as read until this point.
             // this will trigger the expire timer.
-            if (selectedConversationKey && foundSentAt) {
+            if (foundSentAt) {
               getConversationController()
                 .get(selectedConversationKey)
                 ?.markConversationRead(foundSentAt, Date.now());
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 146eae004..5f598881e 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -76,7 +76,7 @@ export const Reaction = (props: ReactionProps): ReactElement => {
   const reactionRef = useRef<HTMLDivElement>(null);
   const { docX, elW } = useMouse(reactionRef);
 
-  const gutterWidth = 380; // TODO make this a variable which can be shared in CSS and JS
+  const gutterWidth = 380; // TODOLATER make this a variable which can be shared in CSS and JS
   const tooltipMidPoint = POPUP_WIDTH / 2; // px
   const [tooltipPosition, setTooltipPosition] = useState<TipPosition>('center');
 
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 4b6136673..fee386e3d 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -201,7 +201,7 @@ const doAppStartUp = async () => {
   void getSwarmPollingInstance().start();
   void loadDefaultRooms();
 
-  // TODO make this a job of the JobRunner
+  // TODOLATER make this a job of the JobRunner
   debounce(triggerAvatarReUploadIfNeeded, 200);
 
   /* Postpone a little bit of the polling of sogs messages to let the swarm messages come in first. */
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index a66573cc5..f7a553aaf 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -193,7 +193,7 @@ Storage.onready(async () => {
         await LibSessionUtil.initializeLibSessionUtilWrappers();
       } catch (e) {
         window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message);
-        // TODO what should we do if this happens?
+        // I don't think there is anything we can do if this happens
         throw e;
       }
     }
@@ -209,7 +209,7 @@ Storage.onready(async () => {
     ]);
   } catch (error) {
     window.log.error(
-      'main_start.js: ConversationController failed to load:',
+      'main_renderer: ConversationController failed to load:',
       error && error.stack ? error.stack : error
     );
   } finally {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index e63ecf58a..75c136521 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -119,12 +119,11 @@ type InMemoryConvoInfos = {
   unreadCount: number;
 };
 
-// TODO decide it it makes sense to move this to a redux slice?
 /**
  * Some fields are not stored in the database, but are kept in memory.
  * We use this map to keep track of them. The key is the conversation id.
  */
-const inMemoryConvoInfos: Map<string, InMemoryConvoInfos> = new Map();
+const inMemoryConvoInfos: Map<string, InMemoryConvoInfos> = new Map(); // decide it it makes sense to move this to a redux slice?
 
 export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public updateLastMessage: () => any;
@@ -339,6 +338,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
     const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
 
+    // rely on the wrapper values rather than the DB ones if they exist in the wrapper
     if (foundContact) {
       if (foundContact.name) {
         toRet.displayNameInProfile = foundContact.name;
@@ -363,10 +363,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.isHidden = foundContact.hidden;
 
       if (foundContact.priority > 0) {
-        toRet.isPinned = true; // TODO priority also handles sorting
+        toRet.isPinned = true;
       }
 
-      // TODO expire timer (not in wrapper yet)
+      if (foundContact.expirationTimerSeconds > 0) {
+        toRet.expireTimer = foundContact.expirationTimerSeconds;
+      }
     } else {
       if (this.get('displayNameInProfile')) {
         toRet.displayNameInProfile = this.get('displayNameInProfile');
@@ -394,6 +396,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (this.get('isPinned')) {
         toRet.isPinned = true;
       }
+
+      if (this.get('expireTimer')) {
+        toRet.expireTimer = this.get('expireTimer');
+      }
     }
 
     if (foundLegacyGroup) {
@@ -412,7 +418,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     if (foundCommunity) {
       if (foundCommunity.priority > 0) {
-        toRet.isPinned = true; // TODO priority also handles sorting
+        toRet.isPinned = true;
       }
     }
 
@@ -887,7 +893,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    */
   public async addIncomingApprovalMessage(timestamp: number, source: string) {
     await this.addSingleIncomingMessage({
-      sent_at: timestamp, // TODO: maybe add timestamp to messageRequestResponse? confirm it doesn't exist first
+      sent_at: timestamp,
       source,
       messageRequestResponse: {
         isApproved: 1,
@@ -1210,7 +1216,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     messageAttributes: Omit<MessageAttributesOptionals, 'conversationId' | 'type' | 'direction'>
   ) {
     // if there's a message by the other user, they've replied to us which we consider an accepted convo
-    if (!this.didApproveMe() && this.isPrivate()) {
+    if (this.isPrivate()) {
       await this.setDidApproveMe(true);
     }
 
@@ -2177,7 +2183,7 @@ export async function commitConversationAndRefreshWrapper(id: string) {
     return;
   }
   // write to DB
-  // TODO remove duplicates between db and wrapper (except nickname&name as we need them for search)
+  // TODOLATER remove duplicates between db and wrapper (except nickname&name as we need them for search, or move search to wrapper too)
   // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
 
   const savedDetails = await Data.saveConversation(convo.attributes);
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 451d026b5..ab7b94215 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -53,7 +53,7 @@ export interface ConversationAttributes {
   type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV3 | ConversationTypeEnum.GROUP;
 
   // 0 means inactive (undefined and null too but we try to get rid of them and only have 0 = inactive)
-  active_at: number;
+  active_at: number; // this field is the one used to sort conversations in the left pane from most recent
 
   lastMessageStatus: LastMessageStatusType;
   /**
@@ -64,10 +64,10 @@ export interface ConversationAttributes {
    */
   lastMessage: string | null;
 
-  avatarImageId?: number; // SOGS ONLY: avatar imageID is currently used only for sogs. It's the fileID of the image uploaded and set as the sogs avatar
+  avatarImageId?: number; // avatar imageID is currently used only for sogs. It's the fileID of the image uploaded and set as the sogs avatar (not only sogs I think, but our profile too?)
 
-  left: boolean; // GROUPS ONLY: if we left the group (communities are removed right away so it not relevant to communities)
-  isKickedFromGroup: boolean; // GROUPS ONLY: if we got kicked from the group (communities just stop polling and a message sent get rejected, so not relevant to communities)
+  left: boolean; // LEGACY GROUPS ONLY: if we left the group (communities are removed right away so it not relevant to communities) // TODOLATER to remove after legacy closed group are dropped
+  isKickedFromGroup: boolean; // LEGACY GROUPS ONLY: if we got kicked from the group (communities just stop polling and a message sent get rejected, so not relevant to communities) // TODOLATER to remove after legacy closed group are dropped
 
   avatarInProfile?: string; // this is the avatar path locally once downloaded and stored in the application attachments folder
 
@@ -75,9 +75,9 @@ export interface ConversationAttributes {
 
   conversationIdOrigin?: string; // Blinded message requests ONLY: The community from which this conversation originated from
 
-  // TODO those two items are only used for legacy closed groups and will be removed when we get rid of the legacy closed groups support
-  lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group // TODO to remove after legacy closed group are dropped
-  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin // TODO to remove after legacy closed group are dropped
+  // TODOLATER those two items are only used for legacy closed groups and will be removed when we get rid of the legacy closed groups support
+  lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group // TODOLATER to remove after legacy closed group are dropped
+  zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin // TODOLATER to remove after legacy closed group are dropped
 
   // ===========================================================================
   // All of the items below are duplicated one way or the other with libsession.
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 29ded3106..1c099db25 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1218,6 +1218,7 @@ function insertContactIntoContactWrapper(
     const dbBlocked = blockedNumbers.includes(contact.id);
     const hidden = contact.hidden || false;
     const isPinned = contact.isPinned;
+    const expirationTimerSeconds = contact.expireTimer || 0;
 
     const wrapperContact = getContactInfoFromDBValues({
       id: contact.id,
@@ -1230,6 +1231,7 @@ function insertContactIntoContactWrapper(
       dbProfileUrl: contact.avatarPointer || undefined,
       isPinned,
       hidden,
+      expirationTimerSeconds,
     });
 
     try {
@@ -1254,6 +1256,7 @@ function insertContactIntoContactWrapper(
             dbProfileUrl: undefined,
             isPinned: false,
             hidden,
+            expirationTimerSeconds: 0,
           })
         );
       } catch (e) {
@@ -1770,9 +1773,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         data: convoVolatileDump,
       });
 
-      // TODO we've just created the initial dumps. We have to add an initial SyncJob to the database so it is run on the next app start/
-      // or find another way of adding one on the next start (store an another item in the DB and check for it on app start?)
-      // or just start a conf sync job on app start
+      // we've just created the initial dumps. A ConfSyncJob is run when the app starts after 20 seconds
     } catch (e) {
       console.error(`failed to create initial wrapper: `, e.stack);
       // if we get an exception here, most likely no users are logged in yet. We can just continue the transaction and the wrappers will be created when a user creates a new account.
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 7270dc543..d12ef88e6 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -504,7 +504,7 @@ function fetchConvoMemoryDetails(convoId: string): SaveConversationReturn {
   const unreadCount = getUnreadCountByConversation(convoId);
   const lastReadTimestampMessageSentTimestamp = getLastMessageReadInConversation(convoId);
 
-  // TODO it would be nice to be able to remove the lastMessage and lastMessageStatus from the conversation table, and just return it when saving the conversation
+  // TODOLATER it would be nice to be able to remove the lastMessage and lastMessageStatus from the conversation table, and just return it when saving the conversation
   // and saving it in memory only.
   // But we'd need to update a bunch of things as we do some logic before setting the lastUpdate text and status mostly in `getMessagePropStatus` and `getNotificationText()`
   // const lastMessages = getLastMessagesByConversation(convoId, 1) as Array:Record<string, any>>;
@@ -557,7 +557,7 @@ export function getIdentityKeys(db: BetterSqlite3.Database) {
 
     const ed25519PrivateKeyUintArray = parsedIdentityKey?.value?.ed25519KeyPair?.privateKey;
 
-    // TODO migrate the ed25519KeyPair for all the users already logged in to a base64 representation
+    // TODOLATER migrate the ed25519KeyPair for all the users already logged in to a base64 representation
     const privateEd25519 = new Uint8Array(Object.values(ed25519PrivateKeyUintArray));
 
     if (!privateEd25519 || isEmpty(privateEd25519)) {
@@ -1404,11 +1404,11 @@ function getFirstUnreadMessageWithMention(
   }
   const likeMatch = `%@${ourPkInThatConversation}%`;
 
-  // TODO make this use the fts search table rather than this one?
+  // TODOLATER make this use the fts search table rather than this one?
   const rows = assertGlobalInstanceOrInstance(instance)
     .prepare(
       `
-    SELECT id, json FROM ${MESSAGES_TABLE} WHERE
+    SELECT id FROM ${MESSAGES_TABLE} WHERE
       conversationId = $conversationId AND
       unread = $unread AND
       body LIKE $likeMatch
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 739226bb1..70fcaaabc 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -366,7 +366,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
         legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp
           ? legacyGroupConvo.get('active_at')
           : latestEnvelopeTimestamp,
-      weWereJustAdded: false, // TODO to remove
+      weWereJustAdded: false, // TODOLATER to remove
     };
 
     await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
@@ -473,10 +473,9 @@ async function applyConvoVolatileUpdateFromWrapper(
 async function handleConvoInfoVolatileUpdate(
   result: IncomingConfResult
 ): Promise<IncomingConfResult> {
-  // TODO do we want to enforce this?
-  // if (!result.needsDump) {
-  //   return result;
-  // }
+  if (!result.needsDump) {
+    return result;
+  }
 
   const types = SessionUtilConvoInfoVolatile.getConvoInfoVolatileTypes();
   for (let typeIndex = 0; typeIndex < types.length; typeIndex++) {
@@ -619,7 +618,6 @@ async function processMergingResults(results: Map<ConfigWrapperObjectTypes, Inco
 async function handleConfigMessagesViaLibSession(
   configMessages: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
 ) {
-  // TODO: Remove this once `useSharedUtilForUserConfig` is permanent
   if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     return;
   }
@@ -769,11 +767,9 @@ const handleClosedGroupsFromConfigLegacy = async (
         publicKey: c.publicKey,
       });
       try {
-        // TODO we should not drop the envelope from cache as long as we are still handling a new closed group from that same envelope
-        // check the removeFromCache inside handleNewClosedGroup()
         await handleNewClosedGroup(envelope, groupUpdate);
       } catch (e) {
-        window?.log?.warn('failed to handle  a new closed group from configuration message');
+        window?.log?.warn('failed to handle a new closed group from configuration message');
       }
     })
   );
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index 88ab70963..cd36b82b9 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -118,7 +118,7 @@ export async function sogsV3FetchPreviewAndSaveIt(roomInfos: OpenGroupV2RoomWith
     return;
   }
   existingImageId = convo.get('avatarImageId');
-  if (existingImageId !== imageIdNumber && imageIdNumber) {
+  if (existingImageId !== imageIdNumber && isFinite(imageIdNumber)) {
     // we have to trigger an update
     // write the file to the disk (automatically encrypted),
 
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index 0a8559eec..aed7acc4a 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -13,7 +13,7 @@ export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.';
 
 // tslint:disable: max-func-body-length
 
-// TODO we should merge those two functions together as they are almost exactly the same
+// TODOLATER we should merge those two functions together as they are almost exactly the same
 const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 44d5dfa65..7f9925046 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -15,6 +15,8 @@ import { SessionUtilContact } from '../utils/libsession/libsession_utils_contact
 import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
+import { LibSessionUtil } from '../utils/libsession/libsession_utils';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 let instance: ConversationController | null;
 
@@ -251,11 +253,7 @@ export class ConversationController {
       // await conversation.setIsApproved(false, false);
       await conversation.commit(); // this updates the wrappers content to reflect the hidden state
 
-      // The note to self cannot be removed from the wrapper I suppose, as it must always be there
-      // TODO I think we want to mark the contacts as hidden instead of removing them, so maybe keep the volatile info too?
-      // if (!isUsFromCache(conversation.id)) {
-      //   await SessionUtilConvoInfoVolatile.remove1o1(conversation.id);
-      // }
+      // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
       // TODO the call above won't mark the conversation as hidden in the wrapper, it will just stop being updated (which is a bad thing)
     }
 
@@ -308,40 +306,49 @@ export class ConversationController {
         this.conversations.add(convoModels);
 
         const start = Date.now();
-        // TODO make this a switch so we take care of all wrappers and have compilation errors if we forgot to add one.
-        // also keep in mind that the convo volatile one need to run for each convo so it must be outside of a `else`
+        const numberOfVariants = LibSessionUtil.requiredUserVariants.length;
         for (let index = 0; index < convoModels.length; index++) {
           const convo = convoModels[index];
-          if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
-            await SessionUtilContact.refreshMappedValue(convo.id, true);
-          } else if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
-            await SessionUtilUserGroups.refreshCachedUserGroup(convo.id, true);
-          }
-          // we actually want to run the convo volatile check and fetch even if one of the cases above is already true
-          if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
-            await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
-              convo.id,
-              Boolean(convo.isClosedGroup() && convo.id.startsWith('05')),
-              true
-            );
+          for (let wrapperIndex = 0; wrapperIndex < numberOfVariants; wrapperIndex++) {
+            const variant = LibSessionUtil.requiredUserVariants[wrapperIndex];
 
-            await convo.refreshInMemoryDetails();
+            switch (variant) {
+              case 'UserConfig':
+                break;
+              case 'ContactsConfig':
+                if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
+                  await SessionUtilContact.refreshMappedValue(convo.id, true);
+                }
+                break;
+              case 'UserGroupsConfig':
+                if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+                  await SessionUtilUserGroups.refreshCachedUserGroup(convo.id, true);
+                }
+                break;
+
+              case 'ConvoInfoVolatileConfig':
+                if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
+                  await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
+                    convo.id,
+                    Boolean(convo.isClosedGroup() && convo.id.startsWith('05')),
+                    true
+                  );
+
+                  await convo.refreshInMemoryDetails();
+                }
+                break;
+
+              default:
+                assertUnreachable(
+                  variant,
+                  `ConversationController: load() unhandled case "${variant}"`
+                );
+            }
           }
         }
         window.log.info(`refreshAllWrappersMappedValues took ${Date.now() - start}ms`);
 
         this._initialFetchComplete = true;
-        // TODO do we really need to do this?
-        // this.conversations.forEach((conversation: ConversationModel) => {
-        //   if (
-        //     conversation.isActive() &&
-        //     !conversation.isHidden() &&
-        //     !conversation.get('lastMessage')
-        //   ) {
-        //     conversation.updateLastMessage();
-        //   }
-        // });
-
         window?.log?.info(
           `ConversationController: done with initial fetch in ${Date.now() - startLoad}ms.`
         );
diff --git a/ts/session/group/open-group.ts b/ts/session/group/open-group.ts
index fe20d215d..8e69e5aa8 100644
--- a/ts/session/group/open-group.ts
+++ b/ts/session/group/open-group.ts
@@ -42,11 +42,11 @@ export async function initiateOpenGroupUpdate(
       return false;
     }
     try {
-      const { fileId, fileUrl } = uploadedFileDetails;
+      const { fileId: avatarImageId, fileUrl } = uploadedFileDetails;
 
       // this is kind of a hack just made to avoid having a specific function downloading from sogs by URL rather than fileID
       const downloaded = await downloadAttachmentSogsV3(
-        { id: fileId, size: null, url: fileUrl },
+        { id: avatarImageId, size: null, url: fileUrl },
         roomInfos
       );
 
@@ -67,11 +67,9 @@ export async function initiateOpenGroupUpdate(
         isRaw: true,
         contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
       });
-      const avatarImageId = fileId;
       await convo.setSessionProfile({
         displayName: groupName || convo.get('displayNameInProfile') || 'Unknown',
         avatarPath: upgraded.path,
-
         avatarImageId,
       });
     } catch (e) {
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 15f1c2e29..68fdef277 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -28,7 +28,7 @@ let timeout: any;
 let logger: any;
 const _activeAttachmentDownloadJobs: any = {};
 
-// TODO type those `any` properties
+// TODOLATER type those `any` properties
 
 export async function start(options: any = {}) {
   ({ logger } = options);
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index dd8f67c33..a4e9cf169 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -95,7 +95,7 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       // so when we call needsDump(), we know for sure that we are up to date
       console.time('ConfigurationSyncDumpJob insertAll');
 
-      // TODO we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
+      // TODOLATER we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
 
       for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
         const variant = LibSessionUtil.requiredUserVariants[index];
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 8244652d8..18ea182c8 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -15,7 +15,6 @@ import { SessionUtilConvoInfoVolatile } from './libsession_utils_convo_info_vola
 import { SessionUtilUserGroups } from './libsession_utils_user_groups';
 import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
-// TODO complete this list
 const requiredUserVariants: Array<ConfigWrapperObjectTypes> = [
   'UserConfig',
   'ContactsConfig',
@@ -44,8 +43,7 @@ async function initializeLibSessionUtilWrappers() {
     throw new Error('edkeypair not found for current user');
   }
   const privateKeyEd25519 = keypair.privKeyBytes;
-  // let's plan a sync on start for now
-  // TODO is this causing any issues?
+  // let's plan a sync on start with some room for the app to be ready
   setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 20000);
 
   // fetch the dumps we already have from the database
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 5d668df62..9b495645f 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -83,6 +83,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbBlocked = !!foundConvo.isBlocked() || false;
   const hidden = foundConvo.get('hidden') || false;
   const isPinned = foundConvo.get('isPinned');
+  const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
 
   const wrapperContact = getContactInfoFromDBValues({
     id,
@@ -95,6 +96,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     dbProfileUrl,
     isPinned,
     hidden,
+    expirationTimerSeconds,
   });
 
   try {
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index c0fda689d..a5c479b36 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -219,7 +219,6 @@ async function refreshConvoVolatileCached(
       default:
         assertUnreachable(convoType, `refreshConvoVolatileCached unhandled case "${convoType}"`);
     }
-    // TODO handle the new closed groups once we got them ready
 
     if (refreshed && !duringAppStart) {
       getConversationController()
@@ -285,10 +284,10 @@ export const SessionUtilConvoInfoVolatile = {
   getVolatileInfoCached,
 
   // 1o1
-  // at the moment, we cannot remove a 1o1 from the conversation volatile info.
+  // at the moment, we cannot remove a contact from the conversation volatile info so there is nothing here
 
   // legacy group
-  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
+  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER
 
   // communities
   removeCommunityFromWrapper,
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 2255a3727..72706ebbb 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -129,7 +129,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         groupAdmins: foundConvo.get('groupAdmins') || [],
         expireTimer: foundConvo.get('expireTimer'),
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
-        hidden: false, // TODO we do not handle hidden yet for groups
+        hidden: false, // TODOLATER we do not handle hidden yet for groups
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',
       });
@@ -184,7 +184,7 @@ async function refreshCachedUserGroup(convoId: string, duringAppStart = false) {
     window.log.info(`refreshMappedValue: not an opengroup convoID: ${convoId}`, e);
   }
 
-  // TODO handle the new closed groups once we got them ready
+  // TODOLATER handle the new closed groups once we got them ready
 }
 
 function getCommunityByConvoIdCached(convoId: string) {
@@ -259,5 +259,5 @@ export const SessionUtilUserGroups = {
   isLegacyGroupToStoreInWrapper,
   getLegacyGroupCached,
   getAllLegacyGroups,
-  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODO
+  removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER
 };
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 2e663a6a4..ba58d3e9c 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -77,7 +77,6 @@ export const syncConfigurationIfNeeded = async () => {
 
 export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) =>
   new Promise(resolve => {
-    // TODO  this should check for feature flag and queue a ConfigurationSyncJob
     const allConvos = getConversationController().getConversations();
     // if we hang for more than 20sec, force resolve this promise.
     setTimeout(() => {
diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
index c88c2f42f..2a4e65ee7 100644
--- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
+++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
@@ -379,35 +379,6 @@ describe('OpenGroupAuthentication', () => {
       }
     });
   });
-
-  // tslint:disable-next-line: no-empty
-  describe('Message Decryption', () => {
-    it.skip('Message Decryption', () => {
-      // TODO: update input and expected output
-    });
-  });
-
-  describe('V4Requests', () => {
-    it.skip('Should bencode POST/PUT request with body successfully', () => {
-      // TODO: update input and expected output
-      // const bencoded = encodeV4Request(postDataToEncoded);
-      // expect(bencoded).to.be.equal(
-      //   'l100:{"method":"POST","endpoint":"/room/test-room/pin/123","headers":{"Content-Type":"application/json"}}2:{}e'
-      // );
-    });
-
-    it.skip('Should bencode GET request without body successfully', () => {
-      // TODO: change ot accept request info and expect uint8 array output
-      // const bencoded = encodeV4Request(getDataToEncode);
-      // expect(bencoded).to.be.equal('l45:{"method":"GET","endpoint":"/room/test-room"}e');
-    });
-
-    it.skip('Should decode bencoded response successfully', () => {
-      // TODO: update input and expected output
-      // const bencoded = decodeV4Response(responseToDecode);
-      // console.error({ bencoded });
-    });
-  });
 });
 
 /**
diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts
index 9a940b589..7de45482f 100644
--- a/ts/types/attachments/VisualAttachment.ts
+++ b/ts/types/attachments/VisualAttachment.ts
@@ -37,7 +37,7 @@ export const getImageDimensions = async ({
       window.log.error('getImageDimensions error', toLogFormat(error));
       reject(error);
     });
-    // TODO image/jpg is hard coded, but it does not look to cause any issues
+    // image/jpg is hard coded here but does not look to cause any issues
     const decryptedUrl = await getDecryptedMediaUrl(objectUrl, 'image/jpg', false);
     image.src = decryptedUrl;
   });
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 914457b7e..7957fdfb3 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -117,6 +117,7 @@ export function getContactInfoFromDBValues({
   isPinned,
   dbProfileUrl,
   dbProfileKey,
+  expirationTimerSeconds,
 }: {
   id: string;
   dbApproved: boolean;
@@ -128,6 +129,7 @@ export function getContactInfoFromDBValues({
   isPinned: boolean;
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
+  expirationTimerSeconds: number | undefined;
 }): ContactInfo {
   const wrapperContact: ContactInfo = {
     id,
@@ -135,9 +137,17 @@ export function getContactInfoFromDBValues({
     approvedMe: !!dbApprovedMe,
     blocked: !!dbBlocked,
     hidden: !!hidden,
-    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
     nickname: dbNickname,
     name: dbName,
+    expirationTimerSeconds:
+      !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
+        ? expirationTimerSeconds
+        : 0, // TODOLATER add the expiration mode handling
+    expirationMode:
+      !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
+        ? 'disappearAfterSend'
+        : 'off',
   };
 
   if (
@@ -166,7 +176,7 @@ export function getCommunityInfoFromDBValues({
 }) {
   const community = {
     fullUrl,
-    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
   };
 
   return community;
@@ -221,7 +231,7 @@ export function getLegacyGroupInfoFromDBValues({
     disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
     hidden: !!hidden,
     name: displayNameInProfile || '',
-    priority: !!isPinned ? 1 : 0, // TODO the priority handling is not that simple
+    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
     members: wrappedMembers,
     encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
     encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
@@ -235,8 +245,9 @@ export function getLegacyGroupInfoFromDBValues({
  *
  */
 export function assertUnreachable(_x: never, message: string): never {
-  console.info(`assertUnreachable: Didn't expect to get here with "${message}"`);
-  throw new Error("Didn't expect to get here");
+  const msg = `assertUnreachable: Didn't expect to get here with "${message}"`;
+  console.info(msg);
+  throw new Error(msg);
 }
 
 export function roomHasBlindEnabled(openGroup?: OpenGroupV2Room) {
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index 97e446871..853325dc6 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -126,7 +126,6 @@ export function getLastProfileUpdateTimestamp() {
 }
 
 export async function setLastProfileUpdateTimestamp(lastUpdateTimestamp: number) {
-  // TODO get rid of this once we remove the feature flag altogether
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     return;
   }
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index d16a08809..d285e77c9 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -129,10 +129,6 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
     callLibSessionWorker(['ContactsConfig', 'get', pubkeyHex]) as Promise<
       ReturnType<ContactsWrapperActionsCalls['get']>
     >,
-  getOrConstruct: async (pubkeyHex: string) =>
-    callLibSessionWorker(['ContactsConfig', 'getOrConstruct', pubkeyHex]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['getOrConstruct']>
-    >,
   getAll: async () =>
     callLibSessionWorker(['ContactsConfig', 'getAll']) as Promise<
       ReturnType<ContactsWrapperActionsCalls['getAll']>
@@ -147,30 +143,6 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
     callLibSessionWorker(['ContactsConfig', 'set', contact]) as Promise<
       ReturnType<ContactsWrapperActionsCalls['set']>
     >,
-  setApproved: async (pubkeyHex: string, approved: boolean) =>
-    callLibSessionWorker(['ContactsConfig', 'setApproved', pubkeyHex, approved]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setApproved']>
-    >,
-  setApprovedMe: async (pubkeyHex: string, approvedMe: boolean) =>
-    callLibSessionWorker(['ContactsConfig', 'setApprovedMe', pubkeyHex, approvedMe]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setApprovedMe']>
-    >,
-  setBlocked: async (pubkeyHex: string, blocked: boolean) =>
-    callLibSessionWorker(['ContactsConfig', 'setBlocked', pubkeyHex, blocked]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setBlocked']>
-    >,
-  setName: async (pubkeyHex: string, name: string) =>
-    callLibSessionWorker(['ContactsConfig', 'setName', pubkeyHex, name]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setName']>
-    >,
-  setNickname: async (pubkeyHex: string, nickname: string) =>
-    callLibSessionWorker(['ContactsConfig', 'setNickname', pubkeyHex, nickname]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setNickname']>
-    >,
-  setProfilePicture: async (pubkeyHex: string, url: string, key: Uint8Array) =>
-    callLibSessionWorker(['ContactsConfig', 'setProfilePicture', pubkeyHex, url, key]) as Promise<
-      ReturnType<ContactsWrapperActionsCalls['setProfilePicture']>
-    >,
 };
 
 export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = {

From fe5eea4c8db930c8057c60b7cc2101af8801079a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 30 Mar 2023 14:59:14 +1100
Subject: [PATCH 057/178] chore: fix critical yarn audit issues

---
 package.json                                  |  7 +-
 ts/models/conversation.ts                     |  1 -
 ts/receiver/configMessage.ts                  | 14 ++-
 .../open_group_api/sogsv3/sogsCapabilities.ts |  2 +-
 ts/session/apis/snode_api/retrieveRequest.ts  |  4 +-
 .../conversations/ConversationController.ts   | 97 +++++++++++--------
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  2 +-
 .../utils/libsession/libsession_utils.ts      |  1 -
 yarn.lock                                     | 22 +----
 9 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/package.json b/package.json
index 470ab2d98..9d30434a2 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,10 @@
     "@types/react": "17.0.2",
     "glob-parent": "^6.0.1",
     "got": "^11.8.5",
-    "jpeg-js": "^0.4.4"
+    "jpeg-js": "^0.4.4",
+    "json5": "^2.2.2",
+    "loader-utils": "^2.0.4",
+    "http-cache-semantics": "^4.1.1"
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
@@ -90,7 +93,6 @@
     "filesize": "3.6.1",
     "firstline": "1.2.1",
     "fs-extra": "9.0.0",
-    "git": "^0.1.5",
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
@@ -193,7 +195,6 @@
     "eslint-plugin-mocha": "^10.0.4",
     "eslint-plugin-more": "^1.0.5",
     "events": "^3.3.0",
-    "file-loader": "^6.2.0",
     "jsdom": "^19.0.0",
     "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "^2.7.5",
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 75c136521..184adaa15 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -2184,7 +2184,6 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   }
   // write to DB
   // TODOLATER remove duplicates between db and wrapper (except nickname&name as we need them for search, or move search to wrapper too)
-  // TODO when deleting a contact from the ConversationController, we still need to keep it in the wrapper but mark it as hidden (and we might need to add an hidden convo model field for it)
 
   const savedDetails = await Data.saveConversation(convo.attributes);
   await convo.refreshInMemoryDetails(savedDetails);
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 70fcaaabc..a20592d51 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -68,7 +68,7 @@ async function mergeConfigsWithIncomingUpdates(
 
   const groupedResults: Map<ConfigWrapperObjectTypes, IncomingConfResult> = new Map();
 
-  // TODO currently we only poll for user config messages, so this can be hardcoded
+  // TODOLATER currently we only poll for user config messages, so this can be hardcoded
   const publicKey = UserUtils.getOurPubKeyStrFromCache();
 
   try {
@@ -86,14 +86,11 @@ async function mergeConfigsWithIncomingUpdates(
       await GenericWrapperActions.merge(variant, toMerge);
       const needsPush = await GenericWrapperActions.needsPush(variant);
       const needsDump = await GenericWrapperActions.needsDump(variant);
-      window.log.info(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
-
-      // TODO do we need to keep track of the hashes or the library does in the end?
-      const messageHashes = toMerge.map(m => m.hash);
       const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
 
+      window.log.info(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
+
       const incomingConfResult: IncomingConfResult = {
-        messageHashes,
         needsDump,
         needsPush,
         kind: LibSessionUtil.variantToKind(variant),
@@ -311,7 +308,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   const legacyGroupsToLeaveInDB = allLegacyGroupsInDb.filter(m => {
     return !allLegacyGroupsIdsInWrapper.includes(m.id);
   });
-  // TODO we need to store the encryption keypair if needed
   window.log.info(
     `we have to join ${legacyGroupsToJoinInDB.length} legacy groups in DB compared to what is in the wrapper`
   );
@@ -366,7 +362,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
         legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp
           ? legacyGroupConvo.get('active_at')
           : latestEnvelopeTimestamp,
-      weWereJustAdded: false, // TODOLATER to remove
+      weWereJustAdded: false, // TODOLATER to remove once legacy groups support is dropped
     };
 
     await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
@@ -399,6 +395,8 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     // save the encryption keypair if needed
     if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
       try {
+        // TODO we need to store the encryption keypair if needed
+
         const inWrapperKeypair: HexKeyPair = {
           publicHex: toHex(fromWrapper.encPubkey),
           privateHex: toHex(fromWrapper.encSeckey),
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts
index 7e0b0f24b..030b0148d 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts
@@ -43,7 +43,7 @@ export const handleCapabilities = async (
   }
 
   // get all v2OpenGroup rooms with the matching serverUrl and set the capabilities.
-  // TODO: implement - update capabilities. Unsure whether to store in DB or save to instance of this obj.
+  // TODOLATER: capabilities are shared accross a server, not a room. We should probably move this to the server but we do not a server level currently, just rooms
 
   const rooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
 
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index ef920ea43..b7909e03c 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -68,7 +68,6 @@ async function buildRetrieveRequest(
   return retrieveRequestsParams;
 }
 
-/** */
 async function retrieveNextMessages(
   targetNode: Snode,
   lastHashes: Array<string>,
@@ -106,10 +105,9 @@ async function retrieveNextMessages(
     );
   }
 
+  // do a basic check to know if we have something kind of looking right (status 200 should always be there for a retrieve)
   const firstResult = results[0];
 
-  // TODO we should probably check for status code of all the results (when polling for a few namespaces at a time)
-
   if (firstResult.code !== 200) {
     window?.log?.warn(`retrieveNextMessages result is not 200 but ${firstResult.code}`);
     throw new Error(
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 7f9925046..0c94ff9d6 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -17,6 +17,7 @@ import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user
 import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { LibSessionUtil } from '../utils/libsession/libsession_utils';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
+import { ConvoVolatileType } from 'session_util_wrapper';
 
 let instance: ConversationController | null;
 
@@ -210,51 +211,63 @@ export class ConversationController {
     await deleteAllMessagesByConvoIdNoConfirmation(id);
     window.log.info(`deleteContact messages destroyed: ${id}`);
 
-    // Legacy group leaving
-    if (conversation.isClosedGroup()) {
-      window.log.info(`deleteContact ClosedGroup case: ${id}`);
-      await leaveClosedGroup(conversation.id);
-      await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
-      await SessionUtilUserGroups.removeLegacyGroupFromWrapper(conversation.id);
-    } else if (conversation.isPublic()) {
-      window?.log?.info('leaving open group v2', conversation.id);
-      // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
-      try {
-        await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
-        await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
-          conversation.id,
-          conversation.id
-        );
-      } catch (e) {
-        window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
-      }
+    const convoType: ConvoVolatileType = conversation.isClosedGroup()
+      ? 'LegacyGroup'
+      : conversation.isPublic()
+      ? 'Community'
+      : '1o1';
 
-      const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
-      if (roomInfos) {
-        getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
-      }
+    switch (convoType) {
+      case '1o1':
+        // if this conversation is a private conversation it's in fact a `contact` for desktop.
+        // we just set the hidden field to true
+        // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
+        // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
+        window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
 
-      // remove the roomInfos locally for this open group room including the pubkey
-      try {
-        await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
-      } catch (e) {
-        window?.log?.info('removeV2OpenGroupRoom failed:', e);
-      }
-    } else if (conversation.isPrivate()) {
-      // if this conversation is a private conversation it's in fact a `contact` for desktop.
-      // we just want to remove everything related to it and set the hidden field to true
-      // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation
-      window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
+        conversation.set({
+          hidden: true,
+        });
+        // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
+        // await conversation.setIsApproved(false, false);
+        await conversation.commit(); // this updates the wrappers content to reflect the hidden state
 
-      conversation.set({
-        hidden: true,
-      });
-      // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
-      // await conversation.setIsApproved(false, false);
-      await conversation.commit(); // this updates the wrappers content to reflect the hidden state
+        // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
+        break;
+      case 'Community':
+        window?.log?.info('leaving open group v2', conversation.id);
+        // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
+        try {
+          await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
+          await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
+            conversation.id,
+            conversation.id
+          );
+        } catch (e) {
+          window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
+        }
 
-      // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
-      // TODO the call above won't mark the conversation as hidden in the wrapper, it will just stop being updated (which is a bad thing)
+        const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
+        if (roomInfos) {
+          getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
+        }
+
+        // remove the roomInfos locally for this open group room including the pubkey
+        try {
+          await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
+        } catch (e) {
+          window?.log?.info('removeV2OpenGroupRoom failed:', e);
+        }
+        break;
+      case 'LegacyGroup':
+        window.log.info(`deleteContact ClosedGroup case: ${id}`);
+        await leaveClosedGroup(conversation.id);
+        await SessionUtilUserGroups.removeLegacyGroupFromWrapper(conversation.id);
+        await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
+
+        break;
+      default:
+        assertUnreachable(convoType, `deleteContact: convoType ${convoType} not handled`);
     }
 
     if (conversation.isGroup()) {
@@ -263,8 +276,6 @@ export class ConversationController {
       await Data.removeConversation(id);
 
       window.log.info(`deleteContact isGroup, convo removed from DB: ${id}`);
-
-      // TODO remove group related entries from their corresponding wrappers here
       this.conversations.remove(conversation);
 
       window?.inboxStore?.dispatch(
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 492ddef62..b3d3899ed 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -182,7 +182,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         }
       }
 
-      // TODO add a way to have a few configuration sync jobs running at the same time, but only a single one per pubkey
+      // TODOLATER add a way to have a few configuration sync jobs running at the same time, but only a single one per pubkey
       const thisJobDestination = us;
 
       const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 18ea182c8..ac6b6d255 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -25,7 +25,6 @@ const requiredUserVariants: Array<ConfigWrapperObjectTypes> = [
 export type IncomingConfResult = {
   needsPush: boolean;
   needsDump: boolean;
-  messageHashes: Array<string>;
   kind: SignalService.SharedConfigMessage.Kind;
   publicKey: string;
   latestEnvelopeTimestamp: number;
diff --git a/yarn.lock b/yarn.lock
index c60e82d79..a27a25a8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3769,14 +3769,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
-  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 file-type@^10.10.0:
   version "10.11.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
@@ -4051,13 +4043,6 @@ getobject@^1.0.0:
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45"
   integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg==
 
-git@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/git/-/git-0.1.5.tgz#9ef62df93f851c27542143bf52d1c68b1017ca15"
-  integrity sha512-N+bfOrXyKMU/fQtCj6D/U9MQOEN0DAA8TLHSLdUQRSWBOkeRvsjJHdrdkvcq05xO7GSDKWc3nDEGoTZ4DfCCSg==
-  dependencies:
-    mime "1.2.9"
-
 glob-parent@^6.0.1, glob-parent@~5.1.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
@@ -5317,11 +5302,6 @@ mime-types@^2.1.12, mime-types@^2.1.27:
   dependencies:
     mime-db "1.52.0"
 
-mime@1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.9.tgz#009cd40867bd35de521b3b966f04e2f8d4d13d09"
-  integrity sha512-WiLgbHTIq5AYUvU/Luli4mZ1bUcHpGNHyCsbl+KPMg4zt+XUDpQehWjuBjdLaEvDTinvKj/FgfQt3fPoT7j08g==
-
 mime@^2.4.6:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
@@ -6940,7 +6920,7 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==

From 027bd46ff741fcb17ecc64cbae9434e5f2244e3a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 31 Mar 2023 11:33:30 +1100
Subject: [PATCH 058/178] fix: allow legacy config message during linking

We only handle handlethem after the new config message ones, so if there is a
shared config message on the network we will use it for the linking
process instead. The legacy one this commit is about is bound to be
removed completely and will only be used until our users have updated to
the new ones for some time.
---
 preload.js                   |  1 -
 ts/receiver/configMessage.ts | 19 ++++++++++++-------
 ts/util/accountManager.ts    |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/preload.js b/preload.js
index 9ede62bd2..8958a37ba 100644
--- a/preload.js
+++ b/preload.js
@@ -237,7 +237,6 @@ const { setupi18n } = require('./ts/util/i18n');
 window.Signal = data.initData();
 
 const { getConversationController } = require('./ts/session/conversations/ConversationController');
-const { isEmpty } = require('lodash');
 window.getConversationController = getConversationController;
 // Linux seems to periodically let the event loop stop, so this is a global workaround
 setInterval(() => {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index a20592d51..d69c4e212 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -24,6 +24,7 @@ import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
+import { Registration } from '../util/registration';
 import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
@@ -654,8 +655,8 @@ async function handleOurProfileUpdateLegacy(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
 ) {
-  // this call won't be needed with the new sharedUtilLibrary
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  // we want to allow if we are not registered, as we might need to fetch an old config message (can be removed once we released for a weeks the libsession util)
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
   const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp();
@@ -678,7 +679,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
   envelope: EnvelopePlus,
   configMessage: SignalService.ConfigurationMessage
 ) {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
   const envelopeTimestamp = toNumber(envelope.timestamp);
@@ -718,7 +719,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
  * @param openGroups string array of open group urls
  */
 const handleOpenGroupsFromConfig = (openGroups: Array<string>) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
   const numberOpenGroup = openGroups?.length || 0;
@@ -746,7 +747,7 @@ const handleClosedGroupsFromConfigLegacy = async (
   closedGroups: Array<SignalService.ConfigurationMessage.IClosedGroup>,
   envelope: EnvelopePlus
 ) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
   const numberClosedGroup = closedGroups?.length || 0;
@@ -781,7 +782,7 @@ const handleContactFromConfigLegacy = async (
   contactReceived: SignalService.ConfigurationMessage.IContact,
   envelope: EnvelopePlus
 ) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
   try {
@@ -845,7 +846,11 @@ async function handleConfigurationMessageLegacy(
   envelope: EnvelopePlus,
   configurationMessage: SignalService.ConfigurationMessage
 ): Promise<void> {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  // when the useSharedUtilForUserConfig flag is ON, we want only allow a legacy config message if we are registering a new user.
+  // this is to allow users linking a device to find their config message if they do not have a shared config message yet.
+  // the process of those messages is always done after the process of the shared config messages, so that's only a fallback.
+
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 63f4b3c4f..8ed77e10d 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -181,6 +181,8 @@ async function registrationDone(ourPubkey: string, displayName: string) {
 
   // initializeLibSessionUtilWrappers needs our publicKey to be set
   await Storage.put('primaryDevicePubKey', ourPubkey);
+  await Registration.markDone();
+
   try {
     await LibSessionUtil.initializeLibSessionUtilWrappers();
   } catch (e) {
@@ -203,8 +205,6 @@ async function registrationDone(ourPubkey: string, displayName: string) {
   };
   window.inboxStore?.dispatch(userActions.userChanged(user));
 
-  await Registration.markDone();
-
   window?.log?.info('dispatching registration event');
   trigger('registration_done');
 }

From f3975b545a6c97a553904bb2ee5bb4f0e5e281c0 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Apr 2023 12:03:23 +1000
Subject: [PATCH 059/178] feat: use priority for hidden and pinned conversation

---
 .../leftpane/overlay/OverlayMessage.tsx       |   7 +-
 ts/components/menu/Menu.tsx                   |   2 +-
 ts/hooks/useParamSelector.ts                  |   9 +-
 ts/models/conversation.ts                     | 167 ++++++++++++------
 ts/models/conversationAttributes.ts           |  24 ++-
 ts/models/message.ts                          |   2 +-
 ts/node/database_utility.ts                   |  10 +-
 ts/node/migration/sessionMigrations.ts        |  57 ++----
 ts/node/sql.ts                                |   6 +-
 ts/receiver/configMessage.ts                  |  30 +---
 ts/receiver/contentMessage.ts                 |   2 +-
 ts/receiver/queuedJob.ts                      |   5 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   7 +-
 .../conversations/ConversationController.ts   |   5 +-
 ts/session/group/closed-group.ts              |  10 +-
 ts/session/utils/calling/CallManager.ts       |   7 +-
 .../libsession/libsession_utils_contacts.ts   |   6 +-
 .../libsession_utils_user_groups.ts           |   5 +-
 ts/state/ducks/conversations.ts               |   3 +-
 ts/state/selectors/conversations.ts           |   8 +-
 .../libsession_wrapper_contacts_test.ts       |   7 +-
 .../libsession_wrapper_usergroups_test.ts     |   7 +-
 .../unit/models/ConversationModels_test.ts    |  15 +-
 .../models/formatRowOfConversation_test.ts    |  23 ---
 .../unit/selectors/conversations_test.ts      |  36 ++--
 ts/types/sqlSharedTypes.ts                    |  26 +--
 26 files changed, 247 insertions(+), 239 deletions(-)

diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 8583ab6ac..0314c02c0 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -66,9 +66,12 @@ export const OverlayMessage = () => {
     if (!convo.isActive() || !convo.isApproved() || convo.isHidden()) {
       // bump the timestamp only if we were not active before
       if (!convo.isActive()) {
-        convo.set({ active_at: Date.now(), isApproved: true, hidden: false });
+        convo.set({ active_at: Date.now() });
       }
-      convo.set({ isApproved: true, hidden: false });
+      await convo.unhideIfNeeded(false);
+
+      // TODO find a way to make this not a hack to show it in the list
+      convo.set({ isApproved: true });
       await convo.commit();
     }
 
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 9ca5153dd..cc989ffa9 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -183,7 +183,7 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
     const conversation = getConversationController().get(conversationId);
 
     const togglePinConversation = async () => {
-      await conversation?.setIsPinned(!isPinned);
+      await conversation?.togglePinned();
     };
 
     const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 7587cf757..1c2f23642 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,4 +1,4 @@
-import { isEmpty, pick } from 'lodash';
+import { isEmpty, isNumber, pick } from 'lodash';
 import { useSelector } from 'react-redux';
 import { ConversationModel } from '../models/conversation';
 import { PubKey } from '../session/types';
@@ -141,7 +141,12 @@ export function useExpireTimer(convoId?: string) {
 
 export function useIsPinned(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
-  return Boolean(convoProps && convoProps.isPinned);
+  return Boolean(
+    convoProps &&
+      isNumber(convoProps.priority) &&
+      isFinite(convoProps.priority) &&
+      convoProps.priority > 0
+  );
 }
 
 export function useIsApproved(convoId?: string) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 184adaa15..f32f0cadd 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -97,6 +97,7 @@ import { Reactions } from '../util/reactions';
 import { Registration } from '../util/registration';
 import { Storage } from '../util/storage';
 import {
+  CONVERSATION_PRIORITIES,
   ConversationAttributes,
   ConversationNotificationSetting,
   ConversationTypeEnum,
@@ -263,7 +264,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public isHidden() {
-    return Boolean(this.get('hidden'));
+    const priority = this.get('priority') || CONVERSATION_PRIORITIES.default;
+    return this.isPrivate() && priority === CONVERSATION_PRIORITIES.hidden;
   }
 
   public async cleanup() {
@@ -280,7 +282,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public getConversationModelProps(): ReduxConversationType {
     const isPublic = this.isPublic();
 
-    const zombies = this.isClosedGroup() ? this.get('zombies') : [];
     const ourNumber = UserUtils.getOurPubKeyStrFromCache();
     const avatarPath = this.getAvatarPath();
     const isPrivate = this.isPrivate();
@@ -289,9 +290,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const weAreModerator = this.isModerator(ourNumber); // only used for sogs
     const isMe = this.isMe();
     const isTyping = !!this.typingTimer;
-    const isKickedFromGroup = !!this.get('isKickedFromGroup');
-    const left = !!this.get('left');
+
     const currentNotificationSetting = this.get('triggerNotificationsFor');
+    const priority = this.get('priority');
 
     // To reduce the redux store size, only set fields which cannot be undefined.
     // For instance, a boolean can usually be not set if false, etc
@@ -299,10 +300,16 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       id: this.id as string,
       activeAt: this.get('active_at'),
       type: this.get('type'),
-      isHidden: !!this.get('hidden'),
-      isMarkedUnread: !!this.get('markedAsUnread'),
     };
 
+    if (isFinite(priority) && priority !== CONVERSATION_PRIORITIES.default) {
+      toRet.priority = priority;
+    }
+
+    if (this.get('markedAsUnread')) {
+      toRet.isMarkedUnread = !!this.get('markedAsUnread');
+    }
+
     if (isPrivate) {
       toRet.isPrivate = true;
     }
@@ -333,6 +340,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.avatarPath = avatarPath;
     }
 
+    if (
+      currentNotificationSetting &&
+      currentNotificationSetting !== ConversationNotificationSetting[0]
+    ) {
+      toRet.currentNotificationSetting = currentNotificationSetting;
+    }
+
     const foundContact = SessionUtilContact.getContactCached(this.id);
     const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
     const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
@@ -360,10 +374,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         toRet.isApproved = foundContact.approved;
       }
 
-      toRet.isHidden = foundContact.hidden;
-
-      if (foundContact.priority > 0) {
-        toRet.isPinned = true;
+      if (foundContact.priority) {
+        toRet.priority = foundContact.priority;
       }
 
       if (foundContact.expirationTimerSeconds > 0) {
@@ -389,19 +401,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       if (this.get('isApproved')) {
         toRet.isApproved = this.get('isApproved');
       }
-      if (!this.get('active_at')) {
-        toRet.isHidden = true;
-      }
-
-      if (this.get('isPinned')) {
-        toRet.isPinned = true;
-      }
 
       if (this.get('expireTimer')) {
         toRet.expireTimer = this.get('expireTimer');
       }
     }
 
+    // -- Handle the group fields from the wrapper and the database --
     if (foundLegacyGroup) {
       toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || [];
       toRet.groupAdmins =
@@ -411,15 +417,32 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         : foundLegacyGroup.name;
       toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds;
 
-      if (foundLegacyGroup.priority > 0) {
-        toRet.isPinned = Boolean(foundLegacyGroup.priority > 0);
+      if (foundLegacyGroup.priority) {
+        toRet.priority = foundLegacyGroup.priority;
+      } // TODO grab the details from the db if we do not have an entry in the wrapper
+    }
+
+    if (this.isClosedGroup()) {
+      if (this.get('isKickedFromGroup')) {
+        toRet.isKickedFromGroup = !!this.get('isKickedFromGroup');
+      }
+      if (this.get('left')) {
+        toRet.left = !!this.get('left');
+      }
+
+      const zombies = this.get('zombies') || [];
+      if (zombies?.length) {
+        toRet.zombies = uniq(zombies);
       }
     }
 
+    // -- Handle the communities fields from the wrapper and the database --
     if (foundCommunity) {
-      if (foundCommunity.priority > 0) {
-        toRet.isPinned = true;
+      if (foundCommunity.priority) {
+        toRet.priority = foundCommunity.priority;
       }
+      // TODO grab the details from the db if we do not have an entry in the wrapper
+      // TODO should we just not rely on the db values?
     }
 
     if (foundVolatileInfo) {
@@ -428,6 +451,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
+    // -- Handle the field stored only in memory for all types of conversation--
     const inMemoryConvoInfo = inMemoryConvoInfos.get(this.id);
     if (inMemoryConvoInfo) {
       if (inMemoryConvoInfo.unreadCount) {
@@ -438,24 +462,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    if (isKickedFromGroup) {
-      toRet.isKickedFromGroup = isKickedFromGroup;
-    }
-    if (left) {
-      toRet.left = left;
-    }
-
-    if (
-      currentNotificationSetting &&
-      currentNotificationSetting !== ConversationNotificationSetting[0]
-    ) {
-      toRet.currentNotificationSetting = currentNotificationSetting;
-    }
-
-    if (zombies && zombies.length) {
-      toRet.zombies = uniq(zombies);
-    }
-
+    // -- Handle the last message status, if needed --
     const lastMessageText = this.get('lastMessage');
     if (lastMessageText && lastMessageText.length) {
       const lastMessageStatus = this.get('lastMessageStatus');
@@ -601,10 +608,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
 
       // we are trying to send a message to someone. If that convo is hidden in the list, make sure it is not
-      if (this.isHidden()) {
-        this.set({ hidden: false });
-        await this.commit();
-      }
+      this.unhideIfNeeded(true);
+
       // an OpenGroupV2 message is just a visible message
       const chatMessageParams: VisibleMessageParams = {
         body,
@@ -1432,22 +1437,76 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return Array.isArray(groupModerators) && groupModerators.includes(pubKey);
   }
 
-  public async setIsPinned(value: boolean, shouldCommit: boolean = true) {
-    const valueForced = Boolean(value);
-
-    if (valueForced !== Boolean(this.isPinned())) {
+  /**
+   * When receiving a shared config message, we need to apply the change after the merge happened to our database.
+   * This is done with this function.
+   * There are other actions to change the priority from the UI (or from )
+   * @param priority
+   * @param shouldCommit
+   */
+  public async setPriorityFromWrapper(
+    priority: number,
+    shouldCommit: boolean = true
+  ): Promise<boolean> {
+    if (priority !== this.get('priority')) {
       this.set({
-        isPinned: valueForced,
+        priority,
       });
 
       if (shouldCommit) {
         await this.commit();
       }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Toggle the pinned state of a conversation.
+   * Any conversation can be pinned and the higher the priority, the higher it will be in the list.
+   * Note: Currently, we do not have an order in the list of pinned conversation, but the libsession util wrapper can handle the order.
+   */
+  public async togglePinned(shouldCommit: boolean = true) {
+    this.set({ priority: this.isPinned() ? 0 : 1 });
+    if (shouldCommit) {
+      await this.commit();
+    }
+    return true;
+  }
+
+  /**
+   * Force the priority to be -1 (PRIORITY_DEFAULT_HIDDEN) so this conversation is hidden in the list. Currently only works for private chats.
+   */
+  public async setHidden(shouldCommit: boolean = true) {
+    if (!this.isPrivate()) {
+      return;
+    }
+    const priority = this.get('priority');
+    if (priority >= CONVERSATION_PRIORITIES.default) {
+      this.set({ priority: CONVERSATION_PRIORITIES.hidden });
+      if (shouldCommit) {
+        await this.commit();
+      }
+    }
+  }
+
+  /**
+   * Reset the priority of this conversation to 0 if it was < 0, but keep anything > 0 as is.
+   * So if the conversation was pinned, we keep it pinned with its current priority.
+   * A pinned cannot be hidden, as the it is all based on the same priority values.
+   */
+  public async unhideIfNeeded(shouldCommit: boolean = true) {
+    const priority = this.get('priority');
+    if (isFinite(priority) && priority < CONVERSATION_PRIORITIES.default) {
+      this.set({ priority: CONVERSATION_PRIORITIES.default });
+      if (shouldCommit) {
+        await this.commit();
+      }
     }
   }
 
   public async markAsUnread(forcedValue: boolean, shouldCommit: boolean = true) {
-    if (!!forcedValue !== !!this.get('markedAsUnread')) {
+    if (!!forcedValue !== this.isMarkedUnread()) {
       this.set({
         markedAsUnread: !!forcedValue,
       });
@@ -1627,7 +1686,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public isPinned() {
-    return Boolean(this.get('isPinned'));
+    const priority = this.get('priority');
+
+    return isFinite(priority) && priority > CONVERSATION_PRIORITIES.default;
   }
 
   public didApproveMe() {
@@ -1638,10 +1699,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return Boolean(this.get('isApproved'));
   }
 
-  public getTitle() {
-    return this.getNicknameOrRealUsernameOrPlaceholder();
-  }
-
   /**
    * For a private convo, returns the loki profilename if set, or a shortened
    * version of the contact pubkey.
@@ -1773,7 +1830,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       message: friendRequestText ? friendRequestText : message.getNotificationText(),
       messageId,
       messageSentAt,
-      title: friendRequestText ? '' : convo.getTitle(),
+      title: friendRequestText ? '' : convo.getNicknameOrRealUsernameOrPlaceholder(),
     });
   }
 
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index ab7b94215..250fbeaf2 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -95,13 +95,12 @@ export interface ConversationAttributes {
   members: Array<string>; // groups only members are all members for this group. zombies excluded (not used for communities)
   groupAdmins: Array<string>; // for sogs and closed group: the unique admins of that group
 
-  isPinned: boolean;
+  priority: number; // -1 = hidden (contact and NTS only), 0 = normal, 1 = pinned
 
   isApproved: boolean; // if we sent a message request or sent a message to this contact, we approve them. If isApproved & didApproveMe, a message request becomes a contact
   didApproveMe: boolean; // if our message request was approved already (or they've sent us a message request/message themselves). If isApproved & didApproveMe, a message request becomes a contact
 
   markedAsUnread: boolean; // Force the conversation as unread even if all the messages are read. Used to highlight a conversation the user wants to check again later, synced.
-  hidden: boolean; // hides a conversation, but keep it the history and nicknames, etc. Currently only supported for contacts
 }
 
 /**
@@ -128,12 +127,29 @@ export const fillConvoAttributesWithDefaults = (
     triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default
 
     isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so
-    isPinned: false,
     isApproved: false,
     didApproveMe: false,
     isKickedFromGroup: false,
     left: false,
-    hidden: true,
+    priority: CONVERSATION_PRIORITIES.default,
     markedAsUnread: false,
   });
 };
+
+/**
+ * Priorities have a weird behavior.
+ * * 0 always means unpinned and not hidden.
+ * * -1 always means hidden.
+ * * anything over 0 means pinned with the higher priority the better. (No sorting currently implemented)
+ *
+ * When our local user pins a conversation we should use 1 as the priority.
+ * When we get an update from the libsession util wrapper, we should trust the value and set it locally as is.
+ * So if we get 100 as priority, we set the conversation priority to 100.
+ * If we get -20 as priority we set it as is, even if our current client does not understand what that means.
+ *
+ */
+export const CONVERSATION_PRIORITIES = {
+  default: 0,
+  hidden: -1,
+  pinned: 1, // anything over 0 means pinned, but when our local users pins a conversation, we set the priority to 1
+};
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 412af54c9..3ed767d77 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1220,7 +1220,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       avatarPath: contactModel ? contactModel.getAvatarPath() : null,
       name: contactModel?.getRealSessionUsername() || null,
       profileName,
-      title: contactModel?.getTitle() || null,
+      title: contactModel?.getNicknameOrRealUsernameOrPlaceholder() || null,
       isMe,
     };
   }
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index b63b0d69b..af102ef89 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -2,6 +2,7 @@ import { difference, omit, pick } from 'lodash';
 import {
   ConversationAttributes,
   ConversationAttributesWithNotSavedOnes,
+  CONVERSATION_PRIORITIES,
 } from '../models/conversationAttributes';
 
 import * as BetterSqlite3 from 'better-sqlite3';
@@ -51,7 +52,6 @@ const allowedKeysFormatRowOfConversation = [
   'members',
   'zombies',
   'isTrustedForAttachmentDownload',
-  'isPinned',
   'isApproved',
   'didApproveMe',
   'mentionedUs',
@@ -74,7 +74,7 @@ const allowedKeysFormatRowOfConversation = [
   'displayNameInProfile',
   'conversationIdOrigin',
   'markedAsUnread',
-  'hidden',
+  'priority',
 ];
 // tslint:disable: cyclomatic-complexity
 export function formatRowOfConversation(
@@ -121,13 +121,12 @@ export function formatRowOfConversation(
 
   // sqlite stores boolean as integer. to clean thing up we force the expected boolean fields to be boolean
   convo.isTrustedForAttachmentDownload = Boolean(convo.isTrustedForAttachmentDownload);
-  convo.isPinned = Boolean(convo.isPinned);
   convo.isApproved = Boolean(convo.isApproved);
   convo.didApproveMe = Boolean(convo.didApproveMe);
   convo.isKickedFromGroup = Boolean(convo.isKickedFromGroup);
   convo.left = Boolean(convo.left);
   convo.markedAsUnread = Boolean(convo.markedAsUnread);
-  convo.hidden = Boolean(convo.hidden);
+  convo.priority = convo.priority || CONVERSATION_PRIORITIES.default;
 
   if (!convo.conversationIdOrigin) {
     convo.conversationIdOrigin = undefined;
@@ -169,7 +168,6 @@ const allowedKeysOfConversationAttributes = [
   'members',
   'zombies',
   'isTrustedForAttachmentDownload',
-  'isPinned',
   'isApproved',
   'didApproveMe',
   'isKickedFromGroup',
@@ -190,7 +188,7 @@ const allowedKeysOfConversationAttributes = [
   'displayNameInProfile',
   'conversationIdOrigin',
   'markedAsUnread',
-  'hidden',
+  'priority',
 ];
 
 /**
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 1c099db25..5b303f59a 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -6,7 +6,10 @@ import {
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
 } from 'session_util_wrapper';
-import { ConversationAttributes } from '../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationAttributes,
+} from '../../models/conversationAttributes';
 import { HexKeyPair } from '../../receiver/keypairs';
 import { fromHexToArray } from '../../session/utils/String';
 import {
@@ -1216,8 +1219,7 @@ function insertContactIntoContactWrapper(
     const dbApproved = !!contact.isApproved || false;
     const dbApprovedMe = !!contact.didApproveMe || false;
     const dbBlocked = blockedNumbers.includes(contact.id);
-    const hidden = contact.hidden || false;
-    const isPinned = contact.isPinned;
+    const priority = contact.priority || 0;
     const expirationTimerSeconds = contact.expireTimer || 0;
 
     const wrapperContact = getContactInfoFromDBValues({
@@ -1229,8 +1231,7 @@ function insertContactIntoContactWrapper(
       dbNickname: contact.nickname || undefined,
       dbProfileKey: contact.profileKey || undefined,
       dbProfileUrl: contact.avatarPointer || undefined,
-      isPinned,
-      hidden,
+      priority,
       expirationTimerSeconds,
     });
 
@@ -1254,8 +1255,7 @@ function insertContactIntoContactWrapper(
             dbNickname: undefined,
             dbProfileKey: undefined,
             dbProfileUrl: undefined,
-            isPinned: false,
-            hidden,
+            priority: CONVERSATION_PRIORITIES.default,
             expirationTimerSeconds: 0,
           })
         );
@@ -1295,12 +1295,12 @@ function insertContactIntoContactWrapper(
 }
 
 function insertCommunityIntoWrapper(
-  community: { id: string; isPinned: boolean },
+  community: { id: string; priority: number },
   userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
   volatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
   db: BetterSqlite3.Database
 ) {
-  const isPinned = community.isPinned;
+  const priority = community.priority;
   const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
 
   const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
@@ -1330,7 +1330,7 @@ function insertCommunityIntoWrapper(
   );
   const wrapperComm = getCommunityInfoFromDBValues({
     fullUrl,
-    isPinned,
+    priority,
   });
 
   try {
@@ -1364,21 +1364,13 @@ function insertCommunityIntoWrapper(
 function insertLegacyGroupIntoWrapper(
   legacyGroup: Pick<
     ConversationAttributes,
-    'hidden' | 'id' | 'isPinned' | 'expireTimer' | 'displayNameInProfile'
+    'id' | 'priority' | 'expireTimer' | 'displayNameInProfile'
   > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
   userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
   volatileInfoConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
   db: BetterSqlite3.Database
 ) {
-  const {
-    isPinned,
-    id,
-    hidden,
-    expireTimer,
-    groupAdmins,
-    members,
-    displayNameInProfile,
-  } = legacyGroup;
+  const { priority, id, expireTimer, groupAdmins, members, displayNameInProfile } = legacyGroup;
 
   const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair(
     legacyGroup.id,
@@ -1387,8 +1379,7 @@ function insertLegacyGroupIntoWrapper(
 
   const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
     id,
-    hidden,
-    isPinned,
+    priority,
     expireTimer,
     groupAdmins,
     members,
@@ -1455,14 +1446,6 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
    * Create a table to store our sharedConfigMessage dumps
    */
   db.transaction(() => {
-    // when deleting a contact we now mark it as 'hidden' rather than overriding the `active_at` field.
-    // by default, conversation are hidden
-    db.exec(
-      `ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN hidden INTEGER NOT NULL DEFAULT ${toSqliteBoolean(
-        true
-      )};
-      `
-    );
     // drop unused readCapability & uploadCapability columns. Also move `writeCapability` to memory only value.
     db.exec(`
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN readCapability; -- stored in a redux slice now
@@ -1471,6 +1454,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN subscriberCount; -- stored in a redux slice now
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN groupModerators; -- stored in a redux slice now
 
+      ALTER TABLE ${CONVERSATIONS_TABLE} RENAME COLUMN isPinned TO priority; -- isPinned was 0 for false and 1 for true, which matches our way of handling the priority
       ALTER TABLE ${CONVERSATIONS_TABLE} DROP COLUMN is_medium_group; -- a medium group starts with 05 and has a type of group. We cache everything renderer side so there is no need for that field
       `);
 
@@ -1478,18 +1462,13 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
     db.exec(`
       ALTER TABLE unprocessed DROP COLUMN serverTimestamp;
       `);
-    // mark every "active" private chats as not hidden
-    db.prepare(
-      `UPDATE ${CONVERSATIONS_TABLE} SET
-        hidden = ${toSqliteBoolean(false)}
-        WHERE type = 'private' AND active_at > 0 AND (didApproveMe OR isApproved);`
-    ).run({});
 
-    // mark every not private chats (groups or communities) as not hidden (even if a group was left or we were kicked, we want it visible in the app)
+    // after the rename of isPinned to priority, we also need to hide any conversation that
+    // TODO do we need to update the conversation priority to hidden for some for those ( like the non active and non approved/didApproveMe?)
     db.prepare(
       `UPDATE ${CONVERSATIONS_TABLE} SET
-        hidden = ${toSqliteBoolean(false)}
-        WHERE type <> 'private' AND active_at > 0;`
+        priority = ${CONVERSATION_PRIORITIES.hidden}
+        WHERE type = 'private' AND active_at IS NULL;`
     ).run({});
 
     db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index d12ef88e6..8f5377d83 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -436,13 +436,12 @@ function saveConversation(data: ConversationAttributes): SaveConversationReturn
     avatarImageId,
     triggerNotificationsFor,
     isTrustedForAttachmentDownload,
-    isPinned,
     isApproved,
     didApproveMe,
     avatarInProfile,
     displayNameInProfile,
     conversationIdOrigin,
-    hidden,
+    priority,
     markedAsUnread,
   } = formatted;
 
@@ -486,13 +485,12 @@ function saveConversation(data: ConversationAttributes): SaveConversationReturn
       avatarImageId,
       triggerNotificationsFor,
       isTrustedForAttachmentDownload: toSqliteBoolean(isTrustedForAttachmentDownload),
-      isPinned: toSqliteBoolean(isPinned),
+      priority,
       isApproved: toSqliteBoolean(isApproved),
       didApproveMe: toSqliteBoolean(didApproveMe),
       avatarInProfile,
       displayNameInProfile,
       conversationIdOrigin,
-      hidden,
       markedAsUnread: toSqliteBoolean(markedAsUnread),
     });
 
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index d69c4e212..36118c023 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -156,8 +156,8 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.hidden) !== Boolean(contactConvo.isHidden())) {
-        contactConvo.set({ hidden: !!wrapperConvo.hidden });
+      if (wrapperConvo.priority !== contactConvo.get('priority')) {
+        contactConvo.set({ priority: wrapperConvo.priority });
         changes = true;
       }
 
@@ -176,13 +176,6 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      //TODO priority means more than just isPinned but has an order logic in it too
-      const shouldBePinned = wrapperConvo.priority > 0;
-      if (shouldBePinned !== Boolean(contactConvo.isPinned())) {
-        await contactConvo.setIsPinned(shouldBePinned, false);
-        changes = true;
-      }
-
       const convoBlocked = wrapperConvo.blocked || false;
       await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
 
@@ -277,12 +270,8 @@ async function handleCommunitiesUpdate() {
     if (fromWrapper && communityConvo) {
       let changes = false;
 
-      //TODO priority means more than just isPinned but has an order logic in it too
-      const shouldBePinned = fromWrapper.priority > 0;
-      if (shouldBePinned !== Boolean(communityConvo.isPinned())) {
-        await communityConvo.setIsPinned(shouldBePinned, false);
-        changes = true;
-      }
+      changes =
+        (await communityConvo.setPriorityFromWrapper(fromWrapper.priority, false)) || changes;
 
       // make sure to write the changes to the database now as the `AvatarDownloadJob` below might take some time before getting run
       if (changes) {
@@ -368,13 +357,10 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
 
     await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
 
-    let changes = false;
-    if (legacyGroupConvo.isPinned() !== fromWrapper.priority > 0) {
-      await legacyGroupConvo.setIsPinned(fromWrapper.priority > 0, false);
-      changes = true;
-    }
-    if (!!legacyGroupConvo.isHidden() !== !!fromWrapper.hidden) {
-      legacyGroupConvo.set({ hidden: !!fromWrapper.hidden });
+    let changes = await legacyGroupConvo.setPriorityFromWrapper(fromWrapper.priority, false);
+
+    if (legacyGroupConvo.get('priority') !== fromWrapper.priority) {
+      legacyGroupConvo.set({ priority: fromWrapper.priority });
       changes = true;
     }
     if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index bcd455c9f..0da4649b5 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -642,10 +642,10 @@ async function handleMessageRequestResponse(
 
   conversationToApprove.set({
     active_at: mostRecentActiveAt,
-    hidden: false,
     isApproved: true,
     didApproveMe: true,
   });
+  await conversationToApprove.unhideIfNeeded(false);
 
   if (convosToMerge.length) {
     // merge fields we care by hand
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 923a76a14..bf808978b 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -267,14 +267,15 @@ async function handleRegularMessage(
   const conversationActiveAt = conversation.get('active_at');
   if (
     !conversationActiveAt ||
-    conversation.get('hidden') ||
+    conversation.isHidden() ||
     (message.get('sent_at') || 0) > conversationActiveAt
   ) {
     conversation.set({
       active_at: message.get('sent_at'),
-      hidden: false, // a new message was received for that conversation. If it was not it should not be hidden anymore
       lastMessage: message.getNotificationText(),
     });
+    // a new message was received for that conversation. If it was not it should not be hidden anymore
+    await conversation.unhideIfNeeded(false);
   }
 
   if (rawDataMessage.profileKey) {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 1c30247c9..0027d3cda 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -8,7 +8,10 @@ import { OpenGroupServerPoller } from './OpenGroupServerPoller';
 
 import autoBind from 'auto-bind';
 import _, { clone, isEqual } from 'lodash';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+} from '../../../../models/conversationAttributes';
 import { SessionUtilUserGroups } from '../../../utils/libsession/libsession_utils_user_groups';
 import { openGroupV2GetRoomInfoViaOnionV4 } from '../sogsv3/sogsV3RoomInfos';
 import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
@@ -222,7 +225,7 @@ export class OpenGroupManagerV2 {
         displayNameInProfile: updatedRoom.roomName,
         isApproved: true,
         didApproveMe: true,
-        hidden: false,
+        priority: CONVERSATION_PRIORITIES.default,
         isTrustedForAttachmentDownload: true, // we always trust attachments when sent to an opengroup
       });
       await conversation.commit();
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 0c94ff9d6..88be9c6af 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -8,7 +8,7 @@ import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { PubKey } from '../types';
 
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { leaveClosedGroup } from '../group/closed-group';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
@@ -224,9 +224,8 @@ export class ConversationController {
         // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
         // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
         window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
-
         conversation.set({
-          hidden: true,
+          priority: CONVERSATION_PRIORITIES.hidden,
         });
         // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
         // await conversation.setIsApproved(false, false);
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 37cb54c65..5816583eb 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -220,13 +220,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
 
   const updates: Pick<
     ConversationAttributes,
-    | 'type'
-    | 'members'
-    | 'displayNameInProfile'
-    | 'active_at'
-    | 'left'
-    | 'lastJoinedTimestamp'
-    | 'hidden'
+    'type' | 'members' | 'displayNameInProfile' | 'active_at' | 'left' | 'lastJoinedTimestamp'
   > = {
     displayNameInProfile: details.name,
     members: details.members,
@@ -234,10 +228,10 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
     lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
-    hidden: false,
   };
 
   conversation.set(updates);
+  await conversation.unhideIfNeeded(false);
 
   const isBlocked = details.blocked || false;
   if (conversation.isClosedGroup()) {
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 92e6643b4..06ad2831c 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -503,7 +503,7 @@ export async function USER_callRecipient(recipient: string) {
   window.log.info('Sending preOffer message to ', ed25519Str(recipient));
   const calledConvo = getConversationController().get(recipient);
   calledConvo.set('active_at', Date.now()); // addSingleOutgoingMessage does the commit for us on the convo
-  calledConvo.set('hidden', false);
+  await calledConvo.unhideIfNeeded(false);
   weAreCallerOnCurrentCall = true;
 
   await calledConvo?.addSingleOutgoingMessage({
@@ -852,7 +852,8 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
   const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
   const callerConvo = getConversationController().get(fromSender);
   callerConvo.set('active_at', networkTimestamp);
-  callerConvo.set('hidden', false);
+  await callerConvo.unhideIfNeeded(false);
+
   await callerConvo?.addSingleIncomingMessage({
     source: UserUtils.getOurPubKeyStrFromCache(),
     sent_at: networkTimestamp,
@@ -1189,7 +1190,7 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
 
   if (incomingCallConversation.isActive() || incomingCallConversation.isHidden()) {
     incomingCallConversation.set('active_at', GetNetworkTime.getNowWithNetworkOffset());
-    incomingCallConversation.set('hidden', false);
+    await incomingCallConversation.unhideIfNeeded(false);
   }
 
   await incomingCallConversation?.addSingleIncomingMessage({
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 9b495645f..ac18b2d0f 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -81,8 +81,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbApproved = !!foundConvo.get('isApproved') || false;
   const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
   const dbBlocked = !!foundConvo.isBlocked() || false;
-  const hidden = foundConvo.get('hidden') || false;
-  const isPinned = foundConvo.get('isPinned');
+  const priority = foundConvo.get('priority') || 0;
   const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
 
   const wrapperContact = getContactInfoFromDBValues({
@@ -94,8 +93,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     dbNickname,
     dbProfileKey,
     dbProfileUrl,
-    isPinned,
-    hidden,
+    priority,
     expirationTimerSeconds,
   });
 
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 72706ebbb..939f9922e 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -102,7 +102,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       );
 
       const wrapperComm = getCommunityInfoFromDBValues({
-        isPinned: !!foundConvo.get('isPinned'),
+        priority: foundConvo.get('priority'),
         fullUrl,
       });
 
@@ -124,12 +124,11 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       const encryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(convoId);
       const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
         id: foundConvo.id,
-        isPinned: !!foundConvo.get('isPinned'),
+        priority: foundConvo.get('priority'),
         members: foundConvo.get('members') || [],
         groupAdmins: foundConvo.get('groupAdmins') || [],
         expireTimer: foundConvo.get('expireTimer'),
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
-        hidden: false, // TODOLATER we do not handle hidden yet for groups
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',
       });
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index a9d6a1ddb..41cea8176 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -245,7 +245,6 @@ export interface ReduxConversationType {
 
   isTyping?: boolean;
   isBlocked?: boolean;
-  isHidden: boolean;
   isKickedFromGroup?: boolean;
   left?: boolean;
   avatarPath?: string | null; // absolute filepath to the avatar
@@ -258,7 +257,7 @@ export interface ReduxConversationType {
    */
   currentNotificationSetting?: ConversationNotificationSettingType;
 
-  isPinned?: boolean;
+  priority?: number; // undefined means 0
   isInitialFetchingInProgress?: boolean;
   isApproved?: boolean;
   didApproveMe?: boolean;
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 39e07e0f8..06f5f2ae9 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -231,10 +231,12 @@ const collator = new Intl.Collator();
 export const _getConversationComparator = (testingi18n?: LocalizerType) => {
   return (left: ReduxConversationType, right: ReduxConversationType): number => {
     // Pin is the first criteria to check
-    if (left.isPinned && !right.isPinned) {
+    const leftPriority = left.priority || 0;
+    const rightPriority = right.priority || 0;
+    if (leftPriority > rightPriority) {
       return -1;
     }
-    if (!left.isPinned && right.isPinned) {
+    if (rightPriority > leftPriority) {
       return 1;
     }
     // Then if none is pinned, check other criteria
@@ -277,7 +279,7 @@ export const _getLeftPaneLists = (
       conversation.type === ConversationTypeEnum.PRIVATE &&
       conversation.isApproved &&
       !conversation.isBlocked &&
-      !conversation.isHidden
+      (conversation.priority || 0) >= 0 // filtering non-hidden conversation
     ) {
       directConversations.push(conversation);
     }
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 56e2acebd..1787cad5b 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -3,7 +3,10 @@ import { expect } from 'chai';
 import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 import Sinon from 'sinon';
 import { ConversationModel } from '../../../../models/conversation';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+} from '../../../../models/conversationAttributes';
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
@@ -349,7 +352,7 @@ describe('libsession_contacts', () => {
           new ConversationModel({
             ...validArgs,
             type: ConversationTypeEnum.PRIVATE,
-            hidden: true,
+            priority: CONVERSATION_PRIORITIES.hidden,
           } as any)
         )
       ).to.be.eq(true);
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index 2d5933029..1626bf1f4 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -2,7 +2,10 @@ import { expect } from 'chai';
 
 import Sinon from 'sinon';
 import { ConversationModel } from '../../../../models/conversation';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+} from '../../../../models/conversationAttributes';
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
 
@@ -97,7 +100,7 @@ describe('libsession_groups', () => {
           SessionUtilUserGroups.isUserGroupToStoreInWrapper(
             new ConversationModel({
               ...validLegacyGroupArgs,
-              hidden: true,
+              priority: CONVERSATION_PRIORITIES.hidden,
             })
           )
         ).to.be.eq(true);
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index 67d9e12a8..f5c8babf0 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -3,6 +3,7 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
+  CONVERSATION_PRIORITIES,
   ConversationAttributes,
   fillConvoAttributesWithDefaults,
 } from '../../../../models/conversationAttributes';
@@ -178,20 +179,20 @@ describe('fillConvoAttributesWithDefaults', () => {
     });
   });
 
-  describe('isPinned', () => {
-    it('initialize isPinned if not given', () => {
+  describe('priority', () => {
+    it('initialize priority if not given', () => {
       expect(fillConvoAttributesWithDefaults({} as ConversationAttributes)).to.have.deep.property(
-        'isPinned',
-        false
+        'priority',
+        0
       );
     });
 
-    it('do not override isPinned if given', () => {
+    it('do not override priority if given', () => {
       expect(
         fillConvoAttributesWithDefaults({
-          isPinned: true,
+          priority: CONVERSATION_PRIORITIES.pinned,
         } as ConversationAttributes)
-      ).to.have.deep.property('isPinned', true);
+      ).to.have.deep.property('priority', 1);
     });
   });
 
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 29ab360f7..f77cbe65a 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -32,29 +32,6 @@ describe('formatRowOfConversation', () => {
     });
   });
 
-  describe('isPinned', () => {
-    it('initialize isPinned if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
-        'isPinned',
-        false
-      );
-    });
-
-    it('do not override isPinned if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ isPinned: 1 }, 'test', 0, false)).to.have.deep.property(
-        'isPinned',
-        true
-      );
-    });
-
-    it('do not override isPinned if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ isPinned: 0 }, 'test', 0, false)).to.have.deep.property(
-        'isPinned',
-        false
-      );
-    });
-  });
-
   describe('isApproved', () => {
     it('initialize isApproved if they are not given', () => {
       expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 8cb1c0712..97bb83e77 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -1,5 +1,8 @@
 import { assert } from 'chai';
-import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+} from '../../../../models/conversationAttributes';
 
 import { ConversationLookupType } from '../../../../state/ducks/conversations';
 import {
@@ -37,8 +40,7 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
-          isPinned: false,
-          isHidden: false,
+          priority: CONVERSATION_PRIORITIES.default,
         },
         id2: {
           id: 'id2',
@@ -63,8 +65,7 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
-          isPinned: false,
-          isHidden: false,
+          priority: CONVERSATION_PRIORITIES.default,
         },
         id3: {
           id: 'id3',
@@ -89,8 +90,7 @@ describe('state/selectors/conversations', () => {
           lastMessage: undefined,
           members: [],
           expireTimer: 0,
-          isPinned: false,
-          isHidden: false,
+          priority: CONVERSATION_PRIORITIES.default,
         },
         id4: {
           id: 'id4',
@@ -116,8 +116,7 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           lastMessage: undefined,
           members: [],
-          isPinned: false,
-          isHidden: false,
+          priority: CONVERSATION_PRIORITIES.default,
         },
         id5: {
           id: 'id5',
@@ -143,8 +142,7 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: false,
-          isHidden: false,
+          priority: CONVERSATION_PRIORITIES.default,
         },
       };
       const comparator = _getConversationComparator(i18n);
@@ -186,9 +184,8 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: false,
+          priority: CONVERSATION_PRIORITIES.default,
           isPublic: false,
-          isHidden: false,
         },
         id2: {
           id: 'id2',
@@ -214,9 +211,9 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: false,
+
+          priority: CONVERSATION_PRIORITIES.default,
           isPublic: false,
-          isHidden: false,
         },
         id3: {
           id: 'id3',
@@ -242,9 +239,8 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: true,
+          priority: CONVERSATION_PRIORITIES.pinned,
           isPublic: false,
-          isHidden: false,
         },
         id4: {
           id: 'id4',
@@ -269,9 +265,8 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: true,
+          priority: CONVERSATION_PRIORITIES.pinned,
           isPublic: false,
-          isHidden: false,
         },
         id5: {
           id: 'id5',
@@ -297,9 +292,8 @@ describe('state/selectors/conversations', () => {
           groupAdmins: [],
           lastMessage: undefined,
           members: [],
-          isPinned: false,
+          priority: CONVERSATION_PRIORITIES.default,
           isPublic: false,
-          isHidden: false,
         },
       };
       const comparator = _getConversationComparator(i18n);
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 7957fdfb3..5aec4d918 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -113,8 +113,7 @@ export function getContactInfoFromDBValues({
   dbBlocked,
   dbName,
   dbNickname,
-  hidden,
-  isPinned,
+  priority,
   dbProfileUrl,
   dbProfileKey,
   expirationTimerSeconds,
@@ -123,10 +122,9 @@ export function getContactInfoFromDBValues({
   dbApproved: boolean;
   dbApprovedMe: boolean;
   dbBlocked: boolean;
-  hidden: boolean;
   dbNickname: string | undefined;
   dbName: string | undefined;
-  isPinned: boolean;
+  priority: number;
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
   expirationTimerSeconds: number | undefined;
@@ -136,8 +134,7 @@ export function getContactInfoFromDBValues({
     approved: !!dbApproved,
     approvedMe: !!dbApprovedMe,
     blocked: !!dbBlocked,
-    hidden: !!hidden,
-    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
+    priority,
     nickname: dbNickname,
     name: dbName,
     expirationTimerSeconds:
@@ -168,15 +165,15 @@ export function getContactInfoFromDBValues({
  * It is created in this file so we can reuse it during the migration (node side), and from the renderer side
  */
 export function getCommunityInfoFromDBValues({
-  isPinned,
+  priority,
   fullUrl,
 }: {
-  isPinned: boolean;
+  priority: number;
   fullUrl: string;
 }) {
   const community = {
     fullUrl,
-    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
+    priority,
   };
 
   return community;
@@ -200,18 +197,14 @@ function maybeArrayJSONtoArray(arr: string | Array<string>): Array<string> {
 
 export function getLegacyGroupInfoFromDBValues({
   id,
-  hidden,
-  isPinned,
+  priority,
   members: maybeMembers,
   displayNameInProfile,
   expireTimer,
   encPubkeyHex,
   encSeckeyHex,
   groupAdmins: maybeAdmins,
-}: Pick<
-  ConversationAttributes,
-  'hidden' | 'id' | 'isPinned' | 'displayNameInProfile' | 'expireTimer'
-> & {
+}: Pick<ConversationAttributes, 'id' | 'priority' | 'displayNameInProfile' | 'expireTimer'> & {
   encPubkeyHex: string;
   encSeckeyHex: string;
   members: string | Array<string>;
@@ -229,9 +222,8 @@ export function getLegacyGroupInfoFromDBValues({
   const legacyGroup: LegacyGroupInfo = {
     pubkeyHex: id,
     disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
-    hidden: !!hidden,
     name: displayNameInProfile || '',
-    priority: !!isPinned ? 1 : 0, // TODOLATER the priority handling is not that simple
+    priority: priority || 0,
     members: wrappedMembers,
     encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
     encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),

From 3ff7281b6a7ac6190bd379ebc83e1410649eaf8d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Apr 2023 13:32:12 +1000
Subject: [PATCH 060/178] chore: remove isGroup from the redux stored entry

as it is always = !isPrivate
---
 ts/components/dialog/InviteContactsDialog.tsx        |  2 +-
 ts/components/dialog/UpdateGroupMembersDialog.tsx    |  2 +-
 ts/hooks/useMembersAvatars.tsx                       |  2 +-
 ts/hooks/useParamSelector.ts                         |  2 +-
 ts/models/conversation.ts                            | 11 +++--------
 ts/node/migration/sessionMigrations.ts               |  5 +++--
 ts/state/ducks/conversations.ts                      |  3 +--
 ts/test/session/unit/selectors/conversations_test.ts | 11 -----------
 8 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index 8aad39239..795e60fd7 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -111,7 +111,7 @@ const InviteContactsDialogInner = (props: Props) => {
   if (!convoProps) {
     throw new Error('InviteContactsDialogInner not a valid convoId given');
   }
-  if (!convoProps.isGroup) {
+  if (convoProps.isPrivate) {
     throw new Error('InviteContactsDialogInner must be a group');
   }
   if (!convoProps.isPublic) {
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index 6b6958358..b6e59d3c8 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -177,7 +177,7 @@ export const UpdateGroupMembersDialog = (props: Props) => {
 
   const dispatch = useDispatch();
 
-  if (!convoProps || !convoProps.isGroup || convoProps.isPublic) {
+  if (!convoProps || convoProps.isPrivate || convoProps.isPublic) {
     throw new Error('UpdateGroupMembersDialog invalid convoProps');
   }
 
diff --git a/ts/hooks/useMembersAvatars.tsx b/ts/hooks/useMembersAvatars.tsx
index 1967381f6..4daa649d5 100644
--- a/ts/hooks/useMembersAvatars.tsx
+++ b/ts/hooks/useMembersAvatars.tsx
@@ -12,7 +12,7 @@ export function useMembersAvatars(closedGroupPubkey: string | undefined) {
     }
     const groupConvo = state.conversations.conversationLookup[closedGroupPubkey];
 
-    if (groupConvo.isPrivate || groupConvo.isPublic || !groupConvo.isGroup) {
+    if (groupConvo.isPrivate || groupConvo.isPublic) {
       return undefined;
     }
     // this must be a closed group
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 1c2f23642..a9a95bf9c 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -71,7 +71,7 @@ export function useIsMe(pubkey?: string) {
 
 export function useIsClosedGroup(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
-  return (convoProps && convoProps.isGroup && !convoProps.isPublic) || false;
+  return (convoProps && !convoProps.isPrivate && !convoProps.isPublic) || false;
 }
 
 export function useIsPrivate(convoId?: string) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index f32f0cadd..501b41854 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -285,14 +285,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const ourNumber = UserUtils.getOurPubKeyStrFromCache();
     const avatarPath = this.getAvatarPath();
     const isPrivate = this.isPrivate();
-    const isGroup = !isPrivate;
     const weAreAdmin = this.isAdmin(ourNumber);
     const weAreModerator = this.isModerator(ourNumber); // only used for sogs
     const isMe = this.isMe();
     const isTyping = !!this.typingTimer;
 
     const currentNotificationSetting = this.get('triggerNotificationsFor');
-    const priority = this.get('priority');
+    const priorityFromDb = this.get('priority');
 
     // To reduce the redux store size, only set fields which cannot be undefined.
     // For instance, a boolean can usually be not set if false, etc
@@ -302,8 +301,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       type: this.get('type'),
     };
 
-    if (isFinite(priority) && priority !== CONVERSATION_PRIORITIES.default) {
-      toRet.priority = priority;
+    if (isFinite(priorityFromDb) && priorityFromDb !== CONVERSATION_PRIORITIES.default) {
+      toRet.priority = priorityFromDb;
     }
 
     if (this.get('markedAsUnread')) {
@@ -314,10 +313,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.isPrivate = true;
     }
 
-    if (isGroup) {
-      toRet.isGroup = true;
-    }
-
     if (weAreAdmin) {
       toRet.weAreAdmin = true;
     }
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 5b303f59a..e9181f48f 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1463,8 +1463,9 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ALTER TABLE unprocessed DROP COLUMN serverTimestamp;
       `);
 
-    // after the rename of isPinned to priority, we also need to hide any conversation that
-    // TODO do we need to update the conversation priority to hidden for some for those ( like the non active and non approved/didApproveMe?)
+    // after the rename of isPinned to priority, we also need to hide any private conversation that is not active at all.
+    // as they might be contacts, we did delete from the app already.
+
     db.prepare(
       `UPDATE ${CONVERSATIONS_TABLE} SET
         priority = ${CONVERSATION_PRIORITIES.hidden}
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 41cea8176..364261ebd 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -234,8 +234,7 @@ export interface ReduxConversationType {
   type: ConversationTypeEnum;
   isMe?: boolean;
   isPublic?: boolean;
-  isGroup?: boolean;
-  isPrivate?: boolean;
+  isPrivate?: boolean; // !isPrivate means isGroup (group or community)
   weAreAdmin?: boolean;
   weAreModerator?: boolean;
   unreadCount?: number;
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 97bb83e77..e51606c9a 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -32,7 +32,6 @@ describe('state/selectors/conversations', () => {
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',
@@ -58,7 +57,6 @@ describe('state/selectors/conversations', () => {
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
           avatarPath: '',
           groupAdmins: [],
@@ -83,7 +81,6 @@ describe('state/selectors/conversations', () => {
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
           avatarPath: '',
           groupAdmins: [],
@@ -108,9 +105,7 @@ describe('state/selectors/conversations', () => {
           isPublic: false,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
-
           avatarPath: '',
           groupAdmins: [],
           expireTimer: 0,
@@ -135,7 +130,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',
@@ -177,7 +171,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',
@@ -204,7 +197,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',
@@ -231,7 +223,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
           displayNameInProfile: 'C',
 
@@ -258,7 +249,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',
@@ -285,7 +275,6 @@ describe('state/selectors/conversations', () => {
           expireTimer: 0,
           currentNotificationSetting: 'all',
           weAreAdmin: false,
-          isGroup: false,
           isPrivate: false,
 
           avatarPath: '',

From 51e4f1dd48820f04fcbe473d3b3220e0b56747cd Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Apr 2023 14:08:10 +1000
Subject: [PATCH 061/178] feat: UI, use group info from wrapper if we have them
 or from DB

---
 ts/models/conversation.ts                     | 23 ++++++++++++++-----
 ts/node/migration/sessionMigrations.ts        |  2 +-
 .../libsession/libsession_utils_contacts.ts   |  3 ++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 501b41854..f26f57ae4 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -414,9 +414,15 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
       if (foundLegacyGroup.priority) {
         toRet.priority = foundLegacyGroup.priority;
-      } // TODO grab the details from the db if we do not have an entry in the wrapper
+      }
+    } else if (this.isClosedGroup()) {
+      toRet.members = this.get('members') || [];
+      toRet.groupAdmins = this.getGroupAdmins();
+      toRet.displayNameInProfile = this.get('displayNameInProfile');
+      toRet.expireTimer = this.get('expireTimer');
     }
 
+    // those are values coming only from the DB when this is a closed group
     if (this.isClosedGroup()) {
       if (this.get('isKickedFromGroup')) {
         toRet.isKickedFromGroup = !!this.get('isKickedFromGroup');
@@ -435,15 +441,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (foundCommunity) {
       if (foundCommunity.priority) {
         toRet.priority = foundCommunity.priority;
-      }
-      // TODO grab the details from the db if we do not have an entry in the wrapper
-      // TODO should we just not rely on the db values?
+      } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function
     }
 
     if (foundVolatileInfo) {
       if (foundVolatileInfo.unread) {
         toRet.isMarkedUnread = foundVolatileInfo.unread;
       }
+    } else {
+      if (this.get('markedAsUnread')) {
+        toRet.isMarkedUnread = this.get('markedAsUnread');
+      }
     }
 
     // -- Handle the field stored only in memory for all types of conversation--
@@ -2234,12 +2242,15 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   if (!convo) {
     return;
   }
-  // write to DB
-  // TODOLATER remove duplicates between db and wrapper (except nickname&name as we need them for search, or move search to wrapper too)
 
+  // TODOLATER remove duplicates between db and wrapper (and move search by name or nickname to wrapper)
+  // TODOLATER insertConvoFromDBIntoWrapperAndRefresh and insertContactFromDBIntoWrapperAndRefresh both fetches the same data from the DB. Might be worth fetching it and providing it to both?
+
+  // write to db
   const savedDetails = await Data.saveConversation(convo.attributes);
   await convo.refreshInMemoryDetails(savedDetails);
 
+  // Performance impact on this is probably to be pretty bad. We might want to push for that DB refactor to be done sooner so we do not need to fetch info from the DB anymore
   for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
     const variant = LibSessionUtil.requiredUserVariants[index];
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index e9181f48f..e3f98ba81 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1601,7 +1601,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
        * Setup up the Contacts Wrapper with all the contact details which needs to be stored in it.
        */
 
-      // this filter is based on the `isContactToStoreInContactsWrapper` function.
+      // this filter is based on the `isContactToStoreInContactsWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start
       const contactsToWriteInWrapper = db
         .prepare(
           `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index ac18b2d0f..b8d3fc248 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -54,9 +54,10 @@ function isContactToStoreInContactsWrapper(convo: ConversationModel): boolean {
     convo.isPrivate() &&
     convo.isActive() &&
     !PubKey.hasBlindedPrefix(convo.id) &&
-    (convo.isApproved() || convo.didApproveMe())
+    (convo.isApproved() || convo.didApproveMe() || convo.isBlocked())
   );
 }
+// TODOLATER should we allow a blinded pubkey to be in the contact wrapper when we blocked it (can we block a blinded message request?)
 
 /**
  * Fetches the specified convo and updates the required field in the wrapper.

From b843d660845d4a2a79dd8fc158ab3a22dba61cf1 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Apr 2023 15:08:37 +1000
Subject: [PATCH 062/178] feat: add the lastJoined and createdAt timestamp from
 wrapper logic

---
 .../conversation/ConversationHeader.tsx       |   4 +-
 ts/models/conversation.ts                     | 157 +++++++++---------
 ts/node/migration/sessionMigrations.ts        |  13 +-
 ts/receiver/configMessage.ts                  |  50 +++---
 ts/session/group/closed-group.ts              |   1 +
 .../libsession_utils_user_groups.ts           |   1 +
 ts/state/selectors/conversations.ts           |  11 +-
 ts/types/sqlSharedTypes.ts                    |   8 +-
 8 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 9a62986ff..736cff2be 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -206,7 +206,7 @@ const BackButton = (props: { onGoBack: () => void; showBackButton: boolean }) =>
 const CallButton = () => {
   const isPrivate = useSelectedIsPrivate();
   const isBlocked = useSelectedIsBlocked();
-  const activeAt = useSelectedIsActive();
+  const isActive = useSelectedIsActive();
   const isMe = useSelectedisNoteToSelf();
   const selectedConvoKey = useSelectedConversationKey();
 
@@ -216,7 +216,7 @@ const CallButton = () => {
 
   const isRequest = useIsRequest(selectedConvoKey);
 
-  if (!isPrivate || isMe || !selectedConvoKey || isBlocked || !activeAt || isRequest) {
+  if (!isPrivate || isMe || !selectedConvoKey || isBlocked || !isActive || isRequest) {
     return null;
   }
 
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index f26f57ae4..0547270bc 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -311,6 +311,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     if (isPrivate) {
       toRet.isPrivate = true;
+      const foundContact = SessionUtilContact.getContactCached(this.id);
+      if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAt)) {
+        toRet.activeAt = foundContact.createdAt;
+      }
     }
 
     if (weAreAdmin) {
@@ -342,80 +346,79 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.currentNotificationSetting = currentNotificationSetting;
     }
 
-    const foundContact = SessionUtilContact.getContactCached(this.id);
-    const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
-    const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
-    const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
+    // const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
+    // const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
+    // const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
 
-    // rely on the wrapper values rather than the DB ones if they exist in the wrapper
-    if (foundContact) {
-      if (foundContact.name) {
-        toRet.displayNameInProfile = foundContact.name;
-      }
+    // // rely on the wrapper values rather than the DB ones if they exist in the wrapper
+    // if (foundContact) {
+    //   if (foundContact.name) {
+    //     toRet.displayNameInProfile = foundContact.name;
+    //   }
 
-      if (foundContact.nickname) {
-        toRet.nickname = foundContact.nickname;
-      }
+    //   if (foundContact.nickname) {
+    //     toRet.nickname = foundContact.nickname;
+    //   }
 
-      if (foundContact.blocked) {
-        toRet.isBlocked = foundContact.blocked;
-      }
+    //   if (foundContact.blocked) {
+    //     toRet.isBlocked = foundContact.blocked;
+    //   }
 
-      if (foundContact.approvedMe) {
-        toRet.didApproveMe = foundContact.approvedMe;
-      }
+    //   if (foundContact.approvedMe) {
+    //     toRet.didApproveMe = foundContact.approvedMe;
+    //   }
 
-      if (foundContact.approved) {
-        toRet.isApproved = foundContact.approved;
-      }
+    //   if (foundContact.approved) {
+    //     toRet.isApproved = foundContact.approved;
+    //   }
 
-      if (foundContact.priority) {
-        toRet.priority = foundContact.priority;
-      }
+    //   if (foundContact.priority) {
+    //     toRet.priority = foundContact.priority;
+    //   }
 
-      if (foundContact.expirationTimerSeconds > 0) {
-        toRet.expireTimer = foundContact.expirationTimerSeconds;
-      }
-    } else {
-      if (this.get('displayNameInProfile')) {
-        toRet.displayNameInProfile = this.get('displayNameInProfile');
-      }
-
-      if (this.get('nickname')) {
-        toRet.nickname = this.get('nickname');
-      }
-
-      if (BlockedNumberController.isBlocked(this.id)) {
-        toRet.isBlocked = true;
-      }
-
-      if (this.get('didApproveMe')) {
-        toRet.didApproveMe = this.get('didApproveMe');
-      }
-
-      if (this.get('isApproved')) {
-        toRet.isApproved = this.get('isApproved');
-      }
-
-      if (this.get('expireTimer')) {
-        toRet.expireTimer = this.get('expireTimer');
-      }
+    //   if (foundContact.expirationTimerSeconds > 0) {
+    //     toRet.expireTimer = foundContact.expirationTimerSeconds;
+    //   }
+    // } else {
+    if (this.get('displayNameInProfile')) {
+      toRet.displayNameInProfile = this.get('displayNameInProfile');
     }
 
-    // -- Handle the group fields from the wrapper and the database --
-    if (foundLegacyGroup) {
-      toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || [];
-      toRet.groupAdmins =
-        foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || [];
-      toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name)
-        ? undefined
-        : foundLegacyGroup.name;
-      toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds;
+    if (this.get('nickname')) {
+      toRet.nickname = this.get('nickname');
+    }
 
-      if (foundLegacyGroup.priority) {
-        toRet.priority = foundLegacyGroup.priority;
-      }
-    } else if (this.isClosedGroup()) {
+    if (BlockedNumberController.isBlocked(this.id)) {
+      toRet.isBlocked = true;
+    }
+
+    if (this.get('didApproveMe')) {
+      toRet.didApproveMe = this.get('didApproveMe');
+    }
+
+    if (this.get('isApproved')) {
+      toRet.isApproved = this.get('isApproved');
+    }
+
+    if (this.get('expireTimer')) {
+      toRet.expireTimer = this.get('expireTimer');
+    }
+    // }
+
+    // // -- Handle the group fields from the wrapper and the database --
+    // if (foundLegacyGroup) {
+    //   toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || [];
+    //   toRet.groupAdmins =
+    //     foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || [];
+    //   toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name)
+    //     ? undefined
+    //     : foundLegacyGroup.name;
+    //   toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds;
+
+    //   if (foundLegacyGroup.priority) {
+    //     toRet.priority = foundLegacyGroup.priority;
+    //   }
+    /*} else*/ if (this.isClosedGroup()) {
       toRet.members = this.get('members') || [];
       toRet.groupAdmins = this.getGroupAdmins();
       toRet.displayNameInProfile = this.get('displayNameInProfile');
@@ -438,21 +441,21 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     // -- Handle the communities fields from the wrapper and the database --
-    if (foundCommunity) {
-      if (foundCommunity.priority) {
-        toRet.priority = foundCommunity.priority;
-      } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function
-    }
+    // if (foundCommunity) {
+    //   if (foundCommunity.priority) {
+    //     toRet.priority = foundCommunity.priority;
+    //   } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function
+    // }
 
-    if (foundVolatileInfo) {
-      if (foundVolatileInfo.unread) {
-        toRet.isMarkedUnread = foundVolatileInfo.unread;
-      }
-    } else {
-      if (this.get('markedAsUnread')) {
-        toRet.isMarkedUnread = this.get('markedAsUnread');
-      }
+    // if (foundVolatileInfo) {
+    //   if (foundVolatileInfo.unread) {
+    //     toRet.isMarkedUnread = foundVolatileInfo.unread;
+    //   }
+    // } else {
+    if (this.get('markedAsUnread')) {
+      toRet.isMarkedUnread = this.get('markedAsUnread');
     }
+    // }
 
     // -- Handle the field stored only in memory for all types of conversation--
     const inMemoryConvoInfo = inMemoryConvoInfos.get(this.id);
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index e3f98ba81..8c2c30a3e 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1364,13 +1364,21 @@ function insertCommunityIntoWrapper(
 function insertLegacyGroupIntoWrapper(
   legacyGroup: Pick<
     ConversationAttributes,
-    'id' | 'priority' | 'expireTimer' | 'displayNameInProfile'
+    'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' | 'lastJoinedTimestamp'
   > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
   userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
   volatileInfoConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
   db: BetterSqlite3.Database
 ) {
-  const { priority, id, expireTimer, groupAdmins, members, displayNameInProfile } = legacyGroup;
+  const {
+    priority,
+    id,
+    expireTimer,
+    groupAdmins,
+    members,
+    displayNameInProfile,
+    lastJoinedTimestamp,
+  } = legacyGroup;
 
   const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair(
     legacyGroup.id,
@@ -1386,6 +1394,7 @@ function insertLegacyGroupIntoWrapper(
     displayNameInProfile,
     encPubkeyHex: latestEncryptionKeyPairHex?.publicHex || '',
     encSeckeyHex: latestEncryptionKeyPairHex?.privateHex || '',
+    lastJoinedTimestamp,
   });
 
   try {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 36118c023..76f2bd942 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -157,7 +157,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       }
 
       if (wrapperConvo.priority !== contactConvo.get('priority')) {
-        contactConvo.set({ priority: wrapperConvo.priority });
+        await contactConvo.setPriorityFromWrapper(wrapperConvo.priority);
         changes = true;
       }
 
@@ -171,8 +171,8 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
-        await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
+      if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
+        await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
         changes = true;
       }
 
@@ -382,8 +382,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     // save the encryption keypair if needed
     if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
       try {
-        // TODO we need to store the encryption keypair if needed
-
         const inWrapperKeypair: HexKeyPair = {
           publicHex: toHex(fromWrapper.encPubkey),
           privateHex: toHex(fromWrapper.encSeckey),
@@ -428,30 +426,32 @@ async function applyConvoVolatileUpdateFromWrapper(
   lastReadMessageTimestamp: number
 ) {
   const foundConvo = getConversationController().get(convoId);
-  if (foundConvo) {
-    try {
-      window.log.debug(
-        `applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
-      );
-      // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
-      await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
-      // this commits to the DB, if needed
-      await foundConvo.markAsUnread(forcedUnread, true);
+  if (!foundConvo) {
+    return;
+  }
 
-      if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
-        await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
-          foundConvo.id,
-          foundConvo.isClosedGroup(),
-          false
-        );
+  try {
+    window.log.debug(
+      `applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
+    );
+    // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
+    await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
+    // this commits to the DB, if needed
+    await foundConvo.markAsUnread(forcedUnread, true);
 
-        await foundConvo.refreshInMemoryDetails();
-      }
-    } catch (e) {
-      window.log.warn(
-        `applyConvoVolatileUpdateFromWrapper of "${convoId}" failed with error ${e.message}`
+    if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
+      await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
+        foundConvo.id,
+        foundConvo.isClosedGroup(),
+        false
       );
+
+      await foundConvo.refreshInMemoryDetails();
     }
+  } catch (e) {
+    window.log.warn(
+      `applyConvoVolatileUpdateFromWrapper of "${convoId}" failed with error ${e.message}`
+    );
   }
 }
 
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 5816583eb..153807e96 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -224,6 +224,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
   > = {
     displayNameInProfile: details.name,
     members: details.members,
+    // Note: legacy group to not support change of admins.
     type: ConversationTypeEnum.GROUP,
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 939f9922e..473fdc072 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -131,6 +131,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',
+        lastJoinedTimestamp: foundConvo.get('lastJoinedTimestamp') || 0,
       });
 
       try {
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 06f5f2ae9..9f0f779a2 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -239,7 +239,7 @@ export const _getConversationComparator = (testingi18n?: LocalizerType) => {
     if (rightPriority > leftPriority) {
       return 1;
     }
-    // Then if none is pinned, check other criteria
+    // Then if none are pinned, check other criteria
     const leftActiveAt = left.activeAt;
     const rightActiveAt = right.activeAt;
     if (leftActiveAt && !rightActiveAt) {
@@ -262,7 +262,7 @@ export const getConversationComparator = createSelector(getIntl, _getConversatio
 
 // export only because we use it in some of our tests
 // tslint:disable-next-line: cyclomatic-complexity
-export const _getLeftPaneLists = (
+const _getLeftPaneLists = (
   sortedConversations: Array<ReduxConversationType>
 ): {
   conversations: Array<ReduxConversationType>;
@@ -401,13 +401,13 @@ const _getPrivateContactsPubkeys = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<string> => {
   return filter(sortedConversations, conversation => {
-    return (
+    return !!(
       conversation.isPrivate &&
       !conversation.isBlocked &&
       !conversation.isMe &&
       conversation.didApproveMe &&
       conversation.isApproved &&
-      Boolean(conversation.activeAt)
+      conversation.activeAt
     );
   }).map(convo => convo.id);
 };
@@ -450,8 +450,9 @@ export type DirectContactsByNameType = {
 export const getDirectContactsByName = createSelector(
   getDirectContacts,
   (contacts: Array<ReduxConversationType>): Array<DirectContactsByNameType> => {
+    const us = UserUtils.getOurPubKeyStrFromCache();
     const extractedContacts = contacts
-      .filter(m => m.id !== UserUtils.getOurPubKeyStrFromCache())
+      .filter(m => m.id !== us)
       .map(m => {
         return {
           id: m.id,
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 5aec4d918..e124eacb8 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -145,6 +145,7 @@ export function getContactInfoFromDBValues({
       !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
         ? 'disappearAfterSend'
         : 'off',
+    createdAt: 0, // this is actually unused as the wrapper keep the value as it is currently stored (this is a created at timestamp, no need to update it)
   };
 
   if (
@@ -204,7 +205,11 @@ export function getLegacyGroupInfoFromDBValues({
   encPubkeyHex,
   encSeckeyHex,
   groupAdmins: maybeAdmins,
-}: Pick<ConversationAttributes, 'id' | 'priority' | 'displayNameInProfile' | 'expireTimer'> & {
+  lastJoinedTimestamp,
+}: Pick<
+  ConversationAttributes,
+  'id' | 'priority' | 'displayNameInProfile' | 'expireTimer' | 'lastJoinedTimestamp'
+> & {
   encPubkeyHex: string;
   encSeckeyHex: string;
   members: string | Array<string>;
@@ -227,6 +232,7 @@ export function getLegacyGroupInfoFromDBValues({
     members: wrappedMembers,
     encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
     encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
+    joinedAt: lastJoinedTimestamp,
   };
 
   return legacyGroup;

From 760642e14912ac40c57943c0f1d232fcf4864e03 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Apr 2023 17:51:39 +1000
Subject: [PATCH 063/178] feat: use the lastJoinedAt and createdAt from the
 wrapper

---
 ts/models/conversation.ts                     | 87 +++++++++----------
 ts/receiver/configMessage.ts                  | 21 ++++-
 ts/session/apis/snode_api/storeMessage.ts     |  1 -
 ts/session/utils/job_runners/JobRunner.ts     |  2 +-
 .../jobs/ConfigurationSyncDumpJob.ts          | 14 +--
 .../job_runners/jobs/ConfigurationSyncJob.ts  | 12 ++-
 .../utils/libsession/libsession_utils.ts      | 13 +--
 .../libsession/libsession_utils_contacts.ts   |  2 +-
 .../libsession_utils_convo_info_volatile.ts   |  2 +-
 .../libsession_utils_user_groups.ts           |  4 +-
 ts/types/sqlSharedTypes.ts                    | 10 +--
 ts/util/logging.ts                            |  2 +-
 .../browser/libsession_worker_interface.ts    |  4 +-
 13 files changed, 89 insertions(+), 85 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 0547270bc..7fd073f49 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -287,8 +287,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const isPrivate = this.isPrivate();
     const weAreAdmin = this.isAdmin(ourNumber);
     const weAreModerator = this.isModerator(ourNumber); // only used for sogs
-    const isMe = this.isMe();
-    const isTyping = !!this.typingTimer;
 
     const currentNotificationSetting = this.get('triggerNotificationsFor');
     const priorityFromDb = this.get('priority');
@@ -311,9 +309,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     if (isPrivate) {
       toRet.isPrivate = true;
+      if (this.typingTimer) {
+        toRet.isTyping = true;
+      }
+      if (this.isMe()) {
+        toRet.isMe = true;
+      }
+
       const foundContact = SessionUtilContact.getContactCached(this.id);
-      if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAt)) {
-        toRet.activeAt = foundContact.createdAt;
+
+      if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAtSeconds)) {
+        toRet.activeAt = foundContact.createdAtSeconds * 1000; // active at is in ms
       }
     }
 
@@ -325,15 +331,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.weAreModerator = true;
     }
 
-    if (isMe) {
-      toRet.isMe = true;
-    }
     if (isPublic) {
       toRet.isPublic = true;
     }
-    if (isTyping) {
-      toRet.isTyping = true;
-    }
 
     if (avatarPath) {
       toRet.avatarPath = avatarPath;
@@ -346,6 +346,28 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.currentNotificationSetting = currentNotificationSetting;
     }
 
+    if (this.get('displayNameInProfile')) {
+      toRet.displayNameInProfile = this.get('displayNameInProfile');
+    }
+    if (this.get('nickname')) {
+      toRet.nickname = this.get('nickname');
+    }
+    if (BlockedNumberController.isBlocked(this.id)) {
+      toRet.isBlocked = true;
+    }
+    if (this.get('didApproveMe')) {
+      toRet.didApproveMe = this.get('didApproveMe');
+    }
+    if (this.get('isApproved')) {
+      toRet.isApproved = this.get('isApproved');
+    }
+    if (this.get('expireTimer')) {
+      toRet.expireTimer = this.get('expireTimer');
+    }
+    if (this.get('markedAsUnread')) {
+      toRet.isMarkedUnread = this.get('markedAsUnread');
+    }
+
     // const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
     // const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
     // const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
@@ -380,30 +402,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     //     toRet.expireTimer = foundContact.expirationTimerSeconds;
     //   }
     // } else {
-    if (this.get('displayNameInProfile')) {
-      toRet.displayNameInProfile = this.get('displayNameInProfile');
-    }
-
-    if (this.get('nickname')) {
-      toRet.nickname = this.get('nickname');
-    }
-
-    if (BlockedNumberController.isBlocked(this.id)) {
-      toRet.isBlocked = true;
-    }
-
-    if (this.get('didApproveMe')) {
-      toRet.didApproveMe = this.get('didApproveMe');
-    }
-
-    if (this.get('isApproved')) {
-      toRet.isApproved = this.get('isApproved');
-    }
-
-    if (this.get('expireTimer')) {
-      toRet.expireTimer = this.get('expireTimer');
-    }
-    // }
 
     // // -- Handle the group fields from the wrapper and the database --
     // if (foundLegacyGroup) {
@@ -418,22 +416,23 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     //   if (foundLegacyGroup.priority) {
     //     toRet.priority = foundLegacyGroup.priority;
     //   }
-    /*} else*/ if (this.isClosedGroup()) {
+    // }
+
+    // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
+    if (this.isClosedGroup()) {
       toRet.members = this.get('members') || [];
       toRet.groupAdmins = this.getGroupAdmins();
-      toRet.displayNameInProfile = this.get('displayNameInProfile');
-      toRet.expireTimer = this.get('expireTimer');
     }
 
     // those are values coming only from the DB when this is a closed group
     if (this.isClosedGroup()) {
       if (this.get('isKickedFromGroup')) {
-        toRet.isKickedFromGroup = !!this.get('isKickedFromGroup');
+        toRet.isKickedFromGroup = this.get('isKickedFromGroup');
       }
       if (this.get('left')) {
-        toRet.left = !!this.get('left');
+        toRet.left = this.get('left');
       }
-
+      // to be dropped once we get rid of the legacy closed groups
       const zombies = this.get('zombies') || [];
       if (zombies?.length) {
         toRet.zombies = uniq(zombies);
@@ -451,10 +450,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     //   if (foundVolatileInfo.unread) {
     //     toRet.isMarkedUnread = foundVolatileInfo.unread;
     //   }
-    // } else {
-    if (this.get('markedAsUnread')) {
-      toRet.isMarkedUnread = this.get('markedAsUnread');
-    }
     // }
 
     // -- Handle the field stored only in memory for all types of conversation--
@@ -468,7 +463,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    // -- Handle the last message status, if needed --
+    // -- Handle the last message status, if present --
     const lastMessageText = this.get('lastMessage');
     if (lastMessageText && lastMessageText.length) {
       const lastMessageStatus = this.get('lastMessageStatus');
@@ -2273,13 +2268,11 @@ export async function commitConversationAndRefreshWrapper(id: string) {
           await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
-
       case 'ConvoInfoVolatileConfig':
         if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
           await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
-
       default:
         assertUnreachable(
           variant,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 76f2bd942..1f739ea2f 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -161,12 +161,12 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approved) !== Boolean(contactConvo.isApproved())) {
+      if (Boolean(wrapperConvo.approved) !== contactConvo.isApproved()) {
         await contactConvo.setIsApproved(Boolean(wrapperConvo.approved), false);
         changes = true;
       }
 
-      if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
+      if (Boolean(wrapperConvo.approvedMe) !== contactConvo.didApproveMe()) {
         await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
         changes = true;
       }
@@ -175,6 +175,17 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
         changes = true;
       }
+      console.warn(
+        `contactConvo.id: ${contactConvo}; wrapperConvo.createdAtSeconds:${
+          wrapperConvo.createdAtSeconds
+        }; current:${contactConvo.get('active_at')}`
+      );
+
+      // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
+      if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
+        contactConvo.set({ active_at: wrapperConvo.createdAtSeconds * 1000 });
+        changes = true;
+      }
 
       const convoBlocked = wrapperConvo.blocked || false;
       await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
@@ -363,6 +374,12 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       legacyGroupConvo.set({ priority: fromWrapper.priority });
       changes = true;
     }
+    const existingTimestampMs = legacyGroupConvo.get('lastJoinedTimestamp');
+    if (Math.floor(existingTimestampMs / 1000) !== fromWrapper.joinedAtSeconds) {
+      legacyGroupConvo.set({ lastJoinedTimestamp: fromWrapper.joinedAtSeconds * 1000 });
+      changes = true;
+    }
+
     if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
       await legacyGroupConvo.updateExpireTimer(
         fromWrapper.disappearingTimerSeconds,
diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts
index 00ea30f86..7517335f9 100644
--- a/ts/session/apis/snode_api/storeMessage.ts
+++ b/ts/session/apis/snode_api/storeMessage.ts
@@ -68,7 +68,6 @@ async function storeOnNode(
     }
 
     const firstResult = result[0];
-    console.warn('we should probably check other results code');
 
     if (firstResult.code !== 200) {
       window?.log?.warn('first result status is not 200 for storeOnNode but: ', firstResult.code);
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 1fc76e348..5d41cc769 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -258,7 +258,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private deleteJobsByIdentifier(identifiers: Array<string>) {
     identifiers.forEach(identifier => {
       const jobIndex = this.jobsScheduled.findIndex(f => f.persistedData.identifier === identifier);
-      window.log.info(
+      window.log.debug(
         `removing job ${jobToLogId(
           this.jobRunnerType,
           this.jobsScheduled[jobIndex]
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index a4e9cf169..616ac2fa5 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -15,6 +15,10 @@ import {
   PersistedJob,
   RunJobResult,
 } from '../PersistedJob';
+import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
+import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
+import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
+import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
 
 const defaultMsBetweenRetries = DURATION.SECONDS * 5;
 const defaultMaxAttempts = 2;
@@ -93,7 +97,6 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       }
       // refresh all the data stored by the wrappers we need to store.
       // so when we call needsDump(), we know for sure that we are up to date
-      console.time('ConfigurationSyncDumpJob insertAll');
 
       // TODOLATER we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
 
@@ -101,22 +104,21 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
-            await LibSessionUtil.insertUserProfileIntoWrapper(us);
+            await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
             break;
           case 'ContactsConfig':
-            await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+            await SessionUtilContact.insertAllContactsIntoContactsWrapper();
             break;
           case 'UserGroupsConfig':
-            await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+            await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
             break;
           case 'ConvoInfoVolatileConfig':
-            await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
+            await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
             break;
           default:
             assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
         }
       }
-      console.timeEnd('ConfigurationSyncDumpJob insertAll');
       await saveDumpsNeededToDB();
       return RunJobResult.Success;
     } catch (e) {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index b3d3899ed..d1391c5ea 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -17,6 +17,10 @@ import {
   PersistedJob,
   RunJobResult,
 } from '../PersistedJob';
+import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
+import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
+import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
+import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
 
 const defaultMsBetweenRetries = 3000;
 const defaultMaxAttempts = 3;
@@ -166,16 +170,16 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
           case 'UserConfig':
-            await LibSessionUtil.insertUserProfileIntoWrapper(us);
+            await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
             break;
           case 'ContactsConfig':
-            await LibSessionUtil.insertAllContactsIntoContactsWrapper();
+            await SessionUtilContact.insertAllContactsIntoContactsWrapper();
             break;
           case 'UserGroupsConfig':
-            await LibSessionUtil.insertAllUserGroupsIntoWrapper();
+            await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
             break;
           case 'ConvoInfoVolatileConfig':
-            await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
+            await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
             break;
           default:
             assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index ac6b6d255..ee529d02c 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -10,10 +10,6 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
-import { SessionUtilContact } from './libsession_utils_contacts';
-import { SessionUtilConvoInfoVolatile } from './libsession_utils_convo_info_volatile';
-import { SessionUtilUserGroups } from './libsession_utils_user_groups';
-import { SessionUtilUserProfile } from './libsession_utils_user_profile';
 
 const requiredUserVariants: Array<ConfigWrapperObjectTypes> = [
   'UserConfig',
@@ -107,8 +103,9 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
     const dump = dumps[index];
     const variant = dump.variant;
     const needsPush = await GenericWrapperActions.needsPush(variant);
+    window.log.debug(`needsPush ${needsPush} for variant: ${variant}`);
+
     if (!needsPush) {
-      console.info('needsPush false for ', variant);
       continue;
     }
 
@@ -181,12 +178,6 @@ export const LibSessionUtil = {
   initializeLibSessionUtilWrappers,
   requiredUserVariants,
   pendingChangesForPubkey,
-  insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
-  insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
-  insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
-  insertAllConvoInfoVolatileIntoWrapper:
-    SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper,
-  removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
   kindToVariant,
   variantToKind,
   markAsPushed,
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index b8d3fc248..60a6c6173 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -34,7 +34,7 @@ async function insertAllContactsIntoContactsWrapper() {
     .filter(isContactToStoreInContactsWrapper)
     .map(m => m.id);
 
-  window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts`);
+  window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts: ${idsToInsert}`);
 
   for (let index = 0; index < idsToInsert.length; index++) {
     const id = idsToInsert[index];
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index a5c479b36..65e050823 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -98,7 +98,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
       ? timestampFromDbMs
       : 0;
 
-  console.info(
+  window.log.debug(
     `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadMessageTimestamp};forcedUnread:${isForcedUnread}...`
   );
 
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 473fdc072..2d63dd322 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -107,7 +107,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       });
 
       try {
-        console.info(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
+        window.log.debug(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
         // this does the create or the update of the matching existing community
         await UserGroupsWrapperActions.setCommunityByFullUrl(
           wrapperComm.fullUrl,
@@ -135,7 +135,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       });
 
       try {
-        console.info(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
+        window.log.debug(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
         // this does the create or the update of the matching existing legacy group
 
         await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index e124eacb8..9cb852381 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,6 +1,6 @@
 import { from_hex } from 'libsodium-wrappers-sumo';
 import { isArray, isEmpty, isEqual } from 'lodash';
-import { ContactInfo, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
+import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
 import { OpenGroupV2Room } from '../data/opengroups';
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
@@ -40,7 +40,6 @@ export type ConfigDumpRow = {
   variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
   publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
   data: Uint8Array; // the blob returned by libsession.dump() call
-  // we might need to add a `seqno` field here.
 };
 
 export type ConfigDumpRowWithoutData = Pick<ConfigDumpRow, 'publicKey' | 'variant'>;
@@ -128,8 +127,8 @@ export function getContactInfoFromDBValues({
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
   expirationTimerSeconds: number | undefined;
-}): ContactInfo {
-  const wrapperContact: ContactInfo = {
+}): ContactInfoSet {
+  const wrapperContact: ContactInfoSet = {
     id,
     approved: !!dbApproved,
     approvedMe: !!dbApprovedMe,
@@ -145,7 +144,6 @@ export function getContactInfoFromDBValues({
       !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
         ? 'disappearAfterSend'
         : 'off',
-    createdAt: 0, // this is actually unused as the wrapper keep the value as it is currently stored (this is a created at timestamp, no need to update it)
   };
 
   if (
@@ -232,7 +230,7 @@ export function getLegacyGroupInfoFromDBValues({
     members: wrappedMembers,
     encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
     encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
-    joinedAt: lastJoinedTimestamp,
+    joinedAtSeconds: Math.floor(lastJoinedTimestamp / 1000),
   };
 
   return legacyGroup;
diff --git a/ts/util/logging.ts b/ts/util/logging.ts
index 63a3ca016..dbe854bd5 100644
--- a/ts/util/logging.ts
+++ b/ts/util/logging.ts
@@ -110,7 +110,7 @@ const development = window && window?.getEnvironment && window?.getEnvironment()
 
 // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
 function logAtLevel(level: string, prefix: string, ...args: any) {
-  if (prefix === 'DEBUG' && window.sessionFeatureFlags.useDebugLogging) {
+  if (prefix === 'DEBUG' && !window.sessionFeatureFlags.useDebugLogging) {
     return;
   }
   if (development) {
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index d285e77c9..30d23f57e 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -5,7 +5,7 @@ import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsessio
 
 import {
   BaseWrapperActionsCalls,
-  ContactInfo,
+  ContactInfoSet,
   ContactsWrapperActionsCalls,
   ConvoInfoVolatileWrapperActionsCalls,
   LegacyGroupInfo,
@@ -139,7 +139,7 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
       ReturnType<ContactsWrapperActionsCalls['erase']>
     >,
 
-  set: async (contact: ContactInfo) =>
+  set: async (contact: ContactInfoSet) =>
     callLibSessionWorker(['ContactsConfig', 'set', contact]) as Promise<
       ReturnType<ContactsWrapperActionsCalls['set']>
     >,

From ef6d9f1d51a21a56b90766b62f6a8881ec4e2b1a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 4 Apr 2023 16:34:12 +1000
Subject: [PATCH 064/178] feat: add empty states for each types of convo

---
 _locales/en/messages.json                     |   3 +
 protos/SignalService.proto                    |  21 +
 protos/SubProtocol.proto                      |  39 --
 ts/components/SessionInboxView.tsx            | 151 +++---
 .../ConversationRequestButtons.tsx            |   6 +-
 .../conversation/ConversationRequestInfo.tsx  |  40 --
 .../conversation/SessionConversation.tsx      |  11 +-
 .../conversation/SubtleNotification.tsx       |  84 ++++
 ts/interactions/conversationInteractions.ts   |  11 +-
 ts/models/conversation.ts                     | 459 ++++++++++--------
 ts/models/message.ts                          |   3 -
 .../open_group_api/opengroupV2/ApiUtil.ts     |  22 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |   2 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   6 +-
 .../open_group_api/utils/OpenGroupUtils.ts    |  11 +-
 .../conversations/ConversationController.ts   |   4 +-
 ts/session/group/open-group.ts                |   4 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   4 +
 .../utils/libsession/libsession_utils.ts      |   6 +-
 .../libsession_utils_convo_info_volatile.ts   |   5 +-
 ts/session/utils/sync/syncUtils.ts            |   2 +
 ts/state/ducks/conversations.ts               |  19 +-
 ts/state/selectors/conversations.ts           |  84 ++--
 ts/state/selectors/selectedConversation.ts    |  33 ++
 ts/types/LocalizerKeys.ts                     |   3 +
 25 files changed, 574 insertions(+), 459 deletions(-)
 delete mode 100644 protos/SubProtocol.proto
 delete mode 100644 ts/components/conversation/ConversationRequestInfo.tsx
 create mode 100644 ts/components/conversation/SubtleNotification.tsx

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 55e74ab10..c4df15896 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -486,6 +486,9 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 0bbfcf659..99b690f35 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -331,3 +331,24 @@ message GroupContext {
 }
 
 
+
+
+message WebSocketRequestMessage {
+  optional string verb    = 1;
+  optional string path    = 2;
+  optional bytes  body    = 3;
+  repeated string headers = 5;
+  optional uint64 id      = 4;
+}
+
+
+message WebSocketMessage {
+  enum Type {
+      UNKNOWN  = 0;
+      REQUEST  = 1;
+      RESPONSE = 2;
+  }
+
+  optional Type                     type     = 1;
+  optional WebSocketRequestMessage  request  = 2;
+}
\ No newline at end of file
diff --git a/protos/SubProtocol.proto b/protos/SubProtocol.proto
deleted file mode 100644
index a788021e5..000000000
--- a/protos/SubProtocol.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package signalservice;
-
-option java_package = "org.whispersystems.websocket.messages.protobuf";
-
-message WebSocketRequestMessage {
-    optional string verb    = 1;
-    optional string path    = 2;
-    optional bytes  body    = 3;
-    repeated string headers = 5;
-    optional uint64 id      = 4;
-}
-
-
-message WebSocketMessage {
-    enum Type {
-        UNKNOWN  = 0;
-        REQUEST  = 1;
-        RESPONSE = 2;
-    }
-
-    optional Type                     type     = 1;
-    optional WebSocketRequestMessage  request  = 2;
-}
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index f2b29b113..fef3c0cc0 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Provider } from 'react-redux';
 import { LeftPane } from './leftpane/LeftPane';
 
 // tslint:disable-next-line: no-submodule-imports
-import { PersistGate } from 'redux-persist/integration/react';
 import { persistStore } from 'redux-persist';
+import { PersistGate } from 'redux-persist/integration/react';
 import { getConversationController } from '../session/conversations';
 import { UserUtils } from '../session/utils';
+import { createStore } from '../state/createStore';
 import { initialCallState } from '../state/ducks/call';
 import {
   getEmptyConversationState,
@@ -15,18 +16,17 @@ import {
 import { initialDefaultRoomState } from '../state/ducks/defaultRooms';
 import { initialModalState } from '../state/ducks/modalDialog';
 import { initialOnionPathState } from '../state/ducks/onion';
+import { initialPrimaryColorState } from '../state/ducks/primaryColor';
 import { initialSearchState } from '../state/ducks/search';
 import { initialSectionState } from '../state/ducks/section';
 import { getEmptyStagedAttachmentsState } from '../state/ducks/stagedAttachments';
 import { initialThemeState } from '../state/ducks/theme';
-import { initialPrimaryColorState } from '../state/ducks/primaryColor';
 import { TimerOptionsArray } from '../state/ducks/timerOptions';
 import { initialUserConfigState } from '../state/ducks/userConfig';
 import { StateType } from '../state/reducer';
 import { makeLookup } from '../util';
-import { SessionMainPanel } from './SessionMainPanel';
-import { createStore } from '../state/createStore';
 import { ExpirationTimerOptions } from '../util/expiringMessages';
+import { SessionMainPanel } from './SessionMainPanel';
 
 // moment does not support es-419 correctly (and cause white screen on app start)
 import moment from 'moment';
@@ -41,91 +41,76 @@ moment.locale((window.i18n as any).getLocale());
 
 // Workaround: A react component's required properties are filtering up through connect()
 //   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-
-type State = {
-  isInitialLoadComplete: boolean;
-};
+import useUpdate from 'react-use/lib/useUpdate';
 
 const StyledGutter = styled.div`
   width: 380px !important;
   transition: none;
 `;
 
-export class SessionInboxView extends React.Component<any, State> {
-  private store: any;
+function createSessionInboxStore() {
+  // Here we set up a full redux store with initial state for our LeftPane Root
+  const conversations = getConversationController()
+    .getConversations()
+    .map(conversation => conversation.getConversationModelProps());
 
-  constructor(props: any) {
-    super(props);
-    this.state = {
-      isInitialLoadComplete: false,
-    };
-  }
+  const timerOptions: TimerOptionsArray = ExpirationTimerOptions.getTimerSecondsWithName();
 
-  public componentDidMount() {
-    this.setupLeftPane();
-  }
+  const initialState: StateType = {
+    conversations: {
+      ...getEmptyConversationState(),
+      conversationLookup: makeLookup(conversations, 'id'),
+    },
+    user: {
+      ourNumber: UserUtils.getOurPubKeyStrFromCache(),
+    },
+    section: initialSectionState,
+    defaultRooms: initialDefaultRoomState,
+    search: initialSearchState,
+    theme: initialThemeState,
+    primaryColor: initialPrimaryColorState,
+    onionPaths: initialOnionPathState,
+    modals: initialModalState,
+    userConfig: initialUserConfigState,
+    timerOptions: {
+      timerOptions,
+    },
+    stagedAttachments: getEmptyStagedAttachmentsState(),
+    call: initialCallState,
+    sogsRoomInfo: initialSogsRoomInfoState,
+  };
 
-  public render() {
-    if (!this.state.isInitialLoadComplete) {
-      return null;
-    }
-
-    const persistor = persistStore(this.store);
-    window.persistStore = persistor;
-
-    return (
-      <div className="inbox index">
-        <Provider store={this.store}>
-          <PersistGate loading={null} persistor={persistor}>
-            <StyledGutter>{this.renderLeftPane()}</StyledGutter>
-            <SessionMainPanel />
-          </PersistGate>
-        </Provider>
-      </div>
-    );
-  }
-
-  private renderLeftPane() {
-    return <LeftPane />;
-  }
-
-  private setupLeftPane() {
-    // Here we set up a full redux store with initial state for our LeftPane Root
-    const conversations = getConversationController()
-      .getConversations()
-      .map(conversation => conversation.getConversationModelProps());
-
-    const timerOptions: TimerOptionsArray = ExpirationTimerOptions.getTimerSecondsWithName();
-
-    const initialState: StateType = {
-      conversations: {
-        ...getEmptyConversationState(),
-        conversationLookup: makeLookup(conversations, 'id'),
-      },
-      user: {
-        ourNumber: UserUtils.getOurPubKeyStrFromCache(),
-      },
-      section: initialSectionState,
-      defaultRooms: initialDefaultRoomState,
-      search: initialSearchState,
-      theme: initialThemeState,
-      primaryColor: initialPrimaryColorState,
-      onionPaths: initialOnionPathState,
-      modals: initialModalState,
-      userConfig: initialUserConfigState,
-      timerOptions: {
-        timerOptions,
-      },
-      stagedAttachments: getEmptyStagedAttachmentsState(),
-      call: initialCallState,
-      sogsRoomInfo: initialSogsRoomInfoState,
-    };
-
-    this.store = createStore(initialState);
-    window.inboxStore = this.store;
-
-    window.openConversationWithMessages = openConversationWithMessages;
-
-    this.setState({ isInitialLoadComplete: true });
-  }
+  return createStore(initialState);
 }
+
+function setupLeftPane(forceUpdateInboxComponent: () => void) {
+  window.openConversationWithMessages = openConversationWithMessages;
+  window.inboxStore = createSessionInboxStore();
+  forceUpdateInboxComponent();
+}
+
+export const SessionInboxView = () => {
+  const update = useUpdate();
+  // run only on mount
+  useEffect(() => setupLeftPane(update), []);
+
+  if (!window.inboxStore) {
+    return null;
+  }
+
+  const persistor = persistStore(window.inboxStore);
+  window.persistStore = persistor;
+
+  return (
+    <div className="inbox index">
+      <Provider store={window.inboxStore}>
+        <PersistGate loading={null} persistor={persistor}>
+          <StyledGutter>
+            <LeftPane />
+          </StyledGutter>
+          <SessionMainPanel />
+        </PersistGate>
+      </Provider>
+    </div>
+  );
+};
diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx
index 911eb598b..3d6d05e5a 100644
--- a/ts/components/conversation/ConversationRequestButtons.tsx
+++ b/ts/components/conversation/ConversationRequestButtons.tsx
@@ -11,10 +11,6 @@ import { hasSelectedConversationIncomingMessages } from '../../state/selectors/c
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../basic/SessionButton';
 
-const handleDeclineConversationRequest = (convoId: string) => {
-  declineConversationWithConfirm(convoId, true);
-};
-
 const handleAcceptConversationRequest = async (convoId: string) => {
   const convo = getConversationController().get(convoId);
   await convo.setDidApproveMe(true);
@@ -69,7 +65,7 @@ export const ConversationMessageRequestButtons = () => {
           buttonColor={SessionButtonColor.Danger}
           text={window.i18n('decline')}
           onClick={() => {
-            handleDeclineConversationRequest(selectedConvoId);
+            declineConversationWithConfirm(selectedConvoId, true);
           }}
           dataTestId="decline-message-request"
         />
diff --git a/ts/components/conversation/ConversationRequestInfo.tsx b/ts/components/conversation/ConversationRequestInfo.tsx
deleted file mode 100644
index 15972ac81..000000000
--- a/ts/components/conversation/ConversationRequestInfo.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import styled from 'styled-components';
-import { useIsRequest } from '../../hooks/useParamSelector';
-import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations';
-import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
-
-const ConversationRequestTextBottom = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  padding: var(--margins-lg);
-  background-color: var(--background-secondary-color);
-`;
-
-const ConversationRequestTextInner = styled.div`
-  color: var(--text-secondary-color);
-  text-align: center;
-  max-width: 390px;
-`;
-
-export const ConversationRequestinfo = () => {
-  const selectedConversation = useSelectedConversationKey();
-  const isIncomingMessageRequest = useIsRequest(selectedConversation);
-
-  const showMsgRequestUI = selectedConversation && isIncomingMessageRequest;
-  const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
-
-  if (!showMsgRequestUI || !hasIncomingMessages) {
-    return null;
-  }
-
-  return (
-    <ConversationRequestTextBottom>
-      <ConversationRequestTextInner>
-        {window.i18n('respondingToRequestWarning')}
-      </ConversationRequestTextInner>
-    </ConversationRequestTextBottom>
-  );
-};
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index c202e0c79..1e77c835e 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -51,7 +51,10 @@ import {
 import { blobToArrayBuffer } from 'blob-util';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
 import { ConversationMessageRequestButtons } from './ConversationRequestButtons';
-import { ConversationRequestinfo } from './ConversationRequestInfo';
+import {
+  NoMessageNoMessageInConversation,
+  RespondToMessageRequestWarning,
+} from './SubtleNotification';
 import { getCurrentRecoveryPhrase } from '../../util/storage';
 import loadImage from 'blueimp-load-image';
 import { markAllReadByConvoId } from '../../interactions/conversationInteractions';
@@ -247,7 +250,7 @@ export class SessionConversation extends React.Component<Props, State> {
       // return an empty message view
       return <MessageView />;
     }
-
+    // TODOLATER break showMessageDetails & selectionMode into it's own container component so we can use hooks to fetch relevant state from the store
     const selectionMode = selectedMessages.length > 0;
 
     return (
@@ -272,6 +275,7 @@ export class SessionConversation extends React.Component<Props, State> {
               {lightBoxOptions?.media && this.renderLightBox(lightBoxOptions)}
 
               <div className="conversation-messages">
+                <NoMessageNoMessageInConversation />
                 <ConversationMessageRequestButtons />
                 <SplitViewContainer
                   top={<InConversationCallContainer />}
@@ -283,11 +287,10 @@ export class SessionConversation extends React.Component<Props, State> {
                   }
                   disableTop={!this.props.hasOngoingCallWithFocusedConvo}
                 />
-
                 {isDraggingFile && <SessionFileDropzone />}
               </div>
+              <RespondToMessageRequestWarning />
 
-              <ConversationRequestinfo />
               <CompositionBox
                 sendMessage={this.sendMessageFn}
                 stagedAttachments={this.props.stagedAttachments}
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
new file mode 100644
index 000000000..d783e7ad8
--- /dev/null
+++ b/ts/components/conversation/SubtleNotification.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+import { useIsRequest } from '../../hooks/useParamSelector';
+import {
+  getSelectedHasMessages,
+  hasSelectedConversationIncomingMessages,
+} from '../../state/selectors/conversations';
+import {
+  getSelectedCanWrite,
+  useSelectedConversationKey,
+  useSelectedNicknameOrProfileNameOrShortenedPubkey,
+  useSelectedisNoteToSelf,
+} from '../../state/selectors/selectedConversation';
+import { LocalizerKeys } from '../../types/LocalizerKeys';
+import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  padding: var(--margins-lg);
+  background-color: var(--background-secondary-color);
+`;
+
+const TextInner = styled.div`
+  color: var(--text-secondary-color);
+  text-align: center;
+  max-width: 390px;
+`;
+
+/**
+ * This component is used to display a warning when the user is responding to a message request.
+ *
+ */
+export const RespondToMessageRequestWarning = () => {
+  const selectedConversation = useSelectedConversationKey();
+  const isIncomingMessageRequest = useIsRequest(selectedConversation);
+
+  const showMsgRequestUI = selectedConversation && isIncomingMessageRequest;
+  const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
+
+  if (!showMsgRequestUI || !hasIncomingMessages) {
+    return null;
+  }
+
+  return (
+    <Container>
+      <TextInner>{window.i18n('respondingToRequestWarning')}</TextInner>
+    </Container>
+  );
+};
+
+/**
+ * This component is used to display a warning when the user is looking at an empty conversation.
+ */
+export const NoMessageNoMessageInConversation = () => {
+  const selectedConversation = useSelectedConversationKey();
+
+  const hasMessage = useSelector(getSelectedHasMessages);
+
+  const isMe = useSelectedisNoteToSelf();
+  const canWrite = useSelector(getSelectedCanWrite);
+  // TODOLATER use this selector accross the whole application (left pane excluded)
+  const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey();
+
+  if (!selectedConversation || hasMessage) {
+    return null;
+  }
+  let localizedKey: LocalizerKeys = 'noMessagesInEverythingElse';
+  if (!canWrite) {
+    localizedKey = 'noMessagesInReadOnly';
+  } else if (isMe) {
+    localizedKey = 'noMessagesInNoteToSelf';
+  }
+
+  return (
+    <Container>
+      <TextInner>
+        <SessionHtmlRenderer html={window.i18n(localizedKey, [nameToRender])}></SessionHtmlRenderer>
+      </TextInner>
+    </Container>
+  );
+};
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index d2f2129dd..733776440 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -15,7 +15,11 @@ import { ConfigurationSync } from '../session/utils/job_runners/jobs/Configurati
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { fromHexToArray, toHex } from '../session/utils/String';
 import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
-import { quoteMessage, resetConversationExternal } from '../state/ducks/conversations';
+import {
+  conversationReset,
+  quoteMessage,
+  resetConversationExternal,
+} from '../state/ducks/conversations';
 import {
   adminLeaveClosedGroup,
   changeNickNameModal,
@@ -134,9 +138,9 @@ export const declineConversationWithConfirm = (convoId: string, syncToDevices: b
 };
 
 /**
- * Sets the approval fields to false for conversation. Sends decline message.
+ * Sets the approval fields to false for conversation. Does not send anything back.
  */
-export const declineConversationWithoutConfirm = async (
+const declineConversationWithoutConfirm = async (
   conversationId: string,
   syncToDevices: boolean = true
 ) => {
@@ -284,6 +288,7 @@ export async function deleteAllMessagesByConvoIdNoConfirmation(conversationId: s
   });
 
   await conversation.commit();
+  window.inboxStore?.dispatch(conversationReset(conversationId));
 }
 
 export function deleteAllMessagesByConvoIdWithConfirmation(conversationId: string) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 7fd073f49..152c5849f 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -220,9 +220,21 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public isMe() {
     return UserUtils.isUsFromCache(this.id);
   }
+
+  /**
+   * Same as this.isOpenGroupV2().
+   *
+   * // TODOLATER merge them together
+   */
   public isPublic(): boolean {
     return this.isOpenGroupV2();
   }
+
+  /**
+   * Same as this.isPublic().
+   *
+   * // TODOLATER merge them together
+   */
   public isOpenGroupV2(): boolean {
     return OpenGroupUtils.isOpenGroupV2(this.id);
   }
@@ -232,6 +244,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         (this.get('type') === ConversationTypeEnum.GROUPV3 && this.id.startsWith('03'))
     );
   }
+
   public isPrivate() {
     return isDirectConversation(this.get('type'));
   }
@@ -593,143 +606,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return getOpenGroupV2FromConversationId(this.id);
   }
 
-  public async sendMessageJob(message: MessageModel, expireTimer: number | undefined) {
-    try {
-      const { body, attachments, preview, quote, fileIdsToLink } = await message.uploadData();
-      const { id } = message;
-      const destination = this.id;
-
-      const sentAt = message.get('sent_at');
-      if (!sentAt) {
-        throw new Error('sendMessageJob() sent_at must be set.');
-      }
-
-      if (this.isPublic() && !this.isOpenGroupV2()) {
-        throw new Error('Only opengroupv2 are supported now');
-      }
-
-      // we are trying to send a message to someone. If that convo is hidden in the list, make sure it is not
-      this.unhideIfNeeded(true);
-
-      // an OpenGroupV2 message is just a visible message
-      const chatMessageParams: VisibleMessageParams = {
-        body,
-        identifier: id,
-        timestamp: sentAt,
-        attachments,
-        expireTimer,
-        preview: preview ? [preview] : [],
-        quote,
-        lokiProfile: UserUtils.getOurProfile(),
-      };
-
-      const shouldApprove = !this.isApproved() && this.isPrivate();
-      const incomingMessageCount = await Data.getMessageCountByType(
-        this.id,
-        MessageDirection.incoming
-      );
-      const hasIncomingMessages = incomingMessageCount > 0;
-
-      if (this.id.startsWith('15')) {
-        window.log.info('Sending a blinded message to this user: ', this.id);
-        await this.sendBlindedMessageRequest(chatMessageParams);
-        return;
-      }
-
-      if (shouldApprove) {
-        await this.setIsApproved(true);
-        if (hasIncomingMessages) {
-          // have to manually add approval for local client here as DB conditional approval check in config msg handling will prevent this from running
-          await this.addOutgoingApprovalMessage(Date.now());
-          if (!this.didApproveMe()) {
-            await this.setDidApproveMe(true);
-          }
-          // should only send once
-          await this.sendMessageRequestResponse();
-          void forceSyncConfigurationNowIfNeeded();
-        }
-      }
-
-      if (this.isOpenGroupV2()) {
-        const chatMessageOpenGroupV2 = new OpenGroupVisibleMessage(chatMessageParams);
-        const roomInfos = this.toOpenGroupV2();
-        if (!roomInfos) {
-          throw new Error('Could not find this room in db');
-        }
-        const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id);
-        // send with blinding if we need to
-        await getMessageQueue().sendToOpenGroupV2({
-          message: chatMessageOpenGroupV2,
-          roomInfos,
-          blinded: Boolean(roomHasBlindEnabled(openGroup)),
-          filesToLink: fileIdsToLink,
-        });
-        return;
-      }
-
-      const destinationPubkey = new PubKey(destination);
-
-      if (this.isPrivate()) {
-        if (this.isMe()) {
-          chatMessageParams.syncTarget = this.id;
-          const chatMessageMe = new VisibleMessage(chatMessageParams);
-
-          await getMessageQueue().sendSyncMessage({
-            namespace: SnodeNamespaces.UserMessages,
-            message: chatMessageMe,
-          });
-          return;
-        }
-
-        if (message.get('groupInvitation')) {
-          const groupInvitation = message.get('groupInvitation');
-          const groupInvitMessage = new GroupInvitationMessage({
-            identifier: id,
-            timestamp: sentAt,
-            name: groupInvitation.name,
-            url: groupInvitation.url,
-            expireTimer: this.get('expireTimer'),
-          });
-          // we need the return await so that errors are caught in the catch {}
-          await getMessageQueue().sendToPubKey(
-            destinationPubkey,
-            groupInvitMessage,
-            SnodeNamespaces.UserMessages
-          );
-          return;
-        }
-        const chatMessagePrivate = new VisibleMessage(chatMessageParams);
-
-        await getMessageQueue().sendToPubKey(
-          destinationPubkey,
-          chatMessagePrivate,
-          SnodeNamespaces.UserMessages
-        );
-        return;
-      }
-
-      if (this.isClosedGroup()) {
-        const chatMessageMediumGroup = new VisibleMessage(chatMessageParams);
-        const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({
-          chatMessage: chatMessageMediumGroup,
-          groupId: destination,
-        });
-
-        // we need the return await so that errors are caught in the catch {}
-        await getMessageQueue().sendToGroup({
-          message: closedGroupVisibleMessage,
-          namespace: SnodeNamespaces.ClosedGroupMessage,
-        });
-        return;
-      }
-
-      throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
-    } catch (e) {
-      await message.saveErrors(e);
-      return null;
-    }
-  }
-
   public async sendReactionJob(sourceMessage: MessageModel, reaction: Reaction) {
     try {
       const destination = this.id;
@@ -739,10 +615,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         throw new Error('sendReactMessageJob() sent_at must be set.');
       }
 
-      if (this.isPublic() && !this.isOpenGroupV2()) {
-        throw new Error('Only opengroupv2 are supported now');
-      }
-
       // an OpenGroupV2 message is just a visible message
       const chatMessageParams: VisibleMessageParams = {
         body: '',
@@ -910,67 +782,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     this.updateLastMessage();
   }
 
-  public async sendBlindedMessageRequest(messageParams: VisibleMessageParams) {
-    const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes();
-    const groupUrl = this.getSogsOriginMessage();
-
-    if (!PubKey.hasBlindedPrefix(this.id)) {
-      window?.log?.warn('sendBlindedMessageRequest - convo is not a blinded one');
-      return;
-    }
-
-    if (!messageParams.body) {
-      window?.log?.warn('sendBlindedMessageRequest - needs a body');
-      return;
-    }
-
-    // include our profile (displayName + avatar url + key for the recipient)
-    messageParams.lokiProfile = getOurProfile();
-
-    if (!ourSignKeyBytes || !groupUrl) {
-      window?.log?.error(
-        'sendBlindedMessageRequest - Cannot get required information for encrypting blinded message.'
-      );
-      return;
-    }
-
-    const roomInfo = OpenGroupData.getV2OpenGroupRoom(groupUrl);
-
-    if (!roomInfo || !roomInfo.serverPublicKey) {
-      ToastUtils.pushToastError('no-sogs-matching', window.i18n('couldntFindServerMatching'));
-      window?.log?.error('Could not find room with matching server url', groupUrl);
-      throw new Error(`Could not find room with matching server url: ${groupUrl}`);
-    }
-
-    const sogsVisibleMessage = new OpenGroupVisibleMessage(messageParams);
-    const paddedBody = addMessagePadding(sogsVisibleMessage.plainTextBuffer());
-
-    const serverPubKey = roomInfo.serverPublicKey;
-
-    const encryptedMsg = await SogsBlinding.encryptBlindedMessage({
-      rawData: paddedBody,
-      senderSigningKey: ourSignKeyBytes,
-      serverPubKey: from_hex(serverPubKey),
-      recipientBlindedPublicKey: from_hex(this.id.slice(2)),
-    });
-
-    if (!encryptedMsg) {
-      throw new Error('encryptBlindedMessage failed');
-    }
-    if (!messageParams.identifier) {
-      throw new Error('encryptBlindedMessage messageParams needs an identifier');
-    }
-
-    this.set({ active_at: Date.now(), isApproved: true });
-
-    await getMessageQueue().sendToOpenGroupV2BlindedRequest({
-      encryptedContent: encryptedMsg,
-      roomInfos: roomInfo,
-      message: sogsVisibleMessage,
-      recipientBlindedId: this.id,
-    });
-  }
-
   /**
    * Sends an accepted message request response.
    * Currently, we never send anything for denied message requests.
@@ -1207,14 +1018,20 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         }
       }
     }
+
+    // TODOLATER we should maybe mark things here as read, but we need a readAt timestamp, and I am not too sure what we should use (considering that disappearing messages needs a real readAt)
+    // const sentAt = messageAttributes.sent_at || messageAttributes.serverTimestamp;
+    // if (sentAt) {
+    //   await this.markConversationRead(sentAt);
+    // }
     return this.addSingleMessage({
       ...messageAttributes,
       conversationId: this.id,
       source: sender,
       type: 'outgoing',
       direction: 'outgoing',
-      unread: 0, // an outgoing message must be read right?
-      received_at: messageAttributes.sent_at, // make sure to set an received_at timestamp for an outgoing message, so the order are right.
+      unread: 0, // an outgoing message must be already read
+      received_at: messageAttributes.sent_at, // make sure to set a received_at timestamp for an outgoing message, so the order are right.
     });
   }
 
@@ -1521,9 +1338,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return !!this.get('markedAsUnread');
   }
 
+  /**
+   * Mark a private conversation as approved to the specified value.
+   * Does not do anything on non private chats.
+   */
   public async setIsApproved(value: boolean, shouldCommit: boolean = true) {
     const valueForced = Boolean(value);
 
+    if (!this.isPrivate()) {
+      return;
+    }
+
     if (valueForced !== Boolean(this.isApproved())) {
       window?.log?.info(`Setting ${ed25519Str(this.id)} isApproved to: ${value}`);
       this.set({
@@ -1536,7 +1361,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
   }
 
+  /**
+   * Mark a private conversation as approved_me to the specified value
+   * Does not do anything on non private chats.
+   */
   public async setDidApproveMe(value: boolean, shouldCommit: boolean = true) {
+    if (!this.isPrivate()) {
+      return;
+    }
     const valueForced = Boolean(value);
     if (valueForced !== Boolean(this.didApproveMe())) {
       window?.log?.info(`Setting ${ed25519Str(this.id)} didApproveMe to: ${value}`);
@@ -1561,8 +1393,19 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   /**
-   * Saves the infos of that room directly on the conversation table.
-   * This does not write anything to the db if no changes are detected
+   * Save the pollInfo to the Database or to the in memory redux slice depending on the data.
+   * things stored to the redux slice of the sogs (ReduxSogsRoomInfos)  are:
+   * - subscriberCount
+   * - canWrite
+   * - moderators
+   *
+   * things stored in the database are
+   * - admins (as they are also stored for groups we just reuse the same field, saved in the DB for now)
+   * - display name of that room
+   *
+   * This function also triggers the download of the new avatar if needed.
+   *
+   * Does not do anything for non public chats.
    */
   // tslint:disable-next-line: cyclomatic-complexity
   public async setPollInfo(infos?: {
@@ -1579,10 +1422,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       hidden_moderators?: Array<string>;
     };
   }) {
+    if (!this.isPublic()) {
+      return;
+    }
     if (!infos || isEmpty(infos)) {
       return;
     }
-    let hasChange = false;
     const { write, active_users, details } = infos;
 
     if (
@@ -1597,14 +1442,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       ReduxSogsRoomInfos.setCanWriteOutsideRedux(this.id, !!write);
     }
 
-    const adminChanged = await this.handleSogsModsOrAdminsChanges({
+    let hasChange = await this.handleSogsModsOrAdminsChanges({
       modsOrAdmins: details.admins,
       hiddenModsOrAdmins: details.hidden_admins,
       type: 'admins',
     });
 
-    hasChange = hasChange || adminChanged;
-
     const modsChanged = await this.handleSogsModsOrAdminsChanges({
       modsOrAdmins: details.moderators,
       hiddenModsOrAdmins: details.hidden_moderators,
@@ -1618,7 +1461,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     hasChange = hasChange || modsChanged;
 
-    if (this.isOpenGroupV2() && details.image_id && isNumber(details.image_id)) {
+    if (this.isPublic() && details.image_id && isNumber(details.image_id)) {
       const roomInfos = OpenGroupData.getV2OpenGroupRoom(this.id);
       if (roomInfos) {
         void sogsV3FetchPreviewAndSaveIt({ ...roomInfos, imageID: `${details.image_id}` });
@@ -1896,6 +1739,200 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return this.markConversationReadBouncy(newestUnreadDate);
   }
 
+  private async sendMessageJob(message: MessageModel, expireTimer: number | undefined) {
+    try {
+      const { body, attachments, preview, quote, fileIdsToLink } = await message.uploadData();
+      const { id } = message;
+      const destination = this.id;
+
+      const sentAt = message.get('sent_at');
+      if (!sentAt) {
+        throw new Error('sendMessageJob() sent_at must be set.');
+      }
+
+      // we are trying to send a message to someone. Make sure this convo is not hidden
+      this.unhideIfNeeded(true);
+
+      // an OpenGroupV2 message is just a visible message
+      const chatMessageParams: VisibleMessageParams = {
+        body,
+        identifier: id,
+        timestamp: sentAt,
+        attachments,
+        expireTimer,
+        preview: preview ? [preview] : [],
+        quote,
+        lokiProfile: UserUtils.getOurProfile(),
+      };
+
+      const shouldApprove = !this.isApproved() && this.isPrivate();
+      const incomingMessageCount = await Data.getMessageCountByType(
+        this.id,
+        MessageDirection.incoming
+      );
+      const hasIncomingMessages = incomingMessageCount > 0;
+
+      if (this.id.startsWith('15')) {
+        window.log.info('Sending a blinded message to this user: ', this.id);
+        await this.sendBlindedMessageRequest(chatMessageParams);
+        return;
+      }
+
+      if (shouldApprove) {
+        await this.setIsApproved(true);
+        if (hasIncomingMessages) {
+          // have to manually add approval for local client here as DB conditional approval check in config msg handling will prevent this from running
+          await this.addOutgoingApprovalMessage(Date.now());
+          if (!this.didApproveMe()) {
+            await this.setDidApproveMe(true);
+          }
+          // should only send once
+          await this.sendMessageRequestResponse();
+          void forceSyncConfigurationNowIfNeeded();
+        }
+      }
+
+      if (this.isOpenGroupV2()) {
+        const chatMessageOpenGroupV2 = new OpenGroupVisibleMessage(chatMessageParams);
+        const roomInfos = this.toOpenGroupV2();
+        if (!roomInfos) {
+          throw new Error('Could not find this room in db');
+        }
+        const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id);
+        // send with blinding if we need to
+        await getMessageQueue().sendToOpenGroupV2({
+          message: chatMessageOpenGroupV2,
+          roomInfos,
+          blinded: Boolean(roomHasBlindEnabled(openGroup)),
+          filesToLink: fileIdsToLink,
+        });
+        return;
+      }
+
+      const destinationPubkey = new PubKey(destination);
+
+      if (this.isPrivate()) {
+        if (this.isMe()) {
+          chatMessageParams.syncTarget = this.id;
+          const chatMessageMe = new VisibleMessage(chatMessageParams);
+
+          await getMessageQueue().sendSyncMessage({
+            namespace: SnodeNamespaces.UserMessages,
+            message: chatMessageMe,
+          });
+          return;
+        }
+
+        if (message.get('groupInvitation')) {
+          const groupInvitation = message.get('groupInvitation');
+          const groupInvitMessage = new GroupInvitationMessage({
+            identifier: id,
+            timestamp: sentAt,
+            name: groupInvitation.name,
+            url: groupInvitation.url,
+            expireTimer: this.get('expireTimer'),
+          });
+          // we need the return await so that errors are caught in the catch {}
+          await getMessageQueue().sendToPubKey(
+            destinationPubkey,
+            groupInvitMessage,
+            SnodeNamespaces.UserMessages
+          );
+          return;
+        }
+        const chatMessagePrivate = new VisibleMessage(chatMessageParams);
+
+        await getMessageQueue().sendToPubKey(
+          destinationPubkey,
+          chatMessagePrivate,
+          SnodeNamespaces.UserMessages
+        );
+        return;
+      }
+
+      if (this.isClosedGroup()) {
+        const chatMessageMediumGroup = new VisibleMessage(chatMessageParams);
+        const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({
+          chatMessage: chatMessageMediumGroup,
+          groupId: destination,
+        });
+
+        // we need the return await so that errors are caught in the catch {}
+        await getMessageQueue().sendToGroup({
+          message: closedGroupVisibleMessage,
+          namespace: SnodeNamespaces.ClosedGroupMessage,
+        });
+        return;
+      }
+
+      throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
+    } catch (e) {
+      await message.saveErrors(e);
+      return null;
+    }
+  }
+
+  private async sendBlindedMessageRequest(messageParams: VisibleMessageParams) {
+    const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes();
+    const groupUrl = this.getSogsOriginMessage();
+
+    if (!PubKey.hasBlindedPrefix(this.id)) {
+      window?.log?.warn('sendBlindedMessageRequest - convo is not a blinded one');
+      return;
+    }
+
+    if (!messageParams.body) {
+      window?.log?.warn('sendBlindedMessageRequest - needs a body');
+      return;
+    }
+
+    // include our profile (displayName + avatar url + key for the recipient)
+    messageParams.lokiProfile = getOurProfile();
+
+    if (!ourSignKeyBytes || !groupUrl) {
+      window?.log?.error(
+        'sendBlindedMessageRequest - Cannot get required information for encrypting blinded message.'
+      );
+      return;
+    }
+
+    const roomInfo = OpenGroupData.getV2OpenGroupRoom(groupUrl);
+
+    if (!roomInfo || !roomInfo.serverPublicKey) {
+      ToastUtils.pushToastError('no-sogs-matching', window.i18n('couldntFindServerMatching'));
+      window?.log?.error('Could not find room with matching server url', groupUrl);
+      throw new Error(`Could not find room with matching server url: ${groupUrl}`);
+    }
+
+    const sogsVisibleMessage = new OpenGroupVisibleMessage(messageParams);
+    const paddedBody = addMessagePadding(sogsVisibleMessage.plainTextBuffer());
+
+    const serverPubKey = roomInfo.serverPublicKey;
+
+    const encryptedMsg = await SogsBlinding.encryptBlindedMessage({
+      rawData: paddedBody,
+      senderSigningKey: ourSignKeyBytes,
+      serverPubKey: from_hex(serverPubKey),
+      recipientBlindedPublicKey: from_hex(this.id.slice(2)),
+    });
+
+    if (!encryptedMsg) {
+      throw new Error('encryptBlindedMessage failed');
+    }
+    if (!messageParams.identifier) {
+      throw new Error('encryptBlindedMessage messageParams needs an identifier');
+    }
+
+    this.set({ active_at: Date.now(), isApproved: true });
+
+    await getMessageQueue().sendToOpenGroupV2BlindedRequest({
+      encryptedContent: encryptedMsg,
+      roomInfos: roomInfo,
+      message: sogsVisibleMessage,
+      recipientBlindedId: this.id,
+    });
+  }
+
   private async bouncyUpdateLastMessage() {
     if (!this.id || !this.get('active_at') || this.isHidden()) {
       return;
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 3ed767d77..8d34b65f8 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -789,9 +789,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
 
     // we want to go for the v1, if this is an OpenGroupV1 or not an open group at all
     if (conversation?.isPublic()) {
-      if (!conversation?.isOpenGroupV2()) {
-        throw new Error('Only opengroupv2 are supported now');
-      }
       const openGroupV2 = conversation.toOpenGroupV2();
       attachmentPromise = uploadAttachmentsV3(finalAttachments, openGroupV2);
       linkPreviewPromise = uploadLinkPreviewsV3(firstPreviewWithData, openGroupV2);
diff --git a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
index 2a9d5be9b..1be6d1227 100644
--- a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
@@ -38,9 +38,9 @@ export type OpenGroupV2InfoJoinable = OpenGroupV2Info & {
 
 // tslint:disable: no-http-string
 
-const legacyDefaultServerIP = '116.203.70.33';
-export const defaultServer = 'https://open.getsession.org';
-const defaultServerHost = new window.URL(defaultServer).host;
+const ourSogsLegacyIp = '116.203.70.33';
+const ourSogsDomainName = 'open.getsession.org';
+const ourSogsUrl = `https://${ourSogsDomainName}`;
 
 /**
  * This function returns true if the server url given matches any of the sogs run by Session.
@@ -66,7 +66,7 @@ export function isSessionRunOpenGroup(server: string): boolean {
     serverHost = lowerCased;
   }
 
-  const options = [legacyDefaultServerIP, defaultServerHost];
+  const options = [ourSogsLegacyIp, ourSogsDomainName];
   return options.includes(serverHost);
 }
 
@@ -110,12 +110,12 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
 
   // If the server is run by Session then include all configurations in case one of the alternate configurations is used
   if (isSessionRunOpenGroup(serverLowerCase)) {
-    serverOptions.add(defaultServerHost);
-    serverOptions.add(`http://${defaultServerHost}`);
-    serverOptions.add(`https://${defaultServerHost}`);
-    serverOptions.add(legacyDefaultServerIP);
-    serverOptions.add(`http://${legacyDefaultServerIP}`);
-    serverOptions.add(`https://${legacyDefaultServerIP}`);
+    serverOptions.add(ourSogsDomainName);
+    serverOptions.add(`http://${ourSogsDomainName}`);
+    serverOptions.add(`https://${ourSogsDomainName}`);
+    serverOptions.add(ourSogsLegacyIp);
+    serverOptions.add(`http://${ourSogsLegacyIp}`);
+    serverOptions.add(`https://${ourSogsLegacyIp}`);
   }
 
   const rooms = flatten(
@@ -139,7 +139,7 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
 }
 
 const defaultServerPublicKey = 'a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238';
-const defaultRoom = `${defaultServer}/main?public_key=${defaultServerPublicKey}`;
+const defaultRoom = `${ourSogsUrl}/main?public_key=${defaultServerPublicKey}`; // we want the https for our sogs, so we can avoid duplicates with http
 
 const loadDefaultRoomsSingle = (): Promise<Array<OpenGroupV2InfoJoinable>> =>
   allowOnlyOneAtATime('loadDefaultRoomsSingle', async () => {
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index 7fe71ce71..a1d12453e 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -62,7 +62,7 @@ async function joinOpenGroupV2(
   room: OpenGroupV2Room,
   fromConfigMessage: boolean
 ): Promise<ConversationModel | undefined> {
-  if (!room.serverUrl || !room.roomId || room.roomId.length < 2 || !room.serverPublicKey) {
+  if (!room.serverUrl || !room.roomId || room.roomId.length < 1 || !room.serverPublicKey) {
     return undefined;
   }
 
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 0027d3cda..648cf12ad 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -51,6 +51,8 @@ export class OpenGroupManagerV2 {
     roomId: string,
     publicKey: string
   ): Promise<ConversationModel | undefined> {
+    // TODOLATER we should rewrite serverUrl when it matches our sogs (by ip, domain name with http or https or nothing)
+    // we should also make sure that whoever calls this function, uses the overriden  serverUrl
     const oneAtaTimeStr = `oneAtaTimeOpenGroupV2Join:${serverUrl}${roomId}`;
     return allowOnlyOneAtATime(oneAtaTimeStr, async () => {
       return this.attemptConnectionV2(serverUrl, roomId, publicKey);
@@ -177,10 +179,10 @@ export class OpenGroupManagerV2 {
         roomId,
         serverPublicKey
       );
-      // here, the convo does not exist. Make sure the db is clean too
+      // here, the convo does not exist. Make sure the db & wrappers are clean too
       await OpenGroupData.removeV2OpenGroupRoom(conversationId);
-
       await SessionUtilUserGroups.removeCommunityFromWrapper(conversationId, fullUrl);
+
       const room: OpenGroupV2Room = {
         serverUrl,
         roomId,
diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
index 5c110fe12..9fecfeea0 100644
--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { isEmpty } from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 
@@ -33,7 +33,7 @@ export const openGroupV2CompleteURLRegex = new RegExp(
  * This is the prefix used to identify our open groups in the conversation database (v1 or v2)
  */
 // tslint:disable-next-line: no-http-string
-export const openGroupPrefix = 'http'; // can be http:// or https://
+const openGroupPrefix = 'http'; // can be http:// or https://
 
 /**
  * This function returns a full url on an open group v2 room used for sync messages for instance.
@@ -42,9 +42,9 @@ export const openGroupPrefix = 'http'; // can be http:// or https://
  */
 export function getCompleteUrlFromRoom(roomInfos: OpenGroupV2Room) {
   if (
-    _.isEmpty(roomInfos.serverUrl) ||
-    _.isEmpty(roomInfos.roomId) ||
-    _.isEmpty(roomInfos.serverPublicKey)
+    isEmpty(roomInfos.serverUrl) ||
+    isEmpty(roomInfos.roomId) ||
+    isEmpty(roomInfos.serverPublicKey)
   ) {
     throw new Error('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set');
   }
@@ -71,6 +71,7 @@ export function prefixify(server: string): string {
  * @returns `${openGroupPrefix}${roomId}@${serverUrl}`
  */
 export function getOpenGroupV2ConversationId(serverUrl: string, roomId: string) {
+  // TODOLATER we should probably make this force the serverURL to be our sogs with https when it matches pubkey or domain name
   if (!roomId.match(`^${roomIdV2Regex}$`)) {
     throw new Error('getOpenGroupV2ConversationId: Invalid roomId');
   }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 88be9c6af..c96e1ae4e 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -297,8 +297,8 @@ export class ConversationController {
   /**
    *
    * @returns the reference of the list of conversations stored.
-   * Warning: You should not not edit things directly from that list. This must only be used for reading things.
-   * If you need to make change, do the usual getConversationControler().get('the id you want to edit')
+   * Warning: You should not edit things directly from that list. This must only be used for reading things.
+   * If you need to make a change, do the usual getConversationControler().get('the id you want to edit')
    */
   public getConversations(): Array<ConversationModel> {
     return this.conversations.models;
diff --git a/ts/session/group/open-group.ts b/ts/session/group/open-group.ts
index 8e69e5aa8..d89558808 100644
--- a/ts/session/group/open-group.ts
+++ b/ts/session/group/open-group.ts
@@ -21,8 +21,8 @@ export async function initiateOpenGroupUpdate(
   // For now, the UI is actually not allowing changing the room name so we do not care.
   const convo = getConversationController().get(groupId);
 
-  if (!convo || !convo.isPublic() || !convo.isOpenGroupV2()) {
-    throw new Error('Only opengroupv2 are supported');
+  if (!convo?.isPublic()) {
+    throw new Error('initiateOpenGroupUpdate can only be used for communities');
   }
   if (avatar && avatar.objectUrl) {
     const blobAvatarAlreadyScaled = await urlToBlob(avatar.objectUrl);
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index d1391c5ea..15dc60231 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -151,6 +151,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
   }
 
   public async run(): Promise<RunJobResult> {
+    const start = Date.now();
+
     try {
       if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
         this.triggerConfSyncJobDone();
@@ -237,6 +239,8 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
     } catch (e) {
       throw e;
     } finally {
+      window.log.debug(`ConfigurationSyncJob run() took ${Date.now() - start}ms`);
+
       // this is a simple way to make sure whatever happens here, we update the lastest timestamp.
       // (a finally statement is always executed (no matter if exception or returns in other try/catch block)
       this.updateLastTickTimestamp();
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index ee529d02c..f648a505b 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -43,9 +43,9 @@ async function initializeLibSessionUtilWrappers() {
 
   // fetch the dumps we already have from the database
   const dumps = await ConfigDumpData.getAllDumpsWithData();
-  console.warn(
+  window.log.info(
     'initializeLibSessionUtilWrappers alldumpsInDB already: ',
-    dumps.map(m => omit(m, 'data'))
+    JSON.stringify(dumps.map(m => omit(m, 'data')))
   );
 
   const userVariantsBuildWithoutErrors = new Set<ConfigWrapperObjectTypes>();
@@ -53,7 +53,7 @@ async function initializeLibSessionUtilWrappers() {
   // load the dumps retrieved from the database into their corresponding wrappers
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
-    console.warn('initializeLibSessionUtilWrappers initing from dump', dump.variant);
+    window.log.debug('initializeLibSessionUtilWrappers initing from dump', dump.variant);
     try {
       await GenericWrapperActions.init(
         dump.variant,
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 65e050823..9ca58193e 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -79,12 +79,13 @@ function getConvoType(convo: ConversationModel): ConvoVolatileType {
 }
 
 /**
- * Fetches the specified convo and updates the required field in the wrapper.
+ * Updates the required field in the wrapper from the data from the `ConversationController`
  * If that community does not exist in the wrapper, it is created before being updated.
  * Same applies for a legacy group.
  */
 async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<void> {
-  const foundConvo = await Data.getConversationById(convoId);
+  // this is too slow to fetch from the database the up to date data here. Let's hope that what we have in memory is up to date enough
+  const foundConvo = getConversationController().get(convoId);
   if (!foundConvo || !isConvoToStoreInWrapper(foundConvo)) {
     return;
   }
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index ba58d3e9c..8318886b4 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -96,6 +96,8 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
         });
+      } else {
+        resolve(true);
       }
 
       return;
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 364261ebd..fe804e8e1 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -11,6 +11,7 @@ import { ReplyingToMessageProps } from '../../components/conversation/compositio
 import { QuotedAttachmentType } from '../../components/conversation/message/message-content/Quote';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
 import {
+  CONVERSATION_PRIORITIES,
   ConversationNotificationSettingType,
   ConversationTypeEnum,
 } from '../../models/conversationAttributes';
@@ -972,9 +973,22 @@ function applyConversationChanged(
     return state;
   }
 
+  let selected = selectedConversation;
+  if (
+    data &&
+    data.isPrivate &&
+    data.id === selectedConversation &&
+    data.priority &&
+    data.priority < CONVERSATION_PRIORITIES.default
+  ) {
+    // A private conversation hidden cannot be a selected.
+    // When opening a hidden conversation, we unhide it so it can be selected again.
+    selected = undefined;
+  }
+
   return {
     ...state,
-    selectedConversation,
+    selectedConversation: selected,
     conversationLookup: {
       ...conversationLookup,
       [id]: { ...data, isInitialFetchingInProgress: existing.isInitialFetchingInProgress },
@@ -982,7 +996,6 @@ function applyConversationChanged(
   };
 }
 
-// destructures
 export const { actions, reducer } = conversationsSlice;
 export const {
   // conversation and messages list
@@ -1020,7 +1033,7 @@ async function unmarkAsForcedUnread(convoId: string) {
   const convo = getConversationController().get(convoId);
   if (convo && convo.isMarkedUnread()) {
     // we just opened it and it was forced "Unread", so we reset the unread state here
-    await convo.markAsUnread(false);
+    await convo.markAsUnread(false, true);
   }
 }
 
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 9f0f779a2..e4f1f4411 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -26,7 +26,11 @@ import { MessageTextSelectorProps } from '../../components/conversation/message/
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
 import { ConversationModel } from '../../models/conversation';
-import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+  isOpenOrClosedGroup,
+} from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
 import { UserUtils } from '../../session/utils';
 import { LocalizerType } from '../../types/Util';
@@ -34,7 +38,7 @@ import { BlockedNumberController } from '../../util';
 import { Storage } from '../../util/storage';
 import { getIntl } from './user';
 
-import { filter, isEmpty, pick, sortBy } from 'lodash';
+import { filter, isEmpty, isNumber, pick, sortBy } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { getModeratorsOutsideRedux } from './sogsRoomInfo';
 import { getSelectedConversation, getSelectedConversationKey } from './selectedConversation';
@@ -88,10 +92,7 @@ export const getSortedMessagesOfSelectedConversation = createSelector(
 export const hasSelectedConversationIncomingMessages = createSelector(
   getSortedMessagesOfSelectedConversation,
   (messages: Array<MessageModelPropsWithoutConvoProps>): boolean => {
-    if (messages.length === 0) {
-      return false;
-    }
-    return Boolean(messages.filter(m => m.propsForMessage.direction === 'incoming').length);
+    return messages.some(m => m.propsForMessage.direction === 'incoming');
   }
 );
 
@@ -260,7 +261,6 @@ export const _getConversationComparator = (testingi18n?: LocalizerType) => {
 
 export const getConversationComparator = createSelector(getIntl, _getConversationComparator);
 
-// export only because we use it in some of our tests
 // tslint:disable-next-line: cyclomatic-complexity
 const _getLeftPaneLists = (
   sortedConversations: Array<ReduxConversationType>
@@ -274,28 +274,34 @@ const _getLeftPaneLists = (
 
   let globalUnreadCount = 0;
   for (const conversation of sortedConversations) {
+    // Blocked conversation are now only visible from the settings, not in the conversation list, so don't add it neither to the contacts list nor the conversation list
+    if (conversation.isBlocked) {
+      continue;
+    }
+    // a contact is a private conversation that is approved by us and active
     if (
       conversation.activeAt !== undefined &&
       conversation.type === ConversationTypeEnum.PRIVATE &&
-      conversation.isApproved &&
-      !conversation.isBlocked &&
-      (conversation.priority || 0) >= 0 // filtering non-hidden conversation
+      conversation.isApproved
+      // we want to keep the hidden conversation in the direct contact list, so we don't filter based on priority
     ) {
       directConversations.push(conversation);
     }
 
-    if (!conversation.isApproved && conversation.isPrivate) {
+    if (
+      (conversation.isPrivate && !conversation.isApproved) ||
+      (conversation.isPrivate &&
+        conversation.priority &&
+        conversation.priority <= CONVERSATION_PRIORITIES.default) // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+    ) {
       // dont increase unread counter, don't push to convo list.
       continue;
     }
 
-    if (conversation.isBlocked) {
-      continue;
-    }
-
     if (
       globalUnreadCount < 100 &&
-      conversation.unreadCount &&
+      isNumber(conversation.unreadCount) &&
+      isFinite(conversation.unreadCount) &&
       conversation.unreadCount > 0 &&
       conversation.currentNotificationSetting !== 'disabled'
     ) {
@@ -322,30 +328,21 @@ export const _getSortedConversations = (
 
   const sortedConversations: Array<ReduxConversationType> = [];
 
-  for (let conversation of sorted) {
-    if (selectedConversation === conversation.id) {
-      conversation = {
-        ...conversation,
-        isSelected: true,
-      };
-    }
-
-    const isBlocked = BlockedNumberController.isBlocked(conversation.id);
-
-    if (isBlocked) {
-      conversation = {
-        ...conversation,
-        isBlocked: true,
-      };
-    }
-
+  for (const conversation of sorted) {
     // Remove all invalid conversations and conversatons of devices associated
     //  with cancelled attempted links
     if (!conversation.isPublic && !conversation.activeAt) {
       continue;
     }
 
-    sortedConversations.push(conversation);
+    const isBlocked = BlockedNumberController.isBlocked(conversation.id);
+    const isSelected = selectedConversation === conversation.id;
+
+    sortedConversations.push({
+      ...conversation,
+      isSelected: isSelected || undefined,
+      isBlocked: isBlocked || undefined,
+    });
   }
 
   return sortedConversations;
@@ -634,12 +631,17 @@ export const getYoungestMessageId = createSelector(
   }
 );
 
-export const getLoadedMessagesLength = createSelector(
-  getConversations,
-  (state: ConversationsStateType): number => {
-    return state.messages.length || 0;
-  }
-);
+function getMessagesFromState(state: StateType) {
+  return state.conversations.messages;
+}
+
+export function getLoadedMessagesLength(state: StateType) {
+  return getMessagesFromState(state).length;
+}
+
+export function getSelectedHasMessages(state: StateType): boolean {
+  return !isEmpty(getMessagesFromState(state));
+}
 
 export const isFirstUnreadMessageIdAbove = createSelector(
   getConversations,
@@ -1021,6 +1023,8 @@ export const getOldTopMessageId = createSelector(
   (state: ConversationsStateType): string | null => state.oldTopMessageId || null
 );
 
+// TODOLATER get rid of all the unneeded createSelector calls
+
 export const getOldBottomMessageId = createSelector(
   getConversations,
   (state: ConversationsStateType): string | null => state.oldBottomMessageId || null
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 7aad23448..4ec411610 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -3,6 +3,7 @@ import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversa
 import { ReduxConversationType } from '../ducks/conversations';
 import { StateType } from '../reducer';
 import { getCanWrite, getSubscriberCount } from './sogsRoomInfo';
+import { PubKey } from '../../session/types';
 
 /**
  * Returns the formatted text for notification setting.
@@ -180,6 +181,38 @@ export function useSelectedDisplayNameInProfile() {
   return useSelector((state: StateType) => getSelectedConversation(state)?.displayNameInProfile);
 }
 
+/**
+ * For a private chat, this returns the (xxxx...xxxx) shortened pubkey
+ * If this is a private chat, but somehow, we have no pubkey, this returns the localized `anonymous` string
+ * Otherwise, this returns the localized `unknown` string
+ */
+export function useSelectedShortenedPubkeyOrFallback() {
+  const isPrivate = useSelectedIsPrivate();
+  const selected = useSelectedConversationKey();
+  if (isPrivate && selected) {
+    return PubKey.shorten(selected);
+  }
+  if (isPrivate) {
+    return window.i18n('anonymous');
+  }
+  return window.i18n('unknown');
+}
+
+/**
+ * That's a very convoluted way to say "nickname or profile name or shortened pubkey or ("Anonymous" or "unknown" depending on the type of conversation).
+ * This also returns the localized "Note to Self" if the conversation is the note to self.
+ */
+export function useSelectedNicknameOrProfileNameOrShortenedPubkey() {
+  const nickname = useSelectedNickname();
+  const profileName = useSelectedDisplayNameInProfile();
+  const shortenedPubkey = useSelectedShortenedPubkeyOrFallback();
+  const isMe = useSelectedisNoteToSelf();
+  if (isMe) {
+    return window.i18n('noteToSelf');
+  }
+  return nickname || profileName || shortenedPubkey;
+}
+
 export function useSelectedWeAreAdmin() {
   return useSelector((state: StateType) => getSelectedConversation(state)?.weAreAdmin || false);
 }
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index d2a094676..f928a0a32 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -485,6 +485,9 @@ export type LocalizerKeys =
   | 'youHaveANewFriendRequest'
   | 'clearAllConfirmationTitle'
   | 'clearAllConfirmationBody'
+  | 'noMessagesInReadOnly'
+  | 'noMessagesInNoteToSelf'
+  | 'noMessagesInEverythingElse'
   | 'hideBanner'
   | 'openMessageRequestInboxDescription'
   | 'clearAllReactions'

From faeb95fefd3f42c99ad0dd23fc8f2b95090e8e46 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 6 Apr 2023 14:07:50 +1000
Subject: [PATCH 065/178] feat: add block/decline logic to msg request &
 wrapper

---
 _locales/en/messages.json                     |   4 +-
 tools/afterCrowdInFetch.sh                    |   2 +-
 ts/components/SplitViewContainer.tsx          |   6 +-
 .../conversation/ConversationHeader.tsx       |  61 ++--
 ...tButtons.tsx => MessageRequestButtons.tsx} |  67 +++-
 .../conversation/SessionConversation.tsx      |  49 ++-
 .../SessionMessagesListContainer.tsx          |  11 +-
 .../conversation/SubtleNotification.tsx       |   6 +-
 .../leftpane/MessageRequestsBanner.tsx        |   4 +-
 .../overlay/OverlayMessageRequest.tsx         |  84 ++---
 ts/components/menu/ConversationHeaderMenu.tsx | 171 ++++++++--
 .../menu/ConversationListItemContextMenu.tsx  |  12 +-
 ts/components/menu/Menu.tsx                   | 315 +++++-------------
 .../menu/MessageRequestBannerContextMenu.tsx  |  27 +-
 ts/components/settings/BlockedList.tsx        |   2 +-
 ts/hooks/useParamSelector.ts                  |  51 ++-
 ts/interactions/conversationInteractions.ts   |  99 ++++--
 ts/models/conversation.ts                     |  99 +++---
 .../libsession/libsession_utils_contacts.ts   |  17 +
 ts/state/ducks/conversations.ts               |  29 +-
 ts/state/selectors/conversations.ts           |  19 +-
 ts/state/selectors/selectedConversation.ts    |  41 +++
 ts/types/LocalizerKeys.ts                     |   4 +-
 23 files changed, 685 insertions(+), 495 deletions(-)
 rename ts/components/conversation/{ConversationRequestButtons.tsx => MessageRequestButtons.tsx} (57%)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c4df15896..37f51cd4e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -240,8 +240,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
diff --git a/tools/afterCrowdInFetch.sh b/tools/afterCrowdInFetch.sh
index 9f4c31572..f03a31979 100755
--- a/tools/afterCrowdInFetch.sh
+++ b/tools/afterCrowdInFetch.sh
@@ -14,5 +14,5 @@ mv $PWD/_locales/zh-TW $PWD/_locales/zh_TW
 
 echo 'Updated locales from crowdin to session-desktop folder'
 
-python $PWD/tools/updateI18nKeysType.py
+python2 $PWD/tools/updateI18nKeysType.py
 
diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx
index cdca3d3ff..6ba7a7041 100644
--- a/ts/components/SplitViewContainer.tsx
+++ b/ts/components/SplitViewContainer.tsx
@@ -67,11 +67,7 @@ const TopSplitViewPanel = ({
 const MIN_HEIGHT_TOP = 200;
 const MIN_HEIGHT_BOTTOM = 0;
 
-export const SplitViewContainer: React.FunctionComponent<SplitViewProps> = ({
-  disableTop,
-  top,
-  bottom,
-}) => {
+export const SplitViewContainer = ({ disableTop, top, bottom }: SplitViewProps) => {
   const [topHeight, setTopHeight] = useState<undefined | number>(undefined);
   const [separatorYPosition, setSeparatorYPosition] = useState<undefined | number>(undefined);
   const [dragging, setDragging] = useState(false);
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 736cff2be..53806eb51 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 
 import { contextMenu } from 'react-contexify';
+import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { ConversationNotificationSettingType } from '../../models/conversationAttributes';
 import {
@@ -11,8 +12,13 @@ import {
   isMessageSelectionMode,
   isRightPanelShowing,
 } from '../../state/selectors/conversations';
-import { useDispatch, useSelector } from 'react-redux';
 
+import {
+  useConversationUsername,
+  useExpireTimer,
+  useIsKickedFromGroup,
+} from '../../hooks/useParamSelector';
+import { callRecipient } from '../../interactions/conversationInteractions';
 import {
   deleteMessagesById,
   deleteMessagesByIdForEveryone,
@@ -23,14 +29,23 @@ import {
   openRightPanel,
   resetSelectedMessageIds,
 } from '../../state/ducks/conversations';
-import { callRecipient } from '../../interactions/conversationInteractions';
 import { getHasIncomingCall, getHasOngoingCall } from '../../state/selectors/call';
 import {
-  useConversationUsername,
-  useExpireTimer,
-  useIsKickedFromGroup,
-  useIsRequest,
-} from '../../hooks/useParamSelector';
+  useSelectedConversationKey,
+  useSelectedIsActive,
+  useSelectedIsBlocked,
+  useSelectedIsPrivateFriend,
+  useSelectedIsGroup,
+  useSelectedIsKickedFromGroup,
+  useSelectedIsPrivate,
+  useSelectedIsPublic,
+  useSelectedMembers,
+  useSelectedNotificationSetting,
+  useSelectedSubscriberCount,
+  useSelectedisNoteToSelf,
+} from '../../state/selectors/selectedConversation';
+import { ExpirationTimerOptions } from '../../util/expiringMessages';
+import { Flex } from '../basic/Flex';
 import {
   SessionButton,
   SessionButtonColor,
@@ -39,21 +54,6 @@ import {
 } from '../basic/SessionButton';
 import { SessionIconButton } from '../icon';
 import { ConversationHeaderMenu } from '../menu/ConversationHeaderMenu';
-import { Flex } from '../basic/Flex';
-import { ExpirationTimerOptions } from '../../util/expiringMessages';
-import {
-  useSelectedConversationKey,
-  useSelectedIsActive,
-  useSelectedIsBlocked,
-  useSelectedIsGroup,
-  useSelectedIsKickedFromGroup,
-  useSelectedisNoteToSelf,
-  useSelectedIsPrivate,
-  useSelectedIsPublic,
-  useSelectedMembers,
-  useSelectedNotificationSetting,
-  useSelectedSubscriberCount,
-} from '../../state/selectors/selectedConversation';
 
 export interface TimerOption {
   name: string;
@@ -123,9 +123,15 @@ const TripleDotContainer = styled.div`
 
 const TripleDotsMenu = (props: { triggerId: string; showBackButton: boolean }) => {
   const { showBackButton } = props;
+
+  const isPrivateFriend = useSelectedIsPrivateFriend();
+  const isPrivate = useSelectedIsPrivate();
   if (showBackButton) {
     return null;
   }
+  if (isPrivate && !isPrivateFriend) {
+    return null;
+  }
   return (
     <TripleDotContainer
       role="button"
@@ -214,9 +220,16 @@ const CallButton = () => {
   const hasOngoingCall = useSelector(getHasOngoingCall);
   const canCall = !(hasIncomingCall || hasOngoingCall);
 
-  const isRequest = useIsRequest(selectedConvoKey);
+  const isPrivateFriend = useSelectedIsPrivateFriend();
 
-  if (!isPrivate || isMe || !selectedConvoKey || isBlocked || !isActive || isRequest) {
+  if (
+    !isPrivate ||
+    isMe ||
+    !selectedConvoKey ||
+    isBlocked ||
+    !isActive ||
+    !isPrivateFriend // call requires us to be friends
+  ) {
     return null;
   }
 
diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx
similarity index 57%
rename from ts/components/conversation/ConversationRequestButtons.tsx
rename to ts/components/conversation/MessageRequestButtons.tsx
index 3d6d05e5a..aec060261 100644
--- a/ts/components/conversation/ConversationRequestButtons.tsx
+++ b/ts/components/conversation/MessageRequestButtons.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
-import { useIsRequest } from '../../hooks/useParamSelector';
+import { useIsIncomingRequest } from '../../hooks/useParamSelector';
 import {
   approveConvoAndSendResponse,
   declineConversationWithConfirm,
@@ -10,13 +10,7 @@ import { getConversationController } from '../../session/conversations';
 import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../basic/SessionButton';
-
-const handleAcceptConversationRequest = async (convoId: string) => {
-  const convo = getConversationController().get(convoId);
-  await convo.setDidApproveMe(true);
-  await convo.addOutgoingApprovalMessage(Date.now());
-  await approveConvoAndSendResponse(convoId, true);
-};
+import { ConversationRequestExplanation } from './SubtleNotification';
 
 const ConversationRequestBanner = styled.div`
   display: flex;
@@ -24,6 +18,7 @@ const ConversationRequestBanner = styled.div`
   justify-content: center;
   padding: var(--margins-lg);
   gap: var(--margins-lg);
+  background-color: var(--background-secondary-color);
 `;
 
 const ConversationBannerRow = styled.div`
@@ -37,22 +32,72 @@ const ConversationBannerRow = styled.div`
   }
 `;
 
+const StyledBlockUserText = styled.span`
+  color: var(--danger-color);
+  cursor: pointer;
+  font-size: var(--font-size-md);
+  align-self: center;
+  font-weight: 700;
+`;
+
+const handleDeclineConversationRequest = (convoId: string, currentSelected: string | undefined) => {
+  declineConversationWithConfirm({
+    conversationId: convoId,
+    syncToDevices: true,
+    blockContact: false,
+    currentlySelectedConvo: currentSelected,
+  });
+};
+
+const handleDeclineAndBlockConversationRequest = (
+  convoId: string,
+  currentSelected: string | undefined
+) => {
+  declineConversationWithConfirm({
+    conversationId: convoId,
+    syncToDevices: true,
+    blockContact: true,
+    currentlySelectedConvo: currentSelected,
+  });
+};
+
+const handleAcceptConversationRequest = async (convoId: string) => {
+  const convo = getConversationController().get(convoId);
+  if (!convo) return;
+  await convo.setDidApproveMe(true, false);
+  await convo.setIsApproved(true, false);
+  await convo.commit();
+  await convo.addOutgoingApprovalMessage(Date.now());
+  await approveConvoAndSendResponse(convoId, true);
+};
+
 export const ConversationMessageRequestButtons = () => {
   const selectedConvoId = useSelectedConversationKey();
 
   const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
-  const isIncomingMessageRequest = useIsRequest(selectedConvoId);
+  const isIncomingRequest = useIsIncomingRequest(selectedConvoId);
 
   if (!selectedConvoId || !hasIncomingMessages) {
     return null;
   }
 
-  if (!isIncomingMessageRequest) {
+  if (!isIncomingRequest) {
     return null;
   }
 
   return (
     <ConversationRequestBanner>
+      <StyledBlockUserText
+        onClick={() => {
+          handleDeclineAndBlockConversationRequest(selectedConvoId, selectedConvoId);
+        }}
+        data-testid="decline-and-block-message-request"
+      >
+        {window.i18n('block')}
+      </StyledBlockUserText>
+
+      <ConversationRequestExplanation />
+
       <ConversationBannerRow>
         <SessionButton
           onClick={async () => {
@@ -65,7 +110,7 @@ export const ConversationMessageRequestButtons = () => {
           buttonColor={SessionButtonColor.Danger}
           text={window.i18n('decline')}
           onClick={() => {
-            declineConversationWithConfirm(selectedConvoId, true);
+            handleDeclineConversationRequest(selectedConvoId, selectedConvoId);
           }}
           dataTestId="decline-message-request"
         />
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index 1e77c835e..67ca5919f 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import _ from 'lodash';
+import React from 'react';
 
-import classNames from 'classnames';
 import autoBind from 'auto-bind';
+import classNames from 'classnames';
 
 import {
   CompositionBox,
@@ -18,49 +18,45 @@ import { SessionMessagesListContainer } from './SessionMessagesListContainer';
 
 import { SessionFileDropzone } from './SessionFileDropzone';
 
-import { InConversationCallContainer } from '../calling/InConversationCallContainer';
-import { SplitViewContainer } from '../SplitViewContainer';
-import { LightboxGallery, MediaItemType } from '../lightbox/LightboxGallery';
+import { blobToArrayBuffer } from 'blob-util';
+import loadImage from 'blueimp-load-image';
 import { Data } from '../../data/data';
+import { markAllReadByConvoId } from '../../interactions/conversationInteractions';
+import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
 import { getConversationController } from '../../session/conversations';
 import { ToastUtils } from '../../session/utils';
 import {
+  ReduxConversationType,
+  SortedMessageModelProps,
   openConversationToSpecificMessage,
   quoteMessage,
-  ReduxConversationType,
   resetSelectedMessageIds,
-  SortedMessageModelProps,
   updateMentionsMembers,
 } from '../../state/ducks/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
-import { SessionTheme } from '../../themes/SessionTheme';
 import { addStagedAttachmentsInConversation } from '../../state/ducks/stagedAttachments';
+import { SessionTheme } from '../../themes/SessionTheme';
 import { MIME } from '../../types';
 import { AttachmentTypeWithPath } from '../../types/Attachment';
-import { arrayBufferToObjectURL, AttachmentUtil, GoogleChrome } from '../../util';
-import { SessionButtonColor } from '../basic/SessionButton';
-import { MessageView } from '../MainViewController';
-import { ConversationHeaderWithDetails } from './ConversationHeader';
-import { MessageDetail } from './message/message-item/MessageDetail';
-import { SessionRightPanelWithDetails } from './SessionRightPanel';
 import {
+  THUMBNAIL_CONTENT_TYPE,
   makeImageThumbnailBuffer,
   makeVideoScreenshot,
-  THUMBNAIL_CONTENT_TYPE,
 } from '../../types/attachments/VisualAttachment';
-import { blobToArrayBuffer } from 'blob-util';
-import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
-import { ConversationMessageRequestButtons } from './ConversationRequestButtons';
-import {
-  NoMessageNoMessageInConversation,
-  RespondToMessageRequestWarning,
-} from './SubtleNotification';
+import { AttachmentUtil, GoogleChrome, arrayBufferToObjectURL } from '../../util';
 import { getCurrentRecoveryPhrase } from '../../util/storage';
-import loadImage from 'blueimp-load-image';
-import { markAllReadByConvoId } from '../../interactions/conversationInteractions';
+import { MessageView } from '../MainViewController';
+import { SplitViewContainer } from '../SplitViewContainer';
+import { SessionButtonColor } from '../basic/SessionButton';
+import { InConversationCallContainer } from '../calling/InConversationCallContainer';
+import { LightboxGallery, MediaItemType } from '../lightbox/LightboxGallery';
+import { ConversationHeaderWithDetails } from './ConversationHeader';
+import { SessionRightPanelWithDetails } from './SessionRightPanel';
+import { NoMessageNoMessageInConversation } from './SubtleNotification';
+import { MessageDetail } from './message/message-item/MessageDetail';
 
-import { SessionSpinner } from '../basic/SessionSpinner';
 import styled from 'styled-components';
+import { SessionSpinner } from '../basic/SessionSpinner';
 // tslint:disable: jsx-curly-spacing
 
 interface State {
@@ -276,7 +272,7 @@ export class SessionConversation extends React.Component<Props, State> {
 
               <div className="conversation-messages">
                 <NoMessageNoMessageInConversation />
-                <ConversationMessageRequestButtons />
+
                 <SplitViewContainer
                   top={<InConversationCallContainer />}
                   bottom={
@@ -289,7 +285,6 @@ export class SessionConversation extends React.Component<Props, State> {
                 />
                 {isDraggingFile && <SessionFileDropzone />}
               </div>
-              <RespondToMessageRequestWarning />
 
               <CompositionBox
                 sendMessage={this.sendMessageFn}
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 23effa227..fccacbddf 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 
-import { SessionScrollButton } from '../SessionScrollButton';
 import { contextMenu } from 'react-contexify';
+import { SessionScrollButton } from '../SessionScrollButton';
 
 import { connect } from 'react-redux';
 
-import { SessionMessagesList } from './SessionMessagesList';
 import autoBind from 'auto-bind';
+import styled from 'styled-components';
 import {
   quotedMessageToAnimate,
   ReduxConversationType,
@@ -19,17 +19,17 @@ import {
   getQuotedMessageToAnimate,
   getSortedMessagesOfSelectedConversation,
 } from '../../state/selectors/conversations';
-import { TypingBubble } from './TypingBubble';
-import styled from 'styled-components';
 import {
   getSelectedConversation,
   getSelectedConversationKey,
 } from '../../state/selectors/selectedConversation';
+import { SessionMessagesList } from './SessionMessagesList';
+import { TypingBubble } from './TypingBubble';
+import { ConversationMessageRequestButtons } from './MessageRequestButtons';
 
 export type SessionMessageListProps = {
   messageContainerRef: React.RefObject<HTMLDivElement>;
 };
-
 export const messageContainerDomID = 'messages-container';
 
 export type ScrollToLoadedReasons =
@@ -127,6 +127,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
           isTyping={!!conversation.isTyping}
           key="typing-bubble"
         />
+        <ConversationMessageRequestButtons />
 
         <ScrollToLoadedMessageContext.Provider value={this.scrollToLoadedMessage}>
           <SessionMessagesList
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
index d783e7ad8..3f5b51f74 100644
--- a/ts/components/conversation/SubtleNotification.tsx
+++ b/ts/components/conversation/SubtleNotification.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
-import { useIsRequest } from '../../hooks/useParamSelector';
 import {
   getSelectedHasMessages,
   hasSelectedConversationIncomingMessages,
@@ -14,6 +13,7 @@ import {
 } from '../../state/selectors/selectedConversation';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
+import { useIsIncomingRequest } from '../../hooks/useParamSelector';
 
 const Container = styled.div`
   display: flex;
@@ -33,9 +33,9 @@ const TextInner = styled.div`
  * This component is used to display a warning when the user is responding to a message request.
  *
  */
-export const RespondToMessageRequestWarning = () => {
+export const ConversationRequestExplanation = () => {
   const selectedConversation = useSelectedConversationKey();
-  const isIncomingMessageRequest = useIsRequest(selectedConversation);
+  const isIncomingMessageRequest = useIsIncomingRequest(selectedConversation);
 
   const showMsgRequestUI = selectedConversation && isIncomingMessageRequest;
   const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages);
diff --git a/ts/components/leftpane/MessageRequestsBanner.tsx b/ts/components/leftpane/MessageRequestsBanner.tsx
index 494f6c04b..ece893518 100644
--- a/ts/components/leftpane/MessageRequestsBanner.tsx
+++ b/ts/components/leftpane/MessageRequestsBanner.tsx
@@ -6,7 +6,7 @@ import styled from 'styled-components';
 import { getUnreadConversationRequests } from '../../state/selectors/conversations';
 import { getHideMessageRequestBanner } from '../../state/selectors/userConfig';
 import { SessionIcon, SessionIconSize, SessionIconType } from '../icon';
-import { MemoMessageRequestBannerContextMenu } from '../menu/MessageRequestBannerContextMenu';
+import { MessageRequestBannerContextMenu } from '../menu/MessageRequestBannerContextMenu';
 
 const StyledMessageRequestBanner = styled.div`
   height: 64px;
@@ -126,7 +126,7 @@ export const MessageRequestsBanner = (props: { handleOnClick: () => any }) => {
         </StyledUnreadCounter>
       </StyledMessageRequestBanner>
       <Portal>
-        <MemoMessageRequestBannerContextMenu triggerId={triggerId} />
+        <MessageRequestBannerContextMenu triggerId={triggerId} />
       </Portal>
     </>
   );
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index cb3f09163..5d9bd695a 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -1,23 +1,19 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 // tslint:disable: no-submodule-imports use-simple-attributes
 
-import { SpacerLG } from '../../basic/Text';
 import { useDispatch, useSelector } from 'react-redux';
-import { getConversationRequests } from '../../../state/selectors/conversations';
-import { MemoConversationListItemWithDetails } from '../conversation-list-item/ConversationListItem';
-import styled from 'styled-components';
-import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
-import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../../state/ducks/section';
-import { getConversationController } from '../../../session/conversations';
-import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
-import { BlockedNumberController } from '../../../util';
 import useKey from 'react-use/lib/useKey';
-import {
-  ReduxConversationType,
-  resetConversationExternal,
-} from '../../../state/ducks/conversations';
+import styled from 'styled-components';
+import { declineConversationWithoutConfirm } from '../../../interactions/conversationInteractions';
+import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
+import { resetConversationExternal } from '../../../state/ducks/conversations';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
+import { SectionType, resetOverlayMode, showLeftPaneSection } from '../../../state/ducks/section';
+import { getConversationRequests } from '../../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
+import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
+import { SpacerLG } from '../../basic/Text';
+import { MemoConversationListItemWithDetails } from '../conversation-list-item/ConversationListItem';
 
 const MessageRequestListPlaceholder = styled.div`
   color: var(--conversation-tab-text-color);
@@ -51,9 +47,20 @@ export const OverlayMessageRequest = () => {
   function closeOverlay() {
     dispatch(resetOverlayMode());
   }
+
+  const currentlySelectedConvo = useSelectedConversationKey();
   const convoRequestCount = useSelector(getConversationRequests).length;
   const messageRequests = useSelector(getConversationRequests);
-  const selectedConvoId = useSelectedConversationKey();
+
+  useEffect(() => {
+    // if no more requests, return to placeholder screen
+
+    if (convoRequestCount === 0) {
+      dispatch(resetOverlayMode());
+      dispatch(showLeftPaneSection(SectionType.Message));
+      dispatch(resetConversationExternal());
+    }
+  }, [dispatch, convoRequestCount]);
 
   const buttonText = window.i18n('clearAll');
 
@@ -61,7 +68,7 @@ export const OverlayMessageRequest = () => {
    * Blocks all message request conversations and synchronizes across linked devices
    * @returns void
    */
-  function handleClearAllRequestsClick(convoRequests: Array<ReduxConversationType>) {
+  function handleClearAllRequestsClick() {
     const { i18n } = window;
     const title = i18n('clearAllConfirmationTitle');
     const message = i18n('clearAllConfirmationBody');
@@ -73,42 +80,23 @@ export const OverlayMessageRequest = () => {
         message,
         onClose,
         onClickOk: async () => {
-          window?.log?.info('Blocking all conversations');
-          if (!convoRequests) {
+          window?.log?.info('Blocking all message requests');
+          if (!messageRequests) {
             window?.log?.info('No conversation requests to block.');
             return;
           }
 
-          let newConvosBlocked = [];
-          const convoController = getConversationController();
-          await Promise.all(
-            (newConvosBlocked = convoRequests.filter(async convo => {
-              const { id } = convo;
-              const convoModel = convoController.get(id);
-              if (!convoModel.isBlocked()) {
-                await BlockedNumberController.block(id);
-                await convoModel.commit();
-              }
-              await convoModel.setIsApproved(false);
-
-              // if we're looking at the convo to decline, close the convo
-              if (selectedConvoId === id) {
-                dispatch(resetConversationExternal());
-              }
-              return true;
-            }))
-          );
-
-          if (newConvosBlocked) {
-            await forceSyncConfigurationNowIfNeeded();
+          for (let index = 0; index < messageRequests.length; index++) {
+            const convo = messageRequests[index];
+            await declineConversationWithoutConfirm({
+              blockContact: false,
+              conversationId: convo.id,
+              currentlySelectedConvo,
+              syncToDevices: false,
+            });
           }
 
-          // if no more requests, return to placeholder screen
-          if (convoRequestCount === newConvosBlocked.length) {
-            dispatch(resetOverlayMode());
-            dispatch(showLeftPaneSection(SectionType.Message));
-            dispatch(resetConversationExternal());
-          }
+          await forceSyncConfigurationNowIfNeeded();
         },
       })
     );
@@ -123,9 +111,7 @@ export const OverlayMessageRequest = () => {
           <SessionButton
             buttonColor={SessionButtonColor.Danger}
             text={buttonText}
-            onClick={() => {
-              handleClearAllRequestsClick(messageRequests);
-            }}
+            onClick={handleClearAllRequestsClick}
           />
         </>
       ) : (
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index adbb2212f..170c42c0b 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -1,31 +1,45 @@
 import React from 'react';
-import { animation, Menu } from 'react-contexify';
+import { animation, Item, Menu, Submenu } from 'react-contexify';
+import { useSelector } from 'react-redux';
+import {
+  setDisappearingMessagesByConvoId,
+  setNotificationForConvoId,
+} from '../../interactions/conversationInteractions';
+import {
+  ConversationNotificationSetting,
+  ConversationNotificationSettingType,
+} from '../../models/conversationAttributes';
+import {
+  useSelectedConversationKey,
+  useSelectedIsActive,
+  useSelectedIsBlocked,
+  useSelectedIsKickedFromGroup,
+  useSelectedIsLeft,
+  useSelectedIsPrivate,
+  useSelectedIsPrivateFriend,
+  useSelectedIsPublic,
+  useSelectedNotificationSetting,
+} from '../../state/selectors/selectedConversation';
+import { getTimerOptions } from '../../state/selectors/timerOptions';
+import { LocalizerKeys } from '../../types/LocalizerKeys';
+import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
+import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 import {
-  AcceptMenuItem,
   AddModeratorsMenuItem,
   BanMenuItem,
   BlockMenuItem,
   ChangeNicknameMenuItem,
   ClearNicknameMenuItem,
-  CopyMenuItem,
-  DeclineMenuItem,
   DeleteContactMenuItem,
   DeleteMessagesMenuItem,
-  DisappearingMessageMenuItem,
   InviteContactMenuItem,
   LeaveGroupMenuItem,
   MarkAllReadMenuItem,
-  NotificationForConvoMenuItem,
-  PinConversationMenuItem,
   RemoveModeratorsMenuItem,
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
 } from './Menu';
-import _ from 'lodash';
-import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
-import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
-import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 
 export type PropsConversationHeaderMenu = {
   triggerId: string;
@@ -34,23 +48,26 @@ export type PropsConversationHeaderMenu = {
 export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
   const { triggerId } = props;
 
-  const selectedConversation = useSelectedConversationKey();
+  const convoId = useSelectedConversationKey();
+  const isPrivateFriend = useSelectedIsPrivateFriend();
+  const isPrivate = useSelectedIsPrivate();
 
-  if (!selectedConversation) {
-    throw new Error('selectedConversation must be set for a header to be visible!');
+  if (!convoId) {
+    throw new Error('convoId must be set for a header to be visible!');
+  }
+
+  // we do not want the triple dots menu at all if this is not a friend at all
+  if (isPrivate && !isPrivateFriend) {
+    return null;
   }
 
   return (
-    <ContextConversationId.Provider value={selectedConversation}>
+    <ContextConversationId.Provider value={convoId}>
       <SessionContextMenuContainer>
         <Menu id={triggerId} animation={animation.fade}>
-          <AcceptMenuItem />
-          <DeclineMenuItem />
           <DisappearingMessageMenuItem />
           <NotificationForConvoMenuItem />
-          <PinConversationMenuItem />
           <BlockMenuItem />
-          <CopyMenuItem />
           <MarkAllReadMenuItem />
           <ChangeNicknameMenuItem />
           <ClearNicknameMenuItem />
@@ -69,3 +86,119 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
     </ContextConversationId.Provider>
   );
 };
+
+/**
+ * Only accessible through the triple dots menu on the conversation header. Not on the Conversation list item, because there is too much to check for before showing it
+ */
+const DisappearingMessageMenuItem = (): JSX.Element | null => {
+  const selectedConvoId = useSelectedConversationKey();
+  const isBlocked = useSelectedIsBlocked();
+  const isActive = useSelectedIsActive();
+  const isPublic = useSelectedIsPublic();
+  const isLeft = useSelectedIsLeft();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const timerOptions = useSelector(getTimerOptions).timerOptions;
+  const isFriend = useSelectedIsPrivateFriend();
+  const isPrivate = useSelectedIsPrivate();
+
+  if (
+    !selectedConvoId ||
+    isPublic ||
+    isLeft ||
+    isKickedFromGroup ||
+    isBlocked ||
+    !isActive ||
+    (isPrivate && !isFriend)
+  ) {
+    return null;
+  }
+
+  // const isRtlMode = isRtlBody();
+
+  return (
+    // Remove the && false to make context menu work with RTL support
+    <Submenu
+      label={window.i18n('disappearingMessages')}
+      // rtl={isRtlMode && false}
+    >
+      {timerOptions.map(item => (
+        <Item
+          key={item.value}
+          onClick={async () => {
+            await setDisappearingMessagesByConvoId(selectedConvoId, item.value);
+          }}
+        >
+          {item.name}
+        </Item>
+      ))}
+    </Submenu>
+  );
+};
+
+/**
+ * Only accessible through the triple dots menu on the conversation header. Not on the Conversation list item, because there is too much to check for before showing it
+ */
+const NotificationForConvoMenuItem = (): JSX.Element | null => {
+  const selectedConvoId = useSelectedConversationKey();
+
+  const currentNotificationSetting = useSelectedNotificationSetting();
+  const isBlocked = useSelectedIsBlocked();
+  const isActive = useSelectedIsActive();
+  const isLeft = useSelectedIsLeft();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const isFriend = useSelectedIsPrivateFriend();
+  const isPrivate = useSelectedIsPrivate();
+
+  if (
+    !selectedConvoId ||
+    isLeft ||
+    isKickedFromGroup ||
+    isBlocked ||
+    !isActive ||
+    (isPrivate && !isFriend)
+  ) {
+    return null;
+  }
+
+  // const isRtlMode = isRtlBody();'
+
+  // exclude mentions_only settings for private chats as this does not make much sense
+  const notificationForConvoOptions = ConversationNotificationSetting.filter(n =>
+    isPrivate ? n !== 'mentions_only' : true
+  ).map((n: ConversationNotificationSettingType) => {
+    // do this separately so typescript's compiler likes it
+    const keyToUse: LocalizerKeys =
+      n === 'all' || !n
+        ? 'notificationForConvo_all'
+        : n === 'disabled'
+        ? 'notificationForConvo_disabled'
+        : 'notificationForConvo_mentions_only';
+    return { value: n, name: window.i18n(keyToUse) };
+  });
+
+  return (
+    // Remove the && false to make context menu work with RTL support
+    <Submenu
+      label={window.i18n('notificationForConvo') as any}
+      // rtl={isRtlMode && false}
+    >
+      {(notificationForConvoOptions || []).map(item => {
+        const disabled = item.value === currentNotificationSetting;
+
+        return (
+          <Item
+            key={item.value}
+            onClick={async () => {
+              await setNotificationForConvoId(selectedConvoId, item.value);
+            }}
+            disabled={disabled}
+          >
+            {item.name}
+          </Item>
+        );
+      })}
+    </Submenu>
+  );
+
+  return null;
+};
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 29b1a01c0..5d37c90f4 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -3,20 +3,20 @@ import { animation, Menu } from 'react-contexify';
 import _ from 'lodash';
 
 import {
-  AcceptMenuItem,
+  AcceptMsgRequestMenuItem,
   BanMenuItem,
   BlockMenuItem,
   ChangeNicknameMenuItem,
   ClearNicknameMenuItem,
   CopyMenuItem,
-  DeclineMenuItem,
+  DeclineAndBlockMsgRequestMenuItem,
+  DeclineMsgRequestMenuItem,
   DeleteContactMenuItem,
   DeleteMessagesMenuItem,
   InviteContactMenuItem,
   LeaveGroupMenuItem,
   MarkAllReadMenuItem,
   MarkConversationUnreadMenuItem,
-  NotificationForConvoMenuItem,
   PinConversationMenuItem,
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
@@ -33,9 +33,9 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
   return (
     <SessionContextMenuContainer>
       <Menu id={triggerId} animation={animation.fade}>
-        <AcceptMenuItem />
-        <DeclineMenuItem />
-        <NotificationForConvoMenuItem />
+        <AcceptMsgRequestMenuItem />
+        <DeclineMsgRequestMenuItem />
+        <DeclineAndBlockMsgRequestMenuItem />
         <PinConversationMenuItem />
         <BlockMenuItem />
         <CopyMenuItem />
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index cc989ffa9..6512a6828 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -1,22 +1,21 @@
 import React, { useContext } from 'react';
 
-import { Item, Submenu } from 'react-contexify';
+import { Item } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   useAvatarPath,
   useConversationUsername,
   useHasNickname,
-  useIsActive,
   useIsBlinded,
   useIsBlocked,
+  useIsIncomingRequest,
   useIsKickedFromGroup,
   useIsLeft,
   useIsMe,
   useIsPinned,
   useIsPrivate,
+  useIsPrivateAndFriend,
   useIsPublic,
-  useIsRequest,
-  useNotificationSetting,
   useWeAreAdmin,
 } from '../../hooks/useParamSelector';
 import {
@@ -27,8 +26,6 @@ import {
   declineConversationWithConfirm,
   deleteAllMessagesByConvoIdWithConfirmation,
   markAllReadByConvoId,
-  setDisappearingMessagesByConvoId,
-  setNotificationForConvoId,
   showAddModeratorsByConvoId,
   showBanUserByConvoId,
   showInviteContactByConvoId,
@@ -38,65 +35,20 @@ import {
   showUpdateGroupNameByConvoId,
   unblockConvoById,
 } from '../../interactions/conversationInteractions';
-import {
-  ConversationNotificationSetting,
-  ConversationNotificationSettingType,
-} from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
 import {
   changeNickNameModal,
   updateConfirmModal,
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
-import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
 import { getIsMessageSection } from '../../state/selectors/section';
-import { getTimerOptions } from '../../state/selectors/timerOptions';
-import { LocalizerKeys } from '../../types/LocalizerKeys';
+import {
+  useSelectedConversationKey,
+  useSelectedIsPrivateFriend,
+} from '../../state/selectors/selectedConversation';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
 
-function showTimerOptions(
-  isPublic: boolean,
-  isKickedFromGroup: boolean,
-  left: boolean,
-  isBlocked: boolean,
-  isRequest: boolean,
-  isActive: boolean
-): boolean {
-  return !isPublic && !left && !isKickedFromGroup && !isBlocked && !isRequest && isActive;
-}
-
-function showNotificationConvo(
-  isKickedFromGroup: boolean,
-  left: boolean,
-  isBlocked: boolean,
-  isRequest: boolean
-): boolean {
-  return !left && !isKickedFromGroup && !isBlocked && !isRequest;
-}
-
-function showBlock(isMe: boolean, isPrivate: boolean, isRequest: boolean): boolean {
-  return !isMe && isPrivate && !isRequest;
-}
-
-function showClearNickname(
-  isMe: boolean,
-  hasNickname: boolean,
-  isPrivate: boolean,
-  isRequest: boolean
-): boolean {
-  return !isMe && hasNickname && isPrivate && !isRequest;
-}
-
-function showChangeNickname(isMe: boolean, isPrivate: boolean, isRequest: boolean) {
-  return !isMe && isPrivate && !isRequest;
-}
-
-// we want to show the copyId for open groups and private chats only
-function showCopyId(isPublic: boolean, isPrivate: boolean, isBlinded: boolean): boolean {
-  return (isPrivate && !isBlinded) || isPublic;
-}
-
 function showDeleteContact(
   isGroup: boolean,
   isPublic: boolean,
@@ -108,30 +60,6 @@ function showDeleteContact(
   return (!isGroup && !isRequest) || (isGroup && (isGroupLeft || isKickedFromGroup || isPublic));
 }
 
-const showUnbanUser = (weAreAdmin: boolean, isPublic: boolean, isKickedFromGroup: boolean) => {
-  return !isKickedFromGroup && weAreAdmin && isPublic;
-};
-
-const showBanUser = (weAreAdmin: boolean, isPublic: boolean, isKickedFromGroup: boolean) => {
-  return !isKickedFromGroup && weAreAdmin && isPublic;
-};
-
-function showAddModerators(
-  weAreAdmin: boolean,
-  isPublic: boolean,
-  isKickedFromGroup: boolean
-): boolean {
-  return !isKickedFromGroup && weAreAdmin && isPublic;
-}
-
-function showRemoveModerators(
-  weAreAdmin: boolean,
-  isPublic: boolean,
-  isKickedFromGroup: boolean
-): boolean {
-  return !isKickedFromGroup && weAreAdmin && isPublic;
-}
-
 function showUpdateGroupName(
   weAreAdmin: boolean,
   isKickedFromGroup: boolean,
@@ -176,7 +104,7 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
 export const PinConversationMenuItem = (): JSX.Element | null => {
   const conversationId = useContext(ContextConversationId);
   const isMessagesSection = useSelector(getIsMessageSection);
-  const isRequest = useIsRequest(conversationId);
+  const isRequest = useIsIncomingRequest(conversationId);
   const isPinned = useIsPinned(conversationId);
 
   if (isMessagesSection && !isRequest) {
@@ -195,7 +123,7 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
 export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
   const conversationId = useContext(ContextConversationId);
   const isMessagesSection = useSelector(getIsMessageSection);
-  const isRequest = useIsRequest(conversationId);
+  const isRequest = useIsIncomingRequest(conversationId);
 
   if (isMessagesSection && !isRequest) {
     const conversation = getConversationController().get(conversationId);
@@ -216,7 +144,7 @@ export const DeleteContactMenuItem = () => {
   const isLeft = useIsLeft(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const isPrivate = useIsPrivate(convoId);
-  const isRequest = useIsRequest(convoId);
+  const isRequest = useIsIncomingRequest(convoId);
 
   if (showDeleteContact(!isPrivate, isPublic, isLeft, isKickedFromGroup, isRequest)) {
     let menuItemText: string;
@@ -330,7 +258,7 @@ export const RemoveModeratorsMenuItem = (): JSX.Element | null => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
 
-  if (showRemoveModerators(weAreAdmin, Boolean(isPublic), Boolean(isKickedFromGroup))) {
+  if (!isKickedFromGroup && weAreAdmin && isPublic) {
     return (
       <Item
         onClick={() => {
@@ -350,7 +278,7 @@ export const AddModeratorsMenuItem = (): JSX.Element | null => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
 
-  if (showAddModerators(weAreAdmin, isPublic, isKickedFromGroup)) {
+  if (!isKickedFromGroup && weAreAdmin && isPublic) {
     return (
       <Item
         onClick={() => {
@@ -370,7 +298,7 @@ export const UnbanMenuItem = (): JSX.Element | null => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
 
-  if (showUnbanUser(weAreAdmin, isPublic, isKickedFromGroup)) {
+  if (isPublic && !isKickedFromGroup && weAreAdmin) {
     return (
       <Item
         onClick={() => {
@@ -390,7 +318,7 @@ export const BanMenuItem = (): JSX.Element | null => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
 
-  if (showBanUser(weAreAdmin, isPublic, isKickedFromGroup)) {
+  if (isPublic && !isKickedFromGroup && weAreAdmin) {
     return (
       <Item
         onClick={() => {
@@ -410,7 +338,9 @@ export const CopyMenuItem = (): JSX.Element | null => {
   const isPrivate = useIsPrivate(convoId);
   const isBlinded = useIsBlinded(convoId);
 
-  if (showCopyId(isPublic, isPrivate, isBlinded)) {
+  // we want to show the copyId for open groups and private chats only
+
+  if ((isPrivate && !isBlinded) || isPublic) {
     const copyIdLabel = isPublic ? window.i18n('copyOpenGroupURL') : window.i18n('copySessionID');
     return (
       <Item
@@ -427,8 +357,8 @@ export const CopyMenuItem = (): JSX.Element | null => {
 
 export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const convoId = useContext(ContextConversationId);
-  const isRequest = useIsRequest(convoId);
-  if (!isRequest) {
+  const isIncomingRequest = useIsIncomingRequest(convoId);
+  if (!isIncomingRequest) {
     return (
       <Item onClick={() => markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
     );
@@ -437,105 +367,6 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   }
 };
 
-export const DisappearingMessageMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
-  const isBlocked = useIsBlocked(convoId);
-  const isActive = useIsActive(convoId);
-  const isPublic = useIsPublic(convoId);
-  const isLeft = useIsLeft(convoId);
-  const isKickedFromGroup = useIsKickedFromGroup(convoId);
-  const timerOptions = useSelector(getTimerOptions).timerOptions;
-  const isRequest = useIsRequest(convoId);
-
-  if (
-    showTimerOptions(
-      Boolean(isPublic),
-      Boolean(isKickedFromGroup),
-      Boolean(isLeft),
-      Boolean(isBlocked),
-      isRequest,
-      isActive
-    )
-  ) {
-    // const isRtlMode = isRtlBody();
-
-    return (
-      // Remove the && false to make context menu work with RTL support
-      <Submenu
-        label={window.i18n('disappearingMessages')}
-        // rtl={isRtlMode && false}
-      >
-        {timerOptions.map(item => (
-          <Item
-            key={item.value}
-            onClick={async () => {
-              await setDisappearingMessagesByConvoId(convoId, item.value);
-            }}
-          >
-            {item.name}
-          </Item>
-        ))}
-      </Submenu>
-    );
-  }
-  return null;
-};
-
-export const NotificationForConvoMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
-  const isKickedFromGroup = useIsKickedFromGroup(convoId);
-  const left = useIsLeft(convoId);
-  const isBlocked = useIsBlocked(convoId);
-  const isPrivate = useIsPrivate(convoId);
-  const isRequest = useIsRequest(convoId);
-  const currentNotificationSetting = useNotificationSetting(convoId);
-
-  if (
-    showNotificationConvo(Boolean(isKickedFromGroup), Boolean(left), Boolean(isBlocked), isRequest)
-  ) {
-    // const isRtlMode = isRtlBody();'
-
-    // exclude mentions_only settings for private chats as this does not make much sense
-    const notificationForConvoOptions = ConversationNotificationSetting.filter(n =>
-      isPrivate ? n !== 'mentions_only' : true
-    ).map((n: ConversationNotificationSettingType) => {
-      // do this separately so typescript's compiler likes it
-      const keyToUse: LocalizerKeys =
-        n === 'all' || !n
-          ? 'notificationForConvo_all'
-          : n === 'disabled'
-          ? 'notificationForConvo_disabled'
-          : 'notificationForConvo_mentions_only';
-      return { value: n, name: window.i18n(keyToUse) };
-    });
-
-    return (
-      // Remove the && false to make context menu work with RTL support
-      <Submenu
-        label={window.i18n('notificationForConvo') as any}
-        // rtl={isRtlMode && false}
-      >
-        {(notificationForConvoOptions || []).map(item => {
-          const disabled = item.value === currentNotificationSetting;
-
-          return (
-            <Item
-              key={item.value}
-              onClick={async () => {
-                await setNotificationForConvoId(convoId, item.value);
-              }}
-              disabled={disabled}
-            >
-              {item.name}
-            </Item>
-          );
-        })}
-      </Submenu>
-    );
-  }
-  return null;
-};
-
 export function isRtlBody(): boolean {
   const body = document.getElementsByTagName('body').item(0);
 
@@ -547,10 +378,10 @@ export const BlockMenuItem = (): JSX.Element | null => {
   const isMe = useIsMe(convoId);
   const isBlocked = useIsBlocked(convoId);
   const isPrivate = useIsPrivate(convoId);
-  const isRequest = useIsRequest(convoId);
+  const isIncomingRequest = useIsIncomingRequest(convoId);
 
-  if (showBlock(Boolean(isMe), Boolean(isPrivate), Boolean(isRequest))) {
-    const blockTitle = isBlocked ? window.i18n('unblockUser') : window.i18n('blockUser');
+  if (!isMe && isPrivate && !isIncomingRequest) {
+    const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
       ? () => unblockConvoById(convoId)
       : () => blockConvoById(convoId);
@@ -564,42 +395,42 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   const isMe = useIsMe(convoId);
   const hasNickname = useHasNickname(convoId);
   const isPrivate = useIsPrivate(convoId);
-  const isRequest = Boolean(useIsRequest(convoId)); // easier to copy paste
+  const isPrivateAndFriend = useIsPrivateAndFriend(convoId);
 
-  if (showClearNickname(Boolean(isMe), Boolean(hasNickname), Boolean(isPrivate), isRequest)) {
-    return (
-      <Item onClick={() => clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
-    );
+  if (isMe || !hasNickname || !isPrivate || !isPrivateAndFriend) {
+    return null;
   }
-  return null;
+
+  return (
+    <Item onClick={() => clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+  );
 };
 
 export const ChangeNicknameMenuItem = () => {
   const convoId = useContext(ContextConversationId);
   const isMe = useIsMe(convoId);
   const isPrivate = useIsPrivate(convoId);
-  const isRequest = useIsRequest(convoId);
-
+  const isPrivateAndFriend = useSelectedIsPrivateFriend();
   const dispatch = useDispatch();
-  if (showChangeNickname(isMe, isPrivate, isRequest)) {
-    return (
-      <Item
-        onClick={() => {
-          dispatch(changeNickNameModal({ conversationId: convoId }));
-        }}
-      >
-        {window.i18n('changeNickname')}
-      </Item>
-    );
+
+  if (isMe || !isPrivate || !isPrivateAndFriend) {
+    return null;
   }
-  return null;
+  return (
+    <Item
+      onClick={() => {
+        dispatch(changeNickNameModal({ conversationId: convoId }));
+      }}
+    >
+      {window.i18n('changeNickname')}
+    </Item>
+  );
 };
 
 export const DeleteMessagesMenuItem = () => {
   const convoId = useContext(ContextConversationId);
-  const isRequest = useIsRequest(convoId);
 
-  if (isRequest) {
+  if (!convoId) {
     return null;
   }
 
@@ -614,25 +445,13 @@ export const DeleteMessagesMenuItem = () => {
   );
 };
 
-export const HideBannerMenuItem = (): JSX.Element => {
-  const dispatch = useDispatch();
-  return (
-    <Item
-      onClick={() => {
-        dispatch(hideMessageRequestBanner());
-      }}
-    >
-      {window.i18n('hideBanner')}
-    </Item>
-  );
-};
-
-export const AcceptMenuItem = () => {
+export const AcceptMsgRequestMenuItem = () => {
   const convoId = useContext(ContextConversationId);
-  const isRequest = useIsRequest(convoId);
+  const isRequest = useIsIncomingRequest(convoId);
   const convo = getConversationController().get(convoId);
+  const isPrivate = useIsPrivate(convoId);
 
-  if (isRequest) {
+  if (isRequest && isPrivate) {
     return (
       <Item
         onClick={async () => {
@@ -648,15 +467,22 @@ export const AcceptMenuItem = () => {
   return null;
 };
 
-export const DeclineMenuItem = () => {
+export const DeclineMsgRequestMenuItem = () => {
   const convoId = useContext(ContextConversationId);
-  const isRequest = useIsRequest(convoId);
+  const isRequest = useIsIncomingRequest(convoId);
+  const isPrivate = useIsPrivate(convoId);
+  const selected = useSelectedConversationKey();
 
-  if (isRequest) {
+  if (isPrivate && isRequest) {
     return (
       <Item
         onClick={() => {
-          declineConversationWithConfirm(convoId, true);
+          declineConversationWithConfirm({
+            conversationId: convoId,
+            syncToDevices: true,
+            blockContact: false,
+            currentlySelectedConvo: selected || undefined,
+          });
         }}
       >
         {window.i18n('decline')}
@@ -665,3 +491,28 @@ export const DeclineMenuItem = () => {
   }
   return null;
 };
+
+export const DeclineAndBlockMsgRequestMenuItem = () => {
+  const convoId = useContext(ContextConversationId);
+  const isRequest = useIsIncomingRequest(convoId);
+  const selected = useSelectedConversationKey();
+  const isPrivate = useIsPrivate(convoId);
+
+  if (isRequest && isPrivate) {
+    return (
+      <Item
+        onClick={() => {
+          declineConversationWithConfirm({
+            conversationId: convoId,
+            syncToDevices: true,
+            blockContact: true,
+            currentlySelectedConvo: selected || undefined,
+          });
+        }}
+      >
+        {window.i18n('block')}
+      </Item>
+    );
+  }
+  return null;
+};
diff --git a/ts/components/menu/MessageRequestBannerContextMenu.tsx b/ts/components/menu/MessageRequestBannerContextMenu.tsx
index d7c3de2de..273e50c4c 100644
--- a/ts/components/menu/MessageRequestBannerContextMenu.tsx
+++ b/ts/components/menu/MessageRequestBannerContextMenu.tsx
@@ -2,14 +2,29 @@ import React from 'react';
 import { animation, Menu } from 'react-contexify';
 import _ from 'lodash';
 
-import { HideBannerMenuItem } from './Menu';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
+import { useDispatch } from 'react-redux';
+import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
+import { Item } from 'react-contexify';
 
 export type PropsContextConversationItem = {
   triggerId: string;
 };
 
-const MessageRequestBannerContextMenu = (props: PropsContextConversationItem) => {
+const HideBannerMenuItem = (): JSX.Element => {
+  const dispatch = useDispatch();
+  return (
+    <Item
+      onClick={() => {
+        dispatch(hideMessageRequestBanner());
+      }}
+    >
+      {window.i18n('hideBanner')}
+    </Item>
+  );
+};
+
+export const MessageRequestBannerContextMenu = (props: PropsContextConversationItem) => {
   const { triggerId } = props;
 
   return (
@@ -20,11 +35,3 @@ const MessageRequestBannerContextMenu = (props: PropsContextConversationItem) =>
     </SessionContextMenuContainer>
   );
 };
-
-function propsAreEqual(prev: PropsContextConversationItem, next: PropsContextConversationItem) {
-  return _.isEqual(prev, next);
-}
-export const MemoMessageRequestBannerContextMenu = React.memo(
-  MessageRequestBannerContextMenu,
-  propsAreEqual
-);
diff --git a/ts/components/settings/BlockedList.tsx b/ts/components/settings/BlockedList.tsx
index 4dd0a59aa..b9083d7ca 100644
--- a/ts/components/settings/BlockedList.tsx
+++ b/ts/components/settings/BlockedList.tsx
@@ -134,7 +134,7 @@ export const BlockedContactsList = () => {
               {hasAtLeastOneSelected && expanded ? (
                 <SessionButton
                   buttonColor={SessionButtonColor.Danger}
-                  text={window.i18n('unblockUser')}
+                  text={window.i18n('unblock')}
                   onClick={unBlockThoseUsers}
                   dataTestId="unblock-button-settings-screen"
                 />
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index a9a95bf9c..ecfc62c6c 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,10 +1,14 @@
-import { isEmpty, isNumber, pick } from 'lodash';
+import { isEmpty, isNumber } from 'lodash';
 import { useSelector } from 'react-redux';
-import { ConversationModel } from '../models/conversation';
+import {
+  hasValidIncomingRequestValues,
+  hasValidOutgoingRequestValues,
+} from '../models/conversation';
 import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
 import { StateType } from '../state/reducer';
 import { getMessageReactsProps } from '../state/selectors/conversations';
+import { isPrivateAndFriend } from '../state/selectors/selectedConversation';
 
 export function useAvatarPath(convoId: string | undefined) {
   const convoProps = useConversationPropsById(convoId);
@@ -79,6 +83,18 @@ export function useIsPrivate(convoId?: string) {
   return Boolean(convoProps && convoProps.isPrivate);
 }
 
+export function useIsPrivateAndFriend(convoId?: string) {
+  const convoProps = useConversationPropsById(convoId);
+  if (!convoProps) {
+    return false;
+  }
+  return isPrivateAndFriend({
+    approvedMe: convoProps.didApproveMe || false,
+    isApproved: convoProps.isApproved || false,
+    isPrivate: convoProps.isPrivate || false,
+  });
+}
+
 export function useIsBlinded(convoId?: string) {
   if (!convoId) {
     return false;
@@ -154,16 +170,39 @@ export function useIsApproved(convoId?: string) {
   return Boolean(convoProps && convoProps.isApproved);
 }
 
-export function useIsRequest(convoId?: string) {
+export function useIsIncomingRequest(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
   if (!convoProps) {
     return false;
   }
   return Boolean(
     convoProps &&
-      ConversationModel.hasValidIncomingRequestValues(
-        pick(convoProps, ['isMe', 'isApproved', 'isPrivate', 'isBlocked', 'activeAt'])
-      )
+      hasValidIncomingRequestValues({
+        isMe: convoProps.isMe || false,
+        isApproved: convoProps.isApproved || false,
+        isPrivate: convoProps.isPrivate || false,
+        isBlocked: convoProps.isBlocked || false,
+        didApproveMe: convoProps.didApproveMe || false,
+        activeAt: convoProps.activeAt || 0,
+      })
+  );
+}
+
+export function useIsOutgoingRequest(convoId?: string) {
+  const convoProps = useConversationPropsById(convoId);
+  if (!convoProps) {
+    return false;
+  }
+  return Boolean(
+    convoProps &&
+      hasValidOutgoingRequestValues({
+        isMe: convoProps.isMe || false,
+        isApproved: convoProps.isApproved || false,
+        didApproveMe: convoProps.didApproveMe || false,
+        isPrivate: convoProps.isPrivate || false,
+        isBlocked: convoProps.isBlocked || false,
+        activeAt: convoProps.activeAt || 0,
+      })
   );
 }
 
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 733776440..32a3e90cc 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -41,6 +41,7 @@ import { setLastProfileUpdateTimestamp } from '../util/storage';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { leaveClosedGroup } from '../session/group/closed-group';
+import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -67,6 +68,11 @@ export async function blockConvoById(conversationId: string) {
     return;
   }
 
+  // I don't think we want to reset the approved fields when blocking a contact
+  // if (conversation.isPrivate()) {
+  //   await conversation.setIsApproved(false);
+  // }
+
   await BlockedNumberController.block(conversation.id);
   await conversation.commit();
   ToastUtils.pushToastSuccess('blocked', window.i18n('blocked'));
@@ -115,17 +121,76 @@ export const approveConvoAndSendResponse = async (
   }
 };
 
-export const declineConversationWithConfirm = (convoId: string, syncToDevices: boolean = true) => {
+export async function declineConversationWithoutConfirm({
+  blockContact,
+  conversationId,
+  currentlySelectedConvo,
+  syncToDevices,
+}: {
+  conversationId: string;
+  currentlySelectedConvo: string | undefined;
+  syncToDevices: boolean;
+  blockContact: boolean; // if set to false, the contact will just be set to not approved
+}) {
+  const conversationToDecline = getConversationController().get(conversationId);
+
+  if (!conversationToDecline || conversationToDecline.isApproved()) {
+    window?.log?.info('Conversation is already declined.');
+    return;
+  }
+
+  // we mark the conversation as inactive. This way it wont' show up in the UI.
+  // we cannot delete it completely on desktop, because we might need the convo details for sogs/group convos.
+  conversationToDecline.set('active_at', undefined);
+  await conversationToDecline.setIsApproved(false, false);
+  await conversationToDecline.setDidApproveMe(false, false);
+  // this will update the value in the wrapper if needed but not remove the entry if we want it gone. The remove is done below with removeContactFromWrapper
+  await conversationToDecline.commit();
+  if (blockContact) {
+    await blockConvoById(conversationId);
+  }
+  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry
+
+    if (
+      conversationToDecline.isPrivate() &&
+      !SessionUtilContact.isContactToStoreInContactsWrapper(conversationToDecline)
+    ) {
+      await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
+    }
+  }
+
+  if (syncToDevices) {
+    await forceSyncConfigurationNowIfNeeded();
+  }
+  if (currentlySelectedConvo && currentlySelectedConvo === conversationId) {
+    window?.inboxStore?.dispatch(resetConversationExternal());
+  }
+}
+
+export const declineConversationWithConfirm = ({
+  conversationId,
+  syncToDevices,
+  blockContact,
+  currentlySelectedConvo,
+}: {
+  conversationId: string;
+  currentlySelectedConvo: string | undefined;
+  syncToDevices: boolean;
+  blockContact: boolean; // if set to false, the contact will just be set to not approved
+}) => {
   window?.inboxStore?.dispatch(
     updateConfirmModal({
-      okText: window.i18n('decline'),
+      okText: blockContact ? window.i18n('block') : window.i18n('decline'),
       cancelText: window.i18n('cancel'),
       message: window.i18n('declineRequestMessage'),
       onClickOk: async () => {
-        await declineConversationWithoutConfirm(convoId, syncToDevices);
-        await blockConvoById(convoId);
-        await forceSyncConfigurationNowIfNeeded();
-        window?.inboxStore?.dispatch(resetConversationExternal());
+        await declineConversationWithoutConfirm({
+          conversationId,
+          currentlySelectedConvo,
+          blockContact,
+          syncToDevices,
+        });
       },
       onClickCancel: () => {
         window?.inboxStore?.dispatch(updateConfirmModal(null));
@@ -137,28 +202,6 @@ export const declineConversationWithConfirm = (convoId: string, syncToDevices: b
   );
 };
 
-/**
- * Sets the approval fields to false for conversation. Does not send anything back.
- */
-const declineConversationWithoutConfirm = async (
-  conversationId: string,
-  syncToDevices: boolean = true
-) => {
-  const conversationToDecline = getConversationController().get(conversationId);
-
-  if (!conversationToDecline || conversationToDecline.isApproved()) {
-    window?.log?.info('Conversation is already declined.');
-    return;
-  }
-
-  await conversationToDecline.setIsApproved(false);
-
-  // Conversation was not approved before so a sync is needed
-  if (syncToDevices) {
-    await forceSyncConfigurationNowIfNeeded();
-  }
-};
-
 export async function showUpdateGroupNameByConvoId(conversationId: string) {
   const conversation = getConversationController().get(conversationId);
   if (conversation.isClosedGroup()) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 152c5849f..372321c50 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -167,44 +167,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     );
   }
 
-  /**
-   * Method to evaluate if a convo contains the right values
-   * @param values Required properties to evaluate if this is a message request
-   */
-  public static hasValidIncomingRequestValues({
-    isMe,
-    isApproved,
-    isBlocked,
-    isPrivate,
-    activeAt,
-  }: {
-    isMe?: boolean;
-    isApproved?: boolean;
-    isBlocked?: boolean;
-    isPrivate?: boolean;
-    activeAt?: number;
-  }): boolean {
-    // if a convo is not active, it means we didn't get any messages nor sent any.
-    const isActive = activeAt && isFinite(activeAt) && activeAt > 0;
-    return Boolean(isPrivate && !isMe && !isApproved && !isBlocked && isActive);
-  }
-
-  public static hasValidOutgoingRequestValues({
-    isMe,
-    didApproveMe,
-    isApproved,
-    isBlocked,
-    isPrivate,
-  }: {
-    isMe?: boolean;
-    isApproved?: boolean;
-    didApproveMe?: boolean;
-    isBlocked?: boolean;
-    isPrivate?: boolean;
-  }): boolean {
-    return Boolean(!isMe && isApproved && isPrivate && !isBlocked && !didApproveMe);
-  }
-
   public idForLogging() {
     if (this.isPrivate()) {
       return this.id;
@@ -727,11 +689,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * Does this conversation contain the properties to be considered a message request
    */
   public isIncomingRequest(): boolean {
-    return ConversationModel.hasValidIncomingRequestValues({
+    return hasValidIncomingRequestValues({
       isMe: this.isMe(),
       isApproved: this.isApproved(),
       isBlocked: this.isBlocked(),
       isPrivate: this.isPrivate(),
+      activeAt: this.get('active_at'),
+      didApproveMe: this.didApproveMe(),
     });
   }
 
@@ -739,12 +703,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * Is this conversation an outgoing message request
    */
   public isOutgoingRequest(): boolean {
-    return ConversationModel.hasValidOutgoingRequestValues({
-      isMe: this.isMe(),
-      isApproved: this.isApproved(),
-      didApproveMe: this.didApproveMe(),
-      isBlocked: this.isBlocked(),
-      isPrivate: this.isPrivate(),
+    return hasValidOutgoingRequestValues({
+      isMe: this.isMe() || false,
+      isApproved: this.isApproved() || false,
+      didApproveMe: this.didApproveMe() || false,
+      isBlocked: this.isBlocked() || false,
+      isPrivate: this.isPrivate() || false,
+      activeAt: this.get('active_at') || 0,
     });
   }
 
@@ -2351,3 +2316,47 @@ export class ConversationCollection extends Backbone.Collection<ConversationMode
   }
 }
 ConversationCollection.prototype.model = ConversationModel;
+
+export function hasValidOutgoingRequestValues({
+  isMe,
+  didApproveMe,
+  isApproved,
+  isBlocked,
+  isPrivate,
+  activeAt,
+}: {
+  isMe: boolean;
+  isApproved: boolean;
+  didApproveMe: boolean;
+  isBlocked: boolean;
+  isPrivate: boolean;
+  activeAt: number;
+}): boolean {
+  const isActive = activeAt && isFinite(activeAt) && activeAt > 0;
+
+  return Boolean(!isMe && isApproved && isPrivate && !isBlocked && !didApproveMe && isActive);
+}
+
+/**
+ * Method to evaluate if a convo contains the right values
+ * @param values Required properties to evaluate if this is a message request
+ */
+export function hasValidIncomingRequestValues({
+  isMe,
+  isApproved,
+  isBlocked,
+  isPrivate,
+  activeAt,
+  didApproveMe,
+}: {
+  isMe: boolean;
+  isApproved: boolean;
+  isBlocked: boolean;
+  isPrivate: boolean;
+  didApproveMe: boolean;
+  activeAt: number;
+}): boolean {
+  // if a convo is not active, it means we didn't get any messages nor sent any.
+  const isActive = activeAt && isFinite(activeAt) && activeAt > 0;
+  return Boolean(isPrivate && !isMe && !isApproved && !isBlocked && isActive && didApproveMe);
+}
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 60a6c6173..730107060 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -113,6 +113,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
  */
 async function refreshMappedValue(id: string, duringAppStart = false) {
   const fromWrapper = await ContactsWrapperActions.get(id);
+
   if (fromWrapper) {
     setMappedValue(fromWrapper);
     if (!duringAppStart) {
@@ -120,6 +121,14 @@ async function refreshMappedValue(id: string, duringAppStart = false) {
         .get(id)
         ?.triggerUIRefresh();
     }
+  } else {
+    if (mappedContactWrapperValues.delete(id)) {
+      if (!duringAppStart) {
+        getConversationController()
+          .get(id)
+          ?.triggerUIRefresh();
+      }
+    }
   }
 }
 
@@ -131,10 +140,18 @@ function getContactCached(id: string) {
   return mappedContactWrapperValues.get(id);
 }
 
+async function removeContactFromWrapper(id: string) {
+  try {
+    await ContactsWrapperActions.erase(id);
+  } catch (e) {
+    window.log.warn(`ContactsWrapperActions.erase of ${id} failed with ${e.message}`);
+  }
+}
 export const SessionUtilContact = {
   isContactToStoreInContactsWrapper,
   insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
+  removeContactFromWrapper,
   getContactCached,
   refreshMappedValue,
 };
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index fe804e8e1..d45e3344d 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -1,20 +1,20 @@
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { getConversationController } from '../../session/conversations';
-import { Data } from '../../data/data';
-import {
-  MessageModelType,
-  PropsForDataExtractionNotification,
-  PropsForMessageRequestResponse,
-} from '../../models/messageType';
 import { omit } from 'lodash';
 import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox';
 import { QuotedAttachmentType } from '../../components/conversation/message/message-content/Quote';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
+import { Data } from '../../data/data';
 import {
   CONVERSATION_PRIORITIES,
   ConversationNotificationSettingType,
   ConversationTypeEnum,
 } from '../../models/conversationAttributes';
+import {
+  MessageModelType,
+  PropsForDataExtractionNotification,
+  PropsForMessageRequestResponse,
+} from '../../models/messageType';
+import { getConversationController } from '../../session/conversations';
 import { ReactionList } from '../../types/Reaction';
 
 export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call';
@@ -571,7 +571,20 @@ const conversationsSlice = createSlice({
     },
 
     openRightPanel(state: ConversationsStateType) {
-      return { ...state, showRightPanel: true };
+      if (
+        state.selectedConversation === undefined ||
+        !state.conversationLookup[state.selectedConversation]
+      ) {
+        return state;
+      }
+      const selected = state.conversationLookup[state.selectedConversation];
+
+      // we can open the right panel always for non private chats. and also when the chat is private, and we are friends with the other person
+      if (!selected.isPrivate || (selected.isApproved && selected.didApproveMe)) {
+        return { ...state, showRightPanel: true };
+      }
+
+      return state;
     },
     closeRightPanel(state: ConversationsStateType) {
       return { ...state, showRightPanel: false };
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index e4f1f4411..091c91a10 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -25,7 +25,7 @@ import { MessageStatusSelectorProps } from '../../components/conversation/messag
 import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText';
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
-import { ConversationModel } from '../../models/conversation';
+import { hasValidIncomingRequestValues } from '../../models/conversation';
 import {
   CONVERSATION_PRIORITIES,
   ConversationTypeEnum,
@@ -364,15 +364,16 @@ const _getConversationRequests = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
   return filter(sortedConversations, conversation => {
-    const { isApproved, isBlocked, isPrivate, isMe, activeAt } = conversation;
-    const isRequest = ConversationModel.hasValidIncomingRequestValues({
-      isApproved,
-      isBlocked,
-      isPrivate,
-      isMe,
-      activeAt,
+    const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe } = conversation;
+    const isIncomingRequest = hasValidIncomingRequestValues({
+      isApproved: isApproved || false,
+      isBlocked: isBlocked || false,
+      isPrivate: isPrivate || false,
+      isMe: isMe || false,
+      activeAt: activeAt || 0,
+      didApproveMe: didApproveMe || false,
     });
-    return isRequest;
+    return isIncomingRequest;
   });
 };
 
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 4ec411610..46ffb800f 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -33,6 +33,14 @@ const getIsSelectedBlocked = (state: StateType): boolean => {
   return Boolean(getSelectedConversation(state)?.isBlocked) || false;
 };
 
+const getSelectedIsApproved = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.isApproved) || false;
+};
+
+const getSelectedApprovedMe = (state: StateType): boolean => {
+  return Boolean(getSelectedConversation(state)?.didApproveMe) || false;
+};
+
 /**
  * Returns true if the currently selected conversation is active (has an active_at field > 0)
  */
@@ -143,6 +151,39 @@ export function useSelectedIsBlocked() {
   return useSelector(getIsSelectedBlocked);
 }
 
+export function useSelectedIsApproved() {
+  return useSelector(getSelectedIsApproved);
+}
+
+export function useSelectedApprovedMe() {
+  return useSelector(getSelectedApprovedMe);
+}
+
+/**
+ * Returns true if the given arguments corresponds to a private contact which is approved both sides. i.e. a friend.
+ */
+export function isPrivateAndFriend({
+  approvedMe,
+  isApproved,
+  isPrivate,
+}: {
+  isPrivate: boolean;
+  isApproved: boolean;
+  approvedMe: boolean;
+}) {
+  return isPrivate && isApproved && approvedMe;
+}
+
+/**
+ * Returns true if the selected conversation is private and is approved both sides
+ */
+export function useSelectedIsPrivateFriend() {
+  const isPrivate = useSelectedIsPrivate();
+  const isApproved = useSelectedIsApproved();
+  const approvedMe = useSelectedApprovedMe();
+  return isPrivateAndFriend({ isPrivate, isApproved, approvedMe });
+}
+
 export function useSelectedIsActive() {
   return useSelector(getIsSelectedActive);
 }
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index f928a0a32..d9f249462 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -240,8 +240,8 @@ export type LocalizerKeys =
   | 'multipleJoinedTheGroup'
   | 'kickedFromTheGroup'
   | 'multipleKickedFromTheGroup'
-  | 'blockUser'
-  | 'unblockUser'
+  | 'block'
+  | 'unblock'
   | 'unblocked'
   | 'blocked'
   | 'blockedSettingsTitle'

From 55a2767fce9309c80782159520778b7a7f226a28 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 6 Apr 2023 16:11:36 +1000
Subject: [PATCH 066/178] feat: do not approve a convo before sending the first
 message

but still sync it's state through the createdAt with libsession util
---
 .../ConversationListItem.tsx                  | 17 ++---
 .../conversation-list-item/ConvoIdContext.tsx | 14 ++++
 .../conversation-list-item/HeaderItem.tsx     | 10 +--
 .../conversation-list-item/MessageItem.tsx    | 14 ++--
 .../conversation-list-item/UserItem.tsx       |  6 +-
 .../leftpane/overlay/OverlayMessage.tsx       |  4 +-
 ts/components/menu/ConversationHeaderMenu.tsx |  6 +-
 .../menu/ConversationListItemContextMenu.tsx  | 39 +++++++++--
 ts/components/menu/Menu.tsx                   | 67 +++++++------------
 ts/components/settings/BlockedList.tsx        |  2 +-
 ts/interactions/conversationInteractions.ts   |  8 +--
 ts/models/conversation.ts                     |  4 +-
 ts/node/migration/sessionMigrations.ts        |  2 +-
 ts/receiver/configMessage.ts                  |  6 --
 .../conversations/ConversationController.ts   |  2 +-
 .../libsession/libsession_utils_contacts.ts   | 24 +++----
 .../libsession_utils_convo_info_volatile.ts   |  8 +--
 .../libsession_utils_user_profile.ts          |  6 +-
 ts/state/ducks/conversations.ts               |  4 +-
 ts/state/selectors/conversations.ts           | 17 +++--
 .../libsession_wrapper_contacts_test.ts       | 35 +++++++---
 21 files changed, 162 insertions(+), 133 deletions(-)
 create mode 100644 ts/components/leftpane/conversation-list-item/ConvoIdContext.tsx

diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index 2158a3197..ccd66c89e 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import React, { useCallback, useContext } from 'react';
+import React, { useCallback } from 'react';
 import { contextMenu } from 'react-contexify';
 
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
@@ -7,8 +7,8 @@ import { Avatar, AvatarSize } from '../../avatar/Avatar';
 import { createPortal } from 'react-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import {
-  openConversationWithMessages,
   ReduxConversationType,
+  openConversationWithMessages,
 } from '../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
@@ -24,18 +24,13 @@ import {
 import { isSearching } from '../../../state/selectors/search';
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu';
+import { ContextConversationProvider, useConvoIdFromContext } from './ConvoIdContext';
 import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
 
 // tslint:disable-next-line: no-empty-interface
 export type ConversationListItemProps = Pick<ReduxConversationType, 'id'>;
 
-/**
- * This React context is used to share deeply in the tree of the ConversationListItem what is the ID we are currently rendering.
- * This is to avoid passing the prop to all the subtree component
- */
-export const ContextConversationId = React.createContext('');
-
 type PropsHousekeeping = {
   style?: Object;
 };
@@ -48,7 +43,7 @@ const Portal = ({ children }: { children: any }) => {
 };
 
 const AvatarItem = () => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
   const userName = useConversationUsername(conversationId);
   const isPrivate = useIsPrivate(conversationId);
   const avatarPath = useAvatarPath(conversationId);
@@ -107,7 +102,7 @@ const ConversationListItem = (props: Props) => {
   );
 
   return (
-    <ContextConversationId.Provider value={conversationId}>
+    <ContextConversationProvider value={conversationId}>
       <div key={key}>
         <div
           role="button"
@@ -141,7 +136,7 @@ const ConversationListItem = (props: Props) => {
           <MemoConversationListItemContextMenu triggerId={triggerId} />
         </Portal>
       </div>
-    </ContextConversationId.Provider>
+    </ContextConversationProvider>
   );
 };
 
diff --git a/ts/components/leftpane/conversation-list-item/ConvoIdContext.tsx b/ts/components/leftpane/conversation-list-item/ConvoIdContext.tsx
new file mode 100644
index 000000000..685460f63
--- /dev/null
+++ b/ts/components/leftpane/conversation-list-item/ConvoIdContext.tsx
@@ -0,0 +1,14 @@
+import React, { useContext } from 'react';
+
+/**
+ * This React context is used to share deeply in the tree of the ConversationListItem what is the ID we are currently rendering.
+ * This is to avoid passing the prop to all the subtree component
+ */
+const ContextConversationId = React.createContext('');
+
+export const ContextConversationProvider = ContextConversationId.Provider;
+
+export function useConvoIdFromContext() {
+  const convoId = useContext(ContextConversationId);
+  return convoId;
+}
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index aff79b258..45e4d64fe 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import React, { useContext } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../../data/data';
@@ -20,12 +20,12 @@ import { isSearching } from '../../../state/selectors/search';
 import { getIsMessageSection } from '../../../state/selectors/section';
 import { Timestamp } from '../../conversation/Timestamp';
 import { SessionIcon } from '../../icon';
-import { ContextConversationId } from './ConversationListItem';
+import { useConvoIdFromContext } from './ConvoIdContext';
 import { UserItem } from './UserItem';
 
 const NotificationSettingIcon = () => {
   const isMessagesSection = useSelector(getIsMessageSection);
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const convoSetting = useConversationPropsById(convoId)?.currentNotificationSetting;
 
   if (!isMessagesSection) {
@@ -66,7 +66,7 @@ const StyledConversationListItemIconWrapper = styled.div`
 `;
 
 const PinIcon = () => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
 
   const isMessagesSection = useSelector(getIsMessageSection);
   const isPinned = useIsPinned(conversationId);
@@ -165,7 +165,7 @@ const UnreadCount = ({ convoId }: { convoId: string }) => {
 };
 
 export const ConversationListItemHeaderItem = () => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
 
   const isSearchingMode = useSelector(isSearching);
 
diff --git a/ts/components/leftpane/conversation-list-item/MessageItem.tsx b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
index ba50e0147..dbffb1b45 100644
--- a/ts/components/leftpane/conversation-list-item/MessageItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/MessageItem.tsx
@@ -1,19 +1,19 @@
 import classNames from 'classnames';
-import React, { useContext } from 'react';
 import { isEmpty } from 'lodash';
+import React from 'react';
+import { useSelector } from 'react-redux';
 import {
   useConversationPropsById,
   useHasUnread,
   useIsPrivate,
   useIsTyping,
 } from '../../../hooks/useParamSelector';
-import { MessageBody } from '../../conversation/message/message-content/MessageBody';
-import { OutgoingMessageStatus } from '../../conversation/message/message-content/OutgoingMessageStatus';
-import { TypingAnimation } from '../../conversation/TypingAnimation';
-import { ContextConversationId } from './ConversationListItem';
-import { useSelector } from 'react-redux';
 import { isSearching } from '../../../state/selectors/search';
 import { getIsMessageRequestOverlayShown } from '../../../state/selectors/section';
+import { TypingAnimation } from '../../conversation/TypingAnimation';
+import { MessageBody } from '../../conversation/message/message-content/MessageBody';
+import { OutgoingMessageStatus } from '../../conversation/message/message-content/OutgoingMessageStatus';
+import { useConvoIdFromContext } from './ConvoIdContext';
 
 function useLastMessageFromConvo(convoId: string) {
   const convoProps = useConversationPropsById(convoId);
@@ -24,7 +24,7 @@ function useLastMessageFromConvo(convoId: string) {
 }
 
 export const MessageItem = () => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
   const lastMessage = useLastMessageFromConvo(conversationId);
   const isGroup = !useIsPrivate(conversationId);
 
diff --git a/ts/components/leftpane/conversation-list-item/UserItem.tsx b/ts/components/leftpane/conversation-list-item/UserItem.tsx
index 22ee22564..0526bcb2f 100644
--- a/ts/components/leftpane/conversation-list-item/UserItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/UserItem.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import {
   useConversationRealName,
@@ -9,10 +9,10 @@ import {
 import { PubKey } from '../../../session/types';
 import { isSearching } from '../../../state/selectors/search';
 import { ContactName } from '../../conversation/ContactName';
-import { ContextConversationId } from './ConversationListItem';
+import { useConvoIdFromContext } from './ConvoIdContext';
 
 export const UserItem = () => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
 
   // we want to show the nickname in brackets if a nickname is set for search results
   const isSearchResultsMode = useSelector(isSearching);
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 0314c02c0..5fefc0f29 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -63,15 +63,13 @@ export const OverlayMessage = () => {
     );
 
     // we now want to show a conversation we just started on the leftpane, even if we did not send a message to it yet
-    if (!convo.isActive() || !convo.isApproved() || convo.isHidden()) {
+    if (!convo.isActive() || convo.isHidden()) {
       // bump the timestamp only if we were not active before
       if (!convo.isActive()) {
         convo.set({ active_at: Date.now() });
       }
       await convo.unhideIfNeeded(false);
 
-      // TODO find a way to make this not a hack to show it in the list
-      convo.set({ isApproved: true });
       await convo.commit();
     }
 
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 170c42c0b..7108413f4 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -22,7 +22,6 @@ import {
 } from '../../state/selectors/selectedConversation';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
-import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 import {
   AddModeratorsMenuItem,
@@ -40,6 +39,7 @@ import {
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
 } from './Menu';
+import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
 
 export type PropsConversationHeaderMenu = {
   triggerId: string;
@@ -62,7 +62,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
   }
 
   return (
-    <ContextConversationId.Provider value={convoId}>
+    <ContextConversationProvider value={convoId}>
       <SessionContextMenuContainer>
         <Menu id={triggerId} animation={animation.fade}>
           <DisappearingMessageMenuItem />
@@ -83,7 +83,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
           <ShowUserDetailsMenuItem />
         </Menu>
       </SessionContextMenuContainer>
-    </ContextConversationId.Provider>
+    </ContextConversationProvider>
   );
 };
 
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 5d37c90f4..7704286a5 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -1,7 +1,13 @@
-import React from 'react';
-import { animation, Menu } from 'react-contexify';
 import _ from 'lodash';
+import React from 'react';
+import { animation, Item, Menu } from 'react-contexify';
 
+import { useSelector } from 'react-redux';
+import { useIsPinned, useIsPrivate, useIsPrivateAndFriend } from '../../hooks/useParamSelector';
+import { getConversationController } from '../../session/conversations';
+import { getIsMessageSection } from '../../state/selectors/section';
+import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
+import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 import {
   AcceptMsgRequestMenuItem,
   BanMenuItem,
@@ -17,11 +23,9 @@ import {
   LeaveGroupMenuItem,
   MarkAllReadMenuItem,
   MarkConversationUnreadMenuItem,
-  PinConversationMenuItem,
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
 } from './Menu';
-import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 
 export type PropsContextConversationItem = {
   triggerId: string;
@@ -33,17 +37,22 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
   return (
     <SessionContextMenuContainer>
       <Menu id={triggerId} animation={animation.fade}>
+        {/* Message request related actions */}
         <AcceptMsgRequestMenuItem />
         <DeclineMsgRequestMenuItem />
         <DeclineAndBlockMsgRequestMenuItem />
+        {/* Generic actions */}
         <PinConversationMenuItem />
         <BlockMenuItem />
         <CopyMenuItem />
+        {/* Read state actions */}
         <MarkAllReadMenuItem />
         <MarkConversationUnreadMenuItem />
+        <DeleteMessagesMenuItem />
+        {/* Nickname actions */}
         <ChangeNicknameMenuItem />
         <ClearNicknameMenuItem />
-        <DeleteMessagesMenuItem />
+        {/* Communities actions */}
         <BanMenuItem />
         <UnbanMenuItem />
         <InviteContactMenuItem />
@@ -62,3 +71,23 @@ export const MemoConversationListItemContextMenu = React.memo(
   ConversationListItemContextMenu,
   propsAreEqual
 );
+
+export const PinConversationMenuItem = (): JSX.Element | null => {
+  const conversationId = useConvoIdFromContext();
+  const isMessagesSection = useSelector(getIsMessageSection);
+  const isPrivateAndFriend = useIsPrivateAndFriend(conversationId);
+  const isPrivate = useIsPrivate(conversationId);
+  const isPinned = useIsPinned(conversationId);
+
+  if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
+    const conversation = getConversationController().get(conversationId);
+
+    const togglePinConversation = async () => {
+      await conversation?.togglePinned();
+    };
+
+    const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
+    return <Item onClick={togglePinConversation}>{menuText}</Item>;
+  }
+  return null;
+};
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 6512a6828..384a2549f 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React from 'react';
 
 import { Item } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
@@ -12,7 +12,6 @@ import {
   useIsKickedFromGroup,
   useIsLeft,
   useIsMe,
-  useIsPinned,
   useIsPrivate,
   useIsPrivateAndFriend,
   useIsPublic,
@@ -47,7 +46,7 @@ import {
   useSelectedIsPrivateFriend,
 } from '../../state/selectors/selectedConversation';
 import { SessionButtonColor } from '../basic/SessionButton';
-import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
+import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
 
 function showDeleteContact(
   isGroup: boolean,
@@ -84,7 +83,7 @@ function showInviteContact(isPublic: boolean): boolean {
 /** Menu items standardized */
 
 export const InviteContactMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
 
   if (showInviteContact(isPublic)) {
@@ -101,31 +100,13 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
   return null;
 };
 
-export const PinConversationMenuItem = (): JSX.Element | null => {
-  const conversationId = useContext(ContextConversationId);
-  const isMessagesSection = useSelector(getIsMessageSection);
-  const isRequest = useIsIncomingRequest(conversationId);
-  const isPinned = useIsPinned(conversationId);
-
-  if (isMessagesSection && !isRequest) {
-    const conversation = getConversationController().get(conversationId);
-
-    const togglePinConversation = async () => {
-      await conversation?.togglePinned();
-    };
-
-    const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
-    return <Item onClick={togglePinConversation}>{menuText}</Item>;
-  }
-  return null;
-};
-
 export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
-  const conversationId = useContext(ContextConversationId);
+  const conversationId = useConvoIdFromContext();
   const isMessagesSection = useSelector(getIsMessageSection);
-  const isRequest = useIsIncomingRequest(conversationId);
+  const isPrivate = useIsPrivate(conversationId);
+  const isPrivateAndFriend = useIsPrivateAndFriend(conversationId);
 
-  if (isMessagesSection && !isRequest) {
+  if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
     const conversation = getConversationController().get(conversationId);
 
     const markUnread = async () => {
@@ -139,7 +120,7 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
 
 export const DeleteContactMenuItem = () => {
   const dispatch = useDispatch();
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isLeft = useIsLeft(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
@@ -182,7 +163,7 @@ export const DeleteContactMenuItem = () => {
 };
 
 export const LeaveGroupMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isLeft = useIsLeft(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
@@ -205,7 +186,7 @@ export const LeaveGroupMenuItem = () => {
 
 export const ShowUserDetailsMenuItem = () => {
   const dispatch = useDispatch();
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPrivate = useIsPrivate(convoId);
   const avatarPath = useAvatarPath(convoId);
   const userName = useConversationUsername(convoId) || convoId;
@@ -233,7 +214,7 @@ export const ShowUserDetailsMenuItem = () => {
 };
 
 export const UpdateGroupNameMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const left = useIsLeft(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
@@ -253,7 +234,7 @@ export const UpdateGroupNameMenuItem = () => {
 };
 
 export const RemoveModeratorsMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
@@ -273,7 +254,7 @@ export const RemoveModeratorsMenuItem = (): JSX.Element | null => {
 };
 
 export const AddModeratorsMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
@@ -293,7 +274,7 @@ export const AddModeratorsMenuItem = (): JSX.Element | null => {
 };
 
 export const UnbanMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
@@ -313,7 +294,7 @@ export const UnbanMenuItem = (): JSX.Element | null => {
 };
 
 export const BanMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
@@ -333,7 +314,7 @@ export const BanMenuItem = (): JSX.Element | null => {
 };
 
 export const CopyMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
   const isPrivate = useIsPrivate(convoId);
   const isBlinded = useIsBlinded(convoId);
@@ -356,7 +337,7 @@ export const CopyMenuItem = (): JSX.Element | null => {
 };
 
 export const MarkAllReadMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest) {
     return (
@@ -374,7 +355,7 @@ export function isRtlBody(): boolean {
 }
 
 export const BlockMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isMe = useIsMe(convoId);
   const isBlocked = useIsBlocked(convoId);
   const isPrivate = useIsPrivate(convoId);
@@ -391,7 +372,7 @@ export const BlockMenuItem = (): JSX.Element | null => {
 };
 
 export const ClearNicknameMenuItem = (): JSX.Element | null => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isMe = useIsMe(convoId);
   const hasNickname = useHasNickname(convoId);
   const isPrivate = useIsPrivate(convoId);
@@ -407,7 +388,7 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
 };
 
 export const ChangeNicknameMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isMe = useIsMe(convoId);
   const isPrivate = useIsPrivate(convoId);
   const isPrivateAndFriend = useSelectedIsPrivateFriend();
@@ -428,7 +409,7 @@ export const ChangeNicknameMenuItem = () => {
 };
 
 export const DeleteMessagesMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
 
   if (!convoId) {
     return null;
@@ -446,7 +427,7 @@ export const DeleteMessagesMenuItem = () => {
 };
 
 export const AcceptMsgRequestMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isRequest = useIsIncomingRequest(convoId);
   const convo = getConversationController().get(convoId);
   const isPrivate = useIsPrivate(convoId);
@@ -468,7 +449,7 @@ export const AcceptMsgRequestMenuItem = () => {
 };
 
 export const DeclineMsgRequestMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isRequest = useIsIncomingRequest(convoId);
   const isPrivate = useIsPrivate(convoId);
   const selected = useSelectedConversationKey();
@@ -493,7 +474,7 @@ export const DeclineMsgRequestMenuItem = () => {
 };
 
 export const DeclineAndBlockMsgRequestMenuItem = () => {
-  const convoId = useContext(ContextConversationId);
+  const convoId = useConvoIdFromContext();
   const isRequest = useIsIncomingRequest(convoId);
   const selected = useSelectedConversationKey();
   const isPrivate = useIsPrivate(convoId);
diff --git a/ts/components/settings/BlockedList.tsx b/ts/components/settings/BlockedList.tsx
index b9083d7ca..93179c37c 100644
--- a/ts/components/settings/BlockedList.tsx
+++ b/ts/components/settings/BlockedList.tsx
@@ -32,7 +32,7 @@ const BlockedEntriesRoundedContainer = styled.div`
 const BlockedContactsSection = styled.div`
   display: flex;
   flex-direction: column;
-  min-height: 0;
+  min-height: 80px;
 
   background: var(--settings-tab-background-color);
   color: var(--settings-tab-text-color);
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 32a3e90cc..0b840c08f 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -134,14 +134,12 @@ export async function declineConversationWithoutConfirm({
 }) {
   const conversationToDecline = getConversationController().get(conversationId);
 
-  if (!conversationToDecline || conversationToDecline.isApproved()) {
+  if (!conversationToDecline || !conversationToDecline.isApproved()) {
     window?.log?.info('Conversation is already declined.');
     return;
   }
 
-  // we mark the conversation as inactive. This way it wont' show up in the UI.
-  // we cannot delete it completely on desktop, because we might need the convo details for sogs/group convos.
-  conversationToDecline.set('active_at', undefined);
+  // Note: do not set the active_at undefined as this would make that conversation not synced with the libsession wrapper
   await conversationToDecline.setIsApproved(false, false);
   await conversationToDecline.setDidApproveMe(false, false);
   // this will update the value in the wrapper if needed but not remove the entry if we want it gone. The remove is done below with removeContactFromWrapper
@@ -154,7 +152,7 @@ export async function declineConversationWithoutConfirm({
 
     if (
       conversationToDecline.isPrivate() &&
-      !SessionUtilContact.isContactToStoreInContactsWrapper(conversationToDecline)
+      !SessionUtilContact.isContactToStoreInWrapper(conversationToDecline)
     ) {
       await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
     }
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 372321c50..584d2d68b 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -2256,12 +2256,12 @@ export async function commitConversationAndRefreshWrapper(id: string) {
 
     switch (variant) {
       case 'UserConfig':
-        if (SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id)) {
+        if (SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id)) {
           await SessionUtilUserProfile.insertUserProfileIntoWrapper(convo.id);
         }
         break;
       case 'ContactsConfig':
-        if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
+        if (SessionUtilContact.isContactToStoreInWrapper(convo)) {
           await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 8c2c30a3e..701f4c2bf 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1610,7 +1610,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
        * Setup up the Contacts Wrapper with all the contact details which needs to be stored in it.
        */
 
-      // this filter is based on the `isContactToStoreInContactsWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start
+      // this filter is based on the `isContactToStoreInWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start
       const contactsToWriteInWrapper = db
         .prepare(
           `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 1f739ea2f..f57ffefe6 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -142,7 +142,6 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
       // our profile update comes from our userProfile, not from the contacts wrapper.
       continue;
     }
-
     const contactConvo = await getConversationController().getOrCreateAndWait(
       wrapperConvo.id,
       ConversationTypeEnum.PRIVATE
@@ -175,11 +174,6 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
         changes = true;
       }
-      console.warn(
-        `contactConvo.id: ${contactConvo}; wrapperConvo.createdAtSeconds:${
-          wrapperConvo.createdAtSeconds
-        }; current:${contactConvo.get('active_at')}`
-      );
 
       // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
       if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index c96e1ae4e..38661cc64 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -326,7 +326,7 @@ export class ConversationController {
               case 'UserConfig':
                 break;
               case 'ContactsConfig':
-                if (SessionUtilContact.isContactToStoreInContactsWrapper(convo)) {
+                if (SessionUtilContact.isContactToStoreInWrapper(convo)) {
                   await SessionUtilContact.refreshMappedValue(convo.id, true);
                 }
                 break;
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 730107060..727537fe5 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -31,7 +31,7 @@ const mappedContactWrapperValues = new Map<string, ContactInfo>();
 async function insertAllContactsIntoContactsWrapper() {
   const idsToInsert = getConversationController()
     .getConversations()
-    .filter(isContactToStoreInContactsWrapper)
+    .filter(isContactToStoreInWrapper)
     .map(m => m.id);
 
   window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts: ${idsToInsert}`);
@@ -44,17 +44,13 @@ async function insertAllContactsIntoContactsWrapper() {
 }
 
 /**
- * Returns true if that conversation is not us, is private, is not blinded and has either the
- * `isApproved` or `didApproveMe` field set.
- * So that would be all the private conversations we either sent or receive a message from, not blinded
+ * Returns true if that conversation is not us, is private, is not blinded.
+ *
+ * We want to sync the message request status so we need to allow a contact even if it's not approved, did not approve us and is not blocked.
  */
-function isContactToStoreInContactsWrapper(convo: ConversationModel): boolean {
+function isContactToStoreInWrapper(convo: ConversationModel): boolean {
   return (
-    !convo.isMe() &&
-    convo.isPrivate() &&
-    convo.isActive() &&
-    !PubKey.hasBlindedPrefix(convo.id) &&
-    (convo.isApproved() || convo.didApproveMe() || convo.isBlocked())
+    !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.hasBlindedPrefix(convo.id)
   );
 }
 // TODOLATER should we allow a blinded pubkey to be in the contact wrapper when we blocked it (can we block a blinded message request?)
@@ -70,8 +66,10 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     return;
   }
 
-  if (!isContactToStoreInContactsWrapper(foundConvo)) {
-    // window.log.info(`insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved. Skipping`);
+  if (!isContactToStoreInWrapper(foundConvo)) {
+    console.warn(
+      `insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved. Skipping`
+    );
     return;
   }
 
@@ -148,7 +146,7 @@ async function removeContactFromWrapper(id: string) {
   }
 }
 export const SessionUtilContact = {
-  isContactToStoreInContactsWrapper,
+  isContactToStoreInWrapper,
   insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
   removeContactFromWrapper,
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 9ca58193e..62ec458b9 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -61,15 +61,15 @@ async function insertAllConvoInfoVolatileIntoWrapper() {
 function isConvoToStoreInWrapper(convo: ConversationModel): boolean {
   return (
     SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo) || // this checks for community & legacy group
-    SessionUtilContact.isContactToStoreInContactsWrapper(convo) || // this checks for contacts
-    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id) // this checks for our own pubkey, as we want to keep track of the read state for the Note To Self
+    SessionUtilContact.isContactToStoreInWrapper(convo) || // this checks for contacts
+    SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id) // this checks for our own pubkey, as we want to keep track of the read state for the Note To Self
   );
 }
 
 function getConvoType(convo: ConversationModel): ConvoVolatileType {
   const convoType: ConvoVolatileType =
-    SessionUtilContact.isContactToStoreInContactsWrapper(convo) ||
-    SessionUtilUserProfile.isUserProfileToStoreInContactsWrapper(convo.id)
+    SessionUtilContact.isContactToStoreInWrapper(convo) ||
+    SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id)
       ? '1o1'
       : SessionUtilUserGroups.isCommunityToStoreInWrapper(convo)
       ? 'Community'
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 87cb3b489..1991b3ea5 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -5,7 +5,7 @@ import { getConversationController } from '../../conversations';
 import { fromHexToArray } from '../String';
 
 async function insertUserProfileIntoWrapper(convoId: string) {
-  if (!isUserProfileToStoreInContactsWrapper(convoId)) {
+  if (!isUserProfileToStoreInWrapper(convoId)) {
     return;
   }
   const us = UserUtils.getOurPubKeyStrFromCache();
@@ -27,7 +27,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
   }
 }
 
-function isUserProfileToStoreInContactsWrapper(convoId: string) {
+function isUserProfileToStoreInWrapper(convoId: string) {
   try {
     const us = UserUtils.getOurPubKeyStrFromCache();
     return convoId === us;
@@ -38,5 +38,5 @@ function isUserProfileToStoreInContactsWrapper(convoId: string) {
 
 export const SessionUtilUserProfile = {
   insertUserProfileIntoWrapper,
-  isUserProfileToStoreInContactsWrapper,
+  isUserProfileToStoreInWrapper,
 };
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index d45e3344d..26da71b5a 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -377,7 +377,7 @@ export const fetchTopMessagesForConversation = createAsyncThunk(
     const mostRecentMessage = await Data.getLastMessageInConversation(conversationKey);
 
     if (!oldestMessage || oldestMessage.id === oldTopMessageId) {
-      window.log.info('fetchTopMessagesForConversation: we are already at the top');
+      window.log.debug('fetchTopMessagesForConversation: we are already at the top');
       return null;
     }
     const messagesProps = await getMessages({
@@ -414,7 +414,7 @@ export const fetchBottomMessagesForConversation = createAsyncThunk(
     const mostRecentMessage = await Data.getLastMessageInConversation(conversationKey);
 
     if (!mostRecentMessage || mostRecentMessage.id === oldBottomMessageId) {
-      window.log.info('fetchBottomMessagesForConversation: we are already at the bottom');
+      window.log.debug('fetchBottomMessagesForConversation: we are already at the bottom');
       return null;
     }
     const messagesProps = await getMessages({
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 091c91a10..da6fe9be5 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -288,11 +288,20 @@ const _getLeftPaneLists = (
       directConversations.push(conversation);
     }
 
+    const isPrivateButHidden =
+      conversation.isPrivate &&
+      conversation.priority &&
+      conversation.priority <= CONVERSATION_PRIORITIES.default;
+
+    /**
+     * When getting a contact from a linked device, before he sent a message, the approved field is false, but a createdAt is used as activeAt
+     */
+    const isPrivateUnapprovedButActive =
+      conversation.isPrivate && !conversation.isApproved && !conversation.activeAt;
+
     if (
-      (conversation.isPrivate && !conversation.isApproved) ||
-      (conversation.isPrivate &&
-        conversation.priority &&
-        conversation.priority <= CONVERSATION_PRIORITIES.default) // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+      isPrivateUnapprovedButActive ||
+      isPrivateButHidden // a hidden contact conversation is only visible from the contact list, not from the global conversation list
     ) {
       // dont increase unread counter, don't push to convo list.
       continue;
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 1787cad5b..c13f25a8e 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -324,7 +324,7 @@ describe('libsession_contacts', () => {
 
     it('excludes ourselves', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({ ...validArgs, id: ourNumber } as any)
         )
       ).to.be.eq(false);
@@ -332,7 +332,7 @@ describe('libsession_contacts', () => {
 
     it('excludes non private', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({ ...validArgs, type: ConversationTypeEnum.GROUP } as any)
         )
       ).to.be.eq(false);
@@ -340,7 +340,7 @@ describe('libsession_contacts', () => {
 
     it('includes private', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({ ...validArgs, type: ConversationTypeEnum.PRIVATE } as any)
         )
       ).to.be.eq(true);
@@ -348,7 +348,7 @@ describe('libsession_contacts', () => {
 
     it('includes hidden private', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             type: ConversationTypeEnum.PRIVATE,
@@ -360,7 +360,7 @@ describe('libsession_contacts', () => {
 
     it('excludes blinded', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             type: ConversationTypeEnum.PRIVATE,
@@ -370,21 +370,34 @@ describe('libsession_contacts', () => {
       ).to.be.eq(false);
     });
 
-    it('excludes non approved by us nor did approveme', () => {
+    it('excludes non approved by us nor did approveme and not active', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            didApproveMe: false,
+            isApproved: false,
+            active_at: undefined,
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+
+    it('includes non approved by us nor did approveme but active', () => {
+      expect(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: false,
             isApproved: false,
           } as any)
         )
-      ).to.be.eq(false);
+      ).to.be.eq(true);
     });
 
     it('includes approved only by us ', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: false,
@@ -396,7 +409,7 @@ describe('libsession_contacts', () => {
 
     it('excludes not active ', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: false,
@@ -409,7 +422,7 @@ describe('libsession_contacts', () => {
 
     it('includes approved only by them ', () => {
       expect(
-        SessionUtilContact.isContactToStoreInContactsWrapper(
+        SessionUtilContact.isContactToStoreInWrapper(
           new ConversationModel({
             ...validArgs,
             didApproveMe: true,

From dc329668fa189b47147af04193ae43472ce77d0b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 18 Apr 2023 10:24:23 +1000
Subject: [PATCH 067/178] chore: fix unit tests

---
 package.json                                  |   9 +-
 ts/session/apis/snode_api/swarmPolling.ts     |   2 +-
 .../conversations/ConversationController.ts   |   7 +-
 ts/session/utils/job_runners/JobRunner.ts     |   5 +-
 ts/session/utils/sync/syncUtils.ts            |   4 +-
 .../libsession_wrapper_contacts_test.ts       | 285 ------------------
 .../libsession_wrapper_test.ts                | 227 ++------------
 .../models/formatRowOfConversation_test.ts    |  23 --
 .../unit/sending/MessageSender_test.ts        |  29 +-
 ts/test/session/unit/sogsv3/ApiUtil_test.ts   |  10 +-
 .../unit/sogsv3/FetchCapabilities_test.ts     |   2 +-
 .../unit/sogsv3/knownBlindedKeys_test.ts      |  11 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   | 227 +-------------
 ts/test/session/unit/utils/Messages_test.ts   |  15 +-
 .../session/unit/utils/OpenGroupUtils_test.ts |  36 +--
 .../unit/utils/job_runner/JobRunner_test.ts   |  59 +++-
 16 files changed, 144 insertions(+), 807 deletions(-)

diff --git a/package.json b/package.json
index 9d30434a2..20d1e2cbc 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots",
-    "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
+    "rebuild-libsession-for-unit-tests": "cd node_modules/session_util_wrapper/ && yarn configure && yarn build && cd ../../ ",
+    "test": "yarn rebuild-libsession-for-unit-tests && mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "coverage": "nyc --reporter=html mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
@@ -274,11 +275,7 @@
         "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
-      "target": [
-        "deb",
-        "rpm",
-        "freebsd"
-      ],
+      "target": ["deb", "rpm", "freebsd"],
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index fca4d5f09..e65fe87d6 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -269,7 +269,7 @@ export class SwarmPolling {
     const messages = uniqBy(allNamespacesWithoutUserConfigIfNeeded, x => x.hash);
 
     // if all snodes returned an error (null), no need to update the lastPolledTimestamp
-    if (isGroup && allNamespacesWithoutUserConfigIfNeeded?.length) {
+    if (isGroup) {
       window?.log?.info(
         `Polled for group(${ed25519Str(pubkey.key)}):, got ${messages.length} messages back.`
       );
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 38661cc64..456ee5752 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -238,12 +238,17 @@ export class ConversationController {
         // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
         try {
           await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
+        } catch (e) {
+          window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
+        }
+
+        try {
           await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
             conversation.id,
             conversation.id
           );
         } catch (e) {
-          window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
+          window?.log?.info('SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:', e);
         }
 
         const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 5d41cc769..d9a2b7b67 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -34,7 +34,6 @@ function jobToLogId<T extends TypeOfPersistedData>(jobRunner: JobRunnerType, job
  *
  * SyncConfigurationJob is a job which can only be planned once until it is a success. So in the queue  on jobs, there can only be one SyncConfigurationJob at all times.
  *
- *
  */
 export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private isInit = false;
@@ -133,6 +132,10 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
     this.currentJob = null;
   }
 
+  public getCurrentJobIdentifier(): string | null {
+    return this.currentJob?.persistedData?.identifier || null;
+  }
+
   /**
    * if we are running a job, this call will await until the job is done and stop the queue
    */
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 8318886b4..5d61eafee 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -30,6 +30,7 @@ import { PubKey } from '../../types';
 import { ConfigurationDumpSync } from '../job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { fromBase64ToArray, fromHexToArray } from '../String';
+import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -141,8 +142,9 @@ const getActiveOpenGroupV2CompleteUrls = async (
   const urls = await Promise.all(
     openGroupsV2ConvoIds.map(async opengroupConvoId => {
       const roomInfos = OpenGroupData.getV2OpenGroupRoom(opengroupConvoId);
+
       if (roomInfos) {
-        return opengroupConvoId;
+        return getCompleteUrlFromRoom(roomInfos);
       }
       return null;
     })
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index c13f25a8e..e1cf49951 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 
-import { from_hex, from_string } from 'libsodium-wrappers-sumo';
 import Sinon from 'sinon';
 import { ConversationModel } from '../../../../models/conversation';
 import {
@@ -22,290 +21,6 @@ describe('libsession_contacts', () => {
 
   // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
 
-  it('libsession_contacts1', () => {
-    const edSecretKey = from_hex(
-      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
-    );
-    const SessionUtilWrapper = require('session_util_wrapper');
-
-    // Initialize a brand new, empty config because we have no dump data to deal with.
-    const contacts = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
-
-    // We don't need to push anything, since this is an empty config
-    expect(contacts.needsPush()).to.be.eql(false);
-    expect(contacts.needsDump()).to.be.eql(false);
-    const real_id = '050000000000000000000000000000000000000000000000000000000000000000';
-
-    // Since it's empty there shouldn't be a get result.
-    expect(contacts.get(real_id)).to.be.null;
-
-    const created = contacts.getOrCreate(real_id);
-
-    expect(created).to.be.not.null;
-
-    expect(created.id).to.be.eq(real_id);
-    expect(created.name).to.be.null;
-    expect(created.nickname).to.be.null;
-    expect(created.approved).to.be.eq(false);
-    expect(created.approvedMe).to.be.eq(false);
-    expect(created.blocked).to.be.eq(false);
-    expect(created.id).to.be.eq(real_id);
-    expect(created.profilePicture?.url).to.be.eq(undefined);
-    expect(created.profilePicture?.key).to.be.eq(undefined);
-
-    expect(contacts.needsPush()).to.be.eql(false);
-    expect(contacts.needsDump()).to.be.eql(false);
-
-    expect(contacts.push().seqno === 0);
-
-    created.name = 'Joe';
-    created.nickname = 'Joey';
-    created.approved = true;
-    created.approvedMe = true;
-    contacts.set(created);
-
-    const updated = contacts.get(real_id);
-    expect(updated).to.not.be.null;
-    expect(updated).to.not.be.undefined;
-
-    expect(updated?.id).to.be.eq(real_id);
-    expect(updated?.name).to.be.eq('Joe');
-    expect(updated?.nickname).to.be.eq('Joey');
-    expect(updated?.approved).to.be.true;
-    expect(updated?.approvedMe).to.be.true;
-    expect(updated?.blocked).to.be.false;
-
-    expect(updated?.profilePicture).to.be.undefined;
-
-    const plop = new Uint8Array(32).fill(6);
-    created.profilePicture = { key: plop, url: 'fakeUrl' };
-    contacts.set(created);
-    const updated2 = contacts.get(real_id);
-
-    expect(updated2?.profilePicture?.url).to.be.deep.eq('fakeUrl');
-    expect(updated2?.profilePicture?.key).to.be.deep.eq(plop);
-
-    expect(contacts.needsPush()).to.be.eql(true);
-    expect(contacts.needsDump()).to.be.eql(true);
-
-    let push1 = contacts.push();
-    expect(push1.seqno).to.be.eq(1);
-
-    // Pretend we uploaded it
-    contacts.confirmPushed(push1.seqno);
-    expect(contacts.needsPush()).to.be.eql(false);
-    expect(contacts.needsDump()).to.be.eql(true);
-
-    const dump = contacts.dump();
-
-    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, dump);
-
-    expect(contacts2.needsPush()).to.be.eql(false);
-    expect(contacts2.needsDump()).to.be.eql(false);
-    expect(contacts2.push().seqno).to.be.eq(1);
-    // Because we just called dump() above, to load up
-    // contacts2.
-    expect(contacts2.needsDump()).to.be.eql(false);
-
-    const x = contacts2.get(real_id);
-    expect(x?.id).to.be.eq(real_id);
-    expect(x?.name).to.be.eq('Joe');
-    expect(x?.nickname).to.be.eq('Joey');
-    expect(x?.approved).to.be.true;
-    expect(x?.approvedMe).to.be.true;
-    expect(x?.blocked).to.be.false;
-
-    const anotherId = '051111111111111111111111111111111111111111111111111111111111111111';
-    contacts2.getOrCreate(anotherId);
-    contacts2.set({
-      id: anotherId,
-    });
-    // We're not setting any fields, but we should still keep a record of the session id
-    expect(contacts2.needsPush()).to.be.true;
-
-    let push2 = contacts2.push();
-    push1.seqno = push2.seqno;
-    push1.data = push2.data;
-    expect(push1.seqno).to.be.equal(2);
-    contacts.merge([push1.data]);
-
-    contacts2.confirmPushed(push1.seqno);
-    expect(contacts.needsPush()).to.be.false;
-    expect(contacts.push().seqno).to.be.eq(push1.seqno);
-
-    // Iterate through and make sure we got everything we expected
-    const allContacts = contacts.getAll();
-    const session_ids = allContacts.map((m: any) => m.id);
-    const nicknames = allContacts.map((m: any) => m.nickname || '(N/A)');
-
-    expect(session_ids.length).to.be.eq(2);
-    expect(session_ids).to.be.deep.eq([real_id, anotherId]);
-    expect(nicknames).to.be.deep.eq(['Joey', '(N/A)']);
-
-    // Conflict! Oh no!
-
-    // On client 1 delete a contact:
-    contacts.erase(real_id);
-    const shouldBeErased = contacts.get(real_id);
-    expect(shouldBeErased).to.be.null;
-
-    // Client 2 adds a new friend:
-    const third_id = '052222222222222222222222222222222222222222222222222222222222222222';
-    contacts2.setNickname(third_id, 'Nickname 3');
-    contacts2.setApproved(third_id, true);
-    contacts2.setBlocked(third_id, true);
-    contacts2.setProfilePicture(
-      third_id,
-      'http://example.com/huge.bmp',
-      from_string('qwert\0yuio1234567890123456789012')
-    );
-
-    expect(contacts.needsPush()).to.be.true;
-    expect(contacts2.needsPush()).to.be.true;
-
-    push1 = contacts.push();
-    push2 = contacts2.push();
-
-    expect(push1.seqno).to.be.eq(push2.seqno);
-    expect(push1.data).to.not.be.deep.eq(push2.data);
-    contacts.confirmPushed(push1.seqno);
-    contacts2.confirmPushed(push2.seqno);
-
-    contacts.merge([push2.data]);
-    expect(contacts.needsPush()).to.be.true;
-
-    contacts2.merge([push1.data]);
-    expect(contacts2.needsPush()).to.be.true;
-
-    push1 = contacts.push();
-    expect(push1.seqno).to.be.eq(push2.seqno + 1);
-    push2 = contacts2.push();
-
-    expect(push1.seqno).to.be.deep.eq(push2.seqno);
-    expect(push1.data).to.be.deep.eq(push2.data);
-
-    contacts.confirmPushed(push1.seqno);
-    contacts2.confirmPushed(push2.seqno);
-
-    expect(contacts.needsPush()).to.be.false;
-    expect(contacts2.needsPush()).to.be.false;
-
-    const allContacts2 = contacts.getAll();
-    const sessionIds2 = allContacts2.map((m: any) => m.id);
-    const nicknames2 = allContacts2.map((m: any) => m.nickname || '(N/A)');
-
-    expect(sessionIds2.length).to.be.eq(2);
-    expect(nicknames2.length).to.be.eq(2);
-    expect(sessionIds2).to.be.deep.eq([anotherId, third_id]);
-    expect(nicknames2).to.be.deep.eq(['(N/A)', 'Nickname 3']);
-  });
-
-  it('libsession_contacts2_c', () => {
-    const edSecretKey = from_hex(
-      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
-    );
-    const SessionUtilWrapper = require('session_util_wrapper');
-
-    // Initialize a brand new, empty config because we have no dump data to deal with.
-    const contacts = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
-
-    const realId = '050000000000000000000000000000000000000000000000000000000000000000';
-
-    expect(contacts.get(realId)).to.be.null;
-    const c = contacts.getOrCreate(realId);
-    expect(c.id).to.be.eq(realId);
-    expect(c.name).to.be.null;
-    expect(c.nickname).to.be.null;
-    expect(c.approved).to.be.false;
-    expect(c.approvedMe).to.be.false;
-    expect(c.blocked).to.be.false;
-    expect(c.profilePicture?.key).to.be.undefined;
-    expect(c.profilePicture?.url).to.be.undefined;
-
-    c.name = 'Joe';
-    c.nickname = 'Joey';
-    c.approved = true;
-    c.approvedMe = true;
-    contacts.set(c);
-
-    const c2 = contacts.getOrCreate(realId);
-    expect(c2.name).to.be.eq('Joe');
-    expect(c2.nickname).to.be.eq('Joey');
-    expect(c2.approved).to.be.true;
-    expect(c2.approvedMe).to.be.true;
-    expect(c2.blocked).to.be.false;
-    expect(c2.profilePicture?.key).to.be.undefined;
-    expect(c2.profilePicture?.url).to.be.undefined;
-
-    expect(contacts.needsDump()).to.be.true;
-    expect(contacts.needsPush()).to.be.true;
-
-    const push1 = contacts.push();
-    expect(push1.seqno).to.be.equal(1);
-
-    const contacts2 = new SessionUtilWrapper.ContactsConfigWrapperInsideWorker(edSecretKey, null);
-
-    let accepted = contacts2.merge([push1.data]);
-    expect(accepted).to.be.equal(1);
-
-    contacts.confirmPushed(push1.seqno);
-
-    let c3 = contacts2.getOrCreate(realId);
-    expect(c3.name).to.be.eq('Joe');
-    expect(c3.nickname).to.be.eq('Joey');
-    expect(c3.approved).to.be.true;
-    expect(c3.approvedMe).to.be.true;
-    expect(c3.blocked).to.be.false;
-    expect(c3.profilePicture?.key).to.be.undefined;
-    expect(c3.profilePicture?.url).to.be.undefined;
-
-    const another_id = '051111111111111111111111111111111111111111111111111111111111111111';
-    c3 = contacts.getOrCreate(another_id);
-    expect(c3.name).to.be.null;
-    expect(c3.nickname).to.be.null;
-    expect(c3.approved).to.be.false;
-    expect(c3.approvedMe).to.be.false;
-    expect(c3.blocked).to.be.false;
-
-    expect(c3.profilePicture?.key).to.be.undefined;
-    expect(c3.profilePicture?.url).to.be.undefined;
-
-    contacts2.set(c3);
-
-    const push2 = contacts2.push();
-    accepted = contacts.merge([push2.data]);
-    expect(accepted).to.be.equal(1);
-
-    const allContacts2 = contacts.getAll();
-    const session_ids2 = allContacts2.map((m: any) => m.id);
-    const nicknames2 = allContacts2.map((m: any) => m.nickname || '(N/A)');
-
-    expect(session_ids2.length).to.be.eq(2);
-    expect(nicknames2.length).to.be.eq(2);
-    expect(session_ids2).to.be.deep.eq([realId, another_id]);
-    expect(nicknames2).to.be.deep.eq(['Joey', '(N/A)']);
-
-    // Changing things while iterating:
-    // no need to support this in JS for now.
-
-    const allContacts3 = contacts.getAll();
-    let deletions = 0;
-    let non_deletions = 0;
-    allContacts3.forEach((contact: any) => {
-      if (contact.id !== realId) {
-        contacts.erase(contact.id);
-        deletions++;
-      } else {
-        non_deletions++;
-      }
-    });
-
-    expect(deletions).to.be.eq(1);
-    expect(non_deletions).to.be.eq(1);
-    expect(contacts.get(realId)).to.exist;
-    expect(contacts.get(another_id)).to.be.null;
-  });
-
   describe('filter contacts for wrapper', () => {
     const ourNumber = '051234567890acbdef';
     const validArgs = {
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index a43d2317a..27c837038 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -1,217 +1,24 @@
 import { expect } from 'chai';
-
-import { stringToUint8Array } from '../../../../session/utils/String';
-import { from_hex, from_string, to_hex } from 'libsodium-wrappers-sumo';
-import { concatUInt8Array } from '../../../../session/crypto';
-
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-
-const fakeKey32 = from_string('secret78901234567890123456789012');
+import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
+import Sinon from 'sinon';
+import { UserUtils } from '../../../../session/utils';
+import { TestUtils } from '../../../test-utils';
 
 describe('libsession_wrapper', () => {
-  it('libsession_user', () => {
-    // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
-    // To do this, you can cd to the node_module/libsession_wrapper folder and do
-    // yarn configure && yarn build
-    // once that is done, you can rename this file and remove the _skip suffix so that test is run.
+  afterEach(() => {
+    Sinon.restore();
+  });
 
-    // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
+  it('isUserProfileToStoreInWrapper returns true if thats our convo', () => {
+    const us = TestUtils.generateFakePubKeyStr();
+    Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(us);
+    expect(SessionUtilUserProfile.isUserProfileToStoreInWrapper(us)).to.be.true;
+  });
 
-    const edSecretKey = from_hex(
-      '0123456789abcdef0123456789abcdef000000000000000000000000000000004cb76fdc6d32278e3f83dbf608360ecc6b65727934b85d2fb86862ff98c46ab7'
-    );
-    const SessionUtilWrapper = require('session_util_wrapper');
-
-    // Initialize a brand new, empty config because we have no dump data to deal with.
-    const conf = new SessionUtilWrapper.UserConfigWrapperInsideWorker(edSecretKey, null);
-
-    // We don't need to push anything, since this is an empty config
-    expect(conf.needsPush()).to.be.eql(false);
-    expect(conf.needsDump()).to.be.eql(false);
-
-    // Since it's empty there shouldn't be a name.
-    expect(conf.getName()).to.be.null;
-
-    let pushResult = conf.push();
-
-    expect(pushResult.seqno).to.be.eq(0);
-    expect(pushResult.data.length).to.be.eq(256);
-
-    expect(conf.storageNamespace()).to.be.eq(2);
-    expect(to_hex(pushResult.data)).to.be.deep.eq(
-      '9ffb5347e061ac40d937ae4f1a890031475bdc11653f94c8ae1d516ffda71d9ee9cdaf9fbaeb15d835cdc7b3b6ecc120361f004ff172dd5e757c80ede10e88945536e6841255a7bca73664ab8a0607fcfe2579c05bb3d9d4b34ac1de2921e703783ce39e317a512cb9d4e3b59176cbde47b5ba24a03065bf8fefe3e8ca2609e0ad10c7c9c3f81dc6d3a399bda0c190e8a228d0acb22863ab84c2d0c411be74dac4de1f8bc18539635db01ea1ef7f28e505703d67786cb419690edd4bd8c92926fc1d6449eaccc31d7d9639e1b36222e5672b87d1e34b7860308c3f40b3997f39fecf6ceb889323826fa69e001816307799fc9fed302a90faa1e43f7cd7367c3c'
-    );
-
-    // This should also be unset:
-    const picResult = conf.getProfilePicture();
-    expect(picResult.url).to.be.null;
-    expect(picResult.key).to.be.null;
-
-    // Now let's go set a profile name and picture:
-    conf.setProfilePicture('http://example.org/omg-pic-123.bmp', new Uint8Array(fakeKey32));
-    expect(conf.getProfilePicture().key).to.be.deep.eq(new Uint8Array(fakeKey32));
-
-    conf.setName('Kallie');
-
-    // Retrieve them just to make sure they set properly:
-    const name = conf.getName();
-
-    expect(name).to.be.not.null;
-    expect(name).to.be.eq('Kallie');
-
-    const picture = conf.getProfilePicture();
-
-    expect(picture.url).to.be.eq('http://example.org/omg-pic-123.bmp');
-    expect(picture.key).to.be.deep.eq(new Uint8Array(fakeKey32));
-
-    // Since we've made changes, we should need to push new config to the swarm, *and* should need
-    // to dump the updated state:
-
-    expect(conf.needsDump()).to.be.true;
-    expect(conf.needsPush()).to.be.true;
-
-    // incremented since we made changes (this only increments once between
-    // dumps; even though we changed two fields here).
-    pushResult = conf.push();
-    expect(pushResult.seqno).to.be.eq(1);
-
-    const expHash0 = from_hex('ea173b57beca8af18c3519a7bbf69c3e7a05d1c049fa9558341d8ebb48b0c965');
-
-    const expPush1Start =
-      'd1:#i1e1:&d1:n6:Kallie1:p34:http://example.org/omg-pic-123.bmp1:q32:secret78901234567890123456789012e1:<lli0e32:';
-    const expPush1End = 'deee1:=d1:n0:1:p0:1:q0:ee';
-
-    // The data to be actually pushed, expanded like this to make it somewhat human-readable:
-    const expPush1Decrypted = concatUInt8Array(
-      stringToUint8Array(expPush1Start),
-      expHash0,
-      stringToUint8Array(expPush1End)
-    );
-    const expPush1Encrypted = from_hex(
-      '877c8e0f5d33f5fffa5a4e162785a9a89918e95de1c4b925201f1f5c29d9ee4f8c36e2b278fce1e6b9d999689dd86ff8e79e0a04004fa54d24da89bc2604cb1df8c1356da8f14710543ecec44f2d57fc56ea8b7e73d119c69d755f4d513d5d069f02396b8ec0cbed894169836f57ca4b782ce705895c593b4230d50c175d44a08045388d3f4160bacb617b9ae8de3ebc8d9024245cd09ce102627cab2acf1b9126159211359606611ca5814de320d1a7099a65c99b0eebbefb92a115f5efa6b9132809300ac010c6857cfbd62af71b0fa97eccec75cb95e67edf40b35fdb9cad125a6976693ab085c6bba96a2e51826e81e16b9ec1232af5680f2ced55310486'
-    );
-
-    expect(to_hex(pushResult.data)).to.be.deep.eq(to_hex(expPush1Encrypted));
-
-    // We haven't dumped, so still need to dump:
-    expect(conf.needsDump()).to.be.true;
-    // We did call push, but we haven't confirmed it as stored yet, so this will still return true:
-    expect(conf.needsPush()).to.be.true;
-
-    const dumped = conf.dump();
-    // (in a real client we'd now store this to disk)
-    expect(conf.needsDump()).to.be.false;
-
-    const expectedDump = concatUInt8Array(
-      stringToUint8Array('d' + '1:!' + 'i2e' + '1:$' + `${expPush1Decrypted.length}` + ':'),
-      expPush1Decrypted,
-      stringToUint8Array('e')
-    );
-    expect(to_hex(dumped)).to.be.deep.eq(to_hex(expectedDump));
-
-    // So now imagine we got back confirmation from the swarm that the push has been stored:
-    conf.confirmPushed(pushResult.seqno);
-    expect(conf.needsPush()).to.be.false;
-    expect(conf.needsDump()).to.be.true;
-
-    conf.dump();
-    expect(conf.needsDump()).to.be.false;
-
-    // Now we're going to set up a second, competing config object (in the real world this would be
-    // another Session client somewhere).
-
-    // Start with an empty config, as abo.setve:
-    const conf2 = new SessionUtilWrapper.UserConfigWrapperInsideWorker(edSecretKey, null);
-
-    expect(conf2.needsDump()).to.be.false;
-
-    // Now imagine we just pulled down the encrypted string from the swarm; we merge it into conf2:
-    const accepted = conf2.merge([expPush1Encrypted]);
-    expect(accepted).to.be.eq(1);
-
-    // Our state has changed, so we need to dump:
-    expect(conf2.needsDump()).to.be.true;
-    conf2.dump();
-    // (store in db)
-    expect(conf2.needsDump()).to.be.false;
-
-    // We *don't* need to push: even though we updated, all we did is update to the merged data (and
-    // didn't have any sort of merge conflict needed):
-    expect(conf2.needsPush()).to.be.false;
-
-    // Now let's create a conflicting update:
-    // Change the name on both clients:
-    conf.setName('Nibbler');
-    conf2.setName('Raz');
-
-    // And, on conf2, we're also going to change the profile pic:
-    conf2.setProfilePicture(
-      'http://new.example.com/pic',
-      stringToUint8Array('qwert\0yuio1234567890123456789012')
-    );
-
-    // Both have changes, so push need a push
-    expect(conf.needsPush()).to.be.true;
-    expect(conf2.needsPush()).to.be.true;
-    pushResult = conf.push();
-    expect(pushResult.seqno).to.be.eq(2); // incremented, since we made a field change
-
-    let pushResult2 = conf2.push();
-    expect(pushResult2.seqno).to.be.eq(2); // incremented, since we made a field change
-
-    // (store in db)
-    conf.dump();
-    conf2.dump();
-
-    // Since we set different things, we're going to get back different serialized data to be
-    // pushed:
-    expect(to_hex(pushResult.data)).to.not.be.deep.eq(to_hex(pushResult2.data));
-
-    // Now imagine that each client pushed its `seqno=2` config to the swarm, but then each client
-    // also fetches new messages and pulls down the other client's `seqno=2` value.
-
-    // Feed the new config into each other.  (This array could hold multiple configs if we pulled
-    // down more than one).
-    conf2.merge([pushResult.data]);
-    conf.merge([pushResult2.data]);
-
-    // Now after the merge we *will* want to push from both client, since both will have generated a
-    // merge conflict update (with seqno = 3).
-    expect(conf.needsPush()).to.be.true;
-    expect(conf2.needsPush()).to.be.true;
-
-    pushResult = conf.push();
-    pushResult2 = conf2.push();
-    expect(pushResult.seqno).to.be.eq(3);
-    expect(pushResult2.seqno).to.be.eq(3);
-
-    // They should have resolved the conflict to the same thing:
-    expect(conf.getName()).to.be.eq('Nibbler');
-    expect(conf2.getName()).to.be.eq('Nibbler');
-
-    // (Note that they could have also both resolved to "Raz" here, but the hash of the serialized
-    // message just happens to have a higher hash -- and thus gets priority -- for this particular
-    // test).
-
-    // Since only one of them set a profile pic there should be no conflict there:
-    const pic = conf.getProfilePicture();
-    const pic2 = conf2.getProfilePicture();
-    expect(pic.url).to.be.eq('http://new.example.com/pic');
-    expect(pic2.url).to.be.eq('http://new.example.com/pic');
-
-    expect(pic.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio1234567890123456789012'));
-    expect(pic2.key).to.be.deep.eq(stringToUint8Array('qwert\0yuio1234567890123456789012'));
-
-    conf.confirmPushed(pushResult.seqno);
-    conf2.confirmPushed(pushResult2.seqno);
-
-    conf.dump();
-    conf2.dump();
-    // (store in db)
-
-    expect(conf.needsPush()).to.be.false;
-    expect(conf.needsDump()).to.be.false;
-    expect(conf2.needsPush()).to.be.false;
-    expect(conf2.needsDump()).to.be.false;
+  it('isUserProfileToStoreInWrapper returns false if thats NOT our convo', () => {
+    const us = TestUtils.generateFakePubKeyStr();
+    const notUs = TestUtils.generateFakePubKeyStr();
+    Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(us);
+    expect(SessionUtilUserProfile.isUserProfileToStoreInWrapper(notUs)).to.be.false;
   });
 });
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index f77cbe65a..4efc4c9b3 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -78,29 +78,6 @@ describe('formatRowOfConversation', () => {
     });
   });
 
-  describe('mentionedUs', () => {
-    it('initialize mentionedUs if they are not given', () => {
-      expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
-        'mentionedUs',
-        false
-      );
-    });
-
-    it('do not override mentionedUs if they are set in the row as integer: true', () => {
-      expect(formatRowOfConversation({ mentionedUs: 1 }, 'test', 0, false)).to.have.deep.property(
-        'mentionedUs',
-        true
-      );
-    });
-
-    it('do not override mentionedUs if they are set in the row as integer: false', () => {
-      expect(formatRowOfConversation({ mentionedUs: 0 }, 'test', 0, false)).to.have.deep.property(
-        'mentionedUs',
-        false
-      );
-    });
-  });
-
   describe('isKickedFromGroup', () => {
     it('initialize isKickedFromGroup if they are not given', () => {
       expect(formatRowOfConversation({}, 'test', 0, false)).to.have.deep.property(
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 237e56b61..110b4cb5c 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -19,15 +19,22 @@ import { MessageUtils, UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 import { stubCreateObjectUrl, stubData, stubUtilWorker } from '../../../test-utils/utils';
 import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test';
+import { fromBase64ToArrayBuffer } from '../../../../session/utils/String';
 
 describe('MessageSender', () => {
   afterEach(() => {
     sinon.restore();
   });
 
-  beforeEach(() => {
+  beforeEach(async () => {
     TestUtils.stubWindowLog();
     TestUtils.stubWindowFeatureFlags();
+    getConversationController().reset();
+    TestUtils.stubData('getItemById').resolves();
+
+    stubData('getAllConversations').resolves([]);
+    stubData('saveConversation').resolves();
+    await getConversationController().load();
   });
 
   // tslint:disable-next-line: max-func-body-length
@@ -114,9 +121,13 @@ describe('MessageSender', () => {
         await MessageSender.send(rawMessage, 3, 10);
 
         const args = sessionMessageAPISendStub.getCall(0).args;
-        expect(args[0]).to.equal(device.key);
+        expect(args[1]).to.equal(device.key);
+        const firstArg = args[0];
+        expect(firstArg.length).to.equal(1);
         // expect(args[3]).to.equal(visibleMessage.timestamp); the timestamp is overwritten on sending by the network clock offset
-        expect(args[2]).to.equal(visibleMessage.ttl());
+        expect(firstArg[0].ttl).to.equal(visibleMessage.ttl());
+        expect(firstArg[0].pubkey).to.equal(device.key);
+        expect(firstArg[0].namespace).to.equal(SnodeNamespaces.UserMessages);
       });
 
       it('should correctly build the envelope and override the timestamp', async () => {
@@ -135,8 +146,10 @@ describe('MessageSender', () => {
         Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset);
         await MessageSender.send(rawMessage, 3, 10);
 
-        const data = sessionMessageAPISendStub.getCall(0).args[1];
-        const webSocketMessage = SignalService.WebSocketMessage.decode(data);
+        const firstArg = sessionMessageAPISendStub.getCall(0).args[0];
+        const { data64 } = firstArg[0];
+        const data = fromBase64ToArrayBuffer(data64);
+        const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data));
         expect(webSocketMessage.request?.body).to.not.equal(
           undefined,
           'Request body should not be undefined'
@@ -187,8 +200,10 @@ describe('MessageSender', () => {
           );
           await MessageSender.send(rawMessage, 3, 10);
 
-          const data = sessionMessageAPISendStub.getCall(0).args[1];
-          const webSocketMessage = SignalService.WebSocketMessage.decode(data);
+          const firstArg = sessionMessageAPISendStub.getCall(0).args[0];
+          const { data64 } = firstArg[0];
+          const data = fromBase64ToArrayBuffer(data64);
+          const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data));
           expect(webSocketMessage.request?.body).to.not.equal(
             undefined,
             'Request body should not be undefined'
diff --git a/ts/test/session/unit/sogsv3/ApiUtil_test.ts b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
index 888cb82c6..68f9464f1 100644
--- a/ts/test/session/unit/sogsv3/ApiUtil_test.ts
+++ b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
@@ -11,6 +11,8 @@ import {
 import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
 import { getConversationController } from '../../../../session/conversations';
 import { stubData, stubOpenGroupData, stubWindowLog } from '../../../test-utils/utils';
+import { UserUtils } from '../../../../session/utils';
+import { TestUtils } from '../../../test-utils';
 
 describe('APIUtils', () => {
   beforeEach(() => {
@@ -115,8 +117,8 @@ describe('APIUtils', () => {
         it('returns false if there no rooms matching that serverURL with http prefix', () => {
           expect(hasExistingOpenGroup('http://1.1.1.1', 'roomId')).to.be.false;
           expect(hasExistingOpenGroup('http://1.1.1.1:4433', 'roomId')).to.be.false;
-          expect(hasExistingOpenGroup('http://plop.com:4433', 'roomId')).to.be.false;
-          expect(hasExistingOpenGroup('https://plop.com', 'roomId')).to.be.false;
+          expect(hasExistingOpenGroup('http://whatever.com:4433', 'roomId')).to.be.false;
+          expect(hasExistingOpenGroup('https://whatever.com', 'roomId')).to.be.false;
         });
       });
     });
@@ -135,6 +137,10 @@ describe('APIUtils', () => {
         getV2OpenGroupRoomsByServerUrl = stubOpenGroupData('getV2OpenGroupRoomsByServerUrl');
         getConversationController().reset();
 
+        Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(
+          TestUtils.generateFakePubKeyStr()
+        );
+
         await getConversationController().load();
 
         const convoOurIp = await getConversationController().getOrCreateAndWait(
diff --git a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
index 48bb64676..45d138d32 100644
--- a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
+++ b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
@@ -33,7 +33,7 @@ describe('FetchCapabilities', () => {
     });
 
     it('return null if given object without cap field  ', () => {
-      expect(parseCapabilities({ plop: [] })).to.be.deep.eq(null);
+      expect(parseCapabilities({ invalid: [] })).to.be.deep.eq(null);
     });
 
     it('return valid if given one cap ', () => {
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 40a259b50..ec2a9f8e6 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -23,6 +23,7 @@ import { getConversationController } from '../../../../session/conversations';
 import { LibSodiumWrappers } from '../../../../session/crypto';
 import { UserUtils } from '../../../../session/utils';
 import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils';
+import { TestUtils } from '../../../test-utils';
 
 // tslint:disable: chai-vague-errors
 
@@ -72,7 +73,7 @@ describe('knownBlindedKeys', () => {
     });
 
     it('loadFromDb with invalid json', async () => {
-      getItemById.resolves({ id: '', value: 'plop invalid json' });
+      getItemById.resolves({ id: '', value: 'invalid json content' });
       await loadKnownBlindedKeys();
       expect(TEST_getCachedBlindedKeys()).to.deep.eq([]);
     });
@@ -481,14 +482,17 @@ describe('knownBlindedKeys', () => {
     describe('when not in cache', () => {
       beforeEach(async () => {
         getConversationController().reset();
+        getItemById.resolves();
 
         stubData('getAllConversations').resolves([]);
         stubData('saveConversation').resolves();
+        Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(
+          TestUtils.generateFakePubKeyStr()
+        );
         await getConversationController().load();
       });
 
       it('does iterate over all the conversations and find the first one matching (fails)', async () => {
-        getItemById.resolves();
         await loadKnownBlindedKeys();
         const shouldBeWrittenToDb = {
           blindedId: knownBlindingMatch.blindedId,
@@ -510,7 +514,6 @@ describe('knownBlindedKeys', () => {
       });
 
       it('does iterate over all the conversations and find the first one matching (passes)', async () => {
-        getItemById.resolves();
         await loadKnownBlindedKeys();
         // adding a private conversation with a known match of the blinded pubkey we have
         await getConversationController().getOrCreateAndWait(
@@ -543,7 +546,6 @@ describe('knownBlindedKeys', () => {
       });
 
       it('does iterate over all the conversations but is not approved so must fail', async () => {
-        getItemById.resolves();
         await loadKnownBlindedKeys();
         // adding a private conversation with a known match of the blinded pubkey we have
         const convo = await getConversationController().getOrCreateAndWait(
@@ -562,7 +564,6 @@ describe('knownBlindedKeys', () => {
       });
 
       it('does iterate over all the conversations but is not private so must fail: group', async () => {
-        getItemById.resolves();
         await loadKnownBlindedKeys();
         // adding a private conversation with a known match of the blinded pubkey we have
         const convo = await getConversationController().getOrCreateAndWait(
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 2e804da0f..6060d4ae6 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -295,7 +295,7 @@ describe('SwarmPolling', () => {
           ConversationTypeEnum.GROUP
         );
 
-        convo.set('active_at', 1); // really old
+        convo.set('active_at', 1); // really old, but active
         const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
 
@@ -451,230 +451,5 @@ describe('SwarmPolling', () => {
         });
       });
     });
-
-    describe('group v3', () => {
-      it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        await swarmPolling.start(true);
-
-        // our pubkey will be polled for, hence the 2
-        expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      });
-
-      it('does run for groupv3 pubkey on start no matter the recent timestamp  ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        await swarmPolling.start(true);
-
-        // our pubkey will be polled for, hence the 2
-        expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      });
-
-      it('does only poll from -10 for closed groups if HF >= 19.1  ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-        getItemByIdStub.restore();
-        getItemByIdStub = TestUtils.stubData('getItemById');
-        getItemByIdStub
-          .withArgs('hasSeenHardfork190')
-          .resolves({ id: 'hasSeenHardfork190', value: true })
-          .withArgs('hasSeenHardfork191')
-          .resolves({ id: 'hasSeenHardfork191', value: true });
-
-        convo.set('active_at', 1);
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-
-        await swarmPolling.start(true);
-
-        // our pubkey will be polled for, hence the 2
-        expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        getItemByIdStub.restore();
-        getItemByIdStub = TestUtils.stubData('getItemById');
-
-        getItemByIdStub.resolves();
-      });
-
-      it('does run for group pubkey on start but not another time if activeAt is old ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-
-        convo.set('active_at', 1); // really old
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-
-        // this calls the stub 2 times, one for our direct pubkey and one for the group
-        await swarmPolling.start(true);
-
-        // this should only call the stub one more time: for our direct pubkey but not for the group pubkey
-        await swarmPolling.pollForAllKeys();
-
-        expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      });
-
-      it('does run twice if activeAt less than one hour ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        await swarmPolling.start(true);
-        clock.tick(9000);
-        // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
-        /** this is not easy to explain, but
-         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
-         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
-         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
-         */
-        clock.restore();
-        await sleepFor(10);
-
-        expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      });
-
-      it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-
-        pollOnceForKeySpy.resetHistory();
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        // this call the stub two times already, one for our direct pubkey and one for the group
-        await swarmPolling.start(true);
-        const timeToTick = 3 * 60 * 1000;
-        swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick);
-        // more than week old, so inactive group but we have to tick after more than 2 min
-        convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000);
-        clock.tick(timeToTick);
-        /** this is not easy to explain, but
-         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
-         * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
-         * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
-         */
-        clock.restore();
-        await sleepFor(10);
-        // we should have two more calls here, so 4 total.
-        expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      });
-
-      it('does run once only if group is inactive and we tick less than 2 minutes ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakeClosedGroupV3PkStr(),
-          ConversationTypeEnum.GROUPV3
-        );
-        pollOnceForKeySpy.resetHistory();
-
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        await swarmPolling.start(true);
-
-        // more than a week old, we should not tick after just 5 seconds
-        convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000);
-
-        clock.tick(1 * 60 * 1000);
-
-        // we should have only one more call here, the one for our direct pubkey fetch
-        expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-      });
-
-      describe('multiple runs', () => {
-        let convo: ConversationModel;
-        let groupConvoPubkey: PubKey;
-
-        beforeEach(async () => {
-          convo = getConversationController().getOrCreate(
-            TestUtils.generateFakeClosedGroupV3PkStr(),
-            ConversationTypeEnum.GROUPV3
-          );
-
-          convo.set('active_at', Date.now());
-          groupConvoPubkey = PubKey.cast(convo.id as string);
-          swarmPolling.addGroupId(groupConvoPubkey);
-          await swarmPolling.start(true);
-        });
-
-        it('does run twice if activeAt is less than 2 days', async () => {
-          pollOnceForKeySpy.resetHistory();
-          // less than 2 days old, this is an active group
-          convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000);
-
-          const timeToTick = 6 * 1000;
-
-          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
-          // we tick more than 5 sec
-          clock.tick(timeToTick);
-
-          await swarmPolling.pollForAllKeys();
-          // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
-          expect(pollOnceForKeySpy.callCount).to.eq(4);
-          // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        });
-
-        it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
-          pollOnceForKeySpy.resetHistory();
-          convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active
-
-          const timeToTick = 65 * 1000;
-          swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
-
-          clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group)
-
-          await swarmPolling.pollForAllKeys();
-          expect(pollOnceForKeySpy.callCount).to.eq(4);
-
-          // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-          expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-          expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        });
-      });
-    });
   });
 });
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index 9ec200211..0e2822b95 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -251,6 +251,9 @@ describe('Message Utils', () => {
       stubData('getAllConversations').resolves([]);
       stubData('saveConversation').resolves();
       stubOpenGroupData('getAllV2OpenGroupRooms').resolves();
+      TestUtils.stubData('getItemById').callsFake(async () => {
+        return { value: '[]' };
+      });
       getConversationController().reset();
 
       await getConversationController().load();
@@ -271,8 +274,9 @@ describe('Message Utils', () => {
         ConversationTypeEnum.PRIVATE
       );
 
-      const convoId3 = getOpenGroupV2ConversationId('chat-dev2.lokinet.org', 'fish');
-      const convoId4 = getOpenGroupV2ConversationId('chat-dev3.lokinet.org', 'fish2');
+      const convoId3 = getOpenGroupV2ConversationId('http://chat-dev2.lokinet.org', 'fish');
+      const convoId4 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish2');
+      const convoId5 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish3');
 
       const convo3 = await getConversationController().getOrCreateAndWait(
         convoId3,
@@ -284,7 +288,7 @@ describe('Message Utils', () => {
         .returns(null)
         .withArgs(convoId3)
         .returns({
-          serverUrl: 'chat-dev2.lokinet.org',
+          serverUrl: 'http://chat-dev2.lokinet.org',
           roomId: 'fish',
           serverPublicKey: 'serverPublicKey',
         } as OpenGroupV2Room);
@@ -297,7 +301,7 @@ describe('Message Utils', () => {
 
       await OpenGroupData.opengroupRoomsLoad();
       const convo5 = await getConversationController().getOrCreateAndWait(
-        convoId4,
+        convoId5,
         ConversationTypeEnum.GROUP
       );
       convo5.set({ active_at: 0 });
@@ -308,11 +312,12 @@ describe('Message Utils', () => {
       );
       const convos = getConversationController().getConversations();
 
+      //convoID3 is active but 4 and 5 are not
       const configMessage = await getCurrentConfigurationMessage(convos);
       expect(configMessage.activeOpenGroups.length).to.equal(1);
       expect(configMessage.activeOpenGroups[0]).to.equal(
         // tslint:disable-next-line: no-http-string
-        'chat-dev2.lokinet.org/fish?public_key=serverPublicKey'
+        'http://chat-dev2.lokinet.org/fish?public_key=serverPublicKey'
       );
     });
   });
diff --git a/ts/test/session/unit/utils/OpenGroupUtils_test.ts b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
index a424cc4c8..ecd6b507e 100644
--- a/ts/test/session/unit/utils/OpenGroupUtils_test.ts
+++ b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
@@ -14,21 +14,21 @@ chai.use(chaiAsPromised as any);
 describe('OpenGroupUtils', () => {
   describe('prefixify', () => {
     it('should just return if http:// is as prefix', () => {
-      expect(prefixify('http://plop.com')).to.be.equal('http://plop.com');
+      expect(prefixify('http://whatever.com')).to.be.equal('http://whatever.com');
     });
     it('should just return if https:// is as prefix', () => {
-      expect(prefixify('https://plop.com')).to.be.equal('https://plop.com');
+      expect(prefixify('https://whatever.com')).to.be.equal('https://whatever.com');
     });
 
     it('should just return if http:// is as prefix ', () => {
-      expect(prefixify('http://plop.com')).to.be.equal('http://plop.com');
+      expect(prefixify('http://whatever.com')).to.be.equal('http://whatever.com');
     });
     it('should just return if https:// is as prefix', () => {
-      expect(prefixify('https://plop.com')).to.be.equal('https://plop.com');
+      expect(prefixify('https://whatever.com')).to.be.equal('https://whatever.com');
     });
 
     it('should prefix with http if ssl is false and no prefix', () => {
-      expect(prefixify('plop.com')).to.be.equal('http://plop.com');
+      expect(prefixify('whatever.com')).to.be.equal('http://whatever.com');
     });
   });
 
@@ -37,7 +37,7 @@ describe('OpenGroupUtils', () => {
       it('throws if roomId is too long 64 ', () => {
         expect(() => {
           getOpenGroupV2ConversationId(
-            'http://plop.com',
+            'http://whatever.com',
             '012345678901234567890#1234567!89012345678901234567890123456789fg01234'
           );
         }).to.throw('getOpenGroupV2ConversationId: Invalid roomId');
@@ -45,37 +45,37 @@ describe('OpenGroupUtils', () => {
 
       it('throws if roomId is too short ', () => {
         expect(() => {
-          getOpenGroupV2ConversationId('http://plop.com', '');
+          getOpenGroupV2ConversationId('http://whatever.com', '');
         }).to.throw('getOpenGroupV2ConversationId: Invalid roomId');
       });
       it('throws if roomId is has forbidden chars ', () => {
         expect(() => {
-          getOpenGroupV2ConversationId('http://plop.com', '1&%^%');
+          getOpenGroupV2ConversationId('http://whatever.com', '1&%^%');
         }).to.throw('getOpenGroupV2ConversationId: Invalid roomId');
       });
     });
 
     it('doesnt throw if roomId and serverUrl are valid ', () => {
       expect(() => {
-        getOpenGroupV2ConversationId('http://127.0.0.1/', 'plop1234');
+        getOpenGroupV2ConversationId('http://127.0.0.1/', 'whatever1234');
       }).to.not.throw();
     });
 
     it('doesnt throw if roomId and serverUrl are valid with port', () => {
       expect(() => {
-        getOpenGroupV2ConversationId('http://127.0.0.1:22/', 'plop1234');
+        getOpenGroupV2ConversationId('http://127.0.0.1:22/', 'whatever1234');
       }).to.not.throw();
     });
 
     it('doesnt throw if roomId and serverUrl are valid with port', () => {
       expect(() => {
-        getOpenGroupV2ConversationId('https://opengroup.com/', 'plop1234');
+        getOpenGroupV2ConversationId('https://opengroup.com/', 'whatever1234');
       }).to.not.throw();
     });
 
     it('throw if serverUrl is no url', () => {
       expect(() => {
-        getOpenGroupV2ConversationId('opengroup', 'plop1234');
+        getOpenGroupV2ConversationId('opengroup', 'whatever1234');
       }).to.throw();
     });
   });
@@ -84,17 +84,17 @@ describe('OpenGroupUtils', () => {
     it('doesnt throw if roomId and serverUrl are valid with port', () => {
       expect(
         getCompleteUrlFromRoom({
-          roomId: 'plop1234',
+          roomId: 'whatever1234',
           serverPublicKey: '05123456789',
           serverUrl: 'https://example.org',
         })
-      ).to.be.eq('https://example.org/plop1234?public_key=05123456789');
+      ).to.be.eq('https://example.org/whatever1234?public_key=05123456789');
     });
 
     it('throws if pubkey is empty', () => {
       expect(() =>
         getCompleteUrlFromRoom({
-          roomId: 'plop1234',
+          roomId: 'whatever1234',
           serverPublicKey: '',
           serverUrl: 'https://example.org',
         })
@@ -104,7 +104,7 @@ describe('OpenGroupUtils', () => {
     it('throws if serverUrl is empty', () => {
       expect(() =>
         getCompleteUrlFromRoom({
-          roomId: 'plop1234',
+          roomId: 'whatever1234',
           serverPublicKey: '05123456789',
           serverUrl: '',
         })
@@ -123,7 +123,7 @@ describe('OpenGroupUtils', () => {
     it('throws if pubkey is null', () => {
       expect(() =>
         getCompleteUrlFromRoom({
-          roomId: 'plop1234',
+          roomId: 'whatever1234',
           serverPublicKey: null as any,
           serverUrl: 'https://example.org',
         })
@@ -133,7 +133,7 @@ describe('OpenGroupUtils', () => {
     it('throws if serverUrl is null', () => {
       expect(() =>
         getCompleteUrlFromRoom({
-          roomId: 'plop1234',
+          roomId: 'whatever1234',
           serverPublicKey: '05123456789',
           serverUrl: null as any,
         })
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 6d7004020..75d5dda6a 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -10,6 +10,7 @@ import {
 } from '../../../../../session/utils/job_runners/PersistedJob';
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
+import { TestUtils } from '../../../../test-utils';
 
 function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
   const job = new FakeSleepForJob({
@@ -185,28 +186,48 @@ describe('JobRunner', () => {
 
     it('two jobs are running sequentially', async () => {
       await runnerMulti.loadJobsFromDb();
-      const job = getFakeSleepForMultiJob({ timestamp: 100 });
+      TestUtils.stubWindowLog();
+      const job = getFakeSleepForMultiJob({ timestamp: 5 });
       const job2 = getFakeSleepForMultiJob({ timestamp: 200 });
       runnerMulti.startProcessing();
-      clock.tick(110);
+      clock.tick(100);
+
       // job should be started right away
       let result = await runnerMulti.addJob(job);
       expect(result).to.eq('job_started');
       result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_deferred');
       expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
-      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
+      expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier);
+
+      console.warn(
+        'runnerMulti.getJobList() initial',
+        runnerMulti.getJobList().map(m => m.identifier),
+        Date.now()
+      );
+      console.warn('=========== awaiting first job ==========');
 
       // each job takes 5s to finish, so let's tick once the first one should be done
-      clock.tick(5010);
-      await runnerMulti.waitCurrentJob();
-      clock.tick(5010);
-      await runnerMulti.waitCurrentJob();
+      clock.tick(5000);
+      expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier);
+      let awaited = await runnerMulti.waitCurrentJob();
+      expect(awaited).to.eq('await');
+      await sleepFor(10);
 
-      expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
+      console.warn('=========== awaited first job ==========');
+      expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job2.persistedData.identifier);
+
+      console.warn('=========== awaiting second job ==========');
 
       clock.tick(5000);
-      await runnerMulti.waitCurrentJob();
+
+      awaited = await runnerMulti.waitCurrentJob();
+      expect(awaited).to.eq('await');
+      await sleepFor(10); // those sleep for is just to let the runner the time to finish writing the tests to the DB and exit the handling of the previous test
+
+      console.warn('=========== awaited second job ==========');
+
+      expect(runnerMulti.getCurrentJobIdentifier()).to.eq(null);
 
       expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
@@ -219,24 +240,32 @@ describe('JobRunner', () => {
       clock.tick(110);
       // job should be started right away
       let result = await runnerMulti.addJob(job);
-      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
-
       expect(result).to.eq('job_started');
-      clock.tick(5010);
-      await runnerMulti.waitCurrentJob();
-      clock.tick(5010);
+      expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]);
+      expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier);
 
+      clock.tick(5000);
+      console.warn('=========== awaiting first job ==========');
+
+      await runnerMulti.waitCurrentJob();
       // just give some time for the runnerMulti to pick up a new job
-      await sleepFor(100);
+      await sleepFor(10);
+      expect(runnerMulti.getJobList()).to.deep.eq([]);
+      expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(null);
+      console.warn('=========== awaited first job ==========');
 
       // the first job should already be finished now
       result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_started');
       expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
 
+      console.warn('=========== awaiting second job ==========');
+
       // each job takes 5s to finish, so let's tick once the first one should be done
       clock.tick(5010);
       await runnerMulti.waitCurrentJob();
+      await sleepFor(10);
+      console.warn('=========== awaited second job ==========');
 
       expect(runnerMulti.getJobList()).to.deep.eq([]);
     });

From c2e3f1b587fa0c676b357cfb3180f4a695df9687 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 19 Apr 2023 16:50:16 +1000
Subject: [PATCH 068/178] chore: update libsession-util name & dependency

---
 package.json                                  |   2 +-
 ts/node/migration/sessionMigrations.ts        |   2 +-
 .../conversations/ConversationController.ts   |   2 +-
 .../libsession/libsession_utils_contacts.ts   |   2 +-
 .../libsession_utils_convo_info_volatile.ts   |   2 +-
 .../libsession_utils_user_groups.ts           |   2 +-
 .../libsession_wrapper_contacts_test.ts       |   2 +-
 .../libsession_wrapper_usergroups_test.ts     |   2 +-
 ts/types/sqlSharedTypes.ts                    |   2 +-
 .../browser/libsession_worker_functions.d.ts  |   2 +-
 .../browser/libsession_worker_interface.ts    |   2 +-
 .../node/libsession/libsession.worker.ts      |   2 +-
 yarn.lock                                     | 126 +++++++++++++-----
 13 files changed, 102 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index c3cf3c6b8..f94d69315 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
@@ -135,7 +136,6 @@
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
-    "session_util_wrapper": "https://github.com/oxen-io/libsession-util-nodejs/",
     "styled-components": "5.1.1",
     "uuid": "8.3.2"
   },
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 701f4c2bf..ebd0bada4 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -5,7 +5,7 @@ import {
   ConvoInfoVolatileWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
-} from 'session_util_wrapper';
+} from 'libsession_util_nodejs';
 import {
   CONVERSATION_PRIORITIES,
   ConversationAttributes,
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 456ee5752..860fac017 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -17,7 +17,7 @@ import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user
 import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { LibSessionUtil } from '../utils/libsession/libsession_utils';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
-import { ConvoVolatileType } from 'session_util_wrapper';
+import { ConvoVolatileType } from 'libsession_util_nodejs';
 
 let instance: ConversationController | null;
 
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 727537fe5..c5b3269c6 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -1,4 +1,4 @@
-import { ContactInfo } from 'session_util_wrapper';
+import { ContactInfo } from 'libsession_util_nodejs';
 import { ConversationModel } from '../../../models/conversation';
 import { getContactInfoFromDBValues } from '../../../types/sqlSharedTypes';
 import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 62ec458b9..2c23c4738 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,5 +1,5 @@
 import { isEmpty, uniq } from 'lodash';
-import { BaseConvoInfoVolatile, ConvoVolatileType } from 'session_util_wrapper';
+import { BaseConvoInfoVolatile, ConvoVolatileType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 2d63dd322..93a02e068 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,5 +1,5 @@
 import { uniq } from 'lodash';
-import { CommunityInfo, LegacyGroupInfo, UserGroupsType } from 'session_util_wrapper';
+import { CommunityInfo, LegacyGroupInfo, UserGroupsType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index e1cf49951..15e676fea 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -10,7 +10,7 @@ import { UserUtils } from '../../../../session/utils';
 import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-// import * as SessionUtilWrapper from 'session_util_wrapper';
+// import * as SessionUtilWrapper from 'libsession_util_nodejs';
 
 // tslint:disable-next-line: max-func-body-length
 describe('libsession_contacts', () => {
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index 1626bf1f4..118d26631 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -10,7 +10,7 @@ import { UserUtils } from '../../../../session/utils';
 import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-// import * as SessionUtilWrapper from 'session_util_wrapper';
+// import * as SessionUtilWrapper from 'libsession_util_nodejs';
 
 // tslint:disable-next-line: max-func-body-length
 describe('libsession_groups', () => {
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 9cb852381..9b54d4bd6 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,6 +1,6 @@
 import { from_hex } from 'libsodium-wrappers-sumo';
 import { isArray, isEmpty, isEqual } from 'lodash';
-import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
+import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'libsession_util_nodejs';
 import { OpenGroupV2Room } from '../data/opengroups';
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
index 6a9e9ebf4..4cb004816 100644
--- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts
+++ b/ts/webworker/workers/browser/libsession_worker_functions.d.ts
@@ -4,7 +4,7 @@ import {
   UserConfigActionsType,
   UserGroupsConfigActionsType,
   ConvoInfoVolatileConfigActionsType,
-} from 'session_util_wrapper';
+} from 'libsession_util_nodejs';
 
 // we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one)
 type UserConfig = 'UserConfig';
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 30d23f57e..996ba408d 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -11,7 +11,7 @@ import {
   LegacyGroupInfo,
   UserConfigWrapperActionsCalls,
   UserGroupsWrapperActionsCalls,
-} from 'session_util_wrapper';
+} from 'libsession_util_nodejs';
 
 let libsessionWorkerInterface: WorkerInterface | undefined;
 
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 9f747d835..b56eb7737 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -6,7 +6,7 @@ import {
   ConvoInfoVolatileWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
-} from 'session_util_wrapper';
+} from 'libsession_util_nodejs';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
 /**
diff --git a/yarn.lock b/yarn.lock
index 1d91b3188..ecf12a6b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1704,7 +1704,7 @@ abab@^2.0.5, abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@^1.0.0:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2011,6 +2011,15 @@ auto-bind@^4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
+axios@^1.3.2:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.5.tgz#e07209b39a0d11848e3e341fa087acd71dadc542"
+  integrity sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -2517,6 +2526,25 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
+cmake-js@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd"
+  integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA==
+  dependencies:
+    axios "^1.3.2"
+    debug "^4"
+    fs-extra "^10.1.0"
+    lodash.isplainobject "^4.0.6"
+    memory-stream "^1.0.0"
+    node-api-headers "^0.0.2"
+    npmlog "^6.0.2"
+    rc "^1.2.7"
+    semver "^7.3.8"
+    tar "^6.1.11"
+    url-join "^4.0.1"
+    which "^2.0.2"
+    yargs "^17.6.0"
+
 color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2861,7 +2889,7 @@ date-fns@^2.29.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3853,6 +3881,11 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
+follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
 foreground-child@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
@@ -3894,7 +3927,7 @@ fs-extra@9.0.0:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-extra@^10.0.0:
+fs-extra@^10.0.0, fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -5050,6 +5083,13 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz":
+  version "0.1.0"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz#f50616a42fa52bc908eb1267954368901774e1f8"
+  dependencies:
+    cmake-js "^7.2.1"
+    nan "^2.17.0"
+
 libsodium-sumo@^0.7.0:
   version "0.7.10"
   resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.10.tgz#169756dbf32088f42e30dfb0a7860074663fb0b4"
@@ -5135,6 +5175,11 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -5251,6 +5296,13 @@ mem@^5.0.0:
     mimic-fn "^2.1.0"
     p-is-promise "^2.1.0"
 
+memory-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2"
+  integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww==
+  dependencies:
+    readable-stream "^3.4.0"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5525,6 +5577,11 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+node-api-headers@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d"
+  integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg==
+
 node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -5548,22 +5605,6 @@ node-gyp@9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-gyp@^9.3.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -5595,13 +5636,6 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -5637,7 +5671,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0:
+npmlog@^6.0.0, npmlog@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -6381,7 +6415,7 @@ rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.1.0"
 
-rc@^1.2.8:
+rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6579,6 +6613,15 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.4.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -6966,13 +7009,6 @@ serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-"session_util_wrapper@https://github.com/oxen-io/libsession-util-nodejs/":
-  version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/#286f68c998d31abf9f9eaff6b66bbb3db54f7e64"
-  dependencies:
-    nan "^2.17.0"
-    node-gyp "^9.3.0"
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -7753,6 +7789,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+url-join@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
+  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
+
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
@@ -8083,7 +8124,7 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
+yargs-parser@^21.0.0, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -8141,6 +8182,19 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
+yargs@^17.6.0:
+  version "17.7.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
+  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From faea0501bbf18881304e5bd235b85c1faeef333f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 20 Apr 2023 16:32:53 +1000
Subject: [PATCH 069/178] chore: rollback to node-gyp way of building
 libsession wrapper

---
 package.json |   2 +-
 yarn.lock    | 125 ++++++++++++++++-----------------------------------
 2 files changed, 40 insertions(+), 87 deletions(-)

diff --git a/package.json b/package.json
index f94d69315..deedc507c 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
diff --git a/yarn.lock b/yarn.lock
index ecf12a6b5..588e6359a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1704,7 +1704,7 @@ abab@^2.0.5, abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1:
+abbrev@1, abbrev@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2011,15 +2011,6 @@ auto-bind@^4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
-axios@^1.3.2:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.5.tgz#e07209b39a0d11848e3e341fa087acd71dadc542"
-  integrity sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==
-  dependencies:
-    follow-redirects "^1.15.0"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -2526,25 +2517,6 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
-cmake-js@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd"
-  integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA==
-  dependencies:
-    axios "^1.3.2"
-    debug "^4"
-    fs-extra "^10.1.0"
-    lodash.isplainobject "^4.0.6"
-    memory-stream "^1.0.0"
-    node-api-headers "^0.0.2"
-    npmlog "^6.0.2"
-    rc "^1.2.7"
-    semver "^7.3.8"
-    tar "^6.1.11"
-    url-join "^4.0.1"
-    which "^2.0.2"
-    yargs "^17.6.0"
-
 color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2889,7 +2861,7 @@ date-fns@^2.29.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3881,11 +3853,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
 foreground-child@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
@@ -3927,7 +3894,7 @@ fs-extra@9.0.0:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-extra@^10.0.0, fs-extra@^10.1.0:
+fs-extra@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -5083,12 +5050,19 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz":
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff":
   version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.0/libsession_util_nodejs-v0.1.0.tar.gz#f50616a42fa52bc908eb1267954368901774e1f8"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff"
   dependencies:
-    cmake-js "^7.2.1"
     nan "^2.17.0"
+    node-gyp "^9.3.0"
+
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs#ec1c65776de580a62bc2e3498d931572ca97006f":
+  version "0.1.0"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs#ec1c65776de580a62bc2e3498d931572ca97006f"
+  dependencies:
+    nan "^2.17.0"
+    node-gyp "^9.3.0"
 
 libsodium-sumo@^0.7.0:
   version "0.7.10"
@@ -5175,11 +5149,6 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -5296,13 +5265,6 @@ mem@^5.0.0:
     mimic-fn "^2.1.0"
     p-is-promise "^2.1.0"
 
-memory-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2"
-  integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww==
-  dependencies:
-    readable-stream "^3.4.0"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5577,11 +5539,6 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
-node-api-headers@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d"
-  integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg==
-
 node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -5605,6 +5562,22 @@ node-gyp@9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
+node-gyp@^9.3.0:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
+  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -5636,6 +5609,13 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -5671,7 +5651,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0, npmlog@^6.0.2:
+npmlog@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -6415,7 +6395,7 @@ rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.1.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6613,15 +6593,6 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -7789,11 +7760,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-join@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
-  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
-
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
@@ -8124,7 +8090,7 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0, yargs-parser@^21.1.1:
+yargs-parser@^21.0.0:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -8182,19 +8148,6 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
-yargs@^17.6.0:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From cbffc299507be57adaebca4c81e330da406dc974 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 21 Apr 2023 15:17:24 +1000
Subject: [PATCH 070/178] fix: run tests for libsession-util integration and
 fix issue

---
 ts/components/leftpane/LeftPane.tsx           |  7 +--
 .../leftpane/LeftPaneMessageSection.tsx       |  3 --
 .../leftpane/MessageRequestsBanner.tsx        |  6 ++-
 .../overlay/SessionJoinableDefaultRooms.tsx   |  2 +-
 ts/components/menu/Menu.tsx                   | 12 ++---
 ts/interactions/conversationInteractions.ts   |  6 +--
 ts/interactions/messageInteractions.ts        |  4 +-
 ts/models/conversation.ts                     |  5 --
 ts/node/migration/sessionMigrations.ts        | 24 ++++++---
 ts/receiver/configMessage.ts                  | 52 +++++++++++++------
 ts/receiver/contentMessage.ts                 |  4 +-
 ts/receiver/opengroup.ts                      |  4 +-
 ts/receiver/queuedJob.ts                      | 15 ++++++
 .../conversations/ConversationController.ts   | 32 +++++++-----
 ts/session/profile_manager/ProfileManager.ts  |  9 +++-
 .../jobs/ConfigurationSyncDumpJob.ts          |  4 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  5 +-
 .../utils/libsession/libsession_utils.ts      |  4 +-
 .../libsession_utils_convo_info_volatile.ts   |  4 +-
 .../libsession_utils_user_groups.ts           | 31 +++++++++--
 .../libsession_utils_user_profile.ts          | 16 ++++--
 ts/state/selectors/conversations.ts           |  5 ++
 ts/util/reactions.ts                          |  6 +--
 .../browser/libsession_worker_interface.ts    | 20 +++----
 24 files changed, 181 insertions(+), 99 deletions(-)

diff --git a/ts/components/leftpane/LeftPane.tsx b/ts/components/leftpane/LeftPane.tsx
index 26aa9a9ee..ff2c91347 100644
--- a/ts/components/leftpane/LeftPane.tsx
+++ b/ts/components/leftpane/LeftPane.tsx
@@ -3,16 +3,15 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { SectionType } from '../../state/ducks/section';
-import { SessionTheme } from '../../themes/SessionTheme';
 import { getLeftPaneLists } from '../../state/selectors/conversations';
 import { getSearchResults, isSearching } from '../../state/selectors/search';
 import { getFocusedSection, getOverlayMode } from '../../state/selectors/section';
-import { getHideMessageRequestBanner } from '../../state/selectors/userConfig';
+import { SessionTheme } from '../../themes/SessionTheme';
+import { SessionToastContainer } from '../SessionToastContainer';
 import { CallInFullScreenContainer } from '../calling/CallInFullScreenContainer';
 import { DraggableCallContainer } from '../calling/DraggableCallContainer';
 import { IncomingCallDialog } from '../calling/IncomingCallDialog';
 import { ModalContainer } from '../dialog/ModalContainer';
-import { SessionToastContainer } from '../SessionToastContainer';
 import { ActionsPanel } from './ActionsPanel';
 import { LeftPaneMessageSection } from './LeftPaneMessageSection';
 import { LeftPaneSettingSection } from './LeftPaneSettingSection';
@@ -28,7 +27,6 @@ const InnerLeftPaneMessageSection = () => {
   const searchResults = showSearch ? useSelector(getSearchResults) : undefined;
 
   const lists = showSearch ? undefined : useSelector(getLeftPaneLists);
-  const messageRequestsEnabled = useSelector(getHideMessageRequestBanner);
   const overlayMode = useSelector(getOverlayMode);
 
   return (
@@ -37,7 +35,6 @@ const InnerLeftPaneMessageSection = () => {
       conversations={lists?.conversations || []}
       contacts={lists?.contacts || []}
       searchResults={searchResults}
-      messageRequestsEnabled={messageRequestsEnabled}
       overlayMode={overlayMode}
     />
   );
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index 1d0ac4e49..e439957ac 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -27,8 +27,6 @@ export interface Props {
   contacts: Array<ReduxConversationType>;
   conversations?: Array<ConversationListItemProps>;
   searchResults?: SearchResultsProps;
-
-  messageRequestsEnabled?: boolean;
   overlayMode: OverlayMode | undefined;
 }
 
@@ -70,7 +68,6 @@ const ClosableOverlay = () => {
 export class LeftPaneMessageSection extends React.Component<Props> {
   public constructor(props: Props) {
     super(props);
-
     autoBind(this);
   }
 
diff --git a/ts/components/leftpane/MessageRequestsBanner.tsx b/ts/components/leftpane/MessageRequestsBanner.tsx
index ece893518..8f06088d3 100644
--- a/ts/components/leftpane/MessageRequestsBanner.tsx
+++ b/ts/components/leftpane/MessageRequestsBanner.tsx
@@ -7,6 +7,7 @@ import { getUnreadConversationRequests } from '../../state/selectors/conversatio
 import { getHideMessageRequestBanner } from '../../state/selectors/userConfig';
 import { SessionIcon, SessionIconSize, SessionIconType } from '../icon';
 import { MessageRequestBannerContextMenu } from '../menu/MessageRequestBannerContextMenu';
+import { isSearching } from '../../state/selectors/search';
 
 const StyledMessageRequestBanner = styled.div`
   height: 64px;
@@ -87,7 +88,10 @@ export const MessageRequestsBanner = (props: { handleOnClick: () => any }) => {
   const conversationRequestsUnread = useSelector(getUnreadConversationRequests).length;
   const hideRequestBanner = useSelector(getHideMessageRequestBanner);
 
-  if (!conversationRequestsUnread || hideRequestBanner) {
+  // when searching hide the message request banner
+  const isCurrentlySearching = useSelector(isSearching);
+
+  if (!conversationRequestsUnread || hideRequestBanner || isCurrentlySearching) {
     return null;
   }
 
diff --git a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
index 4c782bad1..cae773e81 100644
--- a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
+++ b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
@@ -61,7 +61,7 @@ const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
           });
       }
     } catch (e) {
-      window?.log?.warn(e);
+      window?.log?.warn(e.message);
     }
     return () => {
       isCancelled = true;
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 384a2549f..813047bd9 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -41,12 +41,10 @@ import {
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
 import { getIsMessageSection } from '../../state/selectors/section';
-import {
-  useSelectedConversationKey,
-  useSelectedIsPrivateFriend,
-} from '../../state/selectors/selectedConversation';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
+import { PubKey } from '../../session/types';
 
 function showDeleteContact(
   isGroup: boolean,
@@ -339,7 +337,7 @@ export const CopyMenuItem = (): JSX.Element | null => {
 export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const convoId = useConvoIdFromContext();
   const isIncomingRequest = useIsIncomingRequest(convoId);
-  if (!isIncomingRequest) {
+  if (!isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) {
     return (
       <Item onClick={() => markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
     );
@@ -361,7 +359,7 @@ export const BlockMenuItem = (): JSX.Element | null => {
   const isPrivate = useIsPrivate(convoId);
   const isIncomingRequest = useIsIncomingRequest(convoId);
 
-  if (!isMe && isPrivate && !isIncomingRequest) {
+  if (!isMe && isPrivate && !isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
       ? () => unblockConvoById(convoId)
@@ -391,7 +389,7 @@ export const ChangeNicknameMenuItem = () => {
   const convoId = useConvoIdFromContext();
   const isMe = useIsMe(convoId);
   const isPrivate = useIsPrivate(convoId);
-  const isPrivateAndFriend = useSelectedIsPrivateFriend();
+  const isPrivateAndFriend = useIsPrivateAndFriend(convoId);
   const dispatch = useDispatch();
 
   if (isMe || !isPrivate || !isPrivateAndFriend) {
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 0b840c08f..cc0353f8a 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -105,7 +105,7 @@ export const approveConvoAndSendResponse = async (
 ) => {
   const convoToApprove = getConversationController().get(conversationId);
 
-  if (!convoToApprove || convoToApprove.isApproved()) {
+  if (!convoToApprove) {
     window?.log?.info('Conversation is already approved.');
     return;
   }
@@ -134,8 +134,8 @@ export async function declineConversationWithoutConfirm({
 }) {
   const conversationToDecline = getConversationController().get(conversationId);
 
-  if (!conversationToDecline || !conversationToDecline.isApproved()) {
-    window?.log?.info('Conversation is already declined.');
+  if (!conversationToDecline || !conversationToDecline.isPrivate()) {
+    window?.log?.info('No conversation to decline.');
     return;
   }
 
diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts
index 76cfccec9..0b05c9fb9 100644
--- a/ts/interactions/messageInteractions.ts
+++ b/ts/interactions/messageInteractions.ts
@@ -19,7 +19,7 @@ export function banUser(userToBan: string, conversationId: string) {
   try {
     pubKeyToBan = PubKey.cast(userToBan);
   } catch (e) {
-    window?.log?.warn(e);
+    window?.log?.warn(e.message);
     ToastUtils.pushUserBanFailure();
     return;
   }
@@ -44,7 +44,7 @@ export function unbanUser(userToUnBan: string, conversationId: string) {
   try {
     pubKeyToUnban = PubKey.cast(userToUnBan);
   } catch (e) {
-    window?.log?.warn(e);
+    window?.log?.warn(e.message);
     ToastUtils.pushUserBanFailure();
     return;
   }
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 5f2587d6d..7c9a6a83c 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -982,11 +982,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    // TODOLATER we should maybe mark things here as read, but we need a readAt timestamp, and I am not too sure what we should use (considering that disappearing messages needs a real readAt)
-    // const sentAt = messageAttributes.sent_at || messageAttributes.serverTimestamp;
-    // if (sentAt) {
-    //   await this.markConversationRead(sentAt);
-    // }
     return this.addSingleMessage({
       ...messageAttributes,
       conversationId: this.id,
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index ebd0bada4..05f45bc6d 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,11 +1,11 @@
 import * as BetterSqlite3 from 'better-sqlite3';
-import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
 import {
   ContactsConfigWrapperInsideWorker,
   ConvoInfoVolatileWrapperInsideWorker,
   UserConfigWrapperInsideWorker,
   UserGroupsWrapperInsideWorker,
 } from 'libsession_util_nodejs';
+import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationAttributes,
@@ -21,13 +21,13 @@ import {
 import {
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
   CONVERSATIONS_TABLE,
-  dropFtsAndTriggers,
   GUARD_NODE_TABLE,
   LAST_HASHES_TABLE,
   MESSAGES_TABLE,
   NODES_FOR_PUBKEY_TABLE,
-  objectToJSON,
   OPEN_GROUP_ROOMS_V2_TABLE,
+  dropFtsAndTriggers,
+  objectToJSON,
   rebuildFtsTable,
   toSqliteBoolean,
 } from '../database_utility';
@@ -1572,13 +1572,23 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       const ourDbName = ourConversation.displayNameInProfile || '';
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
-      userProfileWrapper.setName(ourDbName);
-
+      const ourConvoPriority = ourConversation.priority;
       if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
-        userProfileWrapper.setProfilePicture(ourDbProfileUrl, ourDbProfileKey);
+        userProfileWrapper.setUserInfo(
+          ourDbName,
+          ourConvoPriority,
+          ourDbProfileUrl || '',
+          ourDbProfileKey
+        );
       } else {
-        userProfileWrapper.setProfilePicture('', new Uint8Array());
+        userProfileWrapper.setUserInfo(
+          ourDbName,
+          ourConvoPriority, // consider that the Note to self is hidden on a fresh account (without avatar set)
+          '',
+          new Uint8Array()
+        );
       }
+
       insertContactIntoContactWrapper(
         ourConversation,
         blockedNumbers,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index c1eeaee60..ed2e49212 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import _, { compact, isEmpty, toNumber } from 'lodash';
+import { compact, isEmpty, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
 import { ConversationInteraction } from '../interactions';
@@ -12,15 +12,17 @@ import {
 import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
+import { getSwarmPollingInstance } from '../session/apis/snode_api';
 import { getConversationController } from '../session/conversations';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
+import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
+import { toHex } from '../session/utils/String';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
-import { toHex } from '../session/utils/String';
 import { configurationMessageReceived, trigger } from '../shims/events';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
@@ -37,6 +39,7 @@ import {
 import { removeFromCache } from './cache';
 import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGroups';
 import { HexKeyPair } from './keypairs';
+import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
 
 function groupByVariant(
@@ -89,7 +92,7 @@ async function mergeConfigsWithIncomingUpdates(
       const needsDump = await GenericWrapperActions.needsDump(variant);
       const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
 
-      window.log.info(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
+      window.log.debug(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
 
       const incomingConfResult: IncomingConfResult = {
         needsDump,
@@ -109,20 +112,23 @@ async function mergeConfigsWithIncomingUpdates(
 }
 
 async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  const updatedUserName = await UserConfigWrapperActions.getName();
   if (!result.needsDump) {
     return result;
   }
-
-  const updatedProfilePicture = await UserConfigWrapperActions.getProfilePicture();
-  const picUpdate = !isEmpty(updatedProfilePicture.key) && !isEmpty(updatedProfilePicture.url);
+  const updateUserInfo = await UserConfigWrapperActions.getUserInfo();
+  if (!updateUserInfo) {
+    return result;
+  }
+  const picUpdate = !isEmpty(updateUserInfo.key) && !isEmpty(updateUserInfo.url);
 
   await updateOurProfileLegacyOrViaLibSession(
     result.latestEnvelopeTimestamp,
-    updatedUserName,
-    picUpdate ? updatedProfilePicture.url : null,
-    picUpdate ? updatedProfilePicture.key : null
+    updateUserInfo.name,
+    picUpdate ? updateUserInfo.url : null,
+    picUpdate ? updateUserInfo.key : null,
+    updateUserInfo.priority
   );
+
   return result;
 }
 
@@ -205,11 +211,16 @@ async function handleCommunitiesUpdate() {
   // first let's check which communities needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB
 
   const allCommunitiesInWrapper = await UserGroupsWrapperActions.getAllCommunities();
+  window.log.debug(
+    'allCommunitiesInWrapper',
+    allCommunitiesInWrapper.map(m => m.fullUrl)
+  );
   const allCommunitiesConversation = getConversationController()
     .getConversations()
     .filter(SessionUtilUserGroups.isCommunityToStoreInWrapper);
 
   const allCommunitiesIdsInDB = allCommunitiesConversation.map(m => m.id as string);
+  window.log.debug('allCommunitiesIdsInDB', allCommunitiesIdsInDB);
 
   const communitiesIdsInWrapper = compact(
     allCommunitiesInWrapper.map(m => {
@@ -291,7 +302,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups();
   const allLegacyGroupsInDb = getConversationController()
     .getConversations()
-    .filter(SessionUtilUserGroups.isLegacyGroupToStoreInWrapper);
+    .filter(SessionUtilUserGroups.isLegacyGroupToRemoveFromDBIfNotInWrapper);
 
   const allLegacyGroupsIdsInDB = allLegacyGroupsInDb.map(m => m.id as string);
   const allLegacyGroupsIdsInWrapper = allLegacyGroupsInWrapper.map(m => m.pubkeyHex);
@@ -300,6 +311,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     return !allLegacyGroupsIdsInDB.includes(m.pubkeyHex);
   });
 
+  window.log.debug(`allLegacyGroupsInWrapper: ${allLegacyGroupsInWrapper.map(m => m.pubkeyHex)} `);
+  window.log.debug(`allLegacyGroupsIdsInDB: ${allLegacyGroupsIdsInDB} `);
+
   const legacyGroupsToLeaveInDB = allLegacyGroupsInDb.filter(m => {
     return !allLegacyGroupsIdsInWrapper.includes(m.id);
   });
@@ -385,6 +399,11 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       );
       changes = true;
     }
+    // start polling for this new group
+    getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex));
+
+    // trigger decrypting of all this group messages we did not decrypt successfully yet.
+    await queueAllCachedFromSource(fromWrapper.pubkeyHex);
 
     if (changes) {
       await legacyGroupConvo.commit();
@@ -578,6 +597,7 @@ async function processMergingResults(results: Map<ConfigWrapperObjectTypes, Inco
           break;
         default:
           try {
+            // we catch errors here because an old client knowing about a new type of config coming from the network should not just crash
             assertUnreachable(kind, `processMergingResults unsupported kind: "${kind}"`);
           } catch (e) {
             window.log.warn('assertUnreachable failed', e.message);
@@ -623,7 +643,7 @@ async function handleConfigMessagesViaLibSession(
   }
 
   window?.log?.info(
-    `Handling our sharedConfig message via libsession_util: ${configMessages.length}`
+    `Handling our sharedConfig message via libsession_util; count: ${configMessages.length}`
   );
 
   const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages);
@@ -635,9 +655,10 @@ async function updateOurProfileLegacyOrViaLibSession(
   sentAt: number,
   displayName: string,
   profileUrl: string | null,
-  profileKey: Uint8Array | null
+  profileKey: Uint8Array | null,
+  priority: number | null // passing null means to not update the priority at all (used for legacy config message for now)
 ) {
-  await ProfileManager.updateOurProfileSync(displayName, profileUrl, profileKey);
+  await ProfileManager.updateOurProfileSync(displayName, profileUrl, profileKey, priority);
 
   await setLastProfileUpdateTimestamp(toNumber(sentAt));
   // do not trigger a signin by linking if the display name is empty
@@ -667,7 +688,8 @@ async function handleOurProfileUpdateLegacy(
       toNumber(sentAt),
       displayName,
       profilePicture,
-      profileKey
+      profileKey,
+      null // passing null to say do not the prioroti, as we do not get one from the legacy config message
     );
   }
 }
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 9fe51ba64..75cd4016a 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -44,7 +44,7 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH
     // the sogs messages do not come as milliseconds but just seconds, so we override it
     await innerHandleSwarmContentMessage(envelope, sentAtTimestamp, plaintext, messageHash);
   } catch (e) {
-    window?.log?.warn(e);
+    window?.log?.warn(e.message);
   }
 }
 
@@ -466,7 +466,7 @@ export async function innerHandleSwarmContentMessage(
       );
     }
   } catch (e) {
-    window?.log?.warn(e);
+    window?.log?.warn(e.message);
   }
 }
 
diff --git a/ts/receiver/opengroup.ts b/ts/receiver/opengroup.ts
index 80ebe0e80..0f6513fe2 100644
--- a/ts/receiver/opengroup.ts
+++ b/ts/receiver/opengroup.ts
@@ -6,10 +6,10 @@ import {
 import { SignalService } from '../protobuf';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupMessageV4 } from '../session/apis/open_group_api/opengroupV2/OpenGroupServerPoller';
+import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
 import { getConversationController } from '../session/conversations';
 import { removeMessagePadding } from '../session/crypto/BufferPadding';
-import { UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { fromBase64ToArray } from '../session/utils/String';
 import { cleanIncomingDataMessage, messageHasVisibleContent } from './dataMessage';
@@ -85,7 +85,7 @@ const handleOpenGroupMessage = async (
   }
 
   void groupConvo.queueJob(async () => {
-    const isMe = UserUtils.isUsFromCache(sender);
+    const isMe = isUsAnySogsFromCache(sender);
 
     // this timestamp has already been forced to ms by the handleMessagesResponseV4() function
     const commonAttributes = { serverTimestamp: sentTimestamp, serverId, conversationId };
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 1eb9db419..807a63a79 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -311,6 +311,20 @@ async function handleExpirationTimerUpdateNoCommit(
   await conversation.updateExpireTimer(expireTimer, source, message.get('received_at'), {}, false);
 }
 
+async function markConvoAsReadIfOutgoingMessage(
+  conversation: ConversationModel,
+  message: MessageModel
+) {
+  const isOutgoingMessage =
+    message.get('type') === 'outgoing' || message.get('direction') === 'outgoing';
+  if (isOutgoingMessage) {
+    const sentAt = message.get('sent_at') || message.get('serverTimestamp');
+    if (sentAt) {
+      conversation.markConversationRead(sentAt);
+    }
+  }
+}
+
 export async function handleMessageJob(
   messageModel: MessageModel,
   conversation: ConversationModel,
@@ -386,6 +400,7 @@ export async function handleMessageJob(
       );
     }
 
+    await markConvoAsReadIfOutgoingMessage(conversation, messageModel);
     if (messageModel.get('unread')) {
       conversation.throttledNotify(messageModel);
     }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 860fac017..83238ad60 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -7,17 +7,18 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou
 import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { PubKey } from '../types';
 
+import { ConvoVolatileType } from 'libsession_util_nodejs';
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
+import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface';
 import { leaveClosedGroup } from '../group/closed-group';
+import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
+import { LibSessionUtil } from '../utils/libsession/libsession_utils';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
-import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
-import { LibSessionUtil } from '../utils/libsession/libsession_utils';
-import { assertUnreachable } from '../../types/sqlSharedTypes';
-import { ConvoVolatileType } from 'libsession_util_nodejs';
 
 let instance: ConversationController | null;
 
@@ -235,6 +236,18 @@ export class ConversationController {
         break;
       case 'Community':
         window?.log?.info('leaving open group v2', conversation.id);
+
+        try {
+          const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(conversation.id);
+
+          await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
+            conversation.id,
+            fromWrapper?.fullUrl || ''
+          );
+        } catch (e) {
+          window?.log?.info('SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:', e);
+        }
+
         // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
         try {
           await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
@@ -242,15 +255,6 @@ export class ConversationController {
           window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
         }
 
-        try {
-          await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
-            conversation.id,
-            conversation.id
-          );
-        } catch (e) {
-          window?.log?.info('SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:', e);
-        }
-
         const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
         if (roomInfos) {
           getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
@@ -264,7 +268,7 @@ export class ConversationController {
         }
         break;
       case 'LegacyGroup':
-        window.log.info(`deleteContact ClosedGroup case: ${id}`);
+        window.log.info(`deleteContact ClosedGroup case: ${conversation.id}`);
         await leaveClosedGroup(conversation.id);
         await SessionUtilUserGroups.removeLegacyGroupFromWrapper(conversation.id);
         await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index a7f2c0299..de418c279 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -10,7 +10,8 @@ import { toHex } from '../utils/String';
 async function updateOurProfileSync(
   displayName: string | undefined,
   profileUrl: string | null,
-  profileKey: Uint8Array | null
+  profileKey: Uint8Array | null,
+  priority: number | null
 ) {
   const us = UserUtils.getOurPubKeyStrFromCache();
   const ourConvo = getConversationController().get(us);
@@ -19,7 +20,11 @@ async function updateOurProfileSync(
     return;
   }
 
-  return updateProfileOfContact(us, displayName, profileUrl, profileKey);
+  await updateProfileOfContact(us, displayName, profileUrl, profileKey);
+  if (priority !== null && ourConvo.get('priority') !== priority) {
+    ourConvo.set('priority', priority);
+    await ourConvo.commit();
+  }
 }
 
 /**
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
index 616ac2fa5..10bab65e2 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
@@ -99,7 +99,7 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
       // so when we call needsDump(), we know for sure that we are up to date
 
       // TODOLATER we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
-
+      // I think dumping should not fetch data from the DB again, but instead just use the data already in the wrapper.
       for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
@@ -174,7 +174,7 @@ async function queueNewJobIfNeeded() {
 
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncDumpRunner.addJob(
-      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() })
+      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() + 1000 }) // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
     );
   } else {
     // if we did run at 100, and it is currently 110, diff is 10
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 15dc60231..672f1505f 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -168,6 +168,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         window.log.warn('did not find our own conversation');
         return RunJobResult.PermanentFailure;
       }
+
       for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
         const variant = LibSessionUtil.requiredUserVariants[index];
         switch (variant) {
@@ -292,9 +293,9 @@ async function queueNewJobIfNeeded() {
   ) {
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncRunner.addJob(
-      new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() })
+      new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + 1000 })
     );
-    window.log.debug('Scheduling ConfSyncJob: ASAP');
+    window.log.debug('Scheduling ConfSyncJob: ASAP'); // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
   } else {
     // if we did run at t=100, and it is currently t=110, the difference is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index f648a505b..c703f8058 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -98,17 +98,18 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   }
 
   const results: Array<OutgoingConfResult> = [];
+  const variantsNeedingPush = new Set<ConfigWrapperObjectTypes>();
 
   for (let index = 0; index < dumps.length; index++) {
     const dump = dumps[index];
     const variant = dump.variant;
     const needsPush = await GenericWrapperActions.needsPush(variant);
-    window.log.debug(`needsPush ${needsPush} for variant: ${variant}`);
 
     if (!needsPush) {
       continue;
     }
 
+    variantsNeedingPush.add(variant);
     const { data, seqno, hashes } = await GenericWrapperActions.push(variant);
 
     const kind = variantToKind(variant);
@@ -124,6 +125,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
       namespace,
     });
   }
+  window.log.debug(`those variants needs push: "${[...variantsNeedingPush]}"`);
 
   return results;
 }
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 2c23c4738..18993a5fe 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -242,9 +242,9 @@ function getVolatileInfoCached(convoId: string): BaseConvoInfoVolatile | undefin
 /**
  * Removes the matching community from the wrapper and from the cached list of communities
  */
-async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutPubkey: string) {
+async function removeCommunityFromWrapper(convoId: string, fullUrlWithPubkey: string) {
   try {
-    await ConvoInfoVolatileWrapperActions.eraseCommunityByFullUrl(fullUrlWithOrWithoutPubkey);
+    await ConvoInfoVolatileWrapperActions.eraseCommunityByFullUrl(fullUrlWithPubkey);
   } catch (e) {
     window.log.warn('removeCommunityFromWrapper failed with ', e.message);
   }
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 93a02e068..348a5b188 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -66,6 +66,27 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean {
   );
 }
 
+/**
+ * We do not want to include groups left in the wrapper, but when receiving a list of wrappers from the network we need to check against the one present locally but already left, to know we need to remove them.
+ *
+ * This is to take care of this case:
+ * - deviceA creates group
+ * - deviceB joins group
+ * - deviceA leaves the group
+ * - deviceB leaves the group
+ * - deviceA removes the group entirely from the wrapper
+ * - deviceB receives the wrapper update and needs to remove the group from the DB
+ *
+ * But, as the group was already left, it would not be accounted for by `isLegacyGroupToStoreInWrapper`
+ *
+ */
+function isLegacyGroupToRemoveFromDBIfNotInWrapper(convo: ConversationModel): boolean {
+  // this filter is based on `isLegacyGroupToStoreInWrapper`
+  return (
+    convo.isGroup() && !convo.isPublic() && convo.id.startsWith('05') // new closed groups won't start with 05
+  );
+}
+
 /**
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that community does not exist in the wrapper, it is created before being updated.
@@ -221,10 +242,13 @@ function getAllLegacyGroups(): Array<LegacyGroupInfo> {
  * Remove the matching legacy group from the wrapper and from the cached list of legacy groups
  */
 async function removeLegacyGroupFromWrapper(groupPk: string) {
-  const fromWrapper = await UserGroupsWrapperActions.getLegacyGroup(groupPk);
-
-  if (fromWrapper) {
+  try {
     await UserGroupsWrapperActions.eraseLegacyGroup(groupPk);
+  } catch (e) {
+    window.log.warn(
+      `UserGroupsWrapperActions.eraseLegacyGroup with = ${groupPk} failed with`,
+      e.message
+    );
   }
 
   mappedLegacyGroupWrapperValues.delete(groupPk);
@@ -257,6 +281,7 @@ export const SessionUtilUserGroups = {
 
   // legacy group
   isLegacyGroupToStoreInWrapper,
+  isLegacyGroupToRemoveFromDBIfNotInWrapper,
   getLegacyGroupCached,
   getAllLegacyGroups,
   removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 1991b3ea5..ab81913d8 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -3,6 +3,7 @@ import { UserUtils } from '..';
 import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { getConversationController } from '../../conversations';
 import { fromHexToArray } from '../String';
+import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes';
 
 async function insertUserProfileIntoWrapper(convoId: string) {
   if (!isUserProfileToStoreInWrapper(convoId)) {
@@ -18,12 +19,21 @@ async function insertUserProfileIntoWrapper(convoId: string) {
   const dbName = ourConvo.get('displayNameInProfile') || '';
   const dbProfileUrl = ourConvo.get('avatarPointer') || '';
   const dbProfileKey = fromHexToArray(ourConvo.get('profileKey') || '');
-  await UserConfigWrapperActions.setName(dbName);
 
   if (dbProfileUrl && !isEmpty(dbProfileKey)) {
-    await UserConfigWrapperActions.setProfilePicture(dbProfileUrl, dbProfileKey);
+    await UserConfigWrapperActions.setUserInfo(
+      dbName,
+      ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
+      dbProfileUrl,
+      dbProfileKey
+    );
   } else {
-    await UserConfigWrapperActions.setProfilePicture('', new Uint8Array());
+    await UserConfigWrapperActions.setUserInfo(
+      dbName,
+      ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
+      '',
+      new Uint8Array()
+    );
   }
 }
 
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index ea294aef3..88396aa9b 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -288,6 +288,11 @@ const _getLeftPaneLists = (
       directConversations.push(conversation);
     }
 
+    // a private conversation not approved is a message request. Exclude them from the left pane lists
+    if (conversation.isPrivate && !conversation.isApproved) {
+      continue;
+    }
+
     const isPrivateButHidden =
       conversation.isPrivate &&
       conversation.priority &&
diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts
index 06451e852..f1f40d46c 100644
--- a/ts/util/reactions.ts
+++ b/ts/util/reactions.ts
@@ -58,7 +58,7 @@ const getMessageByReaction = async (
   }
 
   if (!originalMessage) {
-    window?.log?.warn(`Cannot find the original reacted message ${originalMessageId}.`);
+    window?.log?.debug(`Cannot find the original reacted message ${originalMessageId}.`);
     return null;
   }
 
@@ -236,7 +236,7 @@ const handleMessageReaction = async ({
 const handleClearReaction = async (conversationId: string, serverId: number, emoji: string) => {
   const originalMessage = await Data.getMessageByServerId(conversationId, serverId);
   if (!originalMessage) {
-    window?.log?.warn(
+    window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
     return;
@@ -269,7 +269,7 @@ const handleOpenGroupMessageReactions = async (
 ) => {
   const originalMessage = await Data.getMessageByServerId(conversationId, serverId);
   if (!originalMessage) {
-    window?.log?.warn(
+    window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
     return;
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 996ba408d..dfb58369a 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -92,21 +92,13 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   storageNamespace: async () => GenericWrapperActions.storageNamespace('UserConfig'),
 
   /** UserConfig wrapper specific actions */
-  getName: async () =>
-    callLibSessionWorker(['UserConfig', 'getName']) as Promise<
-      ReturnType<UserConfigWrapperActionsCalls['getName']>
+  getUserInfo: async () =>
+    callLibSessionWorker(['UserConfig', 'getUserInfo']) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['getUserInfo']>
     >,
-  getProfilePicture: async () =>
-    callLibSessionWorker(['UserConfig', 'getProfilePicture']) as Promise<
-      ReturnType<UserConfigWrapperActionsCalls['getProfilePicture']>
-    >,
-  setName: async (name: string) =>
-    callLibSessionWorker(['UserConfig', 'setName', name]) as Promise<
-      ReturnType<UserConfigWrapperActionsCalls['setName']>
-    >,
-  setProfilePicture: async (url: string, key: Uint8Array) =>
-    callLibSessionWorker(['UserConfig', 'setProfilePicture', url, key]) as Promise<
-      ReturnType<UserConfigWrapperActionsCalls['setProfilePicture']>
+  setUserInfo: async (name: string, priority: number, url: string, key: Uint8Array) =>
+    callLibSessionWorker(['UserConfig', 'setUserInfo', name, priority, url, key]) as Promise<
+      ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>
     >,
 };
 

From 00802542867d68e208296f1f94383b03fc0b48e1 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 21 Apr 2023 16:17:14 +1000
Subject: [PATCH 071/178] fix: add NoticeBanner showing when legacy config
 message received

---
 _locales/en/messages.json               |  1 +
 stylesheets/_index.scss                 |  4 +-
 stylesheets/_session.scss               |  2 +-
 stylesheets/_session_conversation.scss  |  1 +
 stylesheets/_session_left_pane.scss     |  6 ++-
 ts/components/NoticeBanner.tsx          | 51 +++++++++++++++++++++++++
 ts/components/SessionInboxView.tsx      | 46 ++++++++++++++++++++--
 ts/components/leftpane/ActionsPanel.tsx |  2 +-
 ts/data/settings-key.ts                 |  2 +
 ts/receiver/configMessage.ts            |  2 +
 ts/types/LocalizerKeys.ts               |  1 +
 11 files changed, 107 insertions(+), 11 deletions(-)
 create mode 100644 ts/components/NoticeBanner.tsx

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0b449a955..132d92303 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -490,6 +490,7 @@
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 377b3f550..44ca0de80 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -6,6 +6,7 @@
 
 .inbox.index {
   display: flex;
+  flex-direction: column;
   background-color: var(--background-primary-color);
 }
 
@@ -64,9 +65,6 @@
   flex-grow: 1;
   display: flex;
 }
-.conversation.placeholder {
-  height: 100vh;
-}
 .left-pane-wrapper {
   flex: 1;
 }
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index ec5a9788c..fc4bd757e 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -525,7 +525,7 @@ label {
 
 .session-settings {
   width: 100%;
-  height: 100vh;
+  height: 100%;
   display: flex;
   flex-direction: column;
   background-color: var(--background-secondary-color);
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index d31334601..867ac787b 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -82,6 +82,7 @@
   display: flex;
   flex-direction: column;
   max-width: calc(100vw - 380px);
+  height: 100%;
 
   .selection-mode {
     .messages-container > *:not(.message-selected) {
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 2e8cd3b07..8ca3e21b2 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -70,14 +70,14 @@ $session-compose-margin: 20px;
 
 .module-left-pane {
   position: relative;
-  height: 100vh;
+  height: 100%;
   flex-shrink: 0;
   border-left: 1px solid var(--border-color);
   border-right: 1px solid var(--border-color);
 
   &-session {
     display: flex;
-    height: 100vh;
+    height: 100%;
   }
 
   &__header {
@@ -143,6 +143,8 @@ $session-compose-margin: 20px;
 
 .conversation.placeholder {
   margin: auto;
+  height: 100%;
+
   .container {
     display: flex;
     height: 100%;
diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx
new file mode 100644
index 000000000..6c9aeb184
--- /dev/null
+++ b/ts/components/NoticeBanner.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Flex } from './basic/Flex';
+import { SessionIconButton } from './icon';
+
+const StyledNoticeBanner = styled(Flex)`
+  position: relative;
+  background-color: var(--primary-color);
+  color: var(--background-primary-color);
+  font-size: var(--font-size-lg);
+  padding: var(--margins-xs) var(--margins-sm);
+  text-align: center;
+  flex-shrink: 0;
+  .session-icon-button {
+    position: absolute;
+    right: var(--margins-sm);
+  }
+`;
+
+const StyledText = styled.span`
+  margin-right: var(--margins-lg);
+`;
+
+type NoticeBannerProps = {
+  text: string;
+  dismissCallback: () => void;
+};
+
+export const NoticeBanner = (props: NoticeBannerProps) => {
+  const { text, dismissCallback } = props;
+
+  return (
+    <StyledNoticeBanner
+      container={true}
+      flexDirection={'row'}
+      justifyContent={'center'}
+      alignItems={'center'}
+    >
+      <StyledText>{text}</StyledText>
+      <SessionIconButton
+        iconType="exit"
+        iconColor="inherit"
+        iconSize="small"
+        onClick={event => {
+          event?.preventDefault();
+          dismissCallback();
+        }}
+      />
+    </StyledNoticeBanner>
+  );
+};
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index 45d70579b..df5126228 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -32,6 +32,7 @@ import { SessionMainPanel } from './SessionMainPanel';
 import moment from 'moment';
 import styled from 'styled-components';
 import { initialSogsRoomInfoState } from '../state/ducks/sogsRoomInfo';
+import { Storage } from '../util/storage';
 
 // Default to the locale from env. It will be overridden if moment
 // does not recognize it with what moment knows which is the closest.
@@ -42,6 +43,10 @@ moment.locale((window.i18n as any).getLocale());
 // Workaround: A react component's required properties are filtering up through connect()
 //   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
 import useUpdate from 'react-use/lib/useUpdate';
+import useInterval from 'react-use/lib/useInterval';
+import { SettingsKey } from '../data/settings-key';
+import { NoticeBanner } from './NoticeBanner';
+import { Flex } from './basic/Flex';
 
 const StyledGutter = styled.div`
   width: 380px !important;
@@ -89,6 +94,36 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) {
   forceUpdateInboxComponent();
 }
 
+const SomeDeviceOutdatedSyncingNotice = () => {
+  const forceUpdate = useUpdate();
+  const isShown = Boolean(window.getSettingValue(SettingsKey.someDeviceOutdatedSyncing));
+
+  // it would be nice to get the settings into a redux slice in addition to their Storage location and keep them in sync.
+  // So we could just use a selector here.
+  useInterval(() => {
+    const shouldBeShown = Storage.get(SettingsKey.someDeviceOutdatedSyncing);
+
+    if (!isShown && shouldBeShown) {
+      forceUpdate();
+    }
+  }, 1000);
+
+  const dismiss = async () => {
+    await window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, false);
+    forceUpdate();
+  };
+
+  if (!isShown) {
+    return null;
+  }
+  return (
+    <NoticeBanner
+      text={window.i18n('someOfYourDeviceUseOutdatedVersion')}
+      dismissCallback={dismiss}
+    />
+  );
+};
+
 export const SessionInboxView = () => {
   const update = useUpdate();
   // run only on mount
@@ -105,10 +140,13 @@ export const SessionInboxView = () => {
     <div className="inbox index">
       <Provider store={window.inboxStore}>
         <PersistGate loading={null} persistor={persistor}>
-          <StyledGutter>
-            <LeftPane />
-          </StyledGutter>
-          <SessionMainPanel />
+          <SomeDeviceOutdatedSyncingNotice />
+          <Flex container={true} height="0" flexShrink={100} flexGrow={1}>
+            <StyledGutter>
+              <LeftPane />
+            </StyledGutter>
+            <SessionMainPanel />
+          </Flex>
         </PersistGate>
       </Provider>
     </div>
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index fee386e3d..1a5cebc09 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -16,8 +16,8 @@ import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 import { clearSearch } from '../../state/ducks/search';
 import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
 import {
-  getOurPrimaryConversation,
   getGlobalUnreadMessageCount,
+  getOurPrimaryConversation,
 } from '../../state/selectors/conversations';
 import { getFocusedSection } from '../../state/selectors/section';
 import { getOurNumber } from '../../state/selectors/user';
diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts
index de2d43fb7..794cdc65c 100644
--- a/ts/data/settings-key.ts
+++ b/ts/data/settings-key.ts
@@ -9,6 +9,7 @@ const settingsStartInTray = 'start-in-tray-setting';
 const settingsOpengroupPruning = 'prune-setting';
 const settingsNotification = 'notification-setting';
 const settingsAudioNotification = 'audio-notification-setting';
+const someDeviceOutdatedSyncing = 'some-device-outdated-syncing';
 
 export const SettingsKey = {
   settingsReadReceipt,
@@ -21,6 +22,7 @@ export const SettingsKey = {
   settingsOpengroupPruning,
   settingsNotification,
   settingsAudioNotification,
+  someDeviceOutdatedSyncing,
 };
 
 export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index ed2e49212..5b0e17ce3 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -41,6 +41,7 @@ import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGr
 import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
+import { SettingsKey } from '../data/settings-key';
 
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
@@ -873,6 +874,7 @@ async function handleConfigurationMessageLegacy(
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
+    window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true);
     await removeFromCache(envelope);
     return;
   }
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index d9f249462..a180e1659 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -489,6 +489,7 @@ export type LocalizerKeys =
   | 'noMessagesInNoteToSelf'
   | 'noMessagesInEverythingElse'
   | 'hideBanner'
+  | 'someOfYourDeviceUseOutdatedVersion'
   | 'openMessageRequestInboxDescription'
   | 'clearAllReactions'
   | 'expandedReactionsText'

From 0e286142f1e21c1d4b71a1b1abf60df55f697436 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 24 Apr 2023 14:34:04 +1000
Subject: [PATCH 072/178] chore: add a redux settings slice, currently outdated
 banner inc

---
 ts/components/SessionInboxView.tsx            | 24 ++----
 ts/components/conversation/TypingBubble.tsx   | 10 +--
 .../composition/CompositionBox.tsx            |  3 +-
 .../message-content/MessageContent.tsx        | 10 +--
 .../message/message-content/MessageText.tsx   |  3 +-
 .../message-item/GroupUpdateMessage.tsx       |  2 +-
 ts/components/dialog/EditProfileDialog.tsx    |  2 +
 ts/components/leftpane/ActionsPanel.tsx       | 12 ++-
 ts/components/lightbox/LightboxGallery.tsx    |  2 +-
 .../registration/RegistrationStages.tsx       |  7 +-
 .../settings/section/CategoryPrivacy.tsx      | 12 +--
 ts/data/data.ts                               | 10 +--
 ts/data/settings-key.ts                       | 10 ++-
 ts/interactions/conversationInteractions.ts   | 19 +++--
 ts/mains/main_renderer.tsx                    | 14 ++--
 ts/node/migration/sessionMigrations.ts        |  9 +--
 ts/node/storage_item.ts                       |  1 -
 ts/receiver/configMessage.ts                  | 31 +++++---
 .../open_group_api/sogsv3/knownBlindedkeys.ts |  6 +-
 ts/session/apis/snode_api/hfHandling.ts       | 32 +++++---
 .../ExpirationTimerUpdateMessage.ts           |  2 +-
 ts/session/sending/PendingMessageCache.ts     |  6 +-
 ts/session/utils/job_runners/JobRunner.ts     |  6 +-
 ts/session/utils/sync/syncUtils.ts            |  4 +-
 ts/state/ducks/settings.tsx                   | 73 +++++++++++++++++++
 ts/state/reducer.ts                           |  3 +
 ts/state/selectors/conversations.ts           |  6 ++
 ts/state/selectors/selectedConversation.ts    |  4 +-
 ts/state/selectors/settings.ts                | 19 +++++
 ts/util/accountManager.ts                     |  4 +-
 ts/util/blockedNumberController.ts            |  6 +-
 ts/util/storage.ts                            | 11 ++-
 .../node/libsession/libsession.worker.ts      |  1 -
 33 files changed, 232 insertions(+), 132 deletions(-)
 create mode 100644 ts/state/ducks/settings.tsx
 create mode 100644 ts/state/selectors/settings.ts

diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index df5126228..2c5ecb383 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -43,10 +43,11 @@ moment.locale((window.i18n as any).getLocale());
 // Workaround: A react component's required properties are filtering up through connect()
 //   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
 import useUpdate from 'react-use/lib/useUpdate';
-import useInterval from 'react-use/lib/useInterval';
 import { SettingsKey } from '../data/settings-key';
 import { NoticeBanner } from './NoticeBanner';
 import { Flex } from './basic/Flex';
+import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
+import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings';
 
 const StyledGutter = styled.div`
   width: 380px !important;
@@ -60,7 +61,6 @@ function createSessionInboxStore() {
     .map(conversation => conversation.getConversationModelProps());
 
   const timerOptions: TimerOptionsArray = ExpirationTimerOptions.getTimerSecondsWithName();
-
   const initialState: StateType = {
     conversations: {
       ...getEmptyConversationState(),
@@ -83,6 +83,7 @@ function createSessionInboxStore() {
     stagedAttachments: getEmptyStagedAttachmentsState(),
     call: initialCallState,
     sogsRoomInfo: initialSogsRoomInfoState,
+    settings: getSettingsInitialState(),
   };
 
   return createStore(initialState);
@@ -91,29 +92,18 @@ function createSessionInboxStore() {
 function setupLeftPane(forceUpdateInboxComponent: () => void) {
   window.openConversationWithMessages = openConversationWithMessages;
   window.inboxStore = createSessionInboxStore();
+  window.inboxStore.dispatch(updateAllOnStorageReady());
   forceUpdateInboxComponent();
 }
 
 const SomeDeviceOutdatedSyncingNotice = () => {
-  const forceUpdate = useUpdate();
-  const isShown = Boolean(window.getSettingValue(SettingsKey.someDeviceOutdatedSyncing));
-
-  // it would be nice to get the settings into a redux slice in addition to their Storage location and keep them in sync.
-  // So we could just use a selector here.
-  useInterval(() => {
-    const shouldBeShown = Storage.get(SettingsKey.someDeviceOutdatedSyncing);
-
-    if (!isShown && shouldBeShown) {
-      forceUpdate();
-    }
-  }, 1000);
+  const outdatedBannerShouldBeShown = useHasDeviceOutdatedSyncing();
 
   const dismiss = async () => {
-    await window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, false);
-    forceUpdate();
+    await Storage.put(SettingsKey.someDeviceOutdatedSyncing, false);
   };
 
-  if (!isShown) {
+  if (!outdatedBannerShouldBeShown) {
     return null;
   }
   return (
diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index 18e2e2059..d3dd01360 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 
 import { TypingAnimation } from './TypingAnimation';
 import styled from 'styled-components';
-import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
+import { ConversationTypeEnum } from '../../models/conversationAttributes';
+import { useSelectedIsGroup } from '../../state/selectors/selectedConversation';
 
 interface TypingBubbleProps {
   conversationType: ConversationTypeEnum;
@@ -22,11 +23,8 @@ const TypingBubbleContainer = styled.div<TypingBubbleProps>`
 `;
 
 export const TypingBubble = (props: TypingBubbleProps) => {
-  if (isOpenOrClosedGroup(props.conversationType)) {
-    return null;
-  }
-
-  if (!props.isTyping) {
+  const isOpenOrClosedGroup = useSelectedIsGroup();
+  if (!isOpenOrClosedGroup || !props.isTyping) {
     return null;
   }
 
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 53227762f..7a0547e5e 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -56,6 +56,7 @@ import {
   getSelectedConversation,
   getSelectedConversationKey,
 } from '../../../state/selectors/selectedConversation';
+import { SettingsKey } from '../../../data/settings-key';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -601,7 +602,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
 
   private renderStagedLinkPreview(): JSX.Element | null {
     // Don't generate link previews if user has turned them off
-    if (!(window.getSettingValue('link-preview-setting') || false)) {
+    if (!(window.getSettingValue(SettingsKey.settingsLinkPreview) || false)) {
       return null;
     }
 
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index ecebf8408..13f23cc23 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -8,9 +8,9 @@ import styled, { css } from 'styled-components';
 import { MessageModelType, MessageRenderingProps } from '../../../../models/messageType';
 import {
   getMessageContentSelectorProps,
-  getMessageTextProps,
   getQuotedMessageToAnimate,
   getShouldHighlightMessage,
+  useMessageIsDeleted,
 } from '../../../../state/selectors/conversations';
 import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
 import { MessageAttachment } from './MessageAttachment';
@@ -96,6 +96,7 @@ export const MessageContent = (props: Props) => {
   const contentProps = useSelector(state =>
     getMessageContentSelectorProps(state as any, props.messageId)
   );
+  const isDeleted = useMessageIsDeleted(props.messageId);
   const [isMessageVisible, setMessageIsVisible] = useState(false);
 
   const scrollToLoadedMessage = useContext(ScrollToLoadedMessageContext);
@@ -149,13 +150,6 @@ export const MessageContent = (props: Props) => {
 
   const { direction, text, timestamp, serverTimestamp, previews } = contentProps;
 
-  const selectedMsg = useSelector(state => getMessageTextProps(state as any, props.messageId));
-
-  let isDeleted = false;
-  if (selectedMsg && selectedMsg.isDeleted !== undefined) {
-    isDeleted = selectedMsg.isDeleted;
-  }
-
   const hasContentAfterAttachmentAndQuote = !isEmpty(previews) || !isEmpty(text);
 
   const toolTipTitle = moment(serverTimestamp || timestamp).format('llll');
diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx
index d84d1bfac..15ef56bd1 100644
--- a/ts/components/conversation/message/message-content/MessageText.tsx
+++ b/ts/components/conversation/message/message-content/MessageText.tsx
@@ -9,6 +9,7 @@ import {
 } from '../../../../state/selectors/conversations';
 import { SessionIcon } from '../../../icon';
 import { MessageBody } from './MessageBody';
+import { StateType } from '../../../../state/reducer';
 
 type Props = {
   messageId: string;
@@ -20,7 +21,7 @@ export type MessageTextSelectorProps = Pick<
 >;
 
 export const MessageText = (props: Props) => {
-  const selected = useSelector(state => getMessageTextProps(state as any, props.messageId));
+  const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId));
   const multiSelectMode = useSelector(isMessageSelectionMode);
 
   if (!selected) {
diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
index 723555936..92d6939a3 100644
--- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
+++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
@@ -52,7 +52,7 @@ const ChangeItemLeft = (left: Array<string>): string => {
 
 // tslint:disable-next-line: cyclomatic-complexity
 const ChangeItem = (change: PropsForGroupUpdateType): string => {
-  const type = change.type;
+  const { type } = change;
   switch (type) {
     case 'name':
       return window.i18n('titleIsNow', [change.newName || '']);
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 2a2bb6e4f..cae2efedc 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -24,6 +24,7 @@ import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIconButton } from '../icon';
+import { ConfigurationDumpSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 
 const handleSaveQRCode = (event: MouseEvent) => {
   event.preventDefault();
@@ -360,6 +361,7 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
 
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     await ConfigurationSync.queueNewJobIfNeeded();
+    await ConfigurationDumpSync.queueNewJobIfNeeded();
     await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 1a5cebc09..bb3169e6d 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -3,11 +3,7 @@ import { getConversationController } from '../../session/conversations';
 import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
 
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  Data,
-  hasSyncedInitialConfigurationItem,
-  lastAvatarUploadTimestamp,
-} from '../../data/data';
+import { Data } from '../../data/data';
 import { getMessageQueue } from '../../session/sending';
 // tslint:disable: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
@@ -47,6 +43,7 @@ import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodeP
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
+import { SettingsKey } from '../../data/settings-key';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -172,14 +169,15 @@ const triggerSyncIfNeeded = async () => {
     .get(us)
     .setIsApproved(true, true);
   const didWeHandleAConfigurationMessageAlready =
-    (await Data.getItemById(hasSyncedInitialConfigurationItem))?.value || false;
+    (await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem))?.value || false;
   if (didWeHandleAConfigurationMessageAlready) {
     await syncConfigurationIfNeeded();
   }
 };
 
 const triggerAvatarReUploadIfNeeded = async () => {
-  const lastTimeStampAvatarUpload = (await Data.getItemById(lastAvatarUploadTimestamp))?.value || 0;
+  const lastTimeStampAvatarUpload =
+    (await Data.getItemById(SettingsKey.lastAvatarUploadTimestamp))?.value || 0;
 
   if (Date.now() - lastTimeStampAvatarUpload > DURATION.DAYS * 14) {
     window.log.info('Reuploading avatar...');
diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx
index f4441b95d..6361cd819 100644
--- a/ts/components/lightbox/LightboxGallery.tsx
+++ b/ts/components/lightbox/LightboxGallery.tsx
@@ -36,7 +36,7 @@ export const LightboxGallery = (props: Props) => {
   const selectedConversation = useSelectedConversationKey();
 
   if (!selectedConversation) {
-    throw new Error('LightboxGallery: selectedConversation is undefined');
+    return null;
   }
 
   const dispatch = useDispatch();
diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx
index 9985552a2..a8f422bfe 100644
--- a/ts/components/registration/RegistrationStages.tsx
+++ b/ts/components/registration/RegistrationStages.tsx
@@ -16,6 +16,7 @@ import {
 } from '../../util/accountManager';
 import { fromHex } from '../../session/utils/String';
 import { setSignInByLinking, setSignWithRecoveryPhrase, Storage } from '../../util/storage';
+import { SettingsKey } from '../../data/settings-key';
 
 // tslint:disable: use-simple-attributes
 
@@ -59,11 +60,7 @@ export async function signUp(signUpDetails: {
   try {
     await resetRegistration();
     await registerSingleDevice(generatedRecoveryPhrase, 'english', trimName);
-    await Data.createOrUpdateItem({
-      id: 'hasSyncedInitialConfigurationItem',
-      value: true,
-      timestamp: Date.now(),
-    });
+    await Storage.put(SettingsKey.hasSyncedInitialConfigurationItem, Date.now());
     await setSignWithRecoveryPhrase(false);
     trigger('openInbox');
   } catch (e) {
diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
index b936ce390..d2490dad9 100644
--- a/ts/components/settings/section/CategoryPrivacy.tsx
+++ b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 // tslint:disable-next-line: no-submodule-imports
 import useUpdate from 'react-use/lib/useUpdate';
-import { Data, hasLinkPreviewPopupBeenDisplayed } from '../../../data/data';
 import { SettingsKey } from '../../../data/settings-key';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
@@ -11,9 +10,10 @@ import { TypingBubble } from '../../conversation/TypingBubble';
 
 import { SessionSettingButtonItem, SessionToggleWithDescription } from '../SessionSettingListItem';
 import { displayPasswordModal } from '../SessionSettings';
+import { Storage } from '../../../util/storage';
+import { useHasLinkPreviewEnabled } from '../../../state/selectors/settings';
 
-async function toggleLinkPreviews(forceUpdate: () => void) {
-  const isToggleOn = Boolean(window.getSettingValue(SettingsKey.settingsLinkPreview));
+async function toggleLinkPreviews(isToggleOn: boolean, forceUpdate: () => void) {
   if (!isToggleOn) {
     window.inboxStore?.dispatch(
       updateConfirmModal({
@@ -29,7 +29,7 @@ async function toggleLinkPreviews(forceUpdate: () => void) {
     );
   } else {
     await window.setSettingValue(SettingsKey.settingsLinkPreview, false);
-    await Data.createOrUpdateItem({ id: hasLinkPreviewPopupBeenDisplayed, value: false });
+    await Storage.put(SettingsKey.hasLinkPreviewPopupBeenDisplayed, false);
     forceUpdate();
   }
 }
@@ -48,7 +48,7 @@ export const SettingsCategoryPrivacy = (props: {
   onPasswordUpdated: (action: string) => void;
 }) => {
   const forceUpdate = useUpdate();
-  const isLinkPreviewsOn = Boolean(window.getSettingValue(SettingsKey.settingsLinkPreview));
+  const isLinkPreviewsOn = useHasLinkPreviewEnabled();
 
   if (props.hasPassword !== null) {
     return (
@@ -76,7 +76,7 @@ export const SettingsCategoryPrivacy = (props: {
         />
         <SessionToggleWithDescription
           onClickToggle={async () => {
-            await toggleLinkPreviews(forceUpdate);
+            await toggleLinkPreviews(isLinkPreviewsOn, forceUpdate);
           }}
           title={window.i18n('linkPreviewsTitle')}
           description={window.i18n('linkPreviewDescription')}
diff --git a/ts/data/data.ts b/ts/data/data.ts
index 110eed4fd..d4e9ab035 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -53,10 +53,6 @@ export type SwarmNode = Snode & {
   address: string;
 };
 
-export const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationItem';
-export const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
-export const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
-
 // Basic
 async function shutdown(): Promise<void> {
   // Stop accepting new SQL jobs, flush outstanding queue
@@ -654,7 +650,7 @@ async function getSnodePoolFromDb(): Promise<Array<Snode> | null> {
 }
 
 async function updateSnodePoolOnDb(snodesAsJsonString: string): Promise<void> {
-  await Data.createOrUpdateItem({ id: SNODE_POOL_ITEM_ID, value: snodesAsJsonString });
+  await Storage.put(SNODE_POOL_ITEM_ID, snodesAsJsonString);
 }
 
 function keysToArrayBuffer(keys: any, data: any) {
@@ -692,8 +688,8 @@ const ITEM_KEYS: Object = {
 };
 
 /**
- * Note: In the app, you should always call createOrUpdateItem through Data.createOrUpdateItem (from the data.ts file).
- * This is to ensure testing and stubbbing works as expected
+ * For anything related to the UI and redux, do not use `createOrUpdateItem` directly. Instead use Storage.put (from the utils folder).
+ * `Storage.put` will update the settings redux slice if needed but createOrUpdateItem will not.
  */
 export async function createOrUpdateItem(data: StorageItem): Promise<void> {
   const { id } = data;
diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts
index 794cdc65c..67f2291d1 100644
--- a/ts/data/settings-key.ts
+++ b/ts/data/settings-key.ts
@@ -9,7 +9,10 @@ const settingsStartInTray = 'start-in-tray-setting';
 const settingsOpengroupPruning = 'prune-setting';
 const settingsNotification = 'notification-setting';
 const settingsAudioNotification = 'audio-notification-setting';
-const someDeviceOutdatedSyncing = 'some-device-outdated-syncing';
+const someDeviceOutdatedSyncing = 'someDeviceOutdatedSyncing';
+const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationItem';
+const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
+const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
 
 export const SettingsKey = {
   settingsReadReceipt,
@@ -23,7 +26,10 @@ export const SettingsKey = {
   settingsNotification,
   settingsAudioNotification,
   someDeviceOutdatedSyncing,
-};
+  hasSyncedInitialConfigurationItem,
+  lastAvatarUploadTimestamp,
+  hasLinkPreviewPopupBeenDisplayed,
+} as const;
 
 export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';
 export const SNODE_POOL_ITEM_ID = 'SNODE_POOL_ITEM_ID';
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index cc0353f8a..c5f8254fc 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -6,7 +6,7 @@ import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils'
 
 import { SessionButtonColor } from '../components/basic/SessionButton';
 import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
-import { Data, hasLinkPreviewPopupBeenDisplayed, lastAvatarUploadTimestamp } from '../data/data';
+import { Data } from '../data/data';
 import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi';
 import { getConversationController } from '../session/conversations';
 import { getSodiumRenderer } from '../session/crypto';
@@ -37,11 +37,13 @@ import { processNewAttachment } from '../types/MessageAttachment';
 import { IMAGE_JPEG } from '../types/MIME';
 import { BlockedNumberController } from '../util/blockedNumberController';
 import { encryptProfile } from '../util/crypto/profileEncrypter';
-import { setLastProfileUpdateTimestamp } from '../util/storage';
+import { Storage, setLastProfileUpdateTimestamp } from '../util/storage';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { leaveClosedGroup } from '../session/group/closed-group';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
+import { SettingsKey } from '../data/settings-key';
+import { ConfigurationDumpSync } from '../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -457,12 +459,13 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
     avatarImageId: fileId,
   });
   const newTimestampReupload = Date.now();
-  await Data.createOrUpdateItem({ id: lastAvatarUploadTimestamp, value: newTimestampReupload });
+  await Storage.put(SettingsKey.lastAvatarUploadTimestamp, newTimestampReupload);
 
   if (newAvatarDecrypted) {
     await setLastProfileUpdateTimestamp(Date.now());
     if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
       await ConfigurationSync.queueNewJobIfNeeded();
+      await ConfigurationDumpSync.queueNewJobIfNeeded();
     } else {
       await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
     }
@@ -502,22 +505,22 @@ export async function replyToMessage(messageId: string) {
  */
 export async function showLinkSharingConfirmationModalDialog(e: any) {
   const pastedText = e.clipboardData.getData('text');
-  if (isURL(pastedText) && !window.getSettingValue('link-preview-setting', false)) {
+  if (isURL(pastedText) && !window.getSettingValue(SettingsKey.settingsLinkPreview, false)) {
     const alreadyDisplayedPopup =
-      (await Data.getItemById(hasLinkPreviewPopupBeenDisplayed))?.value || false;
+      (await Data.getItemById(SettingsKey.hasLinkPreviewPopupBeenDisplayed))?.value || false;
     if (!alreadyDisplayedPopup) {
       window.inboxStore?.dispatch(
         updateConfirmModal({
           shouldShowConfirm:
-            !window.getSettingValue('link-preview-setting') && !alreadyDisplayedPopup,
+            !window.getSettingValue(SettingsKey.settingsLinkPreview) && !alreadyDisplayedPopup,
           title: window.i18n('linkPreviewsTitle'),
           message: window.i18n('linkPreviewsConfirmMessage'),
           okTheme: SessionButtonColor.Danger,
           onClickOk: async () => {
-            await window.setSettingValue('link-preview-setting', true);
+            await window.setSettingValue(SettingsKey.settingsLinkPreview, true);
           },
           onClickClose: async () => {
-            await Data.createOrUpdateItem({ id: hasLinkPreviewPopupBeenDisplayed, value: true });
+            await Storage.put(SettingsKey.hasLinkPreviewPopupBeenDisplayed, true);
           },
         })
       );
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index f7a553aaf..6aebb329f 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -24,6 +24,7 @@ import { initialiseEmojiData } from '../util/emoji';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { runners } from '../session/utils/job_runners/JobRunner';
+import { SettingsKey } from '../data/settings-key';
 // tslint:disable: max-classes-per-file
 
 // Globally disable drag and drop
@@ -163,7 +164,7 @@ Storage.onready(async () => {
       // Stop background processing
       AttachmentDownloads.stop();
       // Stop processing incoming messages
-      // FIXME audric stop polling opengroupv2 and swarm nodes
+      // TODO stop polling opengroupv2 and swarm nodes
 
       // Shut down the data interface cleanly
       await Data.shutdown();
@@ -262,11 +263,6 @@ async function start() {
   WhisperEvents.on('registration_done', async () => {
     window.log.info('handling registration event');
 
-    // Disable link previews as default per Kee
-    Storage.onready(async () => {
-      await Storage.put('link-preview-setting', false);
-    });
-
     await connect();
   });
 
@@ -287,7 +283,7 @@ async function start() {
       });
   }
 
-  function openStandAlone() {
+  function showRegistrationView() {
     ReactDOM.render(<SessionRegistrationView />, document.getElementById('root'));
   }
   ExpirationTimerOptions.initExpiringMessageListener();
@@ -298,7 +294,7 @@ async function start() {
   } else {
     const primaryColor = window.Events.getPrimaryColorSetting();
     await switchPrimaryColorTo(primaryColor);
-    openStandAlone();
+    showRegistrationView();
   }
 
   window.addEventListener('focus', () => {
@@ -386,7 +382,7 @@ async function start() {
   if (launchCount === 1) {
     // Initialise default settings
     await window.setSettingValue('hide-menu-bar', true);
-    await window.setSettingValue('link-preview-setting', false);
+    await window.setSettingValue(SettingsKey.settingsLinkPreview, false);
   }
 
   WhisperEvents.on('openInbox', () => {
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 05f45bc6d..b39a9638e 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1219,7 +1219,7 @@ function insertContactIntoContactWrapper(
     const dbApproved = !!contact.isApproved || false;
     const dbApprovedMe = !!contact.didApproveMe || false;
     const dbBlocked = blockedNumbers.includes(contact.id);
-    const priority = contact.priority || 0;
+    const priority = contact.priority || CONVERSATION_PRIORITIES.default;
     const expirationTimerSeconds = contact.expireTimer || 0;
 
     const wrapperContact = getContactInfoFromDBValues({
@@ -1581,12 +1581,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
           ourDbProfileKey
         );
       } else {
-        userProfileWrapper.setUserInfo(
-          ourDbName,
-          ourConvoPriority, // consider that the Note to self is hidden on a fresh account (without avatar set)
-          '',
-          new Uint8Array()
-        );
+        userProfileWrapper.setUserInfo(ourDbName, ourConvoPriority, '', new Uint8Array());
       }
 
       insertContactIntoContactWrapper(
diff --git a/ts/node/storage_item.ts b/ts/node/storage_item.ts
index 19e276992..5be670a9e 100644
--- a/ts/node/storage_item.ts
+++ b/ts/node/storage_item.ts
@@ -1,5 +1,4 @@
 export type StorageItem = {
   id: string;
   value: any;
-  timestamp?: number;
 };
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 5b0e17ce3..b2b42c3ad 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,6 +1,6 @@
-import { compact, isEmpty, toNumber } from 'lodash';
+import { compact, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
-import { Data, hasSyncedInitialConfigurationItem } from '../data/data';
+import { Data } from '../data/data';
 import { ConversationInteraction } from '../interactions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { SignalService } from '../protobuf';
@@ -27,7 +27,11 @@ import { configurationMessageReceived, trigger } from '../shims/events';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
 import { Registration } from '../util/registration';
-import { getLastProfileUpdateTimestamp, setLastProfileUpdateTimestamp } from '../util/storage';
+import {
+  Storage,
+  getLastProfileUpdateTimestamp,
+  setLastProfileUpdateTimestamp,
+} from '../util/storage';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
@@ -703,8 +707,19 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
     return;
   }
   const envelopeTimestamp = toNumber(envelope.timestamp);
-  const lastConfigUpdate = await Data.getItemById(hasSyncedInitialConfigurationItem);
-  const lastConfigTimestamp = lastConfigUpdate?.timestamp;
+
+  // at some point, we made the hasSyncedInitialConfigurationItem item to have a value=true and a timestamp set.
+  // we can actually just use the timestamp as a boolean, as if it is set, we know we have synced the initial config
+  // but we still need to handle the case where the timestamp was set when the value is true (for backwards compatiblity, until we get rid of the config message legacy)
+  const lastConfigUpdate = await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem);
+
+  let lastConfigTimestamp: number | undefined;
+  if (isNumber(lastConfigUpdate?.value)) {
+    lastConfigTimestamp = lastConfigUpdate?.value;
+  } else if (isNumber((lastConfigUpdate as any)?.timestamp)) {
+    lastConfigTimestamp = (lastConfigUpdate as any)?.timestamp; // ugly, but we can remove it once we dropped support for legacy config message, see comment above
+  }
+
   const isNewerConfig =
     !lastConfigTimestamp || (lastConfigTimestamp && lastConfigTimestamp < envelopeTimestamp);
 
@@ -713,11 +728,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
     return;
   }
 
-  await Data.createOrUpdateItem({
-    id: 'hasSyncedInitialConfigurationItem',
-    value: true,
-    timestamp: envelopeTimestamp,
-  });
+  await Storage.put(SettingsKey.hasSyncedInitialConfigurationItem, envelopeTimestamp);
 
   // we only want to apply changes to closed groups if we never got them
   // new opengroups get added when we get a new closed group message from someone, or a sync'ed message from outself creating the group
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index 96d32ed5e..bc23882ce 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -13,6 +13,7 @@ import { SogsBlinding } from './sogsBlinding';
 import { fromHexToArray } from '../../../utils/String';
 import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key';
 import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes';
+import { Storage } from '../../../../util/storage';
 
 export type BlindedIdMapping = {
   blindedId: string;
@@ -65,10 +66,7 @@ export async function loadKnownBlindedKeys() {
  */
 export async function writeKnownBlindedKeys() {
   if (cachedKnownMapping && cachedKnownMapping.length) {
-    await Data.createOrUpdateItem({
-      id: KNOWN_BLINDED_KEYS_ITEM,
-      value: JSON.stringify(cachedKnownMapping),
-    });
+    await Storage.put(KNOWN_BLINDED_KEYS_ITEM, JSON.stringify(cachedKnownMapping));
   }
 }
 
diff --git a/ts/session/apis/snode_api/hfHandling.ts b/ts/session/apis/snode_api/hfHandling.ts
index 933beea00..dcd7565b6 100644
--- a/ts/session/apis/snode_api/hfHandling.ts
+++ b/ts/session/apis/snode_api/hfHandling.ts
@@ -1,9 +1,13 @@
 import { isNumber } from 'lodash';
 import { Data } from '../../../data/data';
+import { Storage } from '../../../util/storage';
 
 let hasSeenHardfork190: boolean | undefined;
 let hasSeenHardfork191: boolean | undefined;
 
+const hasSeenHardfork190ItemId = 'hasSeenHardfork190';
+const hasSeenHardfork191ItemId = 'hasSeenHardfork191';
+
 /**
  * this is only intended for testing. Do not call this in production.
  */
@@ -11,13 +15,16 @@ export function resetHardForkCachedValues() {
   hasSeenHardfork190 = hasSeenHardfork191 = undefined;
 }
 
+/**
+ * Not used anymore, but keeping those here in case we ever need to do hardfork enabling of features again
+ */
 export async function getHasSeenHF190() {
   if (hasSeenHardfork190 === undefined) {
     // read values from db and cache them as it looks like we did not
-    const oldHhasSeenHardfork190 = (await Data.getItemById('hasSeenHardfork190'))?.value;
+    const oldHhasSeenHardfork190 = (await Data.getItemById(hasSeenHardfork190ItemId))?.value;
     // values do not exist in the db yet. Let's store false for now in the db and update our cached value.
     if (oldHhasSeenHardfork190 === undefined) {
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork190', value: false });
+      await Storage.put(hasSeenHardfork190ItemId, false);
       hasSeenHardfork190 = false;
     } else {
       hasSeenHardfork190 = oldHhasSeenHardfork190;
@@ -26,14 +33,17 @@ export async function getHasSeenHF190() {
   return hasSeenHardfork190;
 }
 
+/**
+ * Not used anymore, but keeping those here in case we ever need to do hardfork enabling of features again
+ */
 export async function getHasSeenHF191() {
   if (hasSeenHardfork191 === undefined) {
     // read values from db and cache them as it looks like we did not
-    const oldHhasSeenHardfork191 = (await Data.getItemById('hasSeenHardfork191'))?.value;
+    const oldHhasSeenHardfork191 = (await Data.getItemById(hasSeenHardfork191ItemId))?.value;
 
     // values do not exist in the db yet. Let's store false for now in the db and update our cached value.
     if (oldHhasSeenHardfork191 === undefined) {
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork191', value: false });
+      await Storage.put(hasSeenHardfork191ItemId, false);
       hasSeenHardfork191 = false;
     } else {
       hasSeenHardfork191 = oldHhasSeenHardfork191;
@@ -45,18 +55,18 @@ export async function getHasSeenHF191() {
 export async function handleHardforkResult(json: Record<string, any>) {
   if (hasSeenHardfork190 === undefined || hasSeenHardfork191 === undefined) {
     // read values from db and cache them as it looks like we did not
-    const oldHhasSeenHardfork190 = (await Data.getItemById('hasSeenHardfork190'))?.value;
-    const oldHasSeenHardfork191 = (await Data.getItemById('hasSeenHardfork191'))?.value;
+    const oldHhasSeenHardfork190 = (await Data.getItemById(hasSeenHardfork190ItemId))?.value;
+    const oldHasSeenHardfork191 = (await Data.getItemById(hasSeenHardfork191ItemId))?.value;
 
     // values do not exist in the db yet. Let's store false for now in the db and update our cached value.
     if (oldHhasSeenHardfork190 === undefined) {
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork190', value: false });
+      await Storage.put(hasSeenHardfork190ItemId, false);
       hasSeenHardfork190 = false;
     } else {
       hasSeenHardfork190 = oldHhasSeenHardfork190;
     }
     if (oldHasSeenHardfork191 === undefined) {
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork191', value: false });
+      await Storage.put(hasSeenHardfork191ItemId, false);
       hasSeenHardfork191 = false;
     } else {
       hasSeenHardfork191 = oldHasSeenHardfork191;
@@ -78,13 +88,11 @@ export async function handleHardforkResult(json: Record<string, any>) {
     isNumber(json.hf[1])
   ) {
     if (!hasSeenHardfork190 && json.hf[0] >= 19 && json.hf[1] >= 0) {
-      // window.log.info('[HF]: We just detected HF 19.0 on "retrieve"');
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork190', value: true });
+      await Storage.put(hasSeenHardfork190ItemId, true);
       hasSeenHardfork190 = true;
     }
     if (!hasSeenHardfork191 && json.hf[0] >= 19 && json.hf[1] >= 1) {
-      // window.log.info('[HF]: We just detected HF 19.1 on "retrieve"');
-      await Data.createOrUpdateItem({ id: 'hasSeenHardfork191', value: true });
+      await Storage.put(hasSeenHardfork191ItemId, true);
       hasSeenHardfork191 = true;
     }
   }
diff --git a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
index 64e0c8d1b..05ad7d874 100644
--- a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
@@ -29,7 +29,7 @@ export class ExpirationTimerUpdateMessage extends DataMessage {
 
     data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
 
-    // FIXME we shouldn't need this once android recieving refactor is done.
+    // TODO we shouldn't need this once android recieving refactor is done.
     // the envelope stores the groupId for a closed group already.
     if (this.groupId) {
       const groupMessage = new SignalService.GroupContext();
diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts
index 5ded9c477..10b3739aa 100644
--- a/ts/session/sending/PendingMessageCache.ts
+++ b/ts/session/sending/PendingMessageCache.ts
@@ -5,6 +5,7 @@ import { ContentMessage } from '../messages/outgoing';
 import { PubKey } from '../types';
 import { MessageUtils } from '../utils';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { Storage } from '../../util/storage';
 
 // This is an abstraction for storing pending messages.
 // Ideally we want to store pending messages in the database so that
@@ -140,9 +141,6 @@ export class PendingMessageCache {
     });
 
     const encodedPendingMessages = JSON.stringify(encodedCache) || '[]';
-    await Data.createOrUpdateItem({
-      id: 'pendingMessages',
-      value: encodedPendingMessages,
-    });
+    await Storage.put('pendingMessages', encodedPendingMessages);
   }
 }
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index d9a2b7b67..c6acbbe6f 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -11,6 +11,7 @@ import {
   RunJobResult,
   TypeOfPersistedData,
 } from './PersistedJob';
+import { Storage } from '../../../util/storage';
 
 /**
  * 'job_in_progress' if there is already a job in progress
@@ -177,10 +178,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
   private async writeJobsToDB() {
     const serialized = this.getSerializedJobs();
     window.log.debug(`writing to db for "${this.jobRunnerType}": `, serialized);
-    await Data.createOrUpdateItem({
-      id: this.getJobRunnerItemId(),
-      value: JSON.stringify(serialized),
-    });
+    await Storage.put(this.getJobRunnerItemId(), JSON.stringify(serialized));
   }
 
   private async addJobUnchecked(job: PersistedJob<T>) {
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 5d61eafee..6bfd32cac 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -31,6 +31,7 @@ import { ConfigurationDumpSync } from '../job_runners/jobs/ConfigurationSyncDump
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { fromBase64ToArray, fromHexToArray } from '../String';
 import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
+import { Storage } from '../../../util/storage';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -38,7 +39,7 @@ const getLastSyncTimestampFromDb = async (): Promise<number | undefined> =>
   (await Data.getItemById(ITEM_ID_LAST_SYNC_TIMESTAMP))?.value;
 
 const writeLastSyncTimestampToDb = async (timestamp: number) =>
-  Data.createOrUpdateItem({ id: ITEM_ID_LAST_SYNC_TIMESTAMP, value: timestamp });
+  Storage.put(ITEM_ID_LAST_SYNC_TIMESTAMP, timestamp);
 
 /**
  * Conditionally Syncs user configuration with other devices linked.
@@ -73,6 +74,7 @@ export const syncConfigurationIfNeeded = async () => {
   } else {
     await ConfigurationDumpSync.queueNewJobIfNeeded();
     await ConfigurationSync.queueNewJobIfNeeded();
+    await ConfigurationDumpSync.queueNewJobIfNeeded();
   }
 };
 
diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx
new file mode 100644
index 000000000..eda23a6e6
--- /dev/null
+++ b/ts/state/ducks/settings.tsx
@@ -0,0 +1,73 @@
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import { SettingsKey } from '../../data/settings-key';
+import { isBoolean } from 'lodash';
+import { Storage } from '../../util/storage';
+
+const SettingsBoolsKeyTrackedInRedux = [
+  SettingsKey.someDeviceOutdatedSyncing,
+  SettingsKey.settingsLinkPreview,
+] as const;
+
+export type SettingsState = {
+  settingsBools: Record<typeof SettingsBoolsKeyTrackedInRedux[number], boolean>;
+};
+
+export function getSettingsInitialState() {
+  return {
+    settingsBools: {
+      someDeviceOutdatedSyncing: false,
+      'link-preview-setting': false, // this is the value of SettingsKey.settingsLinkPreview
+    },
+  };
+}
+
+function isTrackedBoolean(key: string): key is typeof SettingsBoolsKeyTrackedInRedux[number] {
+  return SettingsBoolsKeyTrackedInRedux.indexOf(key as any) !== -1;
+}
+
+/**
+ * This slice is the one holding the settings of the currently logged in user in redux.
+ * This is in addition to the settings stored in the Storage class but is a memory only representation of them.
+ * You should not try to make changes here, but instead through the Storage class.
+ * What you can do with this slice, is to create selectors and hooks to keep your UI in sync with the state in whatever is Storage.
+ */
+const settingsSlice = createSlice({
+  name: 'settings',
+  // when this createSlice gets invoke, the storage is not ready, but redux still wants a state so we just avoid hitting the storage.
+  // Once the storage is ready,
+  initialState: getSettingsInitialState(),
+  reducers: {
+    updateAllOnStorageReady(state) {
+      const linkPreview = Storage.get(SettingsKey.settingsLinkPreview, false);
+      const outdatedSync = Storage.get(SettingsKey.someDeviceOutdatedSyncing, false);
+      state.settingsBools.someDeviceOutdatedSyncing = isBoolean(outdatedSync)
+        ? outdatedSync
+        : false;
+      state.settingsBools['link-preview-setting'] = isBoolean(linkPreview) ? linkPreview : false; // this is the value of SettingsKey.settingsLinkPreview
+      return state;
+    },
+    updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) {
+      const { id, value } = action.payload;
+
+      if (!isTrackedBoolean(id) || !isBoolean(value)) return state;
+
+      state.settingsBools[id] = value;
+
+      return state;
+    },
+    deleteSettingsBoolValue(state, action: PayloadAction<string>) {
+      if (!isTrackedBoolean(action.payload)) return state;
+
+      delete state.settingsBools[action.payload];
+      return state;
+    },
+  },
+});
+
+const { actions, reducer } = settingsSlice;
+export const {
+  updateSettingsBoolValue,
+  deleteSettingsBoolValue,
+  updateAllOnStorageReady,
+} = actions;
+export const settingsReducer = reducer;
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index da394d25f..b81405f70 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -19,6 +19,7 @@ import {
   StagedAttachmentsStateType,
 } from './ducks/stagedAttachments';
 import { PrimaryColorStateType, ThemeStateType } from '../themes/constants/colors';
+import { settingsReducer, SettingsState } from './ducks/settings';
 
 export type StateType = {
   search: SearchStateType;
@@ -35,6 +36,7 @@ export type StateType = {
   stagedAttachments: StagedAttachmentsStateType;
   call: CallStateType;
   sogsRoomInfo: SogsRoomInfoState;
+  settings: SettingsState;
 };
 
 export const reducers = {
@@ -52,6 +54,7 @@ export const reducers = {
   stagedAttachments,
   call,
   sogsRoomInfo: ReduxSogsRoomInfos.sogsRoomInfoReducer,
+  settings: settingsReducer,
 };
 
 // Making this work would require that our reducer signature supported AnyAction, not
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 88396aa9b..a3e5a7bbb 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -42,6 +42,7 @@ import { filter, isEmpty, isNumber, pick, sortBy } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { getModeratorsOutsideRedux } from './sogsRoomInfo';
 import { getSelectedConversation, getSelectedConversationKey } from './selectedConversation';
+import { useSelector } from 'react-redux';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
@@ -882,6 +883,11 @@ export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (p
   return msgProps;
 });
 
+export const useMessageIsDeleted = (messageId: string): boolean => {
+  const props = useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId));
+  return props?.propsForMessage.isDeleted || false;
+};
+
 export const getMessageContextMenuProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageContextMenuSelectorProps
   | undefined => {
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 46ffb800f..759ab8cbf 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -80,10 +80,10 @@ export function getSelectedCanWrite(state: StateType) {
   if (!selectedConvo) {
     return false;
   }
-  const canWrite = getCanWrite(state, selectedConvoPubkey);
+  const canWriteSogs = getCanWrite(state, selectedConvoPubkey);
   const { isBlocked, isKickedFromGroup, left, isPublic } = selectedConvo;
 
-  return !(isBlocked || isKickedFromGroup || left || (isPublic && !canWrite));
+  return !(isBlocked || isKickedFromGroup || left || (isPublic && !canWriteSogs));
 }
 
 /**
diff --git a/ts/state/selectors/settings.ts b/ts/state/selectors/settings.ts
new file mode 100644
index 000000000..ffca0da3e
--- /dev/null
+++ b/ts/state/selectors/settings.ts
@@ -0,0 +1,19 @@
+import { useSelector } from 'react-redux';
+import { SettingsKey } from '../../data/settings-key';
+import { StateType } from '../reducer';
+
+const getLinkPreviewEnabled = (state: StateType) =>
+  state.settings.settingsBools[SettingsKey.settingsLinkPreview];
+
+const getHasDeviceOutdatedSyncing = (state: StateType) =>
+  state.settings.settingsBools[SettingsKey.someDeviceOutdatedSyncing];
+
+export const useHasLinkPreviewEnabled = () => {
+  const value = useSelector(getLinkPreviewEnabled);
+  return Boolean(value);
+};
+
+export const useHasDeviceOutdatedSyncing = () => {
+  const value = useSelector(getHasDeviceOutdatedSyncing);
+  return Boolean(value);
+};
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 8ed77e10d..62c0d2cfb 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -197,8 +197,10 @@ async function registrationDone(ourPubkey: string, displayName: string) {
 
   await conversation.setIsApproved(true, false);
   await conversation.setDidApproveMe(true, false);
-
+  // when onboarding, hide the note to self by default.
+  await conversation.setHidden(true);
   await conversation.commit();
+
   const user = {
     ourNumber: getOurPubKeyStrFromCache(),
     ourPrimary: ourPubkey,
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index 0202b4814..d65a3a331 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -1,6 +1,7 @@
 import { Data } from '../data/data';
 import { commitConversationAndRefreshWrapper } from '../models/conversation';
 import { PubKey } from '../session/types';
+import { Storage } from './storage';
 
 const BLOCKED_NUMBERS_ID = 'blocked';
 
@@ -112,9 +113,6 @@ export class BlockedNumberController {
   }
 
   private static async saveToDB(id: string, numbers: Set<string>): Promise<void> {
-    await Data.createOrUpdateItem({
-      id,
-      value: [...numbers],
-    });
+    await Storage.put(id, [...numbers]);
   }
 }
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index 853325dc6..c864b1d47 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -1,10 +1,12 @@
 import { Data } from '../data/data';
 import { SessionKeyPair } from '../receiver/keypairs';
 import { DEFAULT_RECENT_REACTS } from '../session/constants';
+import { deleteSettingsBoolValue, updateSettingsBoolValue } from '../state/ducks/settings';
+import { isBoolean } from 'lodash';
 
 let ready = false;
 
-type ValueType = string | number | boolean | SessionKeyPair;
+type ValueType = string | number | boolean | SessionKeyPair | Array<string>;
 type InsertedValueType = { id: string; value: ValueType };
 let items: Record<string, InsertedValueType>;
 let callbacks: Array<() => void> = [];
@@ -23,6 +25,10 @@ async function put(key: string, value: ValueType) {
 
   items[key] = data;
   await Data.createOrUpdateItem(data);
+
+  if (isBoolean(value)) {
+    window?.inboxStore?.dispatch(updateSettingsBoolValue({ id: key, value }));
+  }
 }
 
 function get(key: string, defaultValue?: ValueType) {
@@ -45,6 +51,9 @@ async function remove(key: string) {
 
   // tslint:disable-next-line: no-dynamic-delete
   delete items[key];
+
+  window?.inboxStore?.dispatch(deleteSettingsBoolValue(key));
+
   await Data.removeItemById(key);
 }
 
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index b56eb7737..ea918e7be 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -90,7 +90,6 @@ function initUserWrapper(
   const userType = assertUserWrapperType(wrapperType);
 
   const wrapper = getUserWrapper(wrapperType);
-  console.warn('initUserWrapper: ', wrapperType, options);
   if (wrapper) {
     throw new Error(`${wrapperType} already init`);
   }

From 9d87ca254692c9b2e7aadcc33ce14a2c4953f7d2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 26 Apr 2023 15:02:27 +1000
Subject: [PATCH 073/178] fix: test with libsession compiled with node-api

---
 package.json                                  |  2 +-
 ts/node/migration/sessionMigrations.ts        | 31 +++----
 ts/node/migration/signalMigrations.ts         |  2 +-
 .../utils/libsession/libsession_utils.ts      |  7 +-
 .../node/libsession/libsession.worker.ts      | 47 ++++------
 yarn.lock                                     | 92 +++++++++++++++++--
 6 files changed, 124 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index deedc507c..9d54cf536 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,6 @@
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
     "mustache": "2.3.0",
-    "nan": "2.14.2",
     "node-fetch": "^2.6.7",
     "os-locale": "5.0.0",
     "p-retry": "^4.2.0",
@@ -184,6 +183,7 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
+    "cmake-js": "^7.2.1",
     "concurrently": "^7.4.0",
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index b39a9638e..e3a796c8f 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,9 +1,9 @@
 import * as BetterSqlite3 from 'better-sqlite3';
 import {
-  ContactsConfigWrapperInsideWorker,
-  ConvoInfoVolatileWrapperInsideWorker,
-  UserConfigWrapperInsideWorker,
-  UserGroupsWrapperInsideWorker,
+  ContactsConfigWrapperNode,
+  ConvoInfoVolatileWrapperNode,
+  UserConfigWrapperNode,
+  UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
 import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
 import {
@@ -1211,8 +1211,8 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
 function insertContactIntoContactWrapper(
   contact: any,
   blockedNumbers: Array<string>,
-  contactsConfigWrapper: ContactsConfigWrapperInsideWorker | null, // set this to null to only insert into the convo volatile wrapper (i.e. for ourConvo case)
-  volatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
+  contactsConfigWrapper: ContactsConfigWrapperNode | null, // set this to null to only insert into the convo volatile wrapper (i.e. for ourConvo case)
+  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
   db: BetterSqlite3.Database
 ) {
   if (contactsConfigWrapper !== null) {
@@ -1296,8 +1296,8 @@ function insertContactIntoContactWrapper(
 
 function insertCommunityIntoWrapper(
   community: { id: string; priority: number },
-  userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
-  volatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
+  userGroupConfigWrapper: UserGroupsWrapperNode,
+  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
   db: BetterSqlite3.Database
 ) {
   const priority = community.priority;
@@ -1366,8 +1366,8 @@ function insertLegacyGroupIntoWrapper(
     ConversationAttributes,
     'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' | 'lastJoinedTimestamp'
   > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
-  userGroupConfigWrapper: UserGroupsWrapperInsideWorker,
-  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperInsideWorker,
+  userGroupConfigWrapper: UserGroupsWrapperNode,
+  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode,
   db: BetterSqlite3.Database
 ) {
   const {
@@ -1546,13 +1546,10 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       const blockedNumbers = getBlockedNumbersDuringMigration(db);
 
       const { privateEd25519, publicKeyHex } = keys;
-      const userProfileWrapper = new UserConfigWrapperInsideWorker(privateEd25519, null);
-      const contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(privateEd25519, null);
-      const userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(privateEd25519, null);
-      const volatileInfoConfigWrapper = new ConvoInfoVolatileWrapperInsideWorker(
-        privateEd25519,
-        null
-      );
+      const userProfileWrapper = new UserConfigWrapperNode(privateEd25519, null);
+      const contactsConfigWrapper = new ContactsConfigWrapperNode(privateEd25519, null);
+      const userGroupsConfigWrapper = new UserGroupsWrapperNode(privateEd25519, null);
+      const volatileInfoConfigWrapper = new ConvoInfoVolatileWrapperNode(privateEd25519, null);
 
       /**
        * Setup up the User profile wrapper with what is stored in our own conversation
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index e407c1d4a..0c23a7258 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -598,7 +598,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
     if (db) {
       db.close();
     }
-    console.log('migrateDatabase: Migration without cipher change failed', error);
+    console.log('migrateDatabase: Migration without cipher change failed', error.message);
   }
 
   // If that fails, we try to open the database with 3.x compatibility to extract the
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index c703f8058..2e4d12c7f 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -75,8 +75,13 @@ async function initializeLibSessionUtilWrappers() {
 
   for (let index = 0; index < missingRequiredVariants.length; index++) {
     const missingVariant = missingRequiredVariants[index];
-    window.log.warn('initializeLibSessionUtilWrappers: missingRequiredVariants: ', missingVariant);
+    window.log.warn(
+      `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}"`
+    );
     await GenericWrapperActions.init(missingVariant, privateKeyEd25519, null);
+    window.log.debug(
+      `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}" created`
+    );
   }
 }
 
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index ea918e7be..a8f165e75 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,11 +1,10 @@
 import { isEmpty, isNull } from 'lodash';
 import {
-  BaseConfigWrapper,
-  BaseConfigWrapperInsideWorker,
-  ContactsConfigWrapperInsideWorker,
-  ConvoInfoVolatileWrapperInsideWorker,
-  UserConfigWrapperInsideWorker,
-  UserGroupsWrapperInsideWorker,
+  BaseConfigWrapperNode,
+  ContactsConfigWrapperNode,
+  ConvoInfoVolatileWrapperNode,
+  UserConfigWrapperNode,
+  UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
@@ -23,12 +22,12 @@ function assertUnreachable(_x: never, message: string): never {
 /* eslint-disable strict */
 
 // we can only have one of those so don't worry about storing them in a map for now
-let userProfileWrapper: UserConfigWrapperInsideWorker | undefined;
-let contactsConfigWrapper: ContactsConfigWrapperInsideWorker | undefined;
-let userGroupsConfigWrapper: UserGroupsWrapperInsideWorker | undefined;
-let convoInfoVolatileConfigWrapper: ConvoInfoVolatileWrapperInsideWorker | undefined;
+let userProfileWrapper: UserConfigWrapperNode | undefined;
+let contactsConfigWrapper: ContactsConfigWrapperNode | undefined;
+let userGroupsConfigWrapper: UserGroupsWrapperNode | undefined;
+let convoInfoVolatileConfigWrapper: ConvoInfoVolatileWrapperNode | undefined;
 
-function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperInsideWorker | undefined {
+function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperNode | undefined {
   switch (type) {
     case 'UserConfig':
       return userProfileWrapper;
@@ -43,9 +42,7 @@ function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperInside
   }
 }
 
-function getCorrespondingWrapper(
-  wrapperType: ConfigWrapperObjectTypes
-): BaseConfigWrapperInsideWorker {
+function getCorrespondingWrapper(wrapperType: ConfigWrapperObjectTypes): BaseConfigWrapperNode {
   switch (wrapperType) {
     case 'UserConfig':
     case 'ContactsConfig':
@@ -83,10 +80,7 @@ function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWra
 /**
  * This function can be used to initialize a wrapper which takes the private ed25519 key of the user and a dump as argument.
  */
-function initUserWrapper(
-  options: Array<any>,
-  wrapperType: ConfigWrapperObjectTypes
-): BaseConfigWrapper {
+function initUserWrapper(options: Array<any>, wrapperType: ConfigWrapperObjectTypes) {
   const userType = assertUserWrapperType(wrapperType);
 
   const wrapper = getUserWrapper(wrapperType);
@@ -107,17 +101,17 @@ function initUserWrapper(
   }
   switch (userType) {
     case 'UserConfig':
-      userProfileWrapper = new UserConfigWrapperInsideWorker(edSecretKey, dump);
-      return userProfileWrapper;
+      userProfileWrapper = new UserConfigWrapperNode(edSecretKey, dump);
+      break;
     case 'ContactsConfig':
-      contactsConfigWrapper = new ContactsConfigWrapperInsideWorker(edSecretKey, dump);
-      return contactsConfigWrapper;
+      contactsConfigWrapper = new ContactsConfigWrapperNode(edSecretKey, dump);
+      break;
     case 'UserGroupsConfig':
-      userGroupsConfigWrapper = new UserGroupsWrapperInsideWorker(edSecretKey, dump);
-      return userGroupsConfigWrapper;
+      userGroupsConfigWrapper = new UserGroupsWrapperNode(edSecretKey, dump);
+      break;
     case 'ConvoInfoVolatileConfig':
-      convoInfoVolatileConfigWrapper = new ConvoInfoVolatileWrapperInsideWorker(edSecretKey, dump);
-      return convoInfoVolatileConfigWrapper;
+      convoInfoVolatileConfigWrapper = new ConvoInfoVolatileWrapperNode(edSecretKey, dump);
+      break;
     default:
       assertUnreachable(userType, `initUserWrapper: Missing case error "${userType}"`);
   }
@@ -134,7 +128,6 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any]
       postMessage([jobId, null, null]);
       return;
     }
-
     const wrapper = getCorrespondingWrapper(config);
     const fn = (wrapper as any)[action];
 
diff --git a/yarn.lock b/yarn.lock
index 588e6359a..22b52d2cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2011,6 +2011,15 @@ auto-bind@^4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
+axios@^1.3.2:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646"
+  integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -2517,6 +2526,25 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
+cmake-js@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd"
+  integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA==
+  dependencies:
+    axios "^1.3.2"
+    debug "^4"
+    fs-extra "^10.1.0"
+    lodash.isplainobject "^4.0.6"
+    memory-stream "^1.0.0"
+    node-api-headers "^0.0.2"
+    npmlog "^6.0.2"
+    rc "^1.2.7"
+    semver "^7.3.8"
+    tar "^6.1.11"
+    url-join "^4.0.1"
+    which "^2.0.2"
+    yargs "^17.6.0"
+
 color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2861,7 +2889,7 @@ date-fns@^2.29.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3853,6 +3881,11 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
+follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
 foreground-child@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
@@ -3894,7 +3927,7 @@ fs-extra@9.0.0:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-extra@^10.0.0:
+fs-extra@^10.0.0, fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -5149,6 +5182,11 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -5265,6 +5303,13 @@ mem@^5.0.0:
     mimic-fn "^2.1.0"
     p-is-promise "^2.1.0"
 
+memory-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2"
+  integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww==
+  dependencies:
+    readable-stream "^3.4.0"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5464,11 +5509,6 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@2.14.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
 nan@^2.14.0:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
@@ -5539,6 +5579,11 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+node-api-headers@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d"
+  integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg==
+
 node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -5651,7 +5696,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0:
+npmlog@^6.0.0, npmlog@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -6395,7 +6440,7 @@ rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.1.0"
 
-rc@^1.2.8:
+rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6593,6 +6638,15 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.4.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -7760,6 +7814,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+url-join@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
+  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
+
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
@@ -8090,7 +8149,7 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
+yargs-parser@^21.0.0, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -8148,6 +8207,19 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
+yargs@^17.6.0:
+  version "17.7.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
+  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From e263b701b03fed4c6e7f72b1e0f76cfd84fa9c8e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Apr 2023 10:31:43 +1000
Subject: [PATCH 074/178] chore: fetch latest archive from libsession nodejs
 git repo

---
 .github/workflows/build-binaries.yml          |  8 ---
 package.json                                  |  3 +-
 ts/node/migration/sessionMigrations.ts        | 12 ++---
 .../libsession_utils_user_profile.ts          |  6 +--
 .../browser/libsession_worker_interface.ts    |  8 ++-
 yarn.lock                                     | 50 ++++++-------------
 6 files changed, 30 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 50ceeae78..b07282917 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -64,14 +64,6 @@ jobs:
       - name: Generate and concat files
         run: yarn build-everything
 
-      - name: Lint Files
-        # no need to lint files on all platforms. Just do it once on the quicker one
-        if: runner.os == 'Linux'
-        run: yarn lint-full
-
-      - name: Unit Test
-        run: yarn test
-
       - name: Build windows production binaries
         if: runner.os == 'Windows'
         run: node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
diff --git a/package.json b/package.json
index 9d54cf536..17ef56126 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
@@ -202,6 +202,7 @@
     "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "^2.7.5",
     "mocha": "10.0.0",
+    "nan": "^2.17.0",
     "node-gyp": "9.0.0",
     "node-loader": "^2.0.0",
     "nyc": "^15.1.0",
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index e3a796c8f..6348d2e31 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1571,14 +1571,10 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
       const ourConvoPriority = ourConversation.priority;
       if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
-        userProfileWrapper.setUserInfo(
-          ourDbName,
-          ourConvoPriority,
-          ourDbProfileUrl || '',
-          ourDbProfileKey
-        );
-      } else {
-        userProfileWrapper.setUserInfo(ourDbName, ourConvoPriority, '', new Uint8Array());
+        userProfileWrapper.setUserInfo(ourDbName, ourConvoPriority, {
+          url: ourDbProfileUrl,
+          key: ourDbProfileKey,
+        });
       }
 
       insertContactIntoContactWrapper(
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index ab81913d8..02e6ef3a8 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -24,15 +24,13 @@ async function insertUserProfileIntoWrapper(convoId: string) {
     await UserConfigWrapperActions.setUserInfo(
       dbName,
       ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
-      dbProfileUrl,
-      dbProfileKey
+      { url: dbProfileUrl, key: dbProfileKey }
     );
   } else {
     await UserConfigWrapperActions.setUserInfo(
       dbName,
       ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
-      '',
-      new Uint8Array()
+      null
     );
   }
 }
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index dfb58369a..807042443 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -96,8 +96,12 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
     callLibSessionWorker(['UserConfig', 'getUserInfo']) as Promise<
       ReturnType<UserConfigWrapperActionsCalls['getUserInfo']>
     >,
-  setUserInfo: async (name: string, priority: number, url: string, key: Uint8Array) =>
-    callLibSessionWorker(['UserConfig', 'setUserInfo', name, priority, url, key]) as Promise<
+  setUserInfo: async (
+    name: string,
+    priority: number,
+    profilePic: { url: string; key: Uint8Array } | null
+  ) =>
+    callLibSessionWorker(['UserConfig', 'setUserInfo', name, priority, profilePic]) as Promise<
       ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>
     >,
 };
diff --git a/yarn.lock b/yarn.lock
index 22b52d2cc..001b5bc23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1704,7 +1704,7 @@ abab@^2.0.5, abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@^1.0.0:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -5083,19 +5083,19 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff":
-  version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#3c206781fdc242aa1e4b03ff88c8ba501998dbff"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.4/libsession_util_nodejs-v0.1.4.tar.gz":
+  version "0.1.4"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.4/libsession_util_nodejs-v0.1.4.tar.gz#a31cf2030b1b23508628c9f353b25c392e87a804"
   dependencies:
-    nan "^2.17.0"
-    node-gyp "^9.3.0"
+    cmake-js "^7.2.1"
+    node-addon-api "^6.1.0"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs#ec1c65776de580a62bc2e3498d931572ca97006f":
-  version "0.1.0"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs#ec1c65776de580a62bc2e3498d931572ca97006f"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz":
+  version "0.1.5"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz#4f9dbac0c3011fc3edd29ce0625cba1044db6990"
   dependencies:
-    nan "^2.17.0"
-    node-gyp "^9.3.0"
+    cmake-js "^7.2.1"
+    node-addon-api "^6.1.0"
 
 libsodium-sumo@^0.7.0:
   version "0.7.10"
@@ -5579,6 +5579,11 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+node-addon-api@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
+
 node-api-headers@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d"
@@ -5607,22 +5612,6 @@ node-gyp@9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-gyp@^9.3.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -5654,13 +5643,6 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"

From ce186517a30dd1c2a8552c1fd074e4da300bd2d9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Apr 2023 13:42:28 +1000
Subject: [PATCH 075/178] chore: lint code

---
 .github/workflows/build-binaries.yml                     | 8 ++++++++
 package.json                                             | 3 +--
 ts/components/SessionInboxView.tsx                       | 4 +++-
 ts/components/conversation/ConversationHeader.tsx        | 2 +-
 ts/components/conversation/MessageRequestButtons.tsx     | 4 +++-
 ts/components/conversation/SubtleNotification.tsx        | 2 +-
 ts/components/menu/MessageRequestBannerContextMenu.tsx   | 3 +--
 ts/models/conversation.ts                                | 4 +---
 ts/receiver/configMessage.ts                             | 2 +-
 ts/receiver/queuedJob.ts                                 | 7 ++-----
 ts/session/utils/job_runners/JobDeserialization.ts       | 2 +-
 ts/state/ducks/settings.tsx                              | 9 +++++++--
 .../libsession_wrapper_contacts_test.ts                  | 8 --------
 .../libsession_wrapper_usergroups_test.ts                | 1 -
 ts/test/session/unit/utils/Messages_test.ts              | 1 +
 ts/types/sqlSharedTypes.ts                               | 1 +
 ts/webworker/worker_interface.ts                         | 4 +++-
 .../workers/node/libsession/libsession.worker.ts         | 8 ++++----
 tslint.json                                              | 8 +-------
 19 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index b07282917..50ceeae78 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -64,6 +64,14 @@ jobs:
       - name: Generate and concat files
         run: yarn build-everything
 
+      - name: Lint Files
+        # no need to lint files on all platforms. Just do it once on the quicker one
+        if: runner.os == 'Linux'
+        run: yarn lint-full
+
+      - name: Unit Test
+        run: yarn test
+
       - name: Build windows production binaries
         if: runner.os == 'Windows'
         run: node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
diff --git a/package.json b/package.json
index 17ef56126..5e1ddb927 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,7 @@
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots",
-    "rebuild-libsession-for-unit-tests": "cd node_modules/session_util_wrapper/ && yarn configure && yarn build && cd ../../ ",
-    "test": "yarn rebuild-libsession-for-unit-tests && mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
+    "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "coverage": "nyc --reporter=html mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index 2c5ecb383..e357ba7bf 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -117,7 +117,9 @@ const SomeDeviceOutdatedSyncingNotice = () => {
 export const SessionInboxView = () => {
   const update = useUpdate();
   // run only on mount
-  useEffect(() => setupLeftPane(update), []);
+  useEffect(() => {
+    setupLeftPane(update);
+  }, []);
 
   if (!window.inboxStore) {
     return null;
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 53806eb51..ed8c31155 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -34,10 +34,10 @@ import {
   useSelectedConversationKey,
   useSelectedIsActive,
   useSelectedIsBlocked,
-  useSelectedIsPrivateFriend,
   useSelectedIsGroup,
   useSelectedIsKickedFromGroup,
   useSelectedIsPrivate,
+  useSelectedIsPrivateFriend,
   useSelectedIsPublic,
   useSelectedMembers,
   useSelectedNotificationSetting,
diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx
index aec060261..4b874e30e 100644
--- a/ts/components/conversation/MessageRequestButtons.tsx
+++ b/ts/components/conversation/MessageRequestButtons.tsx
@@ -63,7 +63,9 @@ const handleDeclineAndBlockConversationRequest = (
 
 const handleAcceptConversationRequest = async (convoId: string) => {
   const convo = getConversationController().get(convoId);
-  if (!convo) return;
+  if (!convo) {
+    return;
+  }
   await convo.setDidApproveMe(true, false);
   await convo.setIsApproved(true, false);
   await convo.commit();
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
index 3f5b51f74..57c9a3ce2 100644
--- a/ts/components/conversation/SubtleNotification.tsx
+++ b/ts/components/conversation/SubtleNotification.tsx
@@ -77,7 +77,7 @@ export const NoMessageNoMessageInConversation = () => {
   return (
     <Container>
       <TextInner>
-        <SessionHtmlRenderer html={window.i18n(localizedKey, [nameToRender])}></SessionHtmlRenderer>
+        <SessionHtmlRenderer html={window.i18n(localizedKey, [nameToRender])} />
       </TextInner>
     </Container>
   );
diff --git a/ts/components/menu/MessageRequestBannerContextMenu.tsx b/ts/components/menu/MessageRequestBannerContextMenu.tsx
index 273e50c4c..d6e3f67e4 100644
--- a/ts/components/menu/MessageRequestBannerContextMenu.tsx
+++ b/ts/components/menu/MessageRequestBannerContextMenu.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
-import { animation, Menu } from 'react-contexify';
+import { animation, Item, Menu } from 'react-contexify';
 import _ from 'lodash';
 
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 import { useDispatch } from 'react-redux';
 import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
-import { Item } from 'react-contexify';
 
 export type PropsContextConversationItem = {
   triggerId: string;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 7c9a6a83c..d5a05db91 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1217,8 +1217,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * When receiving a shared config message, we need to apply the change after the merge happened to our database.
    * This is done with this function.
    * There are other actions to change the priority from the UI (or from )
-   * @param priority
-   * @param shouldCommit
    */
   public async setPriorityFromWrapper(
     priority: number,
@@ -1709,7 +1707,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
 
       // we are trying to send a message to someone. Make sure this convo is not hidden
-      this.unhideIfNeeded(true);
+      await this.unhideIfNeeded(true);
 
       // an OpenGroupV2 message is just a visible message
       const chatMessageParams: VisibleMessageParams = {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index b2b42c3ad..c81bf2e1f 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -885,7 +885,7 @@ async function handleConfigurationMessageLegacy(
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
-    window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true);
+    await window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true);
     await removeFromCache(envelope);
     return;
   }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 807a63a79..d6063056d 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -311,10 +311,7 @@ async function handleExpirationTimerUpdateNoCommit(
   await conversation.updateExpireTimer(expireTimer, source, message.get('received_at'), {}, false);
 }
 
-async function markConvoAsReadIfOutgoingMessage(
-  conversation: ConversationModel,
-  message: MessageModel
-) {
+function markConvoAsReadIfOutgoingMessage(conversation: ConversationModel, message: MessageModel) {
   const isOutgoingMessage =
     message.get('type') === 'outgoing' || message.get('direction') === 'outgoing';
   if (isOutgoingMessage) {
@@ -400,7 +397,7 @@ export async function handleMessageJob(
       );
     }
 
-    await markConvoAsReadIfOutgoingMessage(conversation, messageModel);
+    markConvoAsReadIfOutgoingMessage(conversation, messageModel);
     if (messageModel.get('unread')) {
       conversation.throttledNotify(messageModel);
     }
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index a3d9d4dc9..72ab41c10 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -30,7 +30,7 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
     case 'FakeSleepForJobMultiType':
       return (new FakeSleepForMultiJob(data) as unknown) as PersistedJob<T>;
     default:
-      console.error('unknown persisted job type:', (data as any).jobType);
+      window?.log?.error('unknown persisted job type:', (data as any).jobType);
       return null;
   }
 }
diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx
index eda23a6e6..7f7050ff3 100644
--- a/ts/state/ducks/settings.tsx
+++ b/ts/state/ducks/settings.tsx
@@ -49,15 +49,20 @@ const settingsSlice = createSlice({
     updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) {
       const { id, value } = action.payload;
 
-      if (!isTrackedBoolean(id) || !isBoolean(value)) return state;
+      if (!isTrackedBoolean(id) || !isBoolean(value)) {
+        return state;
+      }
 
       state.settingsBools[id] = value;
 
       return state;
     },
     deleteSettingsBoolValue(state, action: PayloadAction<string>) {
-      if (!isTrackedBoolean(action.payload)) return state;
+      if (!isTrackedBoolean(action.payload)) {
+        return state;
+      }
 
+      // tslint:disable-next-line: no-dynamic-delete
       delete state.settingsBools[action.payload];
       return state;
     },
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 15e676fea..44cf64a74 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -10,17 +10,9 @@ import { UserUtils } from '../../../../session/utils';
 import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-// import * as SessionUtilWrapper from 'libsession_util_nodejs';
 
 // tslint:disable-next-line: max-func-body-length
 describe('libsession_contacts', () => {
-  // Note: To run this test, you need to compile the libsession wrapper for node (and not for electron).
-  // To do this, you can cd to the node_module/libsession_wrapper folder and do
-  // yarn configure && yarn build
-  // once that is done, you can rename this file and remove the _skip suffix so that test is run.
-
-  // We have to disable it by filename as nodejs tries to load the module during the import step above, and fails as it is not compiled for nodejs but for electron.
-
   describe('filter contacts for wrapper', () => {
     const ourNumber = '051234567890acbdef';
     const validArgs = {
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index 118d26631..166ce063f 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -10,7 +10,6 @@ import { UserUtils } from '../../../../session/utils';
 import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
 
 // tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-// import * as SessionUtilWrapper from 'libsession_util_nodejs';
 
 // tslint:disable-next-line: max-func-body-length
 describe('libsession_groups', () => {
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index 0e2822b95..0f3d34913 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -27,6 +27,7 @@ import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
 chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
+// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string  max-func-body-length
 
 describe('Message Utils', () => {
   afterEach(() => {
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 9b54d4bd6..9b6fc9a69 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -242,6 +242,7 @@ export function getLegacyGroupInfoFromDBValues({
  */
 export function assertUnreachable(_x: never, message: string): never {
   const msg = `assertUnreachable: Didn't expect to get here with "${message}"`;
+  // tslint:disable: no-console
   console.info(msg);
   throw new Error(msg);
 }
diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts
index 935e53e8d..201ed703f 100644
--- a/ts/webworker/worker_interface.ts
+++ b/ts/webworker/worker_interface.ts
@@ -43,7 +43,9 @@ export class WorkerInterface {
       const { resolve, reject, fnName } = job;
 
       if (errorForDisplay) {
-        console.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
+        // tslint:disable: no-console
+
+        window?.log?.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
         return reject(
           new Error(`Error received from worker job ${jobId} (${fnName}): ${errorForDisplay}`)
         );
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index a8f165e75..1fcc7ba43 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -8,19 +8,19 @@ import {
 } from 'libsession_util_nodejs';
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
+/* eslint-disable no-console */
+/* eslint-disable strict */
+// tslint:disable: no-console
+
 /**
  *
  * @param _x Looks like we need to duplicate this function here as we cannot import the existing one from a webworker context
- * @param message
  */
 function assertUnreachable(_x: never, message: string): never {
   console.info(`assertUnreachable: Didn't expect to get here with "${message}"`);
   throw new Error("Didn't expect to get here");
 }
 
-/* eslint-disable no-console */
-/* eslint-disable strict */
-
 // we can only have one of those so don't worry about storing them in a map for now
 let userProfileWrapper: UserConfigWrapperNode | undefined;
 let contactsConfigWrapper: ContactsConfigWrapperNode | undefined;
diff --git a/tslint.json b/tslint.json
index 0838b513f..b0d7b49f0 100644
--- a/tslint.json
+++ b/tslint.json
@@ -29,13 +29,7 @@
     "prefer-for-of": false,
     "chai-vague-errors": false,
     "no-useless-files": false,
-    "ordered-imports": [
-      true,
-      {
-        "import-sources-order": "any",
-        "named-imports-order": "case-insensitive"
-      }
-    ],
+    "ordered-imports": false,
     "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"],
     "semicolon": [true, "always", "ignore-bound-class-methods"],
     "trailing-comma": [

From 9c0f40473c732a752464308ca127de6e8688c02d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Apr 2023 15:46:12 +1000
Subject: [PATCH 076/178] fix: readd dmg-builder as a resolution instead of
 root package

---
 package.json          |   1 +
 ts/updater/updater.ts |   2 +-
 yarn.lock             | 805 +++++++++++++++++++++++-------------------
 3 files changed, 449 insertions(+), 359 deletions(-)

diff --git a/package.json b/package.json
index 5e1ddb927..4f54eec2c 100644
--- a/package.json
+++ b/package.json
@@ -186,6 +186,7 @@
     "concurrently": "^7.4.0",
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
+    "dmg-builder": "23.6.0",
     "electron": "^17.2.0",
     "electron-builder": "22.8.0",
     "electron-notarize": "^0.2.0",
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index a673a3c4a..ce592fb11 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -110,7 +110,7 @@ async function checkForUpdates(
 
     logger.info('[updater] checkForUpdates got github response back ');
 
-    if (!result.updateInfo) {
+    if (!result?.updateInfo) {
       logger.info('[updater] no update info received');
 
       return;
diff --git a/yarn.lock b/yarn.lock
index 001b5bc23..90703f5d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
   integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
 
+"7zip-bin@~5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
+  integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
+
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -15,52 +20,19 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
-  integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
-
 "@babel/compat-data@^7.18.8":
   version "7.18.8"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
   integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
 
-"@babel/core@^7.14.8":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.0.tgz#c58d04d7c6fbfb58ea7681e2b9145cfb62726756"
-  integrity sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.0"
-    "@babel/helper-compilation-targets" "^7.17.10"
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helpers" "^7.18.0"
-    "@babel/parser" "^7.18.0"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/core@^7.7.5":
+"@babel/core@^7.14.8", "@babel/core@^7.7.5":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
   integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
@@ -81,15 +53,6 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.0.tgz#46d28e8a18fc737b028efb25ab105d74473af43f"
-  integrity sha512-81YO9gGx6voPXlvYdZBliFXAZU8vZ9AZ6z+CjlmcnaeOcYSFbMTpdeDUO9xD9dh/68Vq03I8ZspfUTPfitcDHg==
-  dependencies:
-    "@babel/types" "^7.18.0"
-    "@jridgewell/gen-mapping" "^0.3.0"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.9.tgz#68337e9ea8044d6ddc690fb29acae39359cca0a5"
@@ -106,16 +69,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe"
-  integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==
-  dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
 "@babel/helper-compilation-targets@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
@@ -139,27 +92,12 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-environment-visitor@^7.18.9":
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
-"@babel/helper-function-name@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-function-name@^7.18.9":
+"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
   integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
@@ -167,13 +105,6 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -188,35 +119,14 @@
   dependencies:
     "@babel/types" "^7.17.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
-  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-
-"@babel/helper-module-transforms@^7.18.9":
+"@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
   integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
@@ -253,14 +163,7 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
-  dependencies:
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-simple-access@^7.18.6":
+"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
   integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
@@ -274,49 +177,23 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-validator-option@^7.18.6":
+"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
-"@babel/helpers@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.0.tgz#aff37c3590de42102b54842446146d0205946370"
-  integrity sha512-AE+HMYhmlMIbho9nbvicHyxFwhrO+xhKB6AhRxzl8w46Yj0VXTZjEsAoBVC7rB2I0jzX+yWyVybnO08qkfx6kg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-
 "@babel/helpers@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
@@ -326,15 +203,6 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/highlight@^7.16.7":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
-  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -344,11 +212,6 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.0.tgz#10a8d4e656bc01128d299a787aa006ce1a91e112"
-  integrity sha512-AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg==
-
 "@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539"
@@ -548,29 +411,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.0.tgz#6d77142a19cb6088f0af662af1ada37a604d34ae"
-  integrity sha512-YMQvx/6nKEaucl0MY56mwIG483xk8SDNdlUwb2Ts6FUpr7fm85DxEmsY18LXBNhcTz6tO6JwZV8w1W06v8UKeg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.12.1":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
   integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
 "@babel/template@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
@@ -580,23 +427,7 @@
     "@babel/parser" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/traverse@^7.16.7", "@babel/traverse@^7.18.0", "@babel/traverse@^7.4.5":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.0.tgz#0e5ec6db098660b2372dd63d096bf484e32d27ba"
-  integrity sha512-oNOO4vaoIQoGjDQ84LgtF/IAlxlyqL4TUuoQ7xLkQETFaHkY1F7yazhB4Kt3VcZGL0ZF/jhrEpnXqUb0M7V3sw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.0"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.18.0"
-    "@babel/types" "^7.18.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.18.9":
+"@babel/traverse@^7.16.7", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98"
   integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
@@ -612,15 +443,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.0.tgz#ef523ea349722849cb4bf806e9342ede4d071553"
-  integrity sha512-vhAmLPAiC8j9K2GnsnLPCIH5wCrPpYIVBCWRBFDCB7Y/BXLqi/O+1RSTTM2bsmg6U/551+FCf9PNPxjABmxHTw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.18.6", "@babel/types@^7.18.9":
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.9.tgz#7148d64ba133d8d73a41b3172ac4b83a1452205f"
   integrity sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==
@@ -657,6 +480,19 @@
     global-agent "^3.0.0"
     global-tunnel-ng "^2.7.1"
 
+"@electron/universal@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
+  integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==
+  dependencies:
+    "@malept/cross-spawn-promise" "^1.1.0"
+    asar "^3.1.0"
+    debug "^4.3.1"
+    dir-compare "^2.4.0"
+    fs-extra "^9.0.1"
+    minimatch "^3.0.4"
+    plist "^3.0.4"
+
 "@emoji-mart/data@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.6.tgz#68f71be5e023653a3f9f73f4beadfd50848e2131"
@@ -768,16 +604,7 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/gen-mapping@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
-  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/gen-mapping@^0.3.2":
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
@@ -791,17 +618,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
-  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
-
-"@jridgewell/set-array@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
-  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
-
-"@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -814,17 +631,12 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
-  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
-
-"@jridgewell/trace-mapping@^0.3.14":
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -832,13 +644,22 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
-  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+"@malept/cross-spawn-promise@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    cross-spawn "^7.0.1"
+
+"@malept/flatpak-bundler@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858"
+  integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==
+  dependencies:
+    debug "^4.1.1"
+    fs-extra "^9.0.0"
+    lodash "^4.17.15"
+    tmp-promise "^3.0.2"
 
 "@npmcli/fs@^2.1.0":
   version "2.1.0"
@@ -1107,7 +928,7 @@
   resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0"
   integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ==
 
-"@types/debug@^4.1.5":
+"@types/debug@^4.1.5", "@types/debug@^4.1.6":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
   integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
@@ -1180,7 +1001,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^9.0.1":
+"@types/fs-extra@^9.0.1", "@types/fs-extra@^9.0.11":
   version "9.0.13"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
   integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
@@ -1336,6 +1157,14 @@
   resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39"
   integrity sha512-a5AKF1/9pCU3HGMkesgY6LsBdXHUY3WU+I2qgpU0J+I8XuJA1aFr59eS84/HP0+dxsyBSNbt+4yGI2adUpHwSg==
 
+"@types/plist@^3.0.1":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
+  integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==
+  dependencies:
+    "@types/node" "*"
+    xmlbuilder ">=11.0.1"
+
 "@types/prop-types@*":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
@@ -1512,15 +1341,20 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
   integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
 
+"@types/verror@^1.10.3":
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
+  integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^15.0.5":
-  version "15.0.14"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
-  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
+  version "15.0.15"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158"
+  integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1873,6 +1707,11 @@ app-builder-bin@3.5.9:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
   integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==
 
+app-builder-bin@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
+  integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
+
 app-builder-lib@22.8.0:
   version "22.8.0"
   resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.8.0.tgz#342a8976f50ae35cfd07412dbfd4f6c895b32eac"
@@ -1901,6 +1740,38 @@ app-builder-lib@22.8.0:
     semver "^7.3.2"
     temp-file "^3.3.7"
 
+app-builder-lib@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8"
+  integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==
+  dependencies:
+    "7zip-bin" "~5.1.1"
+    "@develar/schema-utils" "~2.6.5"
+    "@electron/universal" "1.2.1"
+    "@malept/flatpak-bundler" "^0.4.0"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
+    chromium-pickle-js "^0.2.0"
+    debug "^4.3.4"
+    ejs "^3.1.7"
+    electron-osx-sign "^0.6.0"
+    electron-publish "23.6.0"
+    form-data "^4.0.0"
+    fs-extra "^10.1.0"
+    hosted-git-info "^4.1.0"
+    is-ci "^3.0.0"
+    isbinaryfile "^4.0.10"
+    js-yaml "^4.1.0"
+    lazy-val "^1.0.5"
+    minimatch "^3.1.2"
+    read-config-file "6.2.0"
+    sanitize-filename "^1.6.3"
+    semver "^7.3.7"
+    tar "^6.1.11"
+    temp-file "^3.4.0"
+
 append-transform@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
@@ -1971,6 +1842,18 @@ asar@3.1.0:
   optionalDependencies:
     "@types/glob" "^7.1.1"
 
+asar@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
+  integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
+
 asbycountry@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/asbycountry/-/asbycountry-1.4.2.tgz#26bf0e090225b93f7d1fc5a177899c900b5c8258"
@@ -1979,11 +1862,21 @@ asbycountry@^1.4.2:
     chalk "^1.1.3"
     fetch "^1.1.0"
 
+assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
   integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async-exit-hook@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
@@ -2063,7 +1956,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
+base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -2111,7 +2004,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2170,7 +2063,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.14.5:
+browserslist@^4.14.5, browserslist@^4.20.2:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
   integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
@@ -2180,27 +2073,47 @@ browserslist@^4.14.5:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
-browserslist@^4.20.2:
-  version "4.20.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
-  integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
-    caniuse-lite "^1.0.30001332"
-    electron-to-chromium "^1.4.118"
-    escalade "^3.1.1"
-    node-releases "^2.0.3"
-    picocolors "^1.0.0"
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
 
 buffer-crc32@0.2.13, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
+buffer-equal@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
+  integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+buffer@^5.1.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 buffer@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
@@ -2225,6 +2138,14 @@ builder-util-runtime@8.9.2:
     debug "^4.3.2"
     sax "^1.2.4"
 
+builder-util-runtime@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60"
+  integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==
+  dependencies:
+    debug "^4.3.4"
+    sax "^1.2.4"
+
 builder-util@22.8.0:
   version "22.8.0"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.8.0.tgz#01684085d1f2370b1bd182f69cbd007426f63f64"
@@ -2245,6 +2166,29 @@ builder-util@22.8.0:
     stat-mode "^1.0.0"
     temp-file "^3.3.7"
 
+builder-util@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9"
+  integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==
+  dependencies:
+    "7zip-bin" "~5.1.1"
+    "@types/debug" "^4.1.6"
+    "@types/fs-extra" "^9.0.11"
+    app-builder-bin "4.0.0"
+    bluebird-lst "^1.0.9"
+    builder-util-runtime "9.1.1"
+    chalk "^4.1.1"
+    cross-spawn "^7.0.3"
+    debug "^4.3.4"
+    fs-extra "^10.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-ci "^3.0.0"
+    js-yaml "^4.1.0"
+    source-map-support "^0.5.19"
+    stat-mode "^1.0.0"
+    temp-file "^3.4.0"
+
 builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2347,11 +2291,6 @@ camelize@^1.0.0:
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==
 
-caniuse-lite@^1.0.30001332:
-  version "1.0.30001342"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
-  integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
-
 caniuse-lite@^1.0.30001400:
   version "1.0.30001436"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz#22d7cbdbbbb60cdc4ca1030ccd6dea9f5de4848b"
@@ -2410,7 +2349,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2458,6 +2397,11 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+ci-info@^3.2.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
 classnames@2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
@@ -2478,6 +2422,14 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+  dependencies:
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
+
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -2595,6 +2547,11 @@ colorette@^2.0.14:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==
+
 colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -2607,6 +2564,13 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
 commander@^2.12.1, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2632,6 +2596,11 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
+compare-version@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
+  integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==
+
 component-classes@^1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691"
@@ -2739,6 +2708,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -2760,6 +2734,13 @@ country-code-lookup@^0.0.19:
   resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6"
   integrity sha512-lpvgdPyj8RuP0CSZhACNf5ueKlLbv/IQUAQfg7yr/qJbFrdcWV7Y+aDN9K/u/bx3MXRfcsjuW+TdIc0AEj7kDw==
 
+crc@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
+  dependencies:
+    buffer "^5.1.0"
+
 cross-env@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
@@ -2778,7 +2759,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2889,14 +2870,14 @@ date-fns@^2.29.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debug@^2.6.9:
+debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3019,17 +3000,43 @@ diff@^4.0.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-dmg-builder@22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.8.0.tgz#2b17127837ed444db3086317eda5cf8912f6e6a9"
-  integrity sha512-orePWjcrl97SYLA8F/6UUtbXJSoZCYu5KOP1lVqD4LOomr8bjGDyEVYZmZYcg5WqKmXucdmO6OpqgzH/aRMMuA==
+dir-compare@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
+  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
   dependencies:
-    app-builder-lib "22.8.0"
-    builder-util "22.8.0"
-    fs-extra "^9.0.1"
+    buffer-equal "1.0.0"
+    colors "1.0.3"
+    commander "2.9.0"
+    minimatch "3.0.4"
+
+dmg-builder@22.8.0, dmg-builder@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948"
+  integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==
+  dependencies:
+    app-builder-lib "23.6.0"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
+    fs-extra "^10.0.0"
     iconv-lite "^0.6.2"
-    js-yaml "^3.14.0"
-    sanitize-filename "^1.6.3"
+    js-yaml "^4.1.0"
+  optionalDependencies:
+    dmg-license "^1.0.11"
+
+dmg-license@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a"
+  integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==
+  dependencies:
+    "@types/plist" "^3.0.1"
+    "@types/verror" "^1.10.3"
+    ajv "^6.10.0"
+    crc "^3.8.0"
+    iconv-corefoundation "^1.1.7"
+    plist "^3.0.4"
+    smart-buffer "^4.0.2"
+    verror "^1.10.0"
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -3087,6 +3094,11 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
+dotenv@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
+  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
+
 dtrace-provider@~0.8:
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e"
@@ -3149,6 +3161,18 @@ electron-notarize@^0.2.0:
     debug "^4.1.1"
     fs-extra "^8.1.0"
 
+electron-osx-sign@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
+  integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
+  dependencies:
+    bluebird "^3.5.0"
+    compare-version "^0.1.2"
+    debug "^2.6.8"
+    isbinaryfile "^3.0.2"
+    minimist "^1.2.0"
+    plist "^3.0.1"
+
 electron-publish@22.8.0:
   version "22.8.0"
   resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.8.0.tgz#7f410fe043abc5d3d896c4ee9eea7a43ea352c7d"
@@ -3163,10 +3187,18 @@ electron-publish@22.8.0:
     lazy-val "^1.0.4"
     mime "^2.4.6"
 
-electron-to-chromium@^1.4.118:
-  version "1.4.137"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f"
-  integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==
+electron-publish@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9"
+  integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==
+  dependencies:
+    "@types/fs-extra" "^9.0.11"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
+    chalk "^4.1.1"
+    fs-extra "^10.0.0"
+    lazy-val "^1.0.5"
+    mime "^2.5.2"
 
 electron-to-chromium@^1.4.251:
   version "1.4.284"
@@ -3237,15 +3269,7 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
-  integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enhanced-resolve@^5.10.0:
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
   integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
@@ -3738,6 +3762,11 @@ extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -3954,7 +3983,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.1:
+fs-extra@^9.0.0, fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -4209,6 +4238,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4299,6 +4333,13 @@ hosted-git-info@^3.0.5:
   dependencies:
     lru-cache "^6.0.0"
 
+hosted-git-info@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
@@ -4358,6 +4399,14 @@ hyphenate-style-name@^1.0.2:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
+iconv-corefoundation@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
+  integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==
+  dependencies:
+    cli-truncate "^2.1.0"
+    node-addon-api "^1.6.3"
+
 iconv-lite@0.6.3, iconv-lite@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
@@ -4377,7 +4426,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.2.1:
+ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -4415,7 +4464,7 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+  integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==
 
 import-local@^3.0.2:
   version "3.1.0"
@@ -4547,6 +4596,20 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-ci@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+  dependencies:
+    ci-info "^3.2.0"
+
+is-core-module@^2.11.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
+  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -4723,7 +4786,14 @@ isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isbinaryfile@^4.0.6:
+isbinaryfile@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isbinaryfile@^4.0.10, isbinaryfile@^4.0.6:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
@@ -4975,7 +5045,7 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
+json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -5031,12 +5101,7 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
-
-klona@^2.0.6:
+klona@^2.0.5, klona@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
@@ -5083,13 +5148,6 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.4/libsession_util_nodejs-v0.1.4.tar.gz":
-  version "0.1.4"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.4/libsession_util_nodejs-v0.1.4.tar.gz#a31cf2030b1b23508628c9f353b25c392e87a804"
-  dependencies:
-    cmake-js "^7.2.1"
-    node-addon-api "^6.1.0"
-
 "libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz":
   version "0.1.5"
   resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz#4f9dbac0c3011fc3edd29ce0625cba1044db6990"
@@ -5192,7 +5250,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5342,7 +5400,7 @@ mime-types@^2.1.12, mime-types@^2.1.27:
   dependencies:
     mime-db "1.52.0"
 
-mime@^2.4.6:
+mime@^2.4.6, mime@^2.5.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
@@ -5369,7 +5427,7 @@ mini-css-extract-plugin@^2.7.5:
   dependencies:
     schema-utils "^4.0.0"
 
-"minimatch@2 || 3", minimatch@5.0.1, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5509,12 +5567,7 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@^2.14.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-
-nan@^2.17.0:
+nan@^2.14.0, nan@^2.17.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
@@ -5579,6 +5632,11 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+node-addon-api@^1.6.3:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
+  integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
+
 node-addon-api@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
@@ -5626,11 +5684,6 @@ node-preload@^0.2.1:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
-  integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
-
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
@@ -6113,6 +6166,14 @@ playwright@1.16.3:
   dependencies:
     playwright-core "=1.16.3"
 
+plist@^3.0.1, plist@^3.0.4:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
+  integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
+  dependencies:
+    base64-js "^1.5.1"
+    xmlbuilder "^15.1.1"
+
 pngjs@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
@@ -6422,7 +6483,7 @@ rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.1.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6602,6 +6663,17 @@ read-config-file@6.0.0:
     json5 "^2.1.2"
     lazy-val "^1.0.4"
 
+read-config-file@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
+  integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg==
+  dependencies:
+    dotenv "^9.0.2"
+    dotenv-expand "^5.1.0"
+    js-yaml "^4.1.0"
+    json5 "^2.2.0"
+    lazy-val "^1.0.4"
+
 read-last-lines-ts@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/read-last-lines-ts/-/read-last-lines-ts-1.2.1.tgz#99e46288c5373c06e16e90e666a46b595dad80a1"
@@ -6620,7 +6692,7 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.4.0:
+readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -6629,15 +6701,6 @@ readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -6716,11 +6779,11 @@ regexpp@^3.2.0:
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac"
+  integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==
   dependencies:
-    rc "^1.2.8"
+    rc "1.2.8"
 
 registry-url@^5.0.0:
   version "5.1.0"
@@ -6783,7 +6846,16 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2:
+resolve@^1.10.0:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6988,17 +7060,10 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
+  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -7111,7 +7176,16 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-smart-buffer@^4.2.0:
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -7191,9 +7265,9 @@ spawn-wrap@^2.0.0:
     which "^2.0.1"
 
 spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -7212,9 +7286,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
 sprintf-js@^1.1.2:
   version "1.1.2"
@@ -7453,7 +7527,7 @@ tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-temp-file@^3.3.7:
+temp-file@^3.3.7, temp-file@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7"
   integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==
@@ -7506,6 +7580,13 @@ throttle-debounce@^3.0.1:
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
   integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
 
+tmp-promise@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
+  integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==
+  dependencies:
+    tmp "^0.2.0"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -7513,6 +7594,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -7839,6 +7927,15 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+verror@^1.10.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
+  integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -8088,6 +8185,11 @@ xml-name-validator@^4.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
+xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
+  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -8131,7 +8233,7 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0, yargs-parser@^21.1.1:
+yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -8176,20 +8278,7 @@ yargs@^15.0.2, yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^17.3.1:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
-  integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
-
-yargs@^17.6.0:
+yargs@^17.3.1, yargs@^17.6.0:
   version "17.7.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
   integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==

From 2fa47434173b551ef0a32801d9a98542f0960e58 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Apr 2023 15:47:05 +1000
Subject: [PATCH 077/178] chore: build windows bins on windows-2022

---
 .github/workflows/build-binaries.yml | 4 ++--
 .github/workflows/pull-request.yml   | 4 ++--
 .github/workflows/release.yml        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 50ceeae78..a5a438b05 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-latest, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,7 +47,7 @@ jobs:
 
       # Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1.3.1
         if: runner.os == 'Windows'
 
       - name: Setup node for windows
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 1eca8ba2f..c274ae199 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-latest, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
 
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1.3.1
         if: runner.os == 'Windows'
 
       - name: Setup node for windows
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb362ef0c..66bb0ad5a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-latest, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -44,7 +44,7 @@ jobs:
 
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1.3.1
         if: runner.os == 'Windows'
 
       - name: Setup node for windows

From dc1daf7ed491ea9560145308ac96020e94576c32 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 27 Apr 2023 16:51:26 +1000
Subject: [PATCH 078/178] chore: include libsession node module into packaged
 apps

---
 .github/workflows/build-binaries.yml | 6 +++---
 .github/workflows/pull-request.yml   | 6 +++---
 .github/workflows/release.yml        | 6 +++---
 package.json                         | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index a5a438b05..c85c95b76 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-11, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
         if: runner.os == 'Windows'
         uses: crazy-max/ghaction-chocolatey@v1.4.2
         with:
-          args: install python2 visualcpp-build-tools -y
+          args: install python2 -y
 
       # Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
@@ -55,7 +55,7 @@ jobs:
         run: |
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2017
+          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c274ae199..d6b9c1405 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-11, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -39,7 +39,7 @@ jobs:
         if: runner.os == 'Windows'
         uses: crazy-max/ghaction-chocolatey@v1.4.2
         with:
-          args: install python2 visualcpp-build-tools -y
+          args: install python2 -y
 
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
@@ -51,7 +51,7 @@ jobs:
         run: |
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2017
+          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66bb0ad5a..1e83298cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-latest, ubuntu-20.04]
+        os: [windows-2022, macos-11, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -40,7 +40,7 @@ jobs:
         if: runner.os == 'Windows'
         uses: crazy-max/ghaction-chocolatey@v1.4.2
         with:
-          args: install python2 visualcpp-build-tools -y
+          args: install python2 -y
 
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
@@ -52,7 +52,7 @@ jobs:
         run: |
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2017
+          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/package.json b/package.json
index 4f54eec2c..cab8729a3 100644
--- a/package.json
+++ b/package.json
@@ -349,6 +349,7 @@
       "!**/*.ts",
       "node_modules/spellchecker/build/Release/*.node",
       "node_modules/websocket/build/Release/*.node",
+      "node_modules/libsession_util_nodejs/build/Release/*.node",
       "node_modules/socks/build/*.js",
       "node_modules/socks/build/common/*.js",
       "node_modules/socks/build/client/*.js",

From 1c48ff8a49462f5fb4657d3a5de1fb590074dd14 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 28 Apr 2023 12:16:23 +1000
Subject: [PATCH 079/178] chore: include worker .node in addition to libsession
 .node

---
 package.json       | 7 +++++--
 ts/util/logging.ts | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index cab8729a3..546cfb21c 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "build-release:macos": "yarn build-release-non-linux",
     "build-release:linux": "yarn sedtoDeb; yarn build-release-non-linux && yarn sedtoAppImage && yarn build-release-non-linux && yarn sedtoDeb",
     "build-release-publish": "run-script-os",
-    "build-release-publish-non-linux": "cross-env SIGNAL_ENV=production $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=always",
+    "build-release-publish-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=always",
     "build-release-publish:win32": "yarn build-release-publish-non-linux",
     "build-release-publish:macos": "yarn build-release-publish-non-linux",
     "build-release-publish:linux": "yarn sedtoDeb; yarn build-release-publish-non-linux && yarn sedtoAppImage && yarn build-release-publish-non-linux && yarn sedtoDeb",
@@ -66,7 +66,7 @@
     "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../",
     "update-git-info": "node ./build/updateLocalConfig.js",
     "worker:utils": "webpack  --config=./utils.worker.config.js",
-    "worker:libsession": "webpack  --config=./libsession.worker.config.js"
+    "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js"
   },
   "dependencies": {
     "@emoji-mart/data": "^1.0.6",
@@ -283,6 +283,8 @@
     },
     "asarUnpack": [
       "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "node_modules/libsession_util_nodejs/build/Release/libsession_util_nodejs.node",
+      "ts/webworker/workers/node/libsession/*.node",
       "ts/mains/main_node.js"
     ],
     "deb": {
@@ -362,6 +364,7 @@
       "!node_modules/better-sqlite3/deps/*",
       "!node_modules/better-sqlite3/src/*",
       "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "ts/webworker/workers/node/libsession/*.node",
       "!dev-app-update.yml"
     ]
   }
diff --git a/ts/util/logging.ts b/ts/util/logging.ts
index dbe854bd5..25269d710 100644
--- a/ts/util/logging.ts
+++ b/ts/util/logging.ts
@@ -135,8 +135,12 @@ window.log = {
 };
 
 window.onerror = (_message, _script, _line, _col, error) => {
-  const errorInfo = error && error.stack ? error.stack : JSON.stringify(error);
-  window.log.error(`Top-level unhandled error: ${errorInfo}`);
+  const errorInfo = JSON.stringify(error);
+
+  window.log.error(
+    `Top-level unhandled error: "${_message}";"${_script}";"${_line}";"${_col}" ${errorInfo}`,
+    error
+  );
 };
 
 window.addEventListener('unhandledrejection', rejectionEvent => {

From 7bb0e52dce03c8291a2a784b0b939590a19417df Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 1 May 2023 09:52:29 +1000
Subject: [PATCH 080/178] chore: update gh actions expiring soon

---
 .github/workflows/build-binaries.yml | 13 +++----------
 .github/workflows/pull-request.yml   | 11 ++---------
 .github/workflows/release.yml        | 11 ++---------
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index c85c95b76..daf07e1ff 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -27,24 +27,18 @@ jobs:
 
       # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version-file: '.nvmrc'
 
       - name: Cache Desktop node_modules
         id: cache-desktop-modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: runner.os != 'Windows'
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
 
-      - name: Chocolatey Install Action
-        if: runner.os == 'Windows'
-        uses: crazy-max/ghaction-chocolatey@v1.4.2
-        with:
-          args: install python2 -y
-
       # Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1
@@ -54,7 +48,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global node-gyp@latest
-          npm config set python python2.7
           npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d6b9c1405..8ad02ccd3 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -24,9 +24,9 @@ jobs:
 
       # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version-file: '.nvmrc'
 
       - name: Cache Desktop node_modules
         id: cache-desktop-modules
@@ -35,12 +35,6 @@ jobs:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
 
-      - name: Chocolatey Install Action
-        if: runner.os == 'Windows'
-        uses: crazy-max/ghaction-chocolatey@v1.4.2
-        with:
-          args: install python2 -y
-
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1
@@ -50,7 +44,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global node-gyp@latest
-          npm config set python python2.7
           npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1e83298cc..1c59a350d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,9 +24,9 @@ jobs:
 
       # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version-file: '.nvmrc'
 
       - name: Cache Desktop node_modules
         id: cache-desktop-modules
@@ -36,12 +36,6 @@ jobs:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
 
-      - name: Chocolatey Install Action
-        if: runner.os == 'Windows'
-        uses: crazy-max/ghaction-chocolatey@v1.4.2
-        with:
-          args: install python2 -y
-
       #Not having this will break the windows build because the PATH won't be set by msbuild.
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1
@@ -51,7 +45,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global node-gyp@latest
-          npm config set python python2.7
           npm config set msvs_version 2022
 
       - name: Install Desktop node_modules

From 6fe6544d6cff4ec87ddb9d7dbb58e96006be3508 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 1 May 2023 14:31:18 +1000
Subject: [PATCH 081/178] fix: split up migration of initial user config dumps
 into two

---
 build/updateLocalConfig.js                    |  3 +-
 tools/afterCrowdInFetch.sh                    |  2 +-
 ts/models/conversation.ts                     | 15 +++-
 ts/node/migration/sessionMigrations.ts        | 74 ++++++++++++++-----
 .../utils/libsession/libsession_utils.ts      |  8 ++
 .../libsession_wrapper_contacts_test.ts       | 13 ++++
 6 files changed, 91 insertions(+), 24 deletions(-)

diff --git a/build/updateLocalConfig.js b/build/updateLocalConfig.js
index 7b0faf89e..7fbbe4df1 100644
--- a/build/updateLocalConfig.js
+++ b/build/updateLocalConfig.js
@@ -9,7 +9,8 @@ const updateLocalConfig = () => {
 
   var hash = '';
   try {
-    // TODO make sure that this works well on windows and macOS builds
+    // this was tested on windows, linux and macOS builds through the CI and works fine, but might require to make git available in the PATH when building unofficial builds.
+    // this is used to udpate the hash of the commit in the UI at the bottom of the settings screen, and in the about view
     var stdout = execSync('git rev-parse HEAD').toString();
     console.info('"git rev-parse HEAD" result: ', stdout && stdout.trim());
 
diff --git a/tools/afterCrowdInFetch.sh b/tools/afterCrowdInFetch.sh
index f03a31979..70beb02ee 100755
--- a/tools/afterCrowdInFetch.sh
+++ b/tools/afterCrowdInFetch.sh
@@ -14,5 +14,5 @@ mv $PWD/_locales/zh-TW $PWD/_locales/zh_TW
 
 echo 'Updated locales from crowdin to session-desktop folder'
 
-python2 $PWD/tools/updateI18nKeysType.py
+python3 $PWD/tools/updateI18nKeysType.py
 
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index d5a05db91..ca8dbf444 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -229,15 +229,22 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   /**
-   * Returns true if this conversation is active
-   * i.e. the conversation is visibie on the left pane. (Either we or another user created this convo).
-   * This is useful because we do not want bumpTyping on the first message typing to a new convo to
-   *  send a message.
+   * Returns true if this conversation is active.
+   * i.e. the conversation is visible on the left pane. (Either we or another user created this convo).
+   * An active conversation is a user/group we interacted with directly, or they did, at some point.
+   * For instance, all of the conversations created when receiving a community are not active, until we start directly talking with them (or they do).
    */
   public isActive() {
     return Boolean(this.get('active_at'));
   }
 
+  /**
+   *
+   * @returns true if this conversation is private and hidden.
+   * A non-private conversation cannot be hidden currently.
+   *  - a community is removed straight away when we leave it and not marked hidden
+   *  - a legacy group is kept visible if we leave it, until we explicitely delete it. At that time, it is removed completely and not marked hidden
+   */
   public isHidden() {
     const priority = this.get('priority') || CONVERSATION_PRIORITIES.default;
     return this.isPrivate() && priority === CONVERSATION_PRIORITIES.hidden;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 6348d2e31..34aca5ff8 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -97,6 +97,7 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToSessionSchemaVersion28,
   updateToSessionSchemaVersion29,
   updateToSessionSchemaVersion30,
+  updateToSessionSchemaVersion31,
 ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
@@ -1452,7 +1453,11 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
 
   console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
   /**
-   * Create a table to store our sharedConfigMessage dumps
+   * Make all the changes required to the database structure to handle the user configs, in the next migration.
+   * I made two migrations because it was easier to separate
+   *  - the part needed a user to be logged in (creating the user dumps needs a private ed25519 key)
+   *  - from the part not requiring a change of user, but which absolutely needed to be happening nevertheless (database structure changes)
+   *
    */
   db.transaction(() => {
     // drop unused readCapability & uploadCapability columns. Also move `writeCapability` to memory only value.
@@ -1472,23 +1477,30 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ALTER TABLE unprocessed DROP COLUMN serverTimestamp;
       `);
 
+    // for manually flagging conversations as unread"
+    db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN markedAsUnread BOOLEAN;`);
+
     // after the rename of isPinned to priority, we also need to hide any private conversation that is not active at all.
     // as they might be contacts, we did delete from the app already.
 
+    // The release of message requests from other platforms (17 april 2022) created a bunch of active, but not "real contacts" conversation.
+    // This `UPDATE` command makes sure to make any private conversation which have was inactive since the 1st may 2022 as inactive
+    db.prepare(
+      `UPDATE ${CONVERSATIONS_TABLE} SET
+            active_at = 0
+            WHERE type = 'private' AND active_at > 0 AND active_at < ${1000 * 1651363200};` // 1st may 2022 GMT
+    ).run({});
+
     db.prepare(
       `UPDATE ${CONVERSATIONS_TABLE} SET
         priority = ${CONVERSATION_PRIORITIES.hidden}
-        WHERE type = 'private' AND active_at IS NULL;`
+        WHERE type = 'private' AND (active_at IS NULL OR active_at = 0 );`
     ).run({});
 
-    db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
-      variant TEXT NOT NULL,
-      publicKey TEXT NOT NULL,
-      data BLOB,
-      PRIMARY KEY (publicKey, variant)
-      );
-      `);
-
+    /**
+     * Remove the `publicChat` prefix from the communities, instead keep the full url+room in it, with the corresponding http or https prefix.
+     * This is easier to handle with the libsession wrappers
+     **/
     const allOpengroupsConvo = db
       .prepare(
         `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
@@ -1535,6 +1547,31 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ).run({ newId });
     });
 
+    // create the table which is going to handle the wrappers, without any content in this migration.
+    db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
+      variant TEXT NOT NULL,
+      publicKey TEXT NOT NULL,
+      data BLOB,
+      PRIMARY KEY (publicKey, variant)
+      );
+      `);
+
+    writeSessionSchemaVersion(targetVersion, db);
+  })();
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+}
+
+function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 31;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
+  db.transaction(() => {
+    // In the migration 30, we made all the changes which didn't require the user to be logged in yet.
+    // in this one, we check if a user is logged in, and if yes we build and save the config dumps for the current state of the database.
     try {
       const keys = getIdentityKeys(db);
 
@@ -1611,7 +1648,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       // this filter is based on the `isContactToStoreInWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start
       const contactsToWriteInWrapper = db
         .prepare(
-          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND NOT hidden AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND priority <> ${CONVERSATION_PRIORITIES.hidden} AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
         )
         .all({
           us: publicKeyHex,
@@ -1762,17 +1799,18 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
 
       // we've just created the initial dumps. A ConfSyncJob is run when the app starts after 20 seconds
     } catch (e) {
-      console.error(`failed to create initial wrapper: `, e.stack);
+      console.error(
+        `failed to create initial wrapper. Might just not have a logged in user yet? `,
+        e.message,
+        e.stack,
+        e
+      );
       // if we get an exception here, most likely no users are logged in yet. We can just continue the transaction and the wrappers will be created when a user creates a new account.
     }
 
-    // for manually flagging conversations as :unread"
-    db.exec(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN markedAsUnread BOOLEAN;`);
-
+    // still, we update the schema version
     writeSessionSchemaVersion(targetVersion, db);
-  })();
-
-  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+  });
 }
 
 export function printTableColumns(table: string, db: BetterSqlite3.Database) {
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 2e4d12c7f..07d71f712 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -79,6 +79,14 @@ async function initializeLibSessionUtilWrappers() {
       `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}"`
     );
     await GenericWrapperActions.init(missingVariant, privateKeyEd25519, null);
+    // save the newly created dump to the database even if it is empty, just so we do not need to recreate one next run
+
+    const dump = await GenericWrapperActions.dump(missingVariant);
+    await ConfigDumpData.saveConfigDump({
+      data: dump,
+      publicKey: UserUtils.getOurPubKeyStrFromCache(),
+      variant: missingVariant,
+    });
     window.log.debug(
       `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}" created`
     );
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 44cf64a74..588065154 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -77,6 +77,19 @@ describe('libsession_contacts', () => {
       ).to.be.eq(false);
     });
 
+    it('excludes hidden but not active', () => {
+      expect(
+        SessionUtilContact.isContactToStoreInWrapper(
+          new ConversationModel({
+            ...validArgs,
+            type: ConversationTypeEnum.PRIVATE,
+            priority: CONVERSATION_PRIORITIES.hidden,
+            active_at: 0,
+          } as any)
+        )
+      ).to.be.eq(false);
+    });
+
     it('excludes non approved by us nor did approveme and not active', () => {
       expect(
         SessionUtilContact.isContactToStoreInWrapper(

From 051c4bb2629c6b6563c51620408de1b790815d64 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 1 May 2023 14:37:50 +1000
Subject: [PATCH 082/178] fix: merge the confSyncDumpJob into the confSyncJob

---
 ts/components/dialog/EditProfileDialog.tsx    |   2 -
 ts/interactions/conversationInteractions.ts   |   2 -
 ts/mains/main_renderer.tsx                    |   2 -
 ts/models/conversation.ts                     |   2 -
 .../conversations/ConversationController.ts   |   2 -
 .../utils/job_runners/JobDeserialization.ts   |   6 -
 ts/session/utils/job_runners/JobRunner.ts     |   7 -
 ts/session/utils/job_runners/PersistedJob.ts  |  10 +-
 .../jobs/ConfigurationSyncDumpJob.ts          | 195 ------------------
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  54 +++--
 .../libsession/libsession_utils_contacts.ts   |  21 --
 .../libsession_utils_convo_info_volatile.ts   |  25 +--
 .../libsession_utils_user_groups.ts           |  24 ---
 ts/session/utils/sync/syncUtils.ts            |  17 +-
 14 files changed, 34 insertions(+), 335 deletions(-)
 delete mode 100644 ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index cae2efedc..2a2bb6e4f 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -24,7 +24,6 @@ import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIconButton } from '../icon';
-import { ConfigurationDumpSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 
 const handleSaveQRCode = (event: MouseEvent) => {
   event.preventDefault();
@@ -361,7 +360,6 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
 
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     await ConfigurationSync.queueNewJobIfNeeded();
-    await ConfigurationDumpSync.queueNewJobIfNeeded();
     await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index c5f8254fc..1fb23818a 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -43,7 +43,6 @@ import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_ut
 import { leaveClosedGroup } from '../session/group/closed-group';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SettingsKey } from '../data/settings-key';
-import { ConfigurationDumpSync } from '../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -465,7 +464,6 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
     await setLastProfileUpdateTimestamp(Date.now());
     if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
       await ConfigurationSync.queueNewJobIfNeeded();
-      await ConfigurationDumpSync.queueNewJobIfNeeded();
     } else {
       await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
     }
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index 6aebb329f..e1acb2191 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -116,8 +116,6 @@ async function startJobRunners() {
   runners.avatarDownloadRunner.startProcessing();
   await runners.configurationSyncRunner.loadJobsFromDb();
   runners.configurationSyncRunner.startProcessing();
-  await runners.configurationSyncDumpRunner.loadJobsFromDb();
-  runners.configurationSyncDumpRunner.startProcessing();
 }
 
 // We need this 'first' check because we don't want to start the app up any other time
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index ca8dbf444..9f1766272 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -72,7 +72,6 @@ import {
   MessageRequestResponseParams,
 } from '../session/messages/outgoing/controlMessage/MessageRequestResponse';
 import { ed25519Str } from '../session/onions/onionPath';
-import { ConfigurationDumpSync } from '../session/utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
@@ -2284,7 +2283,6 @@ export async function commitConversationAndRefreshWrapper(id: string) {
   if (Registration.isDone()) {
     // save the new dump if needed to the DB asap
     // this call throttled so we do not run this too often (and not for every .commit())
-    await ConfigurationDumpSync.queueNewJobIfNeeded();
     await ConfigurationSync.queueNewJobIfNeeded();
   }
   convo.triggerUIRefresh();
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 83238ad60..8101c69c6 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -13,7 +13,6 @@ import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conv
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface';
 import { leaveClosedGroup } from '../group/closed-group';
-import { ConfigurationDumpSync } from '../utils/job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
 import { LibSessionUtil } from '../utils/libsession/libsession_utils';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
@@ -299,7 +298,6 @@ export class ConversationController {
 
     if (!fromSyncMessage) {
       await ConfigurationSync.queueNewJobIfNeeded();
-      await ConfigurationDumpSync.queueNewJobIfNeeded();
     }
   }
 
diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts
index 72ab41c10..363761da0 100644
--- a/ts/session/utils/job_runners/JobDeserialization.ts
+++ b/ts/session/utils/job_runners/JobDeserialization.ts
@@ -4,7 +4,6 @@ import {
   FakeSleepForMultiJob,
 } from '../../../test/session/unit/utils/job_runner/FakeSleepForJob';
 import { AvatarDownload } from './jobs/AvatarDownloadJob';
-import { ConfigurationDumpSync } from './jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from './jobs/ConfigurationSyncJob';
 import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
 
@@ -18,11 +17,6 @@ export function persistedJobFromData<T extends TypeOfPersistedData>(
   switch (data.jobType) {
     case 'ConfigurationSyncJobType':
       return (new ConfigurationSync.ConfigurationSyncJob(data) as unknown) as PersistedJob<T>;
-    case 'ConfigurationSyncDumpJobType':
-      return (new ConfigurationDumpSync.ConfigurationSyncDumpJob(data) as unknown) as PersistedJob<
-        T
-      >;
-
     case 'AvatarDownloadJobType':
       return (new AvatarDownload.AvatarDownloadJob(data) as unknown) as PersistedJob<T>;
     case 'FakeSleepForJobType':
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index c6acbbe6f..8a63a0c46 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -5,7 +5,6 @@ import { persistedJobFromData } from './JobDeserialization';
 import { JobRunnerType } from './jobs/JobRunnerType';
 import {
   AvatarDownloadPersistedData,
-  ConfigurationSyncDumpPersistedData,
   ConfigurationSyncPersistedData,
   PersistedJob,
   RunJobResult,
@@ -369,13 +368,7 @@ const avatarDownloadRunner = new PersistedJobRunner<AvatarDownloadPersistedData>
   null
 );
 
-const configurationSyncDumpRunner = new PersistedJobRunner<ConfigurationSyncDumpPersistedData>(
-  'ConfigurationSyncDumpJob',
-  null
-);
-
 export const runners = {
   configurationSyncRunner,
-  configurationSyncDumpRunner,
   avatarDownloadRunner,
 };
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index 0812ad673..a21495289 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -4,8 +4,7 @@ export type PersistedJobType =
   | 'ConfigurationSyncJobType'
   | 'AvatarDownloadJobType'
   | 'FakeSleepForJobType'
-  | 'FakeSleepForJobMultiType'
-  | 'ConfigurationSyncDumpJobType';
+  | 'FakeSleepForJobMultiType';
 
 interface PersistedJobData {
   jobType: PersistedJobType;
@@ -38,16 +37,11 @@ export interface ConfigurationSyncPersistedData extends PersistedJobData {
   jobType: 'ConfigurationSyncJobType';
 }
 
-export interface ConfigurationSyncDumpPersistedData extends PersistedJobData {
-  jobType: 'ConfigurationSyncDumpJobType';
-}
-
 export type TypeOfPersistedData =
   | ConfigurationSyncPersistedData
   | AvatarDownloadPersistedData
   | FakeSleepJobData
-  | FakeSleepForMultiJobData
-  | ConfigurationSyncDumpPersistedData;
+  | FakeSleepForMultiJobData;
 
 export type AddJobCheckReturn =
   | 'skipAddSameJobPresent'
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
deleted file mode 100644
index 10bab65e2..000000000
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import { isNumber } from 'lodash';
-import { v4 } from 'uuid';
-import { UserUtils } from '../..';
-import { ConfigDumpData } from '../../../../data/configDump/configDump';
-import { assertUnreachable } from '../../../../types/sqlSharedTypes';
-import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
-import { DURATION } from '../../../constants';
-import { getConversationController } from '../../../conversations';
-import { LibSessionUtil } from '../../libsession/libsession_utils';
-import { runners } from '../JobRunner';
-import {
-  AddJobCheckReturn,
-  ConfigurationSyncDumpPersistedData,
-  ConfigurationSyncPersistedData,
-  PersistedJob,
-  RunJobResult,
-} from '../PersistedJob';
-import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
-import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
-import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
-import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
-
-const defaultMsBetweenRetries = DURATION.SECONDS * 5;
-const defaultMaxAttempts = 2;
-
-/**
- * We want to run each of those jobs at least 3seconds apart.
- * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it.
- */
-let lastRunConfigSyncJobDumpTimestamp: number | null = null;
-
-async function saveDumpsNeededToDB(): Promise<boolean> {
-  let savedAtLeastOne = false;
-  for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) {
-    const variant = LibSessionUtil.requiredUserVariants[i];
-    const needsDump = await GenericWrapperActions.needsDump(variant);
-
-    if (!needsDump) {
-      continue;
-    }
-    const dump = await GenericWrapperActions.dump(variant);
-    await ConfigDumpData.saveConfigDump({
-      data: dump,
-      publicKey: UserUtils.getOurPubKeyStrFromCache(),
-      variant,
-    });
-    savedAtLeastOne = true;
-  }
-  return savedAtLeastOne;
-}
-
-/**
- * We have the `ConfigurationSyncDumpJob` and the `ConfigurationSyncJob`.
- * The `ConfigurationSyncDumpJob` involves network request which is slow and might not be available at all, hence it can run only from time to time.
- * But when we do changes to the wrapper, we need to dump it to the database in the event of an app crash or whatever.
- * To it less likely to loose data, we have a lightweight job which can be run a lot more frequently, the `ConfigurationSyncDumpJob`.
- * It just grabs all the wrappers which needs to be stored in the DB, override the data in the wrapper with what is in the database and save the result (if `needsDump` is true) to the corresponding database wrapper.
- *
- */
-class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersistedData> {
-  constructor({
-    identifier,
-    nextAttemptTimestamp,
-    maxAttempts,
-    currentRetry,
-  }: Partial<
-    Pick<
-      ConfigurationSyncPersistedData,
-      'identifier' | 'nextAttemptTimestamp' | 'currentRetry' | 'maxAttempts'
-    >
-  >) {
-    super({
-      jobType: 'ConfigurationSyncDumpJobType',
-      identifier: identifier || v4(),
-      delayBetweenRetries: defaultMsBetweenRetries,
-      maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts,
-      currentRetry: isNumber(currentRetry) ? currentRetry : 0,
-      nextAttemptTimestamp: nextAttemptTimestamp || Date.now(),
-    });
-  }
-
-  public async run(): Promise<RunJobResult> {
-    const start = Date.now();
-    try {
-      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-        return RunJobResult.Success;
-      }
-      window.log.debug(`ConfigurationSyncDumpJob starting ${this.persistedData.identifier}`);
-
-      const us = UserUtils.getOurPubKeyStrFromCache();
-      const ed25519Key = await UserUtils.getUserED25519KeyPairBytes();
-      const conversation = getConversationController().get(us);
-      if (!us || !conversation || !ed25519Key) {
-        // we check for ed25519Key because it is needed for authenticated requests
-        window.log.warn('did not find our own conversation');
-        return RunJobResult.PermanentFailure;
-      }
-      // refresh all the data stored by the wrappers we need to store.
-      // so when we call needsDump(), we know for sure that we are up to date
-
-      // TODOLATER we need to add  the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
-      // I think dumping should not fetch data from the DB again, but instead just use the data already in the wrapper.
-      for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
-        const variant = LibSessionUtil.requiredUserVariants[index];
-        switch (variant) {
-          case 'UserConfig':
-            await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
-            break;
-          case 'ContactsConfig':
-            await SessionUtilContact.insertAllContactsIntoContactsWrapper();
-            break;
-          case 'UserGroupsConfig':
-            await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
-            break;
-          case 'ConvoInfoVolatileConfig':
-            await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
-            break;
-          default:
-            assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
-        }
-      }
-      await saveDumpsNeededToDB();
-      return RunJobResult.Success;
-    } catch (e) {
-      throw e;
-    } finally {
-      // this is a simple way to make sure whatever happens here, we update the lastest timestamp.
-      // (a finally statement is always executed (no matter if exception or returns in other try/catch block)
-      this.updateLastTickTimestamp();
-      window.log.debug(`ConfigurationSyncDumpJob run() took ${Date.now() - start}ms`);
-    }
-  }
-
-  public serializeJob(): ConfigurationSyncDumpPersistedData {
-    const fromParent = super.serializeBase();
-    return fromParent;
-  }
-
-  public addJobCheck(jobs: Array<ConfigurationSyncDumpPersistedData>): AddJobCheckReturn {
-    return this.addJobCheckSameTypePresent(jobs);
-  }
-
-  /**
-   * For the SharedConfig job, we do not care about the jobs already in the list.
-   * We never want to add a new sync configuration job if there is already one in the queue.
-   * This is done by the `addJobCheck` method above
-   */
-  public nonRunningJobsToRemove(_jobs: Array<ConfigurationSyncDumpPersistedData>) {
-    return [];
-  }
-
-  public getJobTimeoutMs(): number {
-    return DURATION.SECONDS * 2;
-  }
-
-  private updateLastTickTimestamp() {
-    lastRunConfigSyncJobDumpTimestamp = Date.now();
-  }
-}
-
-/**
- * Queue a new Sync Configuration if needed job.
- * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
- */
-async function queueNewJobIfNeeded() {
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    return;
-  }
-  if (
-    !lastRunConfigSyncJobDumpTimestamp ||
-    lastRunConfigSyncJobDumpTimestamp < Date.now() - defaultMsBetweenRetries
-  ) {
-    window.log.debug('Scheduling ConfDumpJob: ASAP');
-
-    // this call will make sure that there is only one configuration sync job at all times
-    await runners.configurationSyncDumpRunner.addJob(
-      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() + 1000 }) // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
-    );
-  } else {
-    // if we did run at 100, and it is currently 110, diff is 10
-    const diff = Math.max(Date.now() - lastRunConfigSyncJobDumpTimestamp, 0);
-    // but we want to run every 30, so what we need is actually `30-10` from now = 20
-    const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
-    window.log.debug(`Scheduling ConfDumpJob: in ${leftBeforeNextTick} ms`);
-
-    await runners.configurationSyncDumpRunner.addJob(
-      new ConfigurationSyncDumpJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
-    );
-  }
-}
-
-export const ConfigurationDumpSync = {
-  ConfigurationSyncDumpJob,
-  queueNewJobIfNeeded,
-};
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 672f1505f..70317638c 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -3,7 +3,6 @@ import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { ConfigDumpData } from '../../../../data/configDump/configDump';
 import { ConfigurationSyncJobDone } from '../../../../shims/events';
-import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes';
 import { getConversationController } from '../../../conversations';
@@ -17,10 +16,6 @@ import {
   PersistedJob,
   RunJobResult,
 } from '../PersistedJob';
-import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
-import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
-import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
-import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
 
 const defaultMsBetweenRetries = 3000;
 const defaultMaxAttempts = 3;
@@ -128,6 +123,23 @@ async function buildAndSaveDumpsToDB(
   }
 }
 
+async function saveDumpsNeededToDB(destination: string) {
+  for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) {
+    const variant = LibSessionUtil.requiredUserVariants[i];
+    const needsDump = await GenericWrapperActions.needsDump(variant);
+
+    if (!needsDump) {
+      continue;
+    }
+    const dump = await GenericWrapperActions.dump(variant);
+    await ConfigDumpData.saveConfigDump({
+      data: dump,
+      publicKey: destination,
+      variant,
+    });
+  }
+}
+
 class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData> {
   constructor({
     identifier,
@@ -154,10 +166,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
     const start = Date.now();
 
     try {
-      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-        this.triggerConfSyncJobDone();
-        return RunJobResult.Success;
-      }
       window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`);
 
       const us = UserUtils.getOurPubKeyStrFromCache();
@@ -169,29 +177,17 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         return RunJobResult.PermanentFailure;
       }
 
-      for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
-        const variant = LibSessionUtil.requiredUserVariants[index];
-        switch (variant) {
-          case 'UserConfig':
-            await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
-            break;
-          case 'ContactsConfig':
-            await SessionUtilContact.insertAllContactsIntoContactsWrapper();
-            break;
-          case 'UserGroupsConfig':
-            await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
-            break;
-          case 'ConvoInfoVolatileConfig':
-            await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
-            break;
-          default:
-            assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
-        }
-      }
-
       // TODOLATER add a way to have a few configuration sync jobs running at the same time, but only a single one per pubkey
       const thisJobDestination = us;
 
+      // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc
+      await saveDumpsNeededToDB(thisJobDestination);
+
+      // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them.
+      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+        this.triggerConfSyncJobDone();
+        return RunJobResult.Success;
+      }
       const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination);
 
       // If there are no pending changes then the job can just complete (next time something
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index c5b3269c6..fb0cba9fa 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -19,30 +19,10 @@ import { PubKey } from '../../types';
  * Also, to make sure that our wrapper is up to date, we schedule jobs to be run and fetch all contacts and update all the wrappers entries.
  * This is done in the
  *    - `ConfigurationSyncJob` (sending data to the network) and the
- *    - `ConfigurationSyncDumpJob` (just dumping locally the data)
- * with `insertAllContactsIntoContactsWrapper()`
  *
  */
 const mappedContactWrapperValues = new Map<string, ContactInfo>();
 
-/**
- * Update the ContactWrapper with all the data is cares about from the database.
- */
-async function insertAllContactsIntoContactsWrapper() {
-  const idsToInsert = getConversationController()
-    .getConversations()
-    .filter(isContactToStoreInWrapper)
-    .map(m => m.id);
-
-  window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts: ${idsToInsert}`);
-
-  for (let index = 0; index < idsToInsert.length; index++) {
-    const id = idsToInsert[index];
-
-    await insertContactFromDBIntoWrapperAndRefresh(id);
-  }
-}
-
 /**
  * Returns true if that conversation is not us, is private, is not blinded.
  *
@@ -147,7 +127,6 @@ async function removeContactFromWrapper(id: string) {
 }
 export const SessionUtilContact = {
   isContactToStoreInWrapper,
-  insertAllContactsIntoContactsWrapper,
   insertContactFromDBIntoWrapperAndRefresh,
   removeContactFromWrapper,
   getContactCached,
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 18993a5fe..9e187f40e 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,5 +1,5 @@
-import { isEmpty, uniq } from 'lodash';
 import { BaseConvoInfoVolatile, ConvoVolatileType } from 'libsession_util_nodejs';
+import { isEmpty } from 'lodash';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
@@ -29,28 +29,6 @@ const mappedLegacyGroupWrapperValues = new Map<string, BaseConvoInfoVolatile>();
  */
 const mappedCommunityWrapperValues = new Map<string, BaseConvoInfoVolatile>();
 
-/**
- * Update the ConvoInfoVolatileWrapper with all the data is cares about from the database.
- */
-async function insertAllConvoInfoVolatileIntoWrapper() {
-  const convoIdsToInsert = uniq(
-    getConversationController()
-      .getConversations()
-      .filter(isConvoToStoreInWrapper)
-      .map(m => m.id)
-  );
-
-  window.log.debug(
-    `ConvoInfoVolatileWrapper keep tracks of ${convoIdsToInsert.length} convos in total.`
-  );
-
-  for (let index = 0; index < convoIdsToInsert.length; index++) {
-    const id = convoIdsToInsert[index];
-
-    await insertConvoFromDBIntoWrapperAndRefresh(id);
-  }
-}
-
 /**
  * Returns true if that conversation should be stored in the conversation volatile info wrapper.
  * It actually relies on the two other wrappers to know what to store:
@@ -278,7 +256,6 @@ function getConvoInfoVolatileTypes(): Array<ConvoVolatileType> {
 export const SessionUtilConvoInfoVolatile = {
   // shared
   isConvoToStoreInWrapper,
-  insertAllConvoInfoVolatileIntoWrapper,
   insertConvoFromDBIntoWrapperAndRefresh,
   refreshConvoVolatileCached,
   getConvoInfoVolatileTypes,
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 348a5b188..6ef72206e 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,4 +1,3 @@
-import { uniq } from 'lodash';
 import { CommunityInfo, LegacyGroupInfo, UserGroupsType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
@@ -22,28 +21,6 @@ const mappedCommunityWrapperValues = new Map<string, CommunityInfo>();
  */
 const mappedLegacyGroupWrapperValues = new Map<string, LegacyGroupInfo>();
 
-/**
- * Update the UserGroupsWrapper with all the data is cares about from the database.
- */
-async function insertAllUserGroupsIntoWrapper() {
-  const convoIdsToInsert = uniq(
-    getConversationController()
-      .getConversations()
-      .filter(isUserGroupToStoreInWrapper)
-      .map(m => m.id)
-  );
-
-  window.log.debug(
-    `UserGroupsWrapper keep tracks of ${convoIdsToInsert.length} usergroups including groups and communities`
-  );
-
-  for (let index = 0; index < convoIdsToInsert.length; index++) {
-    const id = convoIdsToInsert[index];
-
-    await insertGroupsFromDBIntoWrapperAndRefresh(id);
-  }
-}
-
 /**
  * Returns true if that conversation is an active group
  */
@@ -268,7 +245,6 @@ function getUserGroupTypes(): Array<UserGroupsType> {
 export const SessionUtilUserGroups = {
   // shared
   isUserGroupToStoreInWrapper,
-  insertAllUserGroupsIntoWrapper,
   insertGroupsFromDBIntoWrapperAndRefresh,
   refreshCachedUserGroup,
   getUserGroupTypes,
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 6bfd32cac..4be280ffc 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -27,7 +27,6 @@ import {
   VisibleMessage,
 } from '../../messages/outgoing/visibleMessage/VisibleMessage';
 import { PubKey } from '../../types';
-import { ConfigurationDumpSync } from '../job_runners/jobs/ConfigurationSyncDumpJob';
 import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { fromBase64ToArray, fromHexToArray } from '../String';
 import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
@@ -72,9 +71,7 @@ export const syncConfigurationIfNeeded = async () => {
     }
     await writeLastSyncTimestampToDb(now);
   } else {
-    await ConfigurationDumpSync.queueNewJobIfNeeded();
     await ConfigurationSync.queueNewJobIfNeeded();
-    await ConfigurationDumpSync.queueNewJobIfNeeded();
   }
 };
 
@@ -87,14 +84,12 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
     }, 20000);
 
     if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      void ConfigurationDumpSync.queueNewJobIfNeeded()
-        .then(ConfigurationSync.queueNewJobIfNeeded)
-        .catch(e => {
-          window.log.warn(
-            'forceSyncConfigurationNowIfNeeded scheduling of jobs failed with',
-            e.message
-          );
-        });
+      void ConfigurationSync.queueNewJobIfNeeded().catch(e => {
+        window.log.warn(
+          'forceSyncConfigurationNowIfNeeded scheduling of jobs failed with',
+          e.message
+        );
+      });
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);

From 8edb1275c20d7f2a0b37d4d8a4f8722e8d1bfcce Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 1 May 2023 16:30:17 +1000
Subject: [PATCH 083/178] fix: keep updating dumps even if user config feature
 is off

---
 ts/components/dialog/EditProfileDialog.tsx    |  2 +-
 ts/interactions/conversationInteractions.ts   | 20 ++++++++----------
 ts/receiver/configMessage.ts                  |  4 ++--
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  3 ---
 ts/session/utils/sync/syncUtils.ts            | 21 ++++++++++---------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 2a2bb6e4f..91534716a 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -357,9 +357,9 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
 
   // might be good to not trigger a sync if the name did not change
   await conversation.commit();
+  await ConfigurationSync.queueNewJobIfNeeded();
 
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    await ConfigurationSync.queueNewJobIfNeeded();
     await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 1fb23818a..db97cd6ed 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -148,15 +148,13 @@ export async function declineConversationWithoutConfirm({
   if (blockContact) {
     await blockConvoById(conversationId);
   }
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry
+  // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry
 
-    if (
-      conversationToDecline.isPrivate() &&
-      !SessionUtilContact.isContactToStoreInWrapper(conversationToDecline)
-    ) {
-      await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
-    }
+  if (
+    conversationToDecline.isPrivate() &&
+    !SessionUtilContact.isContactToStoreInWrapper(conversationToDecline)
+  ) {
+    await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
   }
 
   if (syncToDevices) {
@@ -462,9 +460,9 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
 
   if (newAvatarDecrypted) {
     await setLastProfileUpdateTimestamp(Date.now());
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      await ConfigurationSync.queueNewJobIfNeeded();
-    } else {
+    await ConfigurationSync.queueNewJobIfNeeded();
+
+    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
       await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
     }
   } else {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index c81bf2e1f..e5dd33b94 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -736,7 +736,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
     await handleClosedGroupsFromConfigLegacy(configMessage.closedGroups, envelope);
   }
 
-  handleOpenGroupsFromConfig(configMessage.openGroups);
+  handleOpenGroupsFromConfigLegacy(configMessage.openGroups);
 
   if (configMessage.contacts?.length) {
     await Promise.all(
@@ -749,7 +749,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
  * Trigger a join for all open groups we are not already in.
  * @param openGroups string array of open group urls
  */
-const handleOpenGroupsFromConfig = (openGroups: Array<string>) => {
+const handleOpenGroupsFromConfigLegacy = (openGroups: Array<string>) => {
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 70317638c..04379a610 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -280,9 +280,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    return;
-  }
   if (
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 4be280ffc..fe4f91b26 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -44,6 +44,8 @@ const writeLastSyncTimestampToDb = async (timestamp: number) =>
  * Conditionally Syncs user configuration with other devices linked.
  */
 export const syncConfigurationIfNeeded = async () => {
+  await ConfigurationSync.queueNewJobIfNeeded();
+
   if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
     const now = Date.now();
@@ -70,8 +72,6 @@ export const syncConfigurationIfNeeded = async () => {
       return;
     }
     await writeLastSyncTimestampToDb(now);
-  } else {
-    await ConfigurationSync.queueNewJobIfNeeded();
   }
 };
 
@@ -83,22 +83,23 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
       resolve(false);
     }, 20000);
 
+    // the ConfigurationSync also handles dumping in to the DB if we do not need to push the data, but the dumping needs to be done even before the feature flag is true.
+    void ConfigurationSync.queueNewJobIfNeeded().catch(e => {
+      window.log.warn(
+        'forceSyncConfigurationNowIfNeeded scheduling of jobs ConfigurationSync.queueNewJobIfNeeded failed with: ',
+        e.message
+      );
+    });
     if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      void ConfigurationSync.queueNewJobIfNeeded().catch(e => {
-        window.log.warn(
-          'forceSyncConfigurationNowIfNeeded scheduling of jobs failed with',
-          e.message
-        );
-      });
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
+          return;
         });
       } else {
         resolve(true);
+        return;
       }
-
-      return;
     }
 
     void getCurrentConfigurationMessage(allConvos)

From 44483b7d23d4372fff7dcaf76ac2799432929b6b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 2 May 2023 12:06:08 +1000
Subject: [PATCH 084/178] fix: use releaseFeature from disappearing message PR
 as featureFlag

---
 preload.js                                    |   1 -
 ts/components/dialog/EditProfileDialog.tsx    |  11 +-
 ts/interactions/conversationInteractions.ts   |   4 +-
 ts/receiver/configMessage.ts                  |  31 ++++--
 ts/receiver/queuedJob.ts                      |   5 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  16 ++-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   8 +-
 ts/session/utils/sync/syncUtils.ts            |  15 ++-
 .../unit/utils/job_runner/JobRunner_test.ts   |   4 +-
 ts/util/releaseFeature.ts                     | 104 ++++++++++++++++++
 ts/util/storage.ts                            |   3 +-
 ts/window.d.ts                                |   1 -
 12 files changed, 165 insertions(+), 38 deletions(-)
 create mode 100644 ts/util/releaseFeature.ts

diff --git a/preload.js b/preload.js
index e25a9d1f1..fe8c08818 100644
--- a/preload.js
+++ b/preload.js
@@ -33,7 +33,6 @@ window.sessionFeatureFlags = {
   ),
   useDebugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
   useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
-  useSharedUtilForUserConfig: true,
   debug: {
     debugFileServerRequests: false,
     debugNonSnodeRequests: false,
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 91534716a..34d4947a1 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -15,7 +15,6 @@ import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MAX_USERNAME_BYTES } from '../../session/constants';
 import { getConversationController } from '../../session/conversations';
 import { sanitizeSessionUsername } from '../../session/utils/String';
-import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { editProfileModal } from '../../state/ducks/modalDialog';
 import { pickFileForAvatar } from '../../types/attachments/VisualAttachment';
 import { saveQRCode } from '../../util/saveQRCode';
@@ -357,12 +356,6 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
 
   // might be good to not trigger a sync if the name did not change
   await conversation.commit();
-  await ConfigurationSync.queueNewJobIfNeeded();
-
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    await setLastProfileUpdateTimestamp(Date.now());
-  } else {
-    await setLastProfileUpdateTimestamp(Date.now());
-    await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
-  }
+  await setLastProfileUpdateTimestamp(Date.now());
+  await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
 }
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index db97cd6ed..f6f3a2586 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -43,6 +43,7 @@ import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_ut
 import { leaveClosedGroup } from '../session/group/closed-group';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SettingsKey } from '../data/settings-key';
+import { ReleasedFeatures } from '../util/releaseFeature';
 
 export function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
@@ -461,8 +462,9 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
   if (newAvatarDecrypted) {
     await setLastProfileUpdateTimestamp(Date.now());
     await ConfigurationSync.queueNewJobIfNeeded();
+    const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
-    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    if (!userConfigLibsession) {
       await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
     }
   } else {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index e5dd33b94..9ac3451d8 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -46,6 +46,7 @@ import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
 import { SettingsKey } from '../data/settings-key';
+import { ReleasedFeatures } from '../util/releaseFeature';
 
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
@@ -639,7 +640,9 @@ async function processMergingResults(results: Map<ConfigWrapperObjectTypes, Inco
 async function handleConfigMessagesViaLibSession(
   configMessages: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
 ) {
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+  if (!userConfigLibsession) {
     return;
   }
 
@@ -678,8 +681,9 @@ async function handleOurProfileUpdateLegacy(
   sentAt: number | Long,
   configMessage: SignalService.ConfigurationMessage
 ) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
   // we want to allow if we are not registered, as we might need to fetch an old config message (can be removed once we released for a weeks the libsession util)
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+  if (userConfigLibsession && Registration.isDone()) {
     return;
   }
   const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp();
@@ -703,7 +707,9 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
   envelope: EnvelopePlus,
   configMessage: SignalService.ConfigurationMessage
 ) {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+  if (userConfigLibsession && Registration.isDone()) {
     return;
   }
   const envelopeTimestamp = toNumber(envelope.timestamp);
@@ -736,7 +742,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
     await handleClosedGroupsFromConfigLegacy(configMessage.closedGroups, envelope);
   }
 
-  handleOpenGroupsFromConfigLegacy(configMessage.openGroups);
+  void handleOpenGroupsFromConfigLegacy(configMessage.openGroups);
 
   if (configMessage.contacts?.length) {
     await Promise.all(
@@ -749,8 +755,10 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
  * Trigger a join for all open groups we are not already in.
  * @param openGroups string array of open group urls
  */
-const handleOpenGroupsFromConfigLegacy = (openGroups: Array<string>) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+const handleOpenGroupsFromConfigLegacy = async (openGroups: Array<string>) => {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+  if (userConfigLibsession && Registration.isDone()) {
     return;
   }
   const numberOpenGroup = openGroups?.length || 0;
@@ -778,7 +786,9 @@ const handleClosedGroupsFromConfigLegacy = async (
   closedGroups: Array<SignalService.ConfigurationMessage.IClosedGroup>,
   envelope: EnvelopePlus
 ) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+  if (userConfigLibsession && Registration.isDone()) {
     return;
   }
   const numberClosedGroup = closedGroups?.length || 0;
@@ -813,7 +823,9 @@ const handleContactFromConfigLegacy = async (
   contactReceived: SignalService.ConfigurationMessage.IContact,
   envelope: EnvelopePlus
 ) => {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+  if (userConfigLibsession && Registration.isDone()) {
     return;
   }
   try {
@@ -880,8 +892,9 @@ async function handleConfigurationMessageLegacy(
   // when the useSharedUtilForUserConfig flag is ON, we want only allow a legacy config message if we are registering a new user.
   // this is to allow users linking a device to find their config message if they do not have a shared config message yet.
   // the process of those messages is always done after the process of the shared config messages, so that's only a fallback.
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
+  if (userConfigLibsession && Registration.isDone()) {
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index d6063056d..40c9e5bf3 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -15,6 +15,7 @@ import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig'
 import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig';
 import { GoogleChrome } from '../util';
 import { LinkPreviews } from '../util/linkPreviews';
+import { ReleasedFeatures } from '../util/releaseFeature';
 
 function contentTypeSupported(type: string): boolean {
   const Chrome = GoogleChrome;
@@ -254,7 +255,9 @@ async function handleRegularMessage(
       await conversation.setDidApproveMe(true);
     }
   } else if (type === 'outgoing') {
-    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+
+    if (!userConfigLibsession) {
       // we want to do this for all types of conversations, not just private chats
       handleSyncedReceiptsNoCommit(message, conversation);
 
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index e65fe87d6..afc9865e4 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -21,6 +21,7 @@ import { perfEnd, perfStart } from '../../utils/Performance';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 import { SnodeAPIRetrieve } from './retrieveRequest';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
+import { ReleasedFeatures } from '../../../util/releaseFeature';
 
 export function extractWebSocketContent(
   message: string,
@@ -151,9 +152,10 @@ export class SwarmPolling {
     }
     // we always poll as often as possible for our pubkey
     const ourPubkey = UserUtils.getOurPubKeyFromCache();
-    const directPromise = Promise.all([
-      this.pollOnceForKey(ourPubkey, false, this.getUserNamespacesPolled()),
-    ]).then(() => undefined);
+    const userNamespaces = await this.getUserNamespacesPolled();
+    const directPromise = Promise.all([this.pollOnceForKey(ourPubkey, false, userNamespaces)]).then(
+      () => undefined
+    );
 
     const now = Date.now();
     const groupPromises = this.groupPolling.map(async group => {
@@ -222,10 +224,11 @@ export class SwarmPolling {
     }
 
     let allNamespacesWithoutUserConfigIfNeeded: Array<RetrieveMessageItem> = [];
+    const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
     // check if we just fetched the details from the config namespaces.
     // If yes, merge them together and exclude them from the rest of the messages.
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig && resultsFromAllNamespaces) {
+    if (userConfigLibsession && resultsFromAllNamespaces) {
       const userConfigMessages = resultsFromAllNamespaces
         .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace))
         .map(r => r.messages.messages);
@@ -484,8 +487,9 @@ export class SwarmPolling {
     return newMessages;
   }
 
-  private getUserNamespacesPolled() {
-    return window.sessionFeatureFlags.useSharedUtilForUserConfig
+  private async getUserNamespacesPolled() {
+    const isUserConfigRelease = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+    return isUserConfigRelease
       ? [
           SnodeNamespaces.UserMessages,
           SnodeNamespaces.UserProfile,
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 04379a610..752508483 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -16,6 +16,8 @@ import {
   PersistedJob,
   RunJobResult,
 } from '../PersistedJob';
+import { ReleasedFeatures } from '../../../../util/releaseFeature';
+import { allowOnlyOneAtATime } from '../../Promise';
 
 const defaultMsBetweenRetries = 3000;
 const defaultMaxAttempts = 3;
@@ -182,9 +184,10 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
 
       // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc
       await saveDumpsNeededToDB(thisJobDestination);
+      const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
       // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them.
-      if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+      if (!userConfigLibsession) {
         this.triggerConfSyncJobDone();
         return RunJobResult.Success;
       }
@@ -305,5 +308,6 @@ async function queueNewJobIfNeeded() {
 
 export const ConfigurationSync = {
   ConfigurationSyncJob,
-  queueNewJobIfNeeded,
+  queueNewJobIfNeeded: () =>
+    allowOnlyOneAtATime(`ConfigurationSyncJob-oneAtAtTime`, queueNewJobIfNeeded),
 };
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index fe4f91b26..cf0d7f3d9 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -31,6 +31,7 @@ import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
 import { fromBase64ToArray, fromHexToArray } from '../String';
 import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
 import { Storage } from '../../../util/storage';
+import { ReleasedFeatures } from '../../../util/releaseFeature';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -46,7 +47,8 @@ const writeLastSyncTimestampToDb = async (timestamp: number) =>
 export const syncConfigurationIfNeeded = async () => {
   await ConfigurationSync.queueNewJobIfNeeded();
 
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+  if (!userConfigLibsession) {
     const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
     const now = Date.now();
 
@@ -75,9 +77,9 @@ export const syncConfigurationIfNeeded = async () => {
   }
 };
 
-export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) =>
-  new Promise(resolve => {
-    const allConvos = getConversationController().getConversations();
+export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) => {
+  await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+  return new Promise(resolve => {
     // if we hang for more than 20sec, force resolve this promise.
     setTimeout(() => {
       resolve(false);
@@ -90,17 +92,19 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
         e.message
       );
     });
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+    if (ReleasedFeatures.isUserConfigFeatureReleasedCached()) {
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
           return;
         });
+        return;
       } else {
         resolve(true);
         return;
       }
     }
+    const allConvos = getConversationController().getConversations();
 
     void getCurrentConfigurationMessage(allConvos)
       .then(configMessage => {
@@ -128,6 +132,7 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
         resolve(false);
       });
   });
+};
 
 const getActiveOpenGroupV2CompleteUrls = async (
   convos: Array<ConversationModel>
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 75d5dda6a..f8a024950 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -77,9 +77,9 @@ describe('JobRunner', () => {
         const job = getFakeSleepForJob(123);
 
         await runner.addJob(job);
-        throw new Error('PLOP'); // the line above should throw something else
+        throw new Error('fake error'); // the line above should throw something else
       } catch (e) {
-        expect(e.message).to.not.eq('PLOP');
+        expect(e.message).to.not.eq('fake error');
       }
     });
     it('unsorted list is sorted after loading', async () => {
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
new file mode 100644
index 000000000..2465bb636
--- /dev/null
+++ b/ts/util/releaseFeature.ts
@@ -0,0 +1,104 @@
+import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { assertUnreachable } from '../types/sqlSharedTypes';
+import { Storage } from './storage';
+
+let isDisappearingMessageFeatureReleased: boolean | undefined;
+let isUserConfigLibsessionFeatureReleased: boolean | undefined;
+type FeatureNameTracked = 'disappearing_messages' | 'user_config_libsession';
+
+/**
+ * This is only intended for testing. Do not call this in production.
+ */
+export function resetFeatureReleasedCachedValue() {
+  isDisappearingMessageFeatureReleased = undefined;
+  isUserConfigLibsessionFeatureReleased = undefined;
+}
+
+function getIsFeatureReleasedCached(featureName: FeatureNameTracked) {
+  switch (featureName) {
+    case 'disappearing_messages':
+      return isDisappearingMessageFeatureReleased;
+    case 'user_config_libsession':
+      return isUserConfigLibsessionFeatureReleased;
+    default:
+      assertUnreachable(featureName, `case not handled for getIsFeatureReleasedCached`);
+  }
+}
+
+function setIsFeatureReleasedCached(featureName: FeatureNameTracked, value: boolean) {
+  switch (featureName) {
+    case 'disappearing_messages':
+      isDisappearingMessageFeatureReleased = value;
+      break;
+    case 'user_config_libsession':
+      isUserConfigLibsessionFeatureReleased = value;
+      break;
+    default:
+      assertUnreachable(featureName, `case not handled for setIsFeatureReleasedCached `);
+  }
+}
+
+function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
+  switch (featureName) {
+    case 'disappearing_messages':
+      // TODO update to agreed value between platforms for `disappearing_messages`
+      return 1706778000000; // unix 01/02/2024 09:00;
+    //   return 1677488400000; // testing:  unix 27/02/2023 09:00
+    case 'user_config_libsession':
+      // TODO update to agreed value between platforms for `user_config_libsession`
+
+      return 1706778000000; // unix 01/02/2024 09:00;
+    //   return 1677488400000; // testing: unix 27/02/2023 09:00
+
+    default:
+      assertUnreachable(featureName, `case not handled for getFeatureReleaseTimestamp `);
+  }
+}
+
+export async function getIsFeatureReleased(featureName: FeatureNameTracked): Promise<boolean> {
+  if (getIsFeatureReleasedCached(featureName) === undefined) {
+    // read values from db and cache them as it looks like we did not
+    const oldIsFeatureReleased = Boolean(Storage.get(`featureReleased-${featureName}`));
+    // values do not exist in the db yet. Let's store false for now in the db and update our cached value.
+    if (oldIsFeatureReleased === undefined) {
+      await Storage.put(`featureReleased-${featureName}`, false);
+      setIsFeatureReleasedCached(featureName, false);
+    } else {
+      setIsFeatureReleasedCached(featureName, oldIsFeatureReleased);
+    }
+  }
+  return Boolean(getIsFeatureReleasedCached(featureName));
+}
+
+async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<boolean> {
+  const featureAlreadyReleased = await getIsFeatureReleased(featureName);
+
+  // Is it time to release the feature based on the network timestamp?
+  if (
+    !featureAlreadyReleased &&
+    GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName)
+  ) {
+    window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`);
+    await Storage.put(`featureReleased-${featureName}`, true);
+    setIsFeatureReleasedCached(featureName, true);
+  }
+
+  const isReleased = Boolean(getIsFeatureReleasedCached(featureName));
+  window.log.debug(
+    `[releaseFeature]: "${featureName}" ${isReleased ? 'is released' : 'has not been released yet'}`
+  );
+  return isReleased;
+}
+
+function checkIsUserConfigFeatureReleased() {
+  return checkIsFeatureReleased('user_config_libsession');
+}
+
+function isUserConfigFeatureReleasedCached(): boolean {
+  return !!isUserConfigLibsessionFeatureReleased;
+}
+
+export const ReleasedFeatures = {
+  checkIsUserConfigFeatureReleased,
+  isUserConfigFeatureReleasedCached,
+};
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index c864b1d47..856f77f4d 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -3,6 +3,7 @@ import { SessionKeyPair } from '../receiver/keypairs';
 import { DEFAULT_RECENT_REACTS } from '../session/constants';
 import { deleteSettingsBoolValue, updateSettingsBoolValue } from '../state/ducks/settings';
 import { isBoolean } from 'lodash';
+import { ReleasedFeatures } from './releaseFeature';
 
 let ready = false;
 
@@ -135,7 +136,7 @@ export function getLastProfileUpdateTimestamp() {
 }
 
 export async function setLastProfileUpdateTimestamp(lastUpdateTimestamp: number) {
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
+  if (await ReleasedFeatures.checkIsUserConfigFeatureReleased()) {
     return;
   }
   await put('last_profile_update_timestamp', lastUpdateTimestamp);
diff --git a/ts/window.d.ts b/ts/window.d.ts
index a0bad52c3..586a787ed 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -37,7 +37,6 @@ declare global {
       useOnionRequests: boolean;
       useTestNet: boolean;
       useClosedGroupV3: boolean;
-      useSharedUtilForUserConfig: boolean;
       debug: {
         debugFileServerRequests: boolean;
         debugNonSnodeRequests: boolean;

From 3cd52d5b1ade10813b39ad6783645c99e44b2b4f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 3 May 2023 09:38:53 +1000
Subject: [PATCH 085/178] fix: add currentHashes and update expiry on every
 poll

---
 package.json                                  |   2 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   6 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |  21 +-
 ts/session/apis/snode_api/expire.ts           | 237 ++++++++++++++++++
 ts/session/apis/snode_api/namespaces.ts       |   7 +-
 ts/session/apis/snode_api/retrieveRequest.ts  |  44 +++-
 ts/session/apis/snode_api/snodeSignatures.ts  |  45 +++-
 ts/session/apis/snode_api/swarmPolling.ts     |  67 +++--
 .../conversations/ConversationController.ts   |  16 +-
 ts/util/releaseFeature.ts                     |   6 +-
 .../browser/libsession_worker_interface.ts    |   8 +
 yarn.lock                                     |   6 +-
 12 files changed, 427 insertions(+), 38 deletions(-)
 create mode 100644 ts/session/apis/snode_api/expire.ts

diff --git a/package.json b/package.json
index 546cfb21c..0619864a8 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index edbb54feb..1bab0b823 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -192,7 +192,11 @@ export class OpenGroupManagerV2 {
       );
       // here, the convo does not exist. Make sure the db & wrappers are clean too
       await OpenGroupData.removeV2OpenGroupRoom(conversationId);
-      await SessionUtilUserGroups.removeCommunityFromWrapper(conversationId, fullUrl);
+      try {
+        await SessionUtilUserGroups.removeCommunityFromWrapper(conversationId, fullUrl);
+      } catch (e) {
+        window.log.warn('failed to removeCommunityFromWrapper', conversationId);
+      }
 
       const room: OpenGroupV2Room = {
         serverUrl,
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index b5bfb21cf..69a539a84 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -50,7 +50,8 @@ export type RetrieveSubKeySubRequestType = {
 export type RetrieveSubRequestType =
   | RetrieveLegacyClosedGroupSubRequestType
   | RetrievePubkeySubRequestType
-  | RetrieveSubKeySubRequestType;
+  | RetrieveSubKeySubRequestType
+  | UpdateExpiryOnNodeSubRequest;
 
 /**
  * OXEND_REQUESTS
@@ -129,6 +130,21 @@ export type DeleteFromNodeSubRequest = {
   params: DeleteByHashesFromNodeParams;
 };
 
+export type UpdateExpireNodeParams = {
+  pubkey: string;
+  pubkey_ed25519: string;
+  messages: Array<string>;
+  expiry: number;
+  signature: string;
+  extend?: boolean;
+  shorten?: boolean;
+};
+
+export type UpdateExpiryOnNodeSubRequest = {
+  method: 'expire';
+  params: UpdateExpireNodeParams;
+};
+
 export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest;
 
 export type SnodeApiSubRequests =
@@ -138,7 +154,8 @@ export type SnodeApiSubRequests =
   | StoreOnNodeSubRequest
   | NetworkTimeSubRequest
   | DeleteFromNodeSubRequest
-  | DeleteAllFromNodeSubRequest;
+  | DeleteAllFromNodeSubRequest
+  | UpdateExpiryOnNodeSubRequest;
 
 // tslint:disable: array-type
 export type NonEmptyArray<T> = [T, ...T[]];
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
new file mode 100644
index 000000000..7a3d9f8c0
--- /dev/null
+++ b/ts/session/apis/snode_api/expire.ts
@@ -0,0 +1,237 @@
+import { isEmpty, sample } from 'lodash';
+import { Snode } from '../../../data/data';
+import { getSodiumRenderer } from '../../crypto';
+import { StringUtils, UserUtils } from '../../utils';
+import { fromBase64ToArray, fromHexToArray } from '../../utils/String';
+import { EmptySwarmError } from '../../utils/errors';
+import { UpdateExpireNodeParams } from './SnodeRequestTypes';
+import { doSnodeBatchRequest } from './batchRequest';
+import { GetNetworkTime } from './getNetworkTime';
+import { getSwarmFor } from './snodePool';
+import { SnodeSignature } from './snodeSignatures';
+
+async function verifySignature({
+  pubkey,
+  snodePubkey,
+  expiryApplied,
+  signature,
+  messageHashes,
+  updatedHashes,
+  unchangedHashes,
+}: {
+  pubkey: string;
+  snodePubkey: any;
+  expiryApplied: number;
+  signature: string;
+  messageHashes: Array<string>;
+  updatedHashes: Array<string>;
+  // only used when shorten or extend is in the request
+  unchangedHashes?: Record<string, string>;
+}): Promise<boolean> {
+  if (!expiryApplied || isEmpty(messageHashes) || isEmpty(signature)) {
+    window.log.warn('verifySignature missing argument');
+    return false;
+  }
+
+  const edKeyPrivBytes = fromHexToArray(snodePubkey);
+  /* PUBKEY_HEX || EXPIRY || RMSGs... || UMSGs... || CMSG_EXPs...
+  where RMSGs are the requested expiry hashes,
+  UMSGs are the actual updated hashes, and
+  CMSG_EXPs are (HASH || EXPIRY) values, ascii-sorted by hash, for the unchanged message hashes included in the "unchanged" field.
+  */
+  const hashes = [...messageHashes, ...updatedHashes];
+  if (unchangedHashes && Object.keys(unchangedHashes).length > 0) {
+    hashes.push(
+      ...Object.entries(unchangedHashes)
+        .map(([key, value]: [string, string]) => {
+          return `${key}${value}`;
+        })
+        .sort()
+    );
+  }
+
+  const verificationString = `${pubkey}${expiryApplied}${hashes.join('')}`;
+  const verificationData = StringUtils.encode(verificationString, 'utf8');
+  window.log.debug('verifySignature verificationString', verificationString);
+
+  const sodium = await getSodiumRenderer();
+  try {
+    const isValid = sodium.crypto_sign_verify_detached(
+      fromBase64ToArray(signature),
+      new Uint8Array(verificationData),
+      edKeyPrivBytes
+    );
+
+    return isValid;
+  } catch (e) {
+    window.log.warn('verifySignature failed with: ', e.message);
+    return false;
+  }
+}
+
+async function processExpirationResults(
+  pubkey: string,
+  targetNode: Snode,
+  swarm: Record<string, any>,
+  messageHashes: Array<string>
+) {
+  if (isEmpty(swarm)) {
+    throw Error(`expireOnNodes failed! ${messageHashes}`);
+  }
+
+  // TODO need proper typing for swarm and results
+  const results: Record<string, { hashes: Array<string>; expiry: number }> = {};
+  // window.log.debug(`processExpirationResults start`, swarm, messageHashes);
+
+  for (const nodeKey of Object.keys(swarm)) {
+    if (!isEmpty(swarm[nodeKey].failed)) {
+      const reason = 'Unknown';
+      const statusCode = '404';
+      window?.log?.warn(
+        `loki_message:::expireMessage - Couldn't delete data from: ${
+          targetNode.pubkey_ed25519
+        }${reason && statusCode && ` due to an error ${reason} (${statusCode})`}`
+      );
+      // TODO This might be a redundant step
+      results[nodeKey] = { hashes: [], expiry: 0 };
+    }
+
+    const updatedHashes = swarm[nodeKey].updated;
+    const unchangedHashes = swarm[nodeKey].unchanged;
+    const expiryApplied = swarm[nodeKey].expiry;
+    const signature = swarm[nodeKey].signature;
+
+    const isValid = await verifySignature({
+      pubkey,
+      snodePubkey: nodeKey,
+      expiryApplied,
+      signature,
+      messageHashes,
+      updatedHashes,
+      unchangedHashes,
+    });
+
+    if (!isValid) {
+      window.log.warn(
+        'loki_message:::expireMessage - Signature verification failed!',
+        messageHashes
+      );
+    }
+    results[nodeKey] = { hashes: updatedHashes, expiry: expiryApplied };
+  }
+
+  return results;
+}
+
+async function expireOnNodes(targetNode: Snode, params: UpdateExpireNodeParams) {
+  try {
+    const result = await doSnodeBatchRequest(
+      [
+        {
+          method: 'expire',
+          params,
+        },
+      ],
+      targetNode,
+      4000,
+      params.pubkey,
+      'batch'
+    );
+
+    if (!result || result.length !== 1 || result[0]?.code !== 200 || !result[0]?.body) {
+      return false;
+    }
+
+    try {
+      // TODOLATER make sure that this code still works once disappearing messages is merged
+      const parsed = result[0].body;
+      const expirationResults = await processExpirationResults(
+        params.pubkey,
+        targetNode,
+        parsed.swarm,
+        params.messages
+      );
+      window.log.debug('expireOnNodes attempt complete. Here are the results', expirationResults);
+
+      return true;
+    } catch (e) {
+      window?.log?.warn('expireOnNodes Failed to parse "swarm" result: ', e.msg);
+    }
+    return false;
+  } catch (e) {
+    window?.log?.warn('expire - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`);
+    throw e;
+  }
+}
+
+type ExpireMessageOnSnodeProps = {
+  messageHash: string;
+  expireTimer: number;
+  extend?: boolean;
+  shorten?: boolean;
+};
+
+// TODO make this retry in case of updated swarm
+export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
+  const { messageHash, expireTimer, extend, shorten } = props;
+
+  if (extend && shorten) {
+    window.log.error(
+      '[expireMessageOnSnode] We cannot extend and shorten a message at the same time',
+      messageHash
+    );
+    return;
+  }
+
+  const shortenOrExtend = shorten ? 'shorten' : extend ? 'extend' : ('' as const);
+
+  const ourPubKey = UserUtils.getOurPubKeyStrFromCache();
+
+  if (!ourPubKey) {
+    window.log.eror('[expireMessageOnSnode] No pubkey found', messageHash);
+    return;
+  }
+
+  const swarm = await getSwarmFor(ourPubKey);
+
+  const expiry = GetNetworkTime.getNowWithNetworkOffset() + expireTimer;
+  const signResult = await SnodeSignature.generateUpdateExpirySignature({
+    shortenOrExtend,
+    timestamp: expiry,
+    messageHashes: [messageHash],
+  });
+
+  if (!signResult) {
+    window.log.error('[expireMessageOnSnode] Signing message expiry on swarm failed', messageHash);
+    return;
+  }
+
+  const params: UpdateExpireNodeParams = {
+    pubkey: ourPubKey,
+    pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(),
+    // TODO better testing for failed case
+    messages: [messageHash],
+    expiry,
+    extend: extend || undefined,
+    shorten: shorten || undefined,
+    signature: signResult?.signature,
+  };
+
+  const snode = sample(swarm);
+  if (!snode) {
+    throw new EmptySwarmError(ourPubKey, 'Ran out of swarm nodes to query');
+  }
+
+  try {
+    // TODO make this whole function `expireMessageOnSnode` retry
+    const successfulSend = await expireOnNodes(snode, params);
+  } catch (e) {
+    const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
+    window?.log?.warn(
+      `loki_message:::expireMessage - ${e.code ? `${e.code} ` : ''}${
+        e.message
+      } by ${ourPubKey} for ${messageHash} via snode:${snodeStr}`
+    );
+    throw e;
+  }
+}
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index a6d9ef20c..7bfbb7ffa 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -67,7 +67,12 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) {
       return false;
 
     default:
-      assertUnreachable(namespace, `isUserConfigNamespace case not handled: ${namespace}`);
+      try {
+        assertUnreachable(namespace, `isUserConfigNamespace case not handled: ${namespace}`);
+      } catch (e) {
+        window.log.warn(`isUserConfigNamespace case not handled: ${namespace}: ${e.message}`);
+        return false;
+      }
   }
 }
 
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index b7909e03c..37f6454b1 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -5,9 +5,12 @@ import { doSnodeBatchRequest } from './batchRequest';
 import { GetNetworkTime } from './getNetworkTime';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 
+import { DURATION } from '../../constants';
+import { UserUtils } from '../../utils';
 import {
   RetrieveLegacyClosedGroupSubRequestType,
   RetrieveSubRequestType,
+  UpdateExpiryOnNodeSubRequest,
 } from './SnodeRequestTypes';
 import { SnodeSignature } from './snodeSignatures';
 import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types';
@@ -16,9 +19,10 @@ async function buildRetrieveRequest(
   lastHashes: Array<string>,
   pubkey: string,
   namespaces: Array<SnodeNamespaces>,
-  ourPubkey: string
+  ourPubkey: string,
+  configHashesToBump: Array<string> | null
 ): Promise<Array<RetrieveSubRequestType>> {
-  const retrieveRequestsParams = await Promise.all(
+  const retrieveRequestsParams: Array<RetrieveSubRequestType> = await Promise.all(
     namespaces.map(async (namespace, index) => {
       const retrieveParam = {
         pubkey,
@@ -65,6 +69,33 @@ async function buildRetrieveRequest(
       return retrieve;
     })
   );
+
+  if (configHashesToBump?.length) {
+    const expiry = GetNetworkTime.getNowWithNetworkOffset() + DURATION.DAYS * 30;
+    const signResult = await SnodeSignature.generateUpdateExpirySignature({
+      shortenOrExtend: '',
+      timestamp: expiry,
+      messageHashes: configHashesToBump,
+    });
+    if (!signResult) {
+      window.log.warn(
+        `SnodeSignature.generateUpdateExpirySignature returned result empty for hashes ${configHashesToBump}`
+      );
+    } else {
+      const expireParams: UpdateExpiryOnNodeSubRequest = {
+        method: 'expire',
+        params: {
+          messages: configHashesToBump,
+          pubkey: UserUtils.getOurPubKeyStrFromCache(),
+          expiry,
+          signature: signResult.signature,
+          pubkey_ed25519: signResult.pubkey_ed25519,
+        },
+      };
+
+      retrieveRequestsParams.push(expireParams);
+    }
+  }
   return retrieveRequestsParams;
 }
 
@@ -73,7 +104,8 @@ async function retrieveNextMessages(
   lastHashes: Array<string>,
   associatedWith: string,
   namespaces: Array<SnodeNamespaces>,
-  ourPubkey: string
+  ourPubkey: string,
+  configHashesToBump: Array<string> | null
 ): Promise<RetrieveMessagesResultsBatched> {
   if (namespaces.length !== lastHashes.length) {
     throw new Error('namespaces and lasthashes does not match');
@@ -83,7 +115,8 @@ async function retrieveNextMessages(
     lastHashes,
     associatedWith,
     namespaces,
-    ourPubkey
+    ourPubkey,
+    configHashesToBump
   );
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
@@ -99,7 +132,8 @@ async function retrieveNextMessages(
     );
   }
 
-  if (results.length !== namespaces.length) {
+  // the +1 is to take care of the extra `expire` method added once user config is released
+  if (results.length !== namespaces.length && results.length !== namespaces.length + 1) {
     throw new Error(
       `We asked for updates about ${namespaces.length} messages but got results of length ${results.length}`
     );
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index 2a6b20a89..9402107de 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -94,4 +94,47 @@ async function getSnodeSignatureParams(params: {
   }
 }
 
-export const SnodeSignature = { getSnodeSignatureParams, getSnodeSignatureByHashesParams };
+async function generateUpdateExpirySignature({
+  shortenOrExtend,
+  timestamp,
+  messageHashes,
+}: {
+  shortenOrExtend: 'extend' | 'shorten' | '';
+  timestamp: number;
+  messageHashes: Array<string>;
+}): Promise<{ signature: string; pubkey_ed25519: string } | null> {
+  const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
+
+  if (!ourEd25519Key) {
+    const err = `getSnodeSignatureParams "expiry": User has no getUserED25519KeyPair()`;
+    window.log.warn(err);
+    throw new Error(err);
+  }
+
+  const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey);
+
+  // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N]
+  const verificationString = `expire${shortenOrExtend}${timestamp}${messageHashes.join('')}`;
+  const verificationData = StringUtils.encode(verificationString, 'utf8');
+  const message = new Uint8Array(verificationData);
+
+  const sodium = await getSodiumRenderer();
+  try {
+    const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes);
+    const signatureBase64 = fromUInt8ArrayToBase64(signature);
+
+    return {
+      signature: signatureBase64,
+      pubkey_ed25519: ourEd25519Key.pubKey,
+    };
+  } catch (e) {
+    window.log.warn('generateSignature failed with: ', e.message);
+    return null;
+  }
+}
+
+export const SnodeSignature = {
+  getSnodeSignatureParams,
+  getSnodeSignatureByHashesParams,
+  generateUpdateExpirySignature,
+};
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index afc9865e4..90e54c442 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -22,6 +22,8 @@ import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 import { SnodeAPIRetrieve } from './retrieveRequest';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
 import { ReleasedFeatures } from '../../../util/releaseFeature';
+import { LibSessionUtil } from '../../utils/libsession/libsession_utils';
+import { GenericWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 
 export function extractWebSocketContent(
   message: string,
@@ -215,7 +217,12 @@ export class SwarmPolling {
 
     let resultsFromAllNamespaces: RetrieveMessagesResultsBatched | null;
     try {
-      resultsFromAllNamespaces = await this.pollNodeForKey(toPollFrom, pubkey, namespaces);
+      resultsFromAllNamespaces = await this.pollNodeForKey(
+        toPollFrom,
+        pubkey,
+        namespaces,
+        !isGroup
+      );
     } catch (e) {
       window.log.warn(
         `pollNodeForKey of ${pubkey} namespaces: ${namespaces} failed with: ${e.message}`
@@ -371,39 +378,69 @@ export class SwarmPolling {
   private async pollNodeForKey(
     node: Snode,
     pubkey: PubKey,
-    namespaces: Array<SnodeNamespaces>
+    namespaces: Array<SnodeNamespaces>,
+    isUs: boolean
   ): Promise<RetrieveMessagesResultsBatched | null> {
     const namespaceLength = namespaces.length;
     if (namespaceLength <= 0) {
       throw new Error(`invalid number of retrieve namespace provided: ${namespaceLength}`);
     }
-    const edkey = node.pubkey_ed25519;
+    const snodeEdkey = node.pubkey_ed25519;
     const pkStr = pubkey.key;
 
     try {
       return await pRetry(
         async () => {
           const prevHashes = await Promise.all(
-            namespaces.map(namespace => this.getLastHash(edkey, pkStr, namespace))
+            namespaces.map(namespace => this.getLastHash(snodeEdkey, pkStr, namespace))
           );
-          const results = await SnodeAPIRetrieve.retrieveNextMessages(
+          const configHashesToBump: Array<string> = [];
+
+          if (await ReleasedFeatures.checkIsUserConfigFeatureReleased()) {
+            // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers
+            if (isUs) {
+              for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
+                const variant = LibSessionUtil.requiredUserVariants[index];
+                try {
+                  const toBump = await GenericWrapperActions.currentHashes(variant);
+
+                  if (toBump?.length) {
+                    configHashesToBump.push(...toBump);
+                  }
+                } catch (e) {
+                  window.log.warn(`failed to get currentHashes for user variant ${variant}`);
+                }
+              }
+              window.log.debug(`configHashesToBump: ${configHashesToBump}`);
+            }
+          }
+
+          let results = await SnodeAPIRetrieve.retrieveNextMessages(
             node,
             prevHashes,
             pkStr,
             namespaces,
-            UserUtils.getOurPubKeyStrFromCache()
+            UserUtils.getOurPubKeyStrFromCache(),
+            configHashesToBump
           );
+
           if (!results.length) {
             return [];
           }
-
-          if (results.length !== namespaceLength) {
-            window.log.error(
-              `pollNodeForKey asked for ${namespaceLength} namespaces but received only messages about ${results.length} namespaces`
-            );
-            throw new Error(
-              `pollNodeForKey asked for ${namespaceLength} namespaces but received only messages about ${results.length} namespaces`
-            );
+          // when we asked to extend the expiry of the config messages, exclude it from the list of results as we do not want to mess up the last hash tracking logic
+          if (configHashesToBump.length) {
+            try {
+              const lastResult = results[results.length - 1];
+              if (lastResult?.code !== 200) {
+                // the update expiry of our config messages didn't work.
+                window.log.warn(
+                  `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(
+                    lastResult
+                  )}`
+                );
+              }
+            } catch (e) {}
+            results = results.slice(0, results.length - 1);
           }
 
           const lastMessages = results.map(r => {
@@ -416,7 +453,7 @@ export class SwarmPolling {
                 return;
               }
               return this.updateLastHash({
-                edkey: edkey,
+                edkey: snodeEdkey,
                 pubkey,
                 namespace: namespaces[index],
                 hash: lastMessage.hash,
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 8101c69c6..a49108ffe 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -238,13 +238,17 @@ export class ConversationController {
 
         try {
           const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(conversation.id);
-
-          await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
-            conversation.id,
-            fromWrapper?.fullUrl || ''
-          );
+          if (fromWrapper?.fullUrl) {
+            await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
+              conversation.id,
+              fromWrapper.fullUrl
+            );
+          }
         } catch (e) {
-          window?.log?.info('SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:', e);
+          window?.log?.info(
+            'SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:',
+            e.message
+          );
         }
 
         // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 2465bb636..e8fc4965f 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -84,9 +84,9 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<
   }
 
   const isReleased = Boolean(getIsFeatureReleasedCached(featureName));
-  window.log.debug(
-    `[releaseFeature]: "${featureName}" ${isReleased ? 'is released' : 'has not been released yet'}`
-  );
+  // window.log.debug(
+  //   `[releaseFeature]: "${featureName}" ${isReleased ? 'is released' : 'has not been released yet'}`
+  // );
   return isReleased;
 }
 
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 807042443..115a8f0ac 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -75,6 +75,10 @@ export const GenericWrapperActions = {
     callLibSessionWorker([wrapperId, 'storageNamespace']) as Promise<
       ReturnType<BaseWrapperActionsCalls['storageNamespace']>
     >,
+  currentHashes: async (wrapperId: ConfigWrapperObjectTypes) =>
+    callLibSessionWorker([wrapperId, 'currentHashes']) as Promise<
+      ReturnType<BaseWrapperActionsCalls['currentHashes']>
+    >,
 };
 
 export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
@@ -90,6 +94,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   needsPush: async () => GenericWrapperActions.needsPush('UserConfig'),
   push: async () => GenericWrapperActions.push('UserConfig'),
   storageNamespace: async () => GenericWrapperActions.storageNamespace('UserConfig'),
+  currentHashes: async () => GenericWrapperActions.currentHashes('UserConfig'),
 
   /** UserConfig wrapper specific actions */
   getUserInfo: async () =>
@@ -119,6 +124,7 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
   needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'),
   push: async () => GenericWrapperActions.push('ContactsConfig'),
   storageNamespace: async () => GenericWrapperActions.storageNamespace('ContactsConfig'),
+  currentHashes: async () => GenericWrapperActions.currentHashes('ContactsConfig'),
 
   /** ContactsConfig wrapper specific actions */
   get: async (pubkeyHex: string) =>
@@ -154,6 +160,7 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = {
   needsPush: async () => GenericWrapperActions.needsPush('UserGroupsConfig'),
   push: async () => GenericWrapperActions.push('UserGroupsConfig'),
   storageNamespace: async () => GenericWrapperActions.storageNamespace('UserGroupsConfig'),
+  currentHashes: async () => GenericWrapperActions.currentHashes('UserGroupsConfig'),
 
   /** UserGroups wrapper specific actions */
 
@@ -226,6 +233,7 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
   needsPush: async () => GenericWrapperActions.needsPush('ConvoInfoVolatileConfig'),
   push: async () => GenericWrapperActions.push('ConvoInfoVolatileConfig'),
   storageNamespace: async () => GenericWrapperActions.storageNamespace('ConvoInfoVolatileConfig'),
+  currentHashes: async () => GenericWrapperActions.currentHashes('ConvoInfoVolatileConfig'),
 
   /** ConvoInfoVolatile wrapper specific actions */
   // 1o1
diff --git a/yarn.lock b/yarn.lock
index 90703f5d5..5292a63e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz":
-  version "0.1.5"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.5/libsession_util_nodejs-v0.1.5.tar.gz#4f9dbac0c3011fc3edd29ce0625cba1044db6990"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz":
+  version "0.1.8"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz#49a296dc1d81db5ec8104ef1e6ce5ed2cecff6e9"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From 328c131d8bcb00284d1400f67735d23ff28f0076 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 3 May 2023 10:11:12 +1000
Subject: [PATCH 086/178] chore: cleanup commented caching code of some
 wrappers

---
 ts/models/conversation.ts                     | 63 -------------------
 .../libsession_utils_user_groups.ts           | 27 +-------
 2 files changed, 2 insertions(+), 88 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 9f1766272..f2eba5dcc 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -349,56 +349,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.isMarkedUnread = this.get('markedAsUnread');
     }
 
-    // const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
-    // const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
-    // const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
-
-    // // rely on the wrapper values rather than the DB ones if they exist in the wrapper
-    // if (foundContact) {
-    //   if (foundContact.name) {
-    //     toRet.displayNameInProfile = foundContact.name;
-    //   }
-
-    //   if (foundContact.nickname) {
-    //     toRet.nickname = foundContact.nickname;
-    //   }
-
-    //   if (foundContact.blocked) {
-    //     toRet.isBlocked = foundContact.blocked;
-    //   }
-
-    //   if (foundContact.approvedMe) {
-    //     toRet.didApproveMe = foundContact.approvedMe;
-    //   }
-
-    //   if (foundContact.approved) {
-    //     toRet.isApproved = foundContact.approved;
-    //   }
-
-    //   if (foundContact.priority) {
-    //     toRet.priority = foundContact.priority;
-    //   }
-
-    //   if (foundContact.expirationTimerSeconds > 0) {
-    //     toRet.expireTimer = foundContact.expirationTimerSeconds;
-    //   }
-    // } else {
-
-    // // -- Handle the group fields from the wrapper and the database --
-    // if (foundLegacyGroup) {
-    //   toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || [];
-    //   toRet.groupAdmins =
-    //     foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || [];
-    //   toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name)
-    //     ? undefined
-    //     : foundLegacyGroup.name;
-    //   toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds;
-
-    //   if (foundLegacyGroup.priority) {
-    //     toRet.priority = foundLegacyGroup.priority;
-    //   }
-    // }
-
     // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
     if (this.isClosedGroup()) {
       toRet.members = this.get('members') || [];
@@ -420,19 +370,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       }
     }
 
-    // -- Handle the communities fields from the wrapper and the database --
-    // if (foundCommunity) {
-    //   if (foundCommunity.priority) {
-    //     toRet.priority = foundCommunity.priority;
-    //   } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function
-    // }
-
-    // if (foundVolatileInfo) {
-    //   if (foundVolatileInfo.unread) {
-    //     toRet.isMarkedUnread = foundVolatileInfo.unread;
-    //   }
-    // }
-
     // -- Handle the field stored only in memory for all types of conversation--
     const inMemoryConvoInfo = inMemoryConvoInfos.get(this.id);
     if (inMemoryConvoInfo) {
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 6ef72206e..f5c4bb405 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,4 +1,4 @@
-import { CommunityInfo, LegacyGroupInfo, UserGroupsType } from 'libsession_util_nodejs';
+import { CommunityInfo, UserGroupsType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
@@ -16,11 +16,6 @@ import { getConversationController } from '../../conversations';
  */
 const mappedCommunityWrapperValues = new Map<string, CommunityInfo>();
 
-/**
- * The key of this map is the convoId as stored in the database. So the legacy group 05 sessionID
- */
-const mappedLegacyGroupWrapperValues = new Map<string, LegacyGroupInfo>();
-
 /**
  * Returns true if that conversation is an active group
  */
@@ -164,13 +159,6 @@ async function refreshCachedUserGroup(convoId: string, duringAppStart = false) {
         mappedCommunityWrapperValues.set(convoId, fromWrapper);
       }
       refreshed = true;
-    } else if (convoId.startsWith('05')) {
-      // currently this should only be a legacy group here
-      const fromWrapper = await UserGroupsWrapperActions.getLegacyGroup(convoId);
-      if (fromWrapper) {
-        mappedLegacyGroupWrapperValues.set(convoId, fromWrapper);
-      }
-      refreshed = true;
     }
 
     if (refreshed && !duringAppStart) {
@@ -207,14 +195,6 @@ async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutP
   mappedCommunityWrapperValues.delete(convoId);
 }
 
-function getLegacyGroupCached(convoId: string) {
-  return mappedLegacyGroupWrapperValues.get(convoId);
-}
-
-function getAllLegacyGroups(): Array<LegacyGroupInfo> {
-  return [...mappedLegacyGroupWrapperValues.values()];
-}
-
 /**
  * Remove the matching legacy group from the wrapper and from the cached list of legacy groups
  */
@@ -227,8 +207,6 @@ async function removeLegacyGroupFromWrapper(groupPk: string) {
       e.message
     );
   }
-
-  mappedLegacyGroupWrapperValues.delete(groupPk);
 }
 
 /**
@@ -258,7 +236,6 @@ export const SessionUtilUserGroups = {
   // legacy group
   isLegacyGroupToStoreInWrapper,
   isLegacyGroupToRemoveFromDBIfNotInWrapper,
-  getLegacyGroupCached,
-  getAllLegacyGroups,
+
   removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER
 };

From 318a77be4b3dad4fbefa76084cda4ec49c7bb75a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 4 May 2023 11:42:06 +1000
Subject: [PATCH 087/178] fix: mark messages sent before our lastreadts from
 the wrapper as read

---
 package.json                                  |  2 +-
 ts/components/leftpane/ActionsPanel.tsx       |  2 +-
 ts/models/conversation.ts                     | 22 +++++++-----
 ts/models/conversationAttributes.ts           |  5 +++
 ts/models/message.ts                          |  5 +--
 ts/models/messageFactory.ts                   | 28 ++++++++++++---
 ts/models/messageType.ts                      |  4 ++-
 ts/receiver/configMessage.ts                  | 34 +++++++------------
 ts/receiver/contentMessage.ts                 |  4 +--
 ts/receiver/queuedJob.ts                      |  6 ++--
 ts/session/apis/snode_api/snodePool.ts        |  9 ++---
 ts/session/apis/snode_api/swarmPolling.ts     |  2 +-
 ts/session/utils/calling/CallManager.ts       |  5 +--
 .../utils/libsession/libsession_utils.ts      |  1 +
 yarn.lock                                     |  6 ++--
 15 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 0619864a8..b8015b2e6 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index bb3169e6d..d67994ffe 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -38,12 +38,12 @@ import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
 import { SessionIconButton } from '../icon';
 import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
+import { SettingsKey } from '../../data/settings-key';
 import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
 import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
-import { SettingsKey } from '../../data/settings-key';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index f2eba5dcc..81d0425e6 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -103,6 +103,7 @@ import {
   fillConvoAttributesWithDefaults,
   isDirectConversation,
   isOpenOrClosedGroup,
+  READ_MESSAGE_STATE,
 } from './conversationAttributes';
 
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
@@ -113,6 +114,7 @@ import {
   getModeratorsOutsideRedux,
   getSubscriberCountOutsideRedux,
 } from '../state/selectors/sogsRoomInfo';
+import { markAttributesAsReadIfNeeded } from './messageFactory';
 
 type InMemoryConvoInfos = {
   mentionedUs: boolean;
@@ -345,10 +347,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.get('expireTimer')) {
       toRet.expireTimer = this.get('expireTimer');
     }
-    if (this.get('markedAsUnread')) {
-      toRet.isMarkedUnread = this.get('markedAsUnread');
-    }
-
     // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
     if (this.isClosedGroup()) {
       toRet.members = this.get('members') || [];
@@ -682,7 +680,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       messageRequestResponse: {
         isApproved: 1,
       },
-      unread: 1, // 1 means unread
+      unread: READ_MESSAGE_STATE.unread, // 1 means unread
       expireTimer: 0,
     });
     this.updateLastMessage();
@@ -829,7 +827,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         ...commonAttributes,
         // Even though this isn't reflected to the user, we want to place the last seen
         //   indicator above it. We set it to 'unread' to trigger that placement.
-        unread: 1,
+        unread: READ_MESSAGE_STATE.unread,
         source,
         sent_at: timestamp,
         received_at: timestamp,
@@ -931,7 +929,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       source: sender,
       type: 'outgoing',
       direction: 'outgoing',
-      unread: 0, // an outgoing message must be already read
+      unread: READ_MESSAGE_STATE.read, // an outgoing message must be already read
       received_at: messageAttributes.sent_at, // make sure to set a received_at timestamp for an outgoing message, so the order are right.
     });
   }
@@ -944,12 +942,18 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       await this.setDidApproveMe(true);
     }
 
-    return this.addSingleMessage({
+    const toBeAddedAttributes: MessageAttributesOptionals = {
       ...messageAttributes,
       conversationId: this.id,
       type: 'incoming',
       direction: 'outgoing',
-    });
+    };
+
+    // if the message is trying to be added unread, make sure that it shouldn't be already read from our other devices
+
+    markAttributesAsReadIfNeeded(toBeAddedAttributes);
+
+    return this.addSingleMessage(toBeAddedAttributes);
   }
 
   /**
diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index 250fbeaf2..be2a83477 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -153,3 +153,8 @@ export const CONVERSATION_PRIORITIES = {
   hidden: -1,
   pinned: 1, // anything over 0 means pinned, but when our local users pins a conversation, we set the priority to 1
 };
+
+export const READ_MESSAGE_STATE = {
+  unread: 1,
+  read: 0,
+} as const;
diff --git a/ts/models/message.ts b/ts/models/message.ts
index e5936328b..69386ec1b 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -94,6 +94,7 @@ import { Notifications } from '../util/notifications';
 import { Storage } from '../util/storage';
 import { ConversationModel } from './conversation';
 import { roomHasBlindEnabled } from '../types/sqlSharedTypes';
+import { READ_MESSAGE_STATE } from './conversationAttributes';
 // tslint:disable: cyclomatic-complexity
 
 /**
@@ -205,7 +206,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
 
     const { unread } = attributes;
     if (unread === undefined) {
-      this.set({ unread: 0 });
+      this.set({ unread: READ_MESSAGE_STATE.read });
     }
 
     this.set(attributes);
@@ -1100,7 +1101,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
   }
 
   public markMessageReadNoCommit(readAt: number) {
-    this.set({ unread: 0 });
+    this.set({ unread: READ_MESSAGE_STATE.read });
 
     if (
       this.get('expireTimer') &&
diff --git a/ts/models/messageFactory.ts b/ts/models/messageFactory.ts
index 5a68fdd29..dd5a37450 100644
--- a/ts/models/messageFactory.ts
+++ b/ts/models/messageFactory.ts
@@ -1,4 +1,6 @@
 import { UserUtils } from '../session/utils';
+import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
+import { READ_MESSAGE_STATE } from './conversationAttributes';
 import { MessageModel } from './message';
 import { MessageAttributesOptionals, MessageModelType } from './messageType';
 
@@ -86,7 +88,7 @@ function getSharedAttributesForPublicMessage({
 function getSharedAttributesForOutgoingMessage() {
   return {
     source: UserUtils.getOurPubKeyStrFromCache(),
-    unread: 0,
+    unread: READ_MESSAGE_STATE.read,
     sent_to: [],
     sent: true,
     type: 'outgoing' as MessageModelType,
@@ -96,12 +98,29 @@ function getSharedAttributesForOutgoingMessage() {
 
 function getSharedAttributesForIncomingMessage() {
   return {
-    unread: 1,
+    unread: READ_MESSAGE_STATE.unread,
     type: 'incoming' as MessageModelType,
     direction: 'incoming' as MessageModelType,
   };
 }
 
+export function markAttributesAsReadIfNeeded(messageAttributes: MessageAttributesOptionals) {
+  // if the message is trying to be added unread, make sure that it shouldn't be already read from our other devices
+  if (messageAttributes.unread === READ_MESSAGE_STATE.unread) {
+    const latestUnreadForThisConvo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(
+      messageAttributes.conversationId
+    );
+    const sentAt = messageAttributes.serverTimestamp || messageAttributes.sent_at;
+    if (
+      sentAt &&
+      latestUnreadForThisConvo?.lastRead &&
+      sentAt <= latestUnreadForThisConvo.lastRead
+    ) {
+      messageAttributes.unread = READ_MESSAGE_STATE.read;
+    }
+  }
+}
+
 /**
  * This function is only called when we get a message from ourself from an opengroup polling event
  */
@@ -128,11 +147,12 @@ export function createPublicMessageSentFromNotUs(args: {
   serverTimestamp: number;
   conversationId: string;
 }): MessageModel {
-  const messageData: MessageAttributesOptionals = {
+  const messageAttributes: MessageAttributesOptionals = {
     ...getSharedAttributesForPublicMessage(args),
     ...getSharedAttributesForIncomingMessage(),
     source: args.sender,
   };
+  markAttributesAsReadIfNeeded(messageAttributes);
 
-  return new MessageModel(messageData);
+  return new MessageModel(messageAttributes);
 }
diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index 6057ba5ca..74728ba2d 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -7,6 +7,7 @@ import {
 } from '../state/ducks/conversations';
 import { AttachmentTypeWithPath } from '../types/Attachment';
 import { Reaction, ReactionList, SortedReactionList } from '../types/Reaction';
+import { READ_MESSAGE_STATE } from './conversationAttributes';
 
 export type MessageModelType = 'incoming' | 'outgoing';
 
@@ -44,6 +45,7 @@ export interface MessageAttributes {
   };
   /**
    * 1 means unread, 0 or anything else is read.
+   * You can use the values from READ_MESSAGE_STATE.unread and READ_MESSAGE_STATE.read
    */
   unread: number;
   group?: any;
@@ -224,7 +226,7 @@ export const fillMessageAttributesWithDefaults = (
   const defaulted = defaultsDeep(optAttributes, {
     expireTimer: 0, // disabled
     id: uuidv4(),
-    unread: 0, // if nothing is set, this message is considered read
+    unread: READ_MESSAGE_STATE.read, // if nothing is set, this message is considered read
   });
   // this is just to cleanup a bit the db. delivered and delivered_to were removed, so everytime we load a message
   // we make sure to clean those fields in the json.
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 9ac3451d8..dd4a3d065 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,6 +1,7 @@
 import { compact, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data } from '../data/data';
+import { SettingsKey } from '../data/settings-key';
 import { ConversationInteraction } from '../interactions';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { SignalService } from '../protobuf';
@@ -27,6 +28,7 @@ import { configurationMessageReceived, trigger } from '../shims/events';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
 import { Registration } from '../util/registration';
+import { ReleasedFeatures } from '../util/releaseFeature';
 import {
   Storage,
   getLastProfileUpdateTimestamp,
@@ -45,8 +47,6 @@ import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGr
 import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
-import { SettingsKey } from '../data/settings-key';
-import { ReleasedFeatures } from '../util/releaseFeature';
 
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
@@ -92,13 +92,14 @@ async function mergeConfigsWithIncomingUpdates(
         data: msg.message.data,
         hash: msg.messageHash,
       }));
-
-      await GenericWrapperActions.merge(variant, toMerge);
+      const mergedCount = await GenericWrapperActions.merge(variant, toMerge);
       const needsPush = await GenericWrapperActions.needsPush(variant);
       const needsDump = await GenericWrapperActions.needsDump(variant);
       const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
 
-      window.log.debug(`${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump} `);
+      window.log.debug(
+        `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} `
+      );
 
       const incomingConfResult: IncomingConfResult = {
         needsDump,
@@ -118,9 +119,6 @@ async function mergeConfigsWithIncomingUpdates(
 }
 
 async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
   const updateUserInfo = await UserConfigWrapperActions.getUserInfo();
   if (!updateUserInfo) {
     return result;
@@ -140,9 +138,6 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
 
 // tslint:disable-next-line: cyclomatic-complexity
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
   const us = UserUtils.getOurPubKeyStrFromCache();
 
   const allContacts = await ContactsWrapperActions.getAll();
@@ -432,10 +427,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
 }
 
 async function handleUserGroupsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
-
   const toHandle = SessionUtilUserGroups.getUserGroupTypes();
   for (let index = 0; index < toHandle.length; index++) {
     const typeToHandle = toHandle[index];
@@ -494,10 +485,6 @@ async function applyConvoVolatileUpdateFromWrapper(
 async function handleConvoInfoVolatileUpdate(
   result: IncomingConfResult
 ): Promise<IncomingConfResult> {
-  if (!result.needsDump) {
-    return result;
-  }
-
   const types = SessionUtilConvoInfoVolatile.getConvoInfoVolatileTypes();
   for (let typeIndex = 0; typeIndex < types.length; typeIndex++) {
     const type = types[typeIndex];
@@ -508,6 +495,7 @@ async function handleConvoInfoVolatileUpdate(
           const wrapper1o1s = await ConvoInfoVolatileWrapperActions.getAll1o1();
           for (let index = 0; index < wrapper1o1s.length; index++) {
             const fromWrapper = wrapper1o1s[index];
+
             await applyConvoVolatileUpdateFromWrapper(
               fromWrapper.pubkeyHex,
               fromWrapper.unread,
@@ -650,8 +638,12 @@ async function handleConfigMessagesViaLibSession(
     return;
   }
 
-  window?.log?.info(
-    `Handling our sharedConfig message via libsession_util; count: ${configMessages.length}`
+  window?.log?.debug(
+    `Handling our sharedConfig message via libsession_util ${configMessages.map(m => ({
+      variant: LibSessionUtil.kindToVariant(m.message.kind),
+      hash: m.messageHash,
+      seqno: (m.message.seqno as Long).toNumber(),
+    }))}`
   );
 
   const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages);
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 75cd4016a..3b8bd6dd7 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -12,7 +12,7 @@ import {
   deleteMessagesFromSwarmAndCompletelyLocally,
   deleteMessagesFromSwarmAndMarkAsDeletedLocally,
 } from '../interactions/conversations/unsendingInteractions';
-import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { ConversationTypeEnum, READ_MESSAGE_STATE } from '../models/conversationAttributes';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getConversationController } from '../session/conversations';
 import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
@@ -761,7 +761,7 @@ export async function handleDataExtractionNotification(
         referencedAttachmentTimestamp, // currently unused
         source,
       },
-      unread: 1, // 1 means unread
+      unread: READ_MESSAGE_STATE.unread, // 1 means unread
       expireTimer: 0,
     });
     convo.updateLastMessage();
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 40c9e5bf3..27a07cdb7 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -7,7 +7,7 @@ import { MessageModel, sliceQuoteText } from '../models/message';
 import { getConversationController } from '../session/conversations';
 import { Quote } from './types';
 
-import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { ConversationTypeEnum, READ_MESSAGE_STATE } from '../models/conversationAttributes';
 import { MessageDirection } from '../models/messageType';
 import { SignalService } from '../protobuf';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
@@ -144,7 +144,7 @@ async function processProfileKeyNoCommit(
 
 function updateReadStatus(message: MessageModel) {
   if (message.isExpirationTimerUpdate()) {
-    message.set({ unread: 0 });
+    message.set({ unread: READ_MESSAGE_STATE.read });
   }
 }
 
@@ -307,7 +307,7 @@ async function handleExpirationTimerUpdateNoCommit(
       source,
       expireTimer,
     },
-    unread: 0, // mark the message as read.
+    unread: READ_MESSAGE_STATE.read, // mark the message as read.
   });
   conversation.set({ expireTimer });
 
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index 8adcbff1d..ece4b4f60 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { shuffle } from 'lodash';
 
 import { Data, Snode } from '../../../data/data';
 
@@ -312,10 +312,11 @@ export async function getSwarmFor(pubkey: string): Promise<Array<Snode>> {
   }
 
   // Request new node list from the network
-  const freshNodes = _.shuffle(await requestSnodesForPubkeyFromNetwork(pubkey));
+  const swarm = await requestSnodesForPubkeyFromNetwork(pubkey);
+  const mixedSwarm = shuffle(swarm);
 
-  const edkeys = freshNodes.map((n: Snode) => n.pubkey_ed25519);
+  const edkeys = mixedSwarm.map((n: Snode) => n.pubkey_ed25519);
   await internalUpdateSwarmFor(pubkey, edkeys);
 
-  return freshNodes;
+  return mixedSwarm;
 }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 90e54c442..87594098a 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -251,7 +251,7 @@ export class SwarmPolling {
 
       if (!isGroup && userConfigMessagesMerged.length) {
         window.log.info(
-          `received userConfigMessagesMerged: ${userConfigMessagesMerged.length} for key ${pubkey.key}`
+          `received userConfigMessages count: ${userConfigMessagesMerged.length} for key ${pubkey.key}`
         );
         try {
           await this.handleSharedConfigMessages(userConfigMessagesMerged);
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index ae50d3fbe..98d3bf77b 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -29,6 +29,7 @@ import { PnServer } from '../../apis/push_notification_api';
 import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions';
 import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
+import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
 
 // tslint:disable: function-name
 
@@ -860,7 +861,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
     received_at: networkTimestamp,
     expireTimer: 0,
     callNotificationType: 'answered-a-call',
-    unread: 0,
+    unread: READ_MESSAGE_STATE.read,
   });
   await buildAnswerAndSendIt(fromSender);
 
@@ -1199,7 +1200,7 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
     received_at: GetNetworkTime.getNowWithNetworkOffset(),
     expireTimer: 0,
     callNotificationType: 'missed-call',
-    unread: 1,
+    unread: READ_MESSAGE_STATE.unread,
   });
 }
 
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 07d71f712..79cb65977 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -126,6 +126,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
     const { data, seqno, hashes } = await GenericWrapperActions.push(variant);
 
     const kind = variantToKind(variant);
+
     const namespace = await GenericWrapperActions.storageNamespace(variant);
     results.push({
       message: new SharedConfigMessage({
diff --git a/yarn.lock b/yarn.lock
index 5292a63e1..4f479107e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz":
-  version "0.1.8"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.8/libsession_util_nodejs-v0.1.8.tar.gz#49a296dc1d81db5ec8104ef1e6ce5ed2cecff6e9"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz":
+  version "0.1.10"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz#d508007fd15976bdb8b168234d7a7a2e54c7eaf8"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From bac2887c2804d85726d1ae6ade8ea6577eaf3816 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 4 May 2023 16:14:17 +1000
Subject: [PATCH 088/178] fix: update with latest libsession util

---
 package.json                                     |  2 +-
 ts/components/dialog/InviteContactsDialog.tsx    |  2 +-
 ts/interactions/conversationInteractions.ts      | 16 ++++++++--------
 ts/node/migration/sessionMigrations.ts           |  2 +-
 ts/receiver/configMessage.ts                     |  4 ++--
 ts/session/apis/snode_api/snodeSignatures.ts     |  2 +-
 ts/session/apis/snode_api/swarmPolling.ts        |  4 +++-
 .../conversations/ConversationController.ts      |  4 ++--
 .../job_runners/jobs/ConfigurationSyncJob.ts     |  3 +--
 .../libsession/libsession_utils_user_groups.ts   |  4 ++--
 ts/util/releaseFeature.ts                        | 10 +++++-----
 .../workers/node/libsession/libsession.worker.ts |  6 +++---
 yarn.lock                                        |  6 +++---
 13 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index b8015b2e6..bc2955de3 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index 795e60fd7..6ec80e31d 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -34,7 +34,7 @@ function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
       throw new Error(`getCommunityByFullUrl returned no result for ${convo.id}`);
     }
     const groupInvitation = {
-      url: roomDetails?.fullUrl,
+      url: roomDetails?.fullUrlWithPubkey,
       name: convo.getNicknameOrRealUsernameOrPlaceholder(),
     };
     pubkeys.forEach(async pubkeyStr => {
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index f6f3a2586..77ca33c4d 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -39,28 +39,28 @@ import { BlockedNumberController } from '../util/blockedNumberController';
 import { encryptProfile } from '../util/crypto/profileEncrypter';
 import { Storage, setLastProfileUpdateTimestamp } from '../util/storage';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
-import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { leaveClosedGroup } from '../session/group/closed-group';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SettingsKey } from '../data/settings-key';
 import { ReleasedFeatures } from '../util/releaseFeature';
+import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface';
 
-export function copyPublicKeyByConvoId(convoId: string) {
+export async function copyPublicKeyByConvoId(convoId: string) {
   if (OpenGroupUtils.isOpenGroupV2(convoId)) {
-    const fromWrapper = SessionUtilUserGroups.getCommunityByConvoIdCached(convoId);
+    const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
 
     if (!fromWrapper) {
-      throw new Error('opengroup to copy was not found in the UserGroupsWrapper');
+      window.log.warn('opengroup to copy was not found in the UserGroupsWrapper');
+      return;
     }
 
-    if (fromWrapper.fullUrl) {
-      window.clipboard.writeText(fromWrapper.fullUrl);
+    if (fromWrapper.fullUrlWithPubkey) {
+      window.clipboard.writeText(fromWrapper.fullUrlWithPubkey);
+      ToastUtils.pushCopiedToClipBoard();
     }
   } else {
     window.clipboard.writeText(convoId);
   }
-
-  ToastUtils.pushCopiedToClipBoard();
 }
 
 export async function blockConvoById(conversationId: string) {
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 34aca5ff8..9d3bd53b2 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1500,7 +1500,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
     /**
      * Remove the `publicChat` prefix from the communities, instead keep the full url+room in it, with the corresponding http or https prefix.
      * This is easier to handle with the libsession wrappers
-     **/
+     */
     const allOpengroupsConvo = db
       .prepare(
         `SELECT id FROM ${CONVERSATIONS_TABLE} WHERE
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index dd4a3d065..9f4ca2c14 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -214,7 +214,7 @@ async function handleCommunitiesUpdate() {
   const allCommunitiesInWrapper = await UserGroupsWrapperActions.getAllCommunities();
   window.log.debug(
     'allCommunitiesInWrapper',
-    allCommunitiesInWrapper.map(m => m.fullUrl)
+    allCommunitiesInWrapper.map(m => m.fullUrlWithPubkey)
   );
   const allCommunitiesConversation = getConversationController()
     .getConversations()
@@ -266,7 +266,7 @@ async function handleCommunitiesUpdate() {
   // this call can take quite a long time and should not cause issues to not be awaited
   void Promise.all(
     communitiesToJoinInDB.map(async toJoin => {
-      console.warn('joining community with convoId ', toJoin.fullUrl);
+      window.log.info('joining community with convoId ', toJoin.fullUrlWithPubkey);
       return getOpenGroupManager().attemptConnectionV2OneAtATime(
         toJoin.baseUrl,
         toJoin.roomCasePreserved,
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index 9402107de..dfee91598 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -106,7 +106,7 @@ async function generateUpdateExpirySignature({
   const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
 
   if (!ourEd25519Key) {
-    const err = `getSnodeSignatureParams "expiry": User has no getUserED25519KeyPair()`;
+    const err = 'getSnodeSignatureParams "expiry": User has no getUserED25519KeyPair()';
     window.log.warn(err);
     throw new Error(err);
   }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 87594098a..73c6c44df 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -439,7 +439,9 @@ export class SwarmPolling {
                   )}`
                 );
               }
-            } catch (e) {}
+            } catch (e) {
+              // nothing to do I suppose here.
+            }
             results = results.slice(0, results.length - 1);
           }
 
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index a49108ffe..cc56ba2b8 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -238,10 +238,10 @@ export class ConversationController {
 
         try {
           const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(conversation.id);
-          if (fromWrapper?.fullUrl) {
+          if (fromWrapper?.fullUrlWithPubkey) {
             await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
               conversation.id,
-              fromWrapper.fullUrl
+              fromWrapper.fullUrlWithPubkey
             );
           }
         } catch (e) {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 752508483..efd61d9ea 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -299,7 +299,6 @@ async function queueNewJobIfNeeded() {
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
     window.log.debug('Scheduling ConfSyncJob: LATER');
 
-    // TODO we need to make the addJob wait for the previous addJob to be done before it can be called.
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })
     );
@@ -309,5 +308,5 @@ async function queueNewJobIfNeeded() {
 export const ConfigurationSync = {
   ConfigurationSyncJob,
   queueNewJobIfNeeded: () =>
-    allowOnlyOneAtATime(`ConfigurationSyncJob-oneAtAtTime`, queueNewJobIfNeeded),
+    allowOnlyOneAtATime('ConfigurationSyncJob-oneAtAtTime', queueNewJobIfNeeded),
 };
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index f5c4bb405..65aea766b 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -155,7 +155,7 @@ async function refreshCachedUserGroup(convoId: string, duringAppStart = false) {
     let refreshed = false;
     if (OpenGroupUtils.isOpenGroupV2(convoId)) {
       const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
-      if (fromWrapper && fromWrapper.fullUrl) {
+      if (fromWrapper && fromWrapper.fullUrlWithPubkey) {
         mappedCommunityWrapperValues.set(convoId, fromWrapper);
       }
       refreshed = true;
@@ -190,7 +190,7 @@ async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutP
   );
 
   if (fromWrapper) {
-    await UserGroupsWrapperActions.eraseCommunityByFullUrl(fromWrapper.fullUrl);
+    await UserGroupsWrapperActions.eraseCommunityByFullUrl(fromWrapper.fullUrlWithPubkey);
   }
   mappedCommunityWrapperValues.delete(convoId);
 }
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index e8fc4965f..94d4c0a20 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -21,7 +21,7 @@ function getIsFeatureReleasedCached(featureName: FeatureNameTracked) {
     case 'user_config_libsession':
       return isUserConfigLibsessionFeatureReleased;
     default:
-      assertUnreachable(featureName, `case not handled for getIsFeatureReleasedCached`);
+      assertUnreachable(featureName, 'case not handled for getIsFeatureReleasedCached');
   }
 }
 
@@ -34,7 +34,7 @@ function setIsFeatureReleasedCached(featureName: FeatureNameTracked, value: bool
       isUserConfigLibsessionFeatureReleased = value;
       break;
     default:
-      assertUnreachable(featureName, `case not handled for setIsFeatureReleasedCached `);
+      assertUnreachable(featureName, 'case not handled for setIsFeatureReleasedCached');
   }
 }
 
@@ -47,11 +47,11 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
     case 'user_config_libsession':
       // TODO update to agreed value between platforms for `user_config_libsession`
 
-      return 1706778000000; // unix 01/02/2024 09:00;
+      return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
     //   return 1677488400000; // testing: unix 27/02/2023 09:00
 
     default:
-      assertUnreachable(featureName, `case not handled for getFeatureReleaseTimestamp `);
+      assertUnreachable(featureName, 'case not handled for getFeatureReleaseTimestamp');
   }
 }
 
@@ -90,7 +90,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<
   return isReleased;
 }
 
-function checkIsUserConfigFeatureReleased() {
+async function checkIsUserConfigFeatureReleased() {
   return checkIsFeatureReleased('user_config_libsession');
 }
 
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index 1fcc7ba43..d86a070ae 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -149,9 +149,9 @@ function prepareErrorForPostMessage(error: any) {
     return null;
   }
 
-  if (error.stack) {
-    return error.stack;
-  }
+  // if (error.stack) {
+  //   return error.stack;
+  // }
 
   return error.message;
 }
diff --git a/yarn.lock b/yarn.lock
index 4f479107e..343ddc196 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz":
-  version "0.1.10"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.10/libsession_util_nodejs-v0.1.10.tar.gz#d508007fd15976bdb8b168234d7a7a2e54c7eaf8"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz":
+  version "0.1.14"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz#effb7e83ad6f09fb236b3f25497306b0236732ef"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From 6f6620f622b1f24235e17e724766b96e6d83fb15 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 8 May 2023 14:56:21 +1000
Subject: [PATCH 089/178] fix: skip new  group messages when receved after
 group was removed

---
 .../dialog/AdminLeaveClosedGroupDialog.tsx    |  45 +++---
 ts/interactions/conversationInteractions.ts   |  29 ++--
 ts/models/message.ts                          |   4 +-
 ts/node/migration/sessionMigrations.ts        |  30 ++--
 ts/receiver/closedGroups.ts                   |   9 +-
 ts/receiver/configMessage.ts                  |  68 +++++----
 ts/receiver/receiver.ts                       |  20 +--
 ts/session/apis/snode_api/swarmPolling.ts     |  44 ++++--
 .../conversations/ConversationController.ts   | 140 +++++++++++++++---
 ts/session/conversations/createClosedGroup.ts |  17 +--
 ts/session/crypto/MessageEncrypter.ts         |   1 +
 ts/session/group/closed-group.ts              |  88 ++---------
 ts/session/sending/MessageQueue.ts            |   6 +-
 .../libsession_utils_user_groups.ts           |  12 +-
 ts/state/ducks/conversations.ts               |   4 +-
 ts/util/privacy.ts                            |  13 +-
 16 files changed, 302 insertions(+), 228 deletions(-)

diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
index 36c433593..c42cd999f 100644
--- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
+++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
@@ -1,51 +1,54 @@
-import React from 'react';
+import React, { useState } from 'react';
+import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { getConversationController } from '../../session/conversations';
-import { leaveClosedGroup } from '../../session/group/closed-group';
 import { adminLeaveClosedGroup } from '../../state/ducks/modalDialog';
+import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SpacerLG } from '../basic/Text';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-
-type Props = {
-  conversationId: string;
-};
+import { SessionSpinner } from '../basic/SessionSpinner';
 
 const StyledWarning = styled.p`
   max-width: 500px;
   line-height: 1.3333;
 `;
 
-export const AdminLeaveClosedGroupDialog = (props: Props) => {
+export const AdminLeaveClosedGroupDialog = (props: { conversationId: string }) => {
+  const dispatch = useDispatch();
   const convo = getConversationController().get(props.conversationId);
-  const titleText = `${window.i18n('leaveGroup')} ${convo.getRealSessionUsername()}`;
-  const warningAsAdmin = `${window.i18n('leaveGroupConfirmationAdmin')}`;
-  const okText = window.i18n('leaveAndRemoveForEveryone');
-  const cancelText = window.i18n('cancel');
-
-  const onClickOK = async () => {
-    await leaveClosedGroup(props.conversationId);
-    closeDialog();
-  };
+  const [loading, setLoading] = useState(false);
+  const titleText = `${window.i18n('leaveGroup')} ${convo?.getRealSessionUsername() || ''}`;
 
   const closeDialog = () => {
-    window.inboxStore?.dispatch(adminLeaveClosedGroup(null));
+    dispatch(adminLeaveClosedGroup(null));
+  };
+
+  const onClickOK = async () => {
+    if (loading) {
+      return;
+    }
+    setLoading(true);
+    // we know want to delete a closed group right after we've left it, so we can call the deleteContact which takes care of it all
+    await getConversationController().deleteContact(props.conversationId, false);
+    setLoading(false);
+    closeDialog();
   };
 
   return (
     <SessionWrapperModal title={titleText} onClose={closeDialog}>
       <SpacerLG />
-      <StyledWarning>{warningAsAdmin}</StyledWarning>
+      <StyledWarning>{window.i18n('leaveGroupConfirmationAdmin')}</StyledWarning>
+      <SessionSpinner loading={loading} />
 
       <div className="session-modal__button-group">
         <SessionButton
-          text={okText}
+          text={window.i18n('leaveAndRemoveForEveryone')}
           buttonColor={SessionButtonColor.Danger}
           buttonType={SessionButtonType.Simple}
           onClick={onClickOK}
         />
         <SessionButton
-          text={cancelText}
+          text={window.i18n('cancel')}
           buttonType={SessionButtonType.Simple}
           onClick={closeDialog}
         />
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 77ca33c4d..a2f7ec463 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -7,13 +7,16 @@ import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils'
 import { SessionButtonColor } from '../components/basic/SessionButton';
 import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
 import { Data } from '../data/data';
+import { SettingsKey } from '../data/settings-key';
 import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi';
+import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getConversationController } from '../session/conversations';
 import { getSodiumRenderer } from '../session/crypto';
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
-import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { fromHexToArray, toHex } from '../session/utils/String';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import {
   conversationReset,
@@ -32,17 +35,13 @@ import {
   updateRemoveModeratorsModal,
 } from '../state/ducks/modalDialog';
 import { MIME } from '../types';
-import { urlToBlob } from '../types/attachments/VisualAttachment';
-import { processNewAttachment } from '../types/MessageAttachment';
 import { IMAGE_JPEG } from '../types/MIME';
+import { processNewAttachment } from '../types/MessageAttachment';
+import { urlToBlob } from '../types/attachments/VisualAttachment';
 import { BlockedNumberController } from '../util/blockedNumberController';
 import { encryptProfile } from '../util/crypto/profileEncrypter';
-import { Storage, setLastProfileUpdateTimestamp } from '../util/storage';
-import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
-import { leaveClosedGroup } from '../session/group/closed-group';
-import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
-import { SettingsKey } from '../data/settings-key';
 import { ReleasedFeatures } from '../util/releaseFeature';
+import { Storage, setLastProfileUpdateTimestamp } from '../util/storage';
 import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface';
 
 export async function copyPublicKeyByConvoId(convoId: string) {
@@ -250,19 +249,19 @@ export function showLeaveGroupByConvoId(conversationId: string) {
         title,
         message,
         onClickOk: async () => {
-          await leaveClosedGroup(conversation.id);
+          await getConversationController().deleteContact(conversation.id, false);
           onClickClose();
         },
         onClickClose,
       })
     );
-  } else {
-    window.inboxStore?.dispatch(
-      adminLeaveClosedGroup({
-        conversationId,
-      })
-    );
+    return;
   }
+  window.inboxStore?.dispatch(
+    adminLeaveClosedGroup({
+      conversationId,
+    })
+  );
 }
 export function showInviteContactByConvoId(conversationId: string) {
   window.inboxStore?.dispatch(updateInviteContactModal({ conversationId }));
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 69386ec1b..842d64db8 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -447,8 +447,10 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return 'read';
     }
     const sent = this.get('sent');
+    // control messages we've sent, synced from the network appear to just have the sent_at field set.
+    const sentAt = this.get('sent_at');
     const sentTo = this.get('sent_to') || [];
-    if (sent || sentTo.length > 0) {
+    if (sent || sentTo.length > 0 || sentAt) {
       return 'sent';
     }
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 9d3bd53b2..abc67ceaa 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1431,7 +1431,7 @@ function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
   try {
     const blockedItem = sqlNode.getItemById('blocked', db);
     if (!blockedItem) {
-      throw new Error('no blocked contacts at all');
+      return [];
     }
     const foundBlocked = blockedItem?.value;
     console.info('foundBlockedNumbers during migration', foundBlocked);
@@ -1497,6 +1497,15 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         WHERE type = 'private' AND (active_at IS NULL OR active_at = 0 );`
     ).run({});
 
+    // create the table which is going to handle the wrappers, without any content in this migration.
+    db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
+          variant TEXT NOT NULL,
+          publicKey TEXT NOT NULL,
+          data BLOB,
+          PRIMARY KEY (publicKey, variant)
+          );
+          `);
+
     /**
      * Remove the `publicChat` prefix from the communities, instead keep the full url+room in it, with the corresponding http or https prefix.
      * This is easier to handle with the libsession wrappers
@@ -1531,7 +1540,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
         newId,
         oldId: convoDetails.oldConvoId,
       });
-      // do the same for messages and where else?
+      // do the same for messages
 
       db.prepare(
         `UPDATE ${MESSAGES_TABLE} SET
@@ -1543,19 +1552,11 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       db.prepare(
         `UPDATE ${OPEN_GROUP_ROOMS_V2_TABLE} SET
           conversationId = $newId,
-          json = json_set(json, '$.conversationId', $newId);`
-      ).run({ newId });
+          json = json_set(json, '$.conversationId', $newId)
+          WHERE conversationId = $oldConvoId;`
+      ).run({ newId, oldConvoId: convoDetails.oldConvoId });
     });
 
-    // create the table which is going to handle the wrappers, without any content in this migration.
-    db.exec(`CREATE TABLE ${CONFIG_DUMP_TABLE}(
-      variant TEXT NOT NULL,
-      publicKey TEXT NOT NULL,
-      data BLOB,
-      PRIMARY KEY (publicKey, variant)
-      );
-      `);
-
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
@@ -1712,7 +1713,6 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
 
         communitiesToWriteInWrapper.forEach(community => {
           try {
-            console.info('Writing community: ', JSON.stringify(community));
             insertCommunityIntoWrapper(
               community,
               userGroupsConfigWrapper,
@@ -1810,7 +1810,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
 
     // still, we update the schema version
     writeSessionSchemaVersion(targetVersion, db);
-  });
+  })();
 }
 
 export function printTableColumns(table: string, db: BetterSqlite3.Database) {
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 8ef8b222f..981f7553a 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -342,6 +342,8 @@ export async function markGroupAsLeftOrKicked(
   groupConvo: ConversationModel,
   isKicked: boolean
 ) {
+  getSwarmPollingInstance().removePubkey(groupPublicKey);
+
   await innerRemoveAllClosedGroupEncryptionKeyPairs(groupPublicKey);
 
   if (isKicked) {
@@ -349,7 +351,6 @@ export async function markGroupAsLeftOrKicked(
   } else {
     groupConvo.set('left', true);
   }
-  getSwarmPollingInstance().removePubkey(groupPublicKey);
 }
 
 /**
@@ -547,13 +548,9 @@ async function performIfValid(
   } else if (groupUpdate.type === Type.MEMBER_LEFT) {
     await handleClosedGroupMemberLeft(envelope, convo);
   } else if (groupUpdate.type === Type.ENCRYPTION_KEY_PAIR_REQUEST) {
-    window?.log?.warn(
-      'Received ENCRYPTION_KEY_PAIR_REQUEST message but it is not enabled for now.'
-    );
     await removeFromCache(envelope);
-
-    // if you add a case here, remember to add it where performIfValid is called too.
   }
+  // if you add a case here, remember to add it where performIfValid is called too.
 
   return true;
 }
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 9f4ca2c14..84be29005 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -329,7 +329,15 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
   for (let index = 0; index < legacyGroupsToLeaveInDB.length; index++) {
     const toLeave = legacyGroupsToLeaveInDB[index];
     console.warn('leaving legacy group from configuration sync message with convoId ', toLeave.id);
-    await getConversationController().deleteContact(toLeave.id, true);
+    const toLeaveFromDb = getConversationController().get(toLeave.id);
+
+    // if we were kicked from that group, leave it as is until the user manually deletes it
+    // otherwise, completely remove the conversation
+    if (!toLeaveFromDb?.get('isKickedFromGroup')) {
+      window.log.debug(`we were kicked from ${toLeave.id} so we keep it until manually deleted`);
+
+      await getConversationController().deleteContact(toLeave.id, true);
+    }
   }
 
   for (let index = 0; index < legacyGroupsToJoinInDB.length; index++) {
@@ -379,10 +387,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
 
     let changes = await legacyGroupConvo.setPriorityFromWrapper(fromWrapper.priority, false);
 
-    if (legacyGroupConvo.get('priority') !== fromWrapper.priority) {
-      legacyGroupConvo.set({ priority: fromWrapper.priority });
-      changes = true;
-    }
     const existingTimestampMs = legacyGroupConvo.get('lastJoinedTimestamp');
     if (Math.floor(existingTimestampMs / 1000) !== fromWrapper.joinedAtSeconds) {
       legacyGroupConvo.set({ lastJoinedTimestamp: fromWrapper.joinedAtSeconds * 1000 });
@@ -400,29 +404,31 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       );
       changes = true;
     }
-    // start polling for this new group
-    getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex));
+    // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead
+    if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) {
+      getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex));
 
-    // trigger decrypting of all this group messages we did not decrypt successfully yet.
-    await queueAllCachedFromSource(fromWrapper.pubkeyHex);
+      // save the encryption keypair if needed
+      if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
+        try {
+          const inWrapperKeypair: HexKeyPair = {
+            publicHex: toHex(fromWrapper.encPubkey),
+            privateHex: toHex(fromWrapper.encSeckey),
+          };
+
+          await addKeyPairToCacheAndDBIfNeeded(fromWrapper.pubkeyHex, inWrapperKeypair);
+        } catch (e) {
+          window.log.warn('failed to save keypair for legacugroup', fromWrapper.pubkeyHex);
+        }
+      }
+    }
 
     if (changes) {
       await legacyGroupConvo.commit();
     }
 
-    // save the encryption keypair if needed
-    if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
-      try {
-        const inWrapperKeypair: HexKeyPair = {
-          publicHex: toHex(fromWrapper.encPubkey),
-          privateHex: toHex(fromWrapper.encSeckey),
-        };
-
-        await addKeyPairToCacheAndDBIfNeeded(fromWrapper.pubkeyHex, inWrapperKeypair);
-      } catch (e) {
-        window.log.warn('failed to save keypair for legacugroup', fromWrapper.pubkeyHex);
-      }
-    }
+    // trigger decrypting of all this group messages we did not decrypt successfully yet.
+    await queueAllCachedFromSource(fromWrapper.pubkeyHex);
   }
 }
 
@@ -458,9 +464,9 @@ async function applyConvoVolatileUpdateFromWrapper(
   }
 
   try {
-    window.log.debug(
-      `applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
-    );
+    // window.log.debug(
+    //   `applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
+    // );
     // this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
     await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
     // this commits to the DB, if needed
@@ -639,11 +645,13 @@ async function handleConfigMessagesViaLibSession(
   }
 
   window?.log?.debug(
-    `Handling our sharedConfig message via libsession_util ${configMessages.map(m => ({
-      variant: LibSessionUtil.kindToVariant(m.message.kind),
-      hash: m.messageHash,
-      seqno: (m.message.seqno as Long).toNumber(),
-    }))}`
+    `Handling our sharedConfig message via libsession_util ${JSON.stringify(
+      configMessages.map(m => ({
+        variant: LibSessionUtil.kindToVariant(m.message.kind),
+        hash: m.messageHash,
+        seqno: (m.message.seqno as Long).toNumber(),
+      }))
+    )}`
   );
 
   const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages);
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 58c5d737a..3fe517954 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -1,20 +1,20 @@
+import { v4 as uuidv4 } from 'uuid';
 import { EnvelopePlus } from './types';
 export { downloadAttachment } from './attachments';
-import { v4 as uuidv4 } from 'uuid';
 
 import { addToCache, getAllFromCache, getAllFromCacheForSource, removeFromCache } from './cache';
 
 // innerHandleSwarmContentMessage is only needed because of code duplication in handleDecryptedEnvelope...
-import { handleSwarmContentMessage, innerHandleSwarmContentMessage } from './contentMessage';
 import _ from 'lodash';
+import { handleSwarmContentMessage, innerHandleSwarmContentMessage } from './contentMessage';
 
-import { getEnvelopeId } from './common';
-import { StringUtils, UserUtils } from '../session/utils';
-import { SignalService } from '../protobuf';
 import { Data } from '../data/data';
-import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
+import { SignalService } from '../protobuf';
+import { StringUtils, UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
+import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
+import { getEnvelopeId } from './common';
 
 const incomingMessagePromises: Array<Promise<any>> = [];
 
@@ -147,9 +147,11 @@ export function handleRequest(
  */
 export async function queueAllCached() {
   const items = await getAllFromCache();
-  items.forEach(item => {
-    void queueCached(item);
-  });
+
+  await items.reduce(async (promise, item) => {
+    await promise;
+    await queueCached(item);
+  }, Promise.resolve());
 }
 
 export async function queueAllCachedFromSource(source: string) {
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 73c6c44df..d2035e719 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -23,7 +23,10 @@ import { SnodeAPIRetrieve } from './retrieveRequest';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
 import { ReleasedFeatures } from '../../../util/releaseFeature';
 import { LibSessionUtil } from '../../utils/libsession/libsession_utils';
-import { GenericWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
+import {
+  GenericWrapperActions,
+  UserGroupsWrapperActions,
+} from '../../../webworker/workers/browser/libsession_worker_interface';
 
 export function extractWebSocketContent(
   message: string,
@@ -171,13 +174,13 @@ export class SwarmPolling {
           ?.idForLogging() || group.pubkey.key;
 
       if (diff >= convoPollingTimeout) {
-        window?.log?.info(
+        window?.log?.debug(
           `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} `
         );
 
         return this.pollOnceForKey(group.pubkey, true, [SnodeNamespaces.ClosedGroupMessage]);
       }
-      window?.log?.info(
+      window?.log?.debug(
         `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}`
       );
 
@@ -186,7 +189,7 @@ export class SwarmPolling {
     try {
       await Promise.all(concat([directPromise], groupPromises));
     } catch (e) {
-      window?.log?.info('pollForAllKeys exception: ', e);
+      window?.log?.warn('pollForAllKeys exception: ', e);
       throw e;
     } finally {
       setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE);
@@ -270,7 +273,7 @@ export class SwarmPolling {
       );
     }
     if (allNamespacesWithoutUserConfigIfNeeded.length) {
-      window.log.info(
+      window.log.debug(
         `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}`
       );
     }
@@ -280,7 +283,7 @@ export class SwarmPolling {
 
     // if all snodes returned an error (null), no need to update the lastPolledTimestamp
     if (isGroup) {
-      window?.log?.info(
+      window?.log?.debug(
         `Polled for group(${ed25519Str(pubkey.key)}):, got ${messages.length} messages back.`
       );
       let lastPolledTimestamp = Date.now();
@@ -306,15 +309,28 @@ export class SwarmPolling {
     const newMessages = await this.handleSeenMessages(messages);
     perfEnd(`handleSeenMessages-${polledPubkey}`, 'handleSeenMessages');
 
-    // trigger the handling of all the other messages, not shared config related
-    newMessages.forEach(m => {
-      const content = extractWebSocketContent(m.data, m.hash);
-      if (!content) {
-        return;
-      }
+    // don't handle incoming messages from group swarms when using the userconfig and the group is not one of the tracked group
+    const isUserConfigReleaseLive = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+    if (
+      isUserConfigReleaseLive &&
+      isGroup &&
+      polledPubkey.startsWith('05') &&
+      !(await UserGroupsWrapperActions.getLegacyGroup(polledPubkey)) // just check if a legacy group with that name exists
+    ) {
+      // that pubkey is not tracked in the wrapper anymore. Just discard those messages and make sure we are not polling
+      // TODOLATER we might need to do something like this for the new closed groups once released
+      await getSwarmPollingInstance().removePubkey(polledPubkey);
+    } else {
+      // trigger the handling of all the other messages, not shared config related
+      newMessages.forEach(m => {
+        const content = extractWebSocketContent(m.data, m.hash);
+        if (!content) {
+          return;
+        }
 
-      Receiver.handleRequest(content.body, isGroup ? polledPubkey : null, content.messageHash);
-    });
+        Receiver.handleRequest(content.body, isGroup ? polledPubkey : null, content.messageHash);
+      });
+    }
   }
 
   private async handleSharedConfigMessages(userConfigMessagesMerged: Array<RetrieveMessageItem>) {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index cc56ba2b8..1d37bb9b2 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -12,12 +12,18 @@ import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/con
 import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface';
-import { leaveClosedGroup } from '../group/closed-group';
 import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob';
 import { LibSessionUtil } from '../utils/libsession/libsession_utils';
 import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
+import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
+import { getMessageQueue } from '..';
+import { markGroupAsLeftOrKicked } from '../../receiver/closedGroups';
+import { getSwarmPollingInstance } from '../apis/snode_api';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
+import { UserUtils } from '../utils';
 
 let instance: ConversationController | null;
 
@@ -262,6 +268,7 @@ export class ConversationController {
         if (roomInfos) {
           getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
         }
+        await this.cleanUpGroupConversation(conversation.id);
 
         // remove the roomInfos locally for this open group room including the pubkey
         try {
@@ -272,34 +279,13 @@ export class ConversationController {
         break;
       case 'LegacyGroup':
         window.log.info(`deleteContact ClosedGroup case: ${conversation.id}`);
-        await leaveClosedGroup(conversation.id);
-        await SessionUtilUserGroups.removeLegacyGroupFromWrapper(conversation.id);
-        await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(conversation.id);
-
+        await leaveClosedGroup(conversation.id, fromSyncMessage); // this removes the data from the group and convo volatile info
+        await this.cleanUpGroupConversation(conversation.id);
         break;
       default:
         assertUnreachable(convoType, `deleteContact: convoType ${convoType} not handled`);
     }
 
-    if (conversation.isGroup()) {
-      window.log.info(`deleteContact isGroup, removing convo from DB: ${id}`);
-      // not a private conversation, so not a contact for the ContactWrapper
-      await Data.removeConversation(id);
-
-      window.log.info(`deleteContact isGroup, convo removed from DB: ${id}`);
-      this.conversations.remove(conversation);
-
-      window?.inboxStore?.dispatch(
-        conversationActions.conversationChanged({
-          id: conversation.id,
-          data: conversation.getConversationModelProps(),
-        })
-      );
-      window.inboxStore?.dispatch(conversationActions.conversationRemoved(conversation.id));
-
-      window.log.info(`deleteContact NOT private, convo removed from store: ${id}`);
-    }
-
     if (!fromSyncMessage) {
       await ConfigurationSync.queueNewJobIfNeeded();
     }
@@ -400,4 +386,110 @@ export class ConversationController {
     }
     this.conversations.reset([]);
   }
+
+  private async cleanUpGroupConversation(id: string) {
+    window.log.info(`deleteContact isGroup, removing convo from DB: ${id}`);
+    // not a private conversation, so not a contact for the ContactWrapper
+    await Data.removeConversation(id);
+
+    window.log.info(`deleteContact isGroup, convo removed from DB: ${id}`);
+    const conversation = this.conversations.get(id);
+
+    if (conversation) {
+      this.conversations.remove(conversation);
+
+      window?.inboxStore?.dispatch(
+        conversationActions.conversationChanged({
+          id: id,
+          data: conversation.getConversationModelProps(),
+        })
+      );
+    }
+    window.inboxStore?.dispatch(conversationActions.conversationRemoved(id));
+
+    window.log.info(`deleteContact NOT private, convo removed from store: ${id}`);
+  }
+}
+
+/**
+ * You most likely don't want to call this function directly, but instead use the deleteContact() from the ConversationController as it will take care of more cleaningup.
+ *
+ * Note: `fromSyncMessage` is used to know if we need to send a leave group message to the group first.
+ * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true.
+ */
+async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
+  const convo = getConversationController().get(groupId);
+
+  if (!convo || !convo.isClosedGroup()) {
+    window?.log?.error('Cannot leave non-existing group');
+    return;
+  }
+
+  const ourNumber = UserUtils.getOurPubKeyStrFromCache();
+  const isCurrentUserAdmin = convo.get('groupAdmins')?.includes(ourNumber);
+
+  let members: Array<string> = [];
+  let admins: Array<string> = [];
+
+  // if we are the admin, the group must be destroyed for every members
+  if (isCurrentUserAdmin) {
+    window?.log?.info('Admin left a closed group. We need to destroy it');
+    convo.set({ left: true });
+    members = [];
+    admins = [];
+  } else {
+    // otherwise, just the exclude ourself from the members and trigger an update with this
+    convo.set({ left: true });
+    members = (convo.get('members') || []).filter((m: string) => m !== ourNumber);
+    admins = convo.get('groupAdmins') || [];
+  }
+  convo.set({ members });
+  await convo.updateGroupAdmins(admins, false);
+  await convo.commit();
+
+  const source = UserUtils.getOurPubKeyStrFromCache();
+  const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
+
+  const dbMessage = await convo.addSingleOutgoingMessage({
+    group_update: { left: [source] },
+    sent_at: networkTimestamp,
+    expireTimer: 0,
+  });
+
+  getSwarmPollingInstance().removePubkey(groupId);
+
+  if (!fromSyncMessage) {
+    // Send the update to the group
+    const ourLeavingMessage = new ClosedGroupMemberLeftMessage({
+      timestamp: networkTimestamp,
+      groupId,
+      identifier: dbMessage.id as string,
+    });
+
+    window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
+    // sent the message to the group and once done, remove everything related to this group
+    const wasSent = await getMessageQueue().sendToPubKeyNonDurably({
+      message: ourLeavingMessage,
+      namespace: SnodeNamespaces.ClosedGroupMessage,
+      pubkey: PubKey.cast(groupId),
+    });
+    window?.log?.info(
+      `Leaving message sent ${groupId}. Removing everything related to this group.`
+    );
+    if (wasSent) {
+      await cleanUpFullyLeftLegacyGroup(groupId);
+    }
+  } else {
+    await cleanUpFullyLeftLegacyGroup(groupId);
+  }
+}
+
+async function cleanUpFullyLeftLegacyGroup(groupId: string) {
+  const convo = getConversationController().get(groupId);
+
+  await UserGroupsWrapperActions.eraseLegacyGroup(groupId);
+  await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(groupId);
+  if (convo) {
+    await markGroupAsLeftOrKicked(groupId, convo, false);
+  }
 }
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index f95184578..e2fe7f308 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -8,11 +8,7 @@ import { openConversationWithMessages } from '../../state/ducks/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
-import {
-  generateClosedGroupPublicKey,
-  generateCurve25519KeyPairWithoutPrefix,
-  generateGroupV3Keypair,
-} from '../crypto';
+import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto';
 import {
   ClosedGroupNewMessage,
   ClosedGroupNewMessageParams,
@@ -31,13 +27,14 @@ export async function createClosedGroup(groupName: string, members: Array<string
 
   const us = UserUtils.getOurPubKeyStrFromCache();
 
-  const identityKeyPair = await generateGroupV3Keypair();
-  if (!identityKeyPair) {
-    throw new Error('Could not create identity keypair for new closed group v3');
-  }
+  // const identityKeyPair = await generateGroupV3Keypair();
+  // if (!identityKeyPair) {
+  //   throw new Error('Could not create identity keypair for new closed group v3');
+  // }
 
   // a v3 pubkey starts with 03 and an old one starts with 05
-  const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey();
+  const groupPublicKey = await generateClosedGroupPublicKey();
+  // const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey();
 
   // the first encryption keypair is generated the same for all versions of closed group
   const encryptionKeyPair = await generateCurve25519KeyPairWithoutPrefix();
diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts
index 14ed8db17..7f570a239 100644
--- a/ts/session/crypto/MessageEncrypter.ts
+++ b/ts/session/crypto/MessageEncrypter.ts
@@ -43,6 +43,7 @@ export async function encrypt(
       window?.log?.warn("Couldn't get key pair for closed group during encryption");
       throw new Error("Couldn't get key pair for closed group");
     }
+
     const hexPubFromECKeyPair = PubKey.cast(hexEncryptionKeyPair.publicHex);
 
     const cipherTextClosedGroup = await MessageEncrypter.encryptUsingSessionProtocol(
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 153807e96..06559baec 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -2,34 +2,30 @@ import { PubKey } from '../types';
 
 import _ from 'lodash';
 
-import { fromHexToArray, toHex } from '../utils/String';
-import { BlockedNumberController } from '../../util/blockedNumberController';
-import { getConversationController } from '../conversations';
-import { Data } from '../../data/data';
 import { v4 as uuidv4 } from 'uuid';
-import { SignalService } from '../../protobuf';
-import { generateCurve25519KeyPairWithoutPrefix } from '../crypto';
-import { encryptUsingSessionProtocol } from '../crypto/MessageEncrypter';
-import { ECKeyPair } from '../../receiver/keypairs';
-import { UserUtils } from '../utils';
-import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
+import { getMessageQueue } from '..';
+import { Data } from '../../data/data';
 import { ConversationModel } from '../../models/conversation';
+import { ConversationAttributes, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MessageModel } from '../../models/message';
+import { SignalService } from '../../protobuf';
 import {
   addKeyPairToCacheAndDBIfNeeded,
   distributingClosedGroupEncryptionKeyPairs,
-  markGroupAsLeftOrKicked,
 } from '../../receiver/closedGroups';
-import { getMessageQueue } from '..';
+import { ECKeyPair } from '../../receiver/keypairs';
+import { BlockedNumberController } from '../../util/blockedNumberController';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { getConversationController } from '../conversations';
+import { generateCurve25519KeyPairWithoutPrefix } from '../crypto';
+import { encryptUsingSessionProtocol } from '../crypto/MessageEncrypter';
 import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage';
 import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage';
 import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
 import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
-import { getSwarmPollingInstance } from '../apis/snode_api';
-import { ConversationAttributes, ConversationTypeEnum } from '../../models/conversationAttributes';
-import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
-import { SnodeNamespaces } from '../apis/snode_api/namespaces';
+import { UserUtils } from '../utils';
+import { fromHexToArray, toHex } from '../utils/String';
 
 export type GroupInfo = {
   id: string;
@@ -258,66 +254,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
   );
 }
 
-export async function leaveClosedGroup(groupId: string) {
-  const convo = getConversationController().get(groupId);
-
-  if (!convo || !convo.isClosedGroup()) {
-    window?.log?.error('Cannot leave non-existing group');
-    return;
-  }
-
-  const ourNumber = UserUtils.getOurPubKeyFromCache();
-  const isCurrentUserAdmin = convo.get('groupAdmins')?.includes(ourNumber.key);
-
-  let members: Array<string> = [];
-  let admins: Array<string> = [];
-
-  // if we are the admin, the group must be destroyed for every members
-  if (isCurrentUserAdmin) {
-    window?.log?.info('Admin left a closed group. We need to destroy it');
-    convo.set({ left: true });
-    members = [];
-    admins = [];
-  } else {
-    // otherwise, just the exclude ourself from the members and trigger an update with this
-    convo.set({ left: true });
-    members = (convo.get('members') || []).filter((m: string) => m !== ourNumber.key);
-    admins = convo.get('groupAdmins') || [];
-  }
-  convo.set({ members });
-  await convo.updateGroupAdmins(admins, false);
-  await convo.commit();
-
-  const source = UserUtils.getOurPubKeyStrFromCache();
-  const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
-
-  const dbMessage = await convo.addSingleOutgoingMessage({
-    group_update: { left: [source] },
-    sent_at: networkTimestamp,
-    expireTimer: 0,
-  });
-  // Send the update to the group
-  const ourLeavingMessage = new ClosedGroupMemberLeftMessage({
-    timestamp: networkTimestamp,
-    groupId,
-    identifier: dbMessage.id as string,
-  });
-
-  window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
-  // sent the message to the group and once done, remove everything related to this group
-  getSwarmPollingInstance().removePubkey(groupId);
-  await getMessageQueue().sendToGroup({
-    message: ourLeavingMessage,
-    namespace: SnodeNamespaces.ClosedGroupMessage,
-    sentCb: async () => {
-      window?.log?.info(
-        `Leaving message sent ${groupId}. Removing everything related to this group.`
-      );
-      await markGroupAsLeftOrKicked(groupId, convo, false);
-    },
-  });
-}
-
 async function sendNewName(convo: ConversationModel, name: string, messageId: string) {
   if (name.length === 0) {
     window?.log?.warn('No name given for group update. Skipping');
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 68c93254b..99eaf4f36 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -231,7 +231,11 @@ export class MessageQueue {
     pubkey,
   }: {
     pubkey: PubKey;
-    message: ClosedGroupNewMessage | CallMessage | SharedConfigMessage;
+    message:
+      | ClosedGroupNewMessage
+      | CallMessage
+      | SharedConfigMessage
+      | ClosedGroupMemberLeftMessage;
     namespace: SnodeNamespaces;
   }): Promise<boolean | number> {
     let rawMessage;
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 65aea766b..ea7aa3d57 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -10,6 +10,7 @@ import {
 import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { OpenGroupUtils } from '../../apis/open_group_api/utils';
 import { getConversationController } from '../../conversations';
+import { isEmpty } from 'lodash';
 
 /**
  * The key of this map is the convoId as stored in the database.
@@ -129,9 +130,18 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
 
       try {
         window.log.debug(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
+
         // this does the create or the update of the matching existing legacy group
 
-        await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
+        if (
+          !isEmpty(wrapperLegacyGroup.name) &&
+          !isEmpty(wrapperLegacyGroup.encPubkey) &&
+          !isEmpty(wrapperLegacyGroup.encSeckey)
+        ) {
+          console.warn('inserting into user wrapper', wrapperLegacyGroup);
+          await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
+        }
+
         await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index b94781b67..8d25b4173 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -377,7 +377,7 @@ export const fetchTopMessagesForConversation = createAsyncThunk(
     const mostRecentMessage = await Data.getLastMessageInConversation(conversationKey);
 
     if (!oldestMessage || oldestMessage.id === oldTopMessageId) {
-      window.log.debug('fetchTopMessagesForConversation: we are already at the top');
+      // window.log.debug('fetchTopMessagesForConversation: we are already at the top');
       return null;
     }
     const messagesProps = await getMessages({
@@ -414,7 +414,7 @@ export const fetchBottomMessagesForConversation = createAsyncThunk(
     const mostRecentMessage = await Data.getLastMessageInConversation(conversationKey);
 
     if (!mostRecentMessage || mostRecentMessage.id === oldBottomMessageId) {
-      window.log.debug('fetchBottomMessagesForConversation: we are already at the bottom');
+      // window.log.debug('fetchBottomMessagesForConversation: we are already at the bottom');
       return null;
     }
     const messagesProps = await getMessages({
diff --git a/ts/util/privacy.ts b/ts/util/privacy.ts
index 9085d5fe8..2ab8a5e36 100644
--- a/ts/util/privacy.ts
+++ b/ts/util/privacy.ts
@@ -2,7 +2,7 @@
 
 // tslint:disable-next-line: no-submodule-imports
 import { compose } from 'lodash/fp';
-import { escapeRegExp, isRegExp, isString } from 'lodash';
+import { escapeRegExp, isNil, isRegExp, isString } from 'lodash';
 import { getAppRootPath } from '../node/getRootPath';
 
 const APP_ROOT_PATH = getAppRootPath();
@@ -98,9 +98,16 @@ const removeNewlines = (text: string) => text.replace(/\r?\n|\r/g, '');
 //      redactSensitivePaths :: String -> String
 const redactSensitivePaths = redactPath(APP_ROOT_PATH);
 
-const isDev = (process.env.NODE_APP_INSTANCE || '').startsWith('devprod');
+function shouldNotRedactLogs() {
+  // if the env variable `SESSION_NO_REDACT` is set, trust it as a boolean
+  if (!isNil(process.env.SESSION_NO_REDACT)) {
+    return process.env.SESSION_NO_REDACT;
+  }
+  // otherwise we don't want to redact logs when running on the devprod env
+  return (process.env.NODE_APP_INSTANCE || '').startsWith('devprod');
+}
 
 //      redactAll :: String -> String
-export const redactAll = !isDev
+export const redactAll = !shouldNotRedactLogs()
   ? compose(redactSensitivePaths, redactGroupIds, redactSessionID, redactSnodeIP, redactServerUrl)
   : (text: string) => text;

From 760ce5caa551584b84301175feba6cd91c93828e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 9 May 2023 13:37:31 +1000
Subject: [PATCH 090/178] fix: add the maxSizeMap to have priority per retrieve
 namespaces

---
 ts/components/menu/Menu.tsx                   |  2 +-
 ts/receiver/closedGroups.ts                   |  7 +--
 ts/receiver/configMessage.ts                  |  1 +
 .../opengroupV2/OpenGroupManagerV2.ts         |  1 +
 ts/session/apis/snode_api/namespaces.ts       | 57 ++++++++++++++++++-
 ts/session/apis/snode_api/retrieveRequest.ts  |  3 +
 ts/session/apis/snode_api/swarmPolling.ts     |  2 +-
 .../conversations/ConversationController.ts   | 49 ++++++++++------
 ts/session/conversations/createClosedGroup.ts | 18 +-----
 ts/session/group/closed-group.ts              |  5 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  2 +-
 .../libsession_utils_user_groups.ts           |  8 ++-
 .../session/unit/onion/SnodeNamespace_test.ts | 30 ++++++++++
 13 files changed, 137 insertions(+), 48 deletions(-)
 create mode 100644 ts/test/session/unit/onion/SnodeNamespace_test.ts

diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 813047bd9..d22ca79c6 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -324,7 +324,7 @@ export const CopyMenuItem = (): JSX.Element | null => {
     return (
       <Item
         onClick={() => {
-          copyPublicKeyByConvoId(convoId);
+          void copyPublicKeyByConvoId(convoId);
         }}
       >
         {copyIdLabel}
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 981f7553a..a2474de8d 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -289,12 +289,7 @@ export async function handleNewClosedGroup(
   // ***** Creating a new group *****
   window?.log?.info('Received a new ClosedGroup of id:', groupId);
 
-  await ClosedGroup.addUpdateMessage(
-    convo,
-    { newName: name, joiningMembers: members },
-    envelope.senderIdentity || envelope.source, // new group message are coming as session messages
-    envelopeTimestamp
-  );
+  // we don't want the initial "AAA,BBB and You joined the group"
 
   // We only set group admins on group creation
   const groupDetails: ClosedGroup.GroupInfo = {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 84be29005..b930acaca 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -424,6 +424,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     }
 
     if (changes) {
+      // this commit will grab the latest encryption keypair and add it to the user group wrapper if needed
       await legacyGroupConvo.commit();
     }
 
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 1bab0b823..a6ae4ac66 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -209,6 +209,7 @@ export class OpenGroupManagerV2 {
       // will need it and access it from the db
       await OpenGroupData.saveV2OpenGroupRoom(room);
 
+      // TODOLATER make the requests made here retry a few times (can fail when trying to join a group too soon after a restart)
       const roomInfos = await openGroupV2GetRoomInfoViaOnionV4({
         serverPubkey: serverPublicKey,
         serverUrl,
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 7bfbb7ffa..a1558953d 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -1,3 +1,4 @@
+import { last, orderBy } from 'lodash';
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
 
 export enum SnodeNamespaces {
@@ -32,7 +33,7 @@ export enum SnodeNamespaces {
   /**
    * This is the namespace used to sync the closed group details for each of the closed groups we are polling
    */
-  ClosedGroupInfo = 1,
+  // ClosedGroupInfo = 1,
 }
 
 type PickEnum<T, K extends T> = {
@@ -41,7 +42,7 @@ type PickEnum<T, K extends T> = {
 
 export type SnodeNamespacesGroup = PickEnum<
   SnodeNamespaces,
-  SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMessage
+  SnodeNamespaces.ClosedGroupMessage // | SnodeNamespaces.ClosedGroupInfo
 >;
 
 export type SnodeNamespacesUser = PickEnum<
@@ -62,7 +63,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) {
     case SnodeNamespaces.UserGroups:
     case SnodeNamespaces.ConvoInfoVolatile:
       return true;
-    case SnodeNamespaces.ClosedGroupInfo:
+    // case SnodeNamespaces.ClosedGroupInfo:
     case SnodeNamespaces.ClosedGroupMessage:
       return false;
 
@@ -76,6 +77,56 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) {
   }
 }
 
+function namespacePriority(namespace: SnodeNamespaces): number {
+  switch (namespace) {
+    case SnodeNamespaces.UserMessages:
+      return 10;
+    case SnodeNamespaces.UserContacts:
+      return 1;
+    case SnodeNamespaces.UserProfile:
+      return 1;
+    case SnodeNamespaces.UserGroups:
+      return 1;
+    case SnodeNamespaces.ConvoInfoVolatile:
+      return 1;
+    case SnodeNamespaces.ClosedGroupMessage:
+      return 10;
+
+    default:
+      try {
+        assertUnreachable(namespace, `isUserConfigNamespace case not handled: ${namespace}`);
+      } catch (e) {
+        window.log.warn(`isUserConfigNamespace case not handled: ${namespace}: ${e.message}`);
+        return 1;
+      }
+  }
+}
+
+function maxSizeMap(namespaces: Array<SnodeNamespaces>) {
+  let lastSplit = 1;
+  const withPriorities = namespaces.map(namespace => {
+    return { namespace, priority: namespacePriority(namespace) };
+  });
+  const groupedByPriorities: Array<{ priority: number; namespaces: Array<SnodeNamespaces> }> = [];
+  withPriorities.forEach(item => {
+    if (!groupedByPriorities.find(p => p.priority === item.priority)) {
+      groupedByPriorities.push({ priority: item.priority, namespaces: [] });
+    }
+    groupedByPriorities.find(p => p.priority === item.priority)?.namespaces.push(item.namespace);
+  });
+
+  const sortedDescPriorities = orderBy(groupedByPriorities, ['priority'], ['desc']);
+  const lowestPriority = last(sortedDescPriorities)?.priority || 1;
+  const sizeMap = sortedDescPriorities.flatMap(m => {
+    const paddingForLowerPriority = m.priority === lowestPriority ? 0 : 1;
+    const splitsForPriority = paddingForLowerPriority + m.namespaces.length;
+    lastSplit *= splitsForPriority;
+    return m.namespaces.map(namespace => ({ namespace, maxSize: -lastSplit }));
+  });
+  return sizeMap;
+}
+
 export const SnodeNamespace = {
   isUserConfigNamespace,
+  maxSizeMap,
 };
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index 37f6454b1..e148ad8b3 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -22,13 +22,16 @@ async function buildRetrieveRequest(
   ourPubkey: string,
   configHashesToBump: Array<string> | null
 ): Promise<Array<RetrieveSubRequestType>> {
+  const maxSizeMap = SnodeNamespace.maxSizeMap(namespaces);
   const retrieveRequestsParams: Array<RetrieveSubRequestType> = await Promise.all(
     namespaces.map(async (namespace, index) => {
+      const foundMaxSize = maxSizeMap.find(m => m.namespace === namespace)?.maxSize;
       const retrieveParam = {
         pubkey,
         last_hash: lastHashes.at(index) || '',
         namespace,
         timestamp: GetNetworkTime.getNowWithNetworkOffset(),
+        max_size: foundMaxSize,
       };
 
       if (namespace === SnodeNamespaces.ClosedGroupMessage) {
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index d2035e719..6b497652b 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -319,7 +319,7 @@ export class SwarmPolling {
     ) {
       // that pubkey is not tracked in the wrapper anymore. Just discard those messages and make sure we are not polling
       // TODOLATER we might need to do something like this for the new closed groups once released
-      await getSwarmPollingInstance().removePubkey(polledPubkey);
+      getSwarmPollingInstance().removePubkey(polledPubkey);
     } else {
       // trigger the handling of all the other messages, not shared config related
       newMessages.forEach(m => {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 1d37bb9b2..7849443b4 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -24,6 +24,7 @@ import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
+import { isEmpty } from 'lodash';
 
 let instance: ConversationController | null;
 
@@ -458,30 +459,42 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
 
   getSwarmPollingInstance().removePubkey(groupId);
 
-  if (!fromSyncMessage) {
-    // Send the update to the group
-    const ourLeavingMessage = new ClosedGroupMemberLeftMessage({
-      timestamp: networkTimestamp,
-      groupId,
-      identifier: dbMessage.id as string,
-    });
+  if (fromSyncMessage) {
+    // no need to send our leave message as our other device should already have sent it.
+    await cleanUpFullyLeftLegacyGroup(groupId);
+    return;
+  }
 
-    window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
-    // sent the message to the group and once done, remove everything related to this group
-    const wasSent = await getMessageQueue().sendToPubKeyNonDurably({
-      message: ourLeavingMessage,
-      namespace: SnodeNamespaces.ClosedGroupMessage,
-      pubkey: PubKey.cast(groupId),
-    });
+  const keypair = await Data.getLatestClosedGroupEncryptionKeyPair(groupId);
+  if (!keypair || isEmpty(keypair) || isEmpty(keypair.publicHex) || isEmpty(keypair.privateHex)) {
+    // if we do not have a keypair, we won't be able to send our leaving message neither, so just skip sending it.
+    // this can happen when getting a group from a broken libsession usergroup wrapper, but not only.
+    await cleanUpFullyLeftLegacyGroup(groupId);
+    return;
+  }
+
+  // Send the update to the group
+  const ourLeavingMessage = new ClosedGroupMemberLeftMessage({
+    timestamp: networkTimestamp,
+    groupId,
+    identifier: dbMessage.id as string,
+  });
+
+  window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
+
+  // if we do not have a keypair for that group, we can't send our leave message, so just skip the message sending part
+  const wasSent = await getMessageQueue().sendToPubKeyNonDurably({
+    message: ourLeavingMessage,
+    namespace: SnodeNamespaces.ClosedGroupMessage,
+    pubkey: PubKey.cast(groupId),
+  });
+  if (wasSent) {
     window?.log?.info(
       `Leaving message sent ${groupId}. Removing everything related to this group.`
     );
-    if (wasSent) {
-      await cleanUpFullyLeftLegacyGroup(groupId);
-    }
-  } else {
     await cleanUpFullyLeftLegacyGroup(groupId);
   }
+  // if we failed to send our leaving message, don't remove everything yet as we might want to retry sending our leaving message later.
 }
 
 async function cleanUpFullyLeftLegacyGroup(groupId: string) {
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index e2fe7f308..24d5ae051 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import { ClosedGroup, getMessageQueue } from '..';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { MessageModel } from '../../models/message';
 import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups';
 import { ECKeyPair } from '../../receiver/keypairs';
 import { openConversationWithMessages } from '../../state/ducks/conversations';
@@ -64,13 +63,8 @@ export async function createClosedGroup(groupName: string, members: Array<string
     expireTimer: existingExpireTimer,
   };
 
-  // used for UI only, adding of a message to remind who is in the group and the name of the group
-  const groupDiff: ClosedGroup.GroupDiff = {
-    newName: groupName,
-    joiningMembers: listOfMembers,
-  };
+  // we don't want the initial "AAA and You joined the group"
 
-  const dbMessage = await ClosedGroup.addUpdateMessage(convo, groupDiff, us, Date.now());
   // be sure to call this before sending the message.
   // the sending pipeline needs to know from GroupUtils when a message is for a medium group
   await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
@@ -89,18 +83,17 @@ export async function createClosedGroup(groupName: string, members: Array<string
     groupName,
     admins,
     encryptionKeyPair,
-    dbMessage,
     existingExpireTimer
   );
 
   if (allInvitesSent) {
     const newHexKeypair = encryptionKeyPair.toHexKeyPair();
-
     await addKeyPairToCacheAndDBIfNeeded(groupPublicKey, newHexKeypair);
-
     // Subscribe to this group id
     getSwarmPollingInstance().addGroupId(new PubKey(groupPublicKey));
   }
+  // commit again as now the keypair is saved and can be added to the libsession wrapper UserGroup
+  await convo.commit();
 
   await forceSyncConfigurationNowIfNeeded();
 
@@ -118,7 +111,6 @@ async function sendToGroupMembers(
   groupName: string,
   admins: Array<string>,
   encryptionKeyPair: ECKeyPair,
-  dbMessage: MessageModel,
   existingExpireTimer: number,
   isRetry: boolean = false
 ): Promise<any> {
@@ -128,7 +120,6 @@ async function sendToGroupMembers(
     groupName,
     admins,
     encryptionKeyPair,
-    dbMessage,
     existingExpireTimer
   );
   window?.log?.info(`Sending invites for group ${groupPublicKey} to ${listOfMembers}`);
@@ -184,7 +175,6 @@ async function sendToGroupMembers(
               groupName,
               admins,
               encryptionKeyPair,
-              dbMessage,
               existingExpireTimer,
               isRetrySend
             );
@@ -202,7 +192,6 @@ function createInvitePromises(
   groupName: string,
   admins: Array<string>,
   encryptionKeyPair: ECKeyPair,
-  dbMessage: MessageModel,
   existingExpireTimer: number
 ) {
   return listOfMembers.map(async m => {
@@ -213,7 +202,6 @@ function createInvitePromises(
       admins,
       keypair: encryptionKeyPair,
       timestamp: Date.now(),
-      identifier: dbMessage.id,
       expireTimer: existingExpireTimer,
     };
     const message = new ClosedGroupNewMessage(messageParams);
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 06559baec..17a289044 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -26,6 +26,7 @@ import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { UserUtils } from '../utils';
 import { fromHexToArray, toHex } from '../utils/String';
+import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 
 export type GroupInfo = {
   id: string;
@@ -419,7 +420,7 @@ async function generateAndSendNewEncryptionKeyPair(
 
   const keypairsMessage = new ClosedGroupEncryptionPairMessage({
     groupId: toHex(groupId),
-    timestamp: Date.now(),
+    timestamp: GetNetworkTime.getNowWithNetworkOffset(),
     encryptedKeyPairs: wrappers,
   });
 
@@ -433,7 +434,9 @@ async function generateAndSendNewEncryptionKeyPair(
     distributingClosedGroupEncryptionKeyPairs.delete(toHex(groupId));
 
     await addKeyPairToCacheAndDBIfNeeded(toHex(groupId), newKeyPair.toHexKeyPair());
+    await groupConvo?.commit(); // this makes sure to include the new encryption keypair in the libsession usergroup wrapper
   };
+
   // this is to be sent to the group pubkey adress
   await getMessageQueue().sendToGroup({
     message: keypairsMessage,
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index efd61d9ea..d2a64a26c 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -296,7 +296,7 @@ async function queueNewJobIfNeeded() {
     // if we did run at t=100, and it is currently t=110, the difference is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
-    const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 0);
+    const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000);
     window.log.debug('Scheduling ConfSyncJob: LATER');
 
     await runners.configurationSyncRunner.addJob(
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index ea7aa3d57..560cea9ec 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -132,14 +132,18 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         window.log.debug(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
 
         // this does the create or the update of the matching existing legacy group
-
         if (
           !isEmpty(wrapperLegacyGroup.name) &&
           !isEmpty(wrapperLegacyGroup.encPubkey) &&
           !isEmpty(wrapperLegacyGroup.encSeckey)
         ) {
-          console.warn('inserting into user wrapper', wrapperLegacyGroup);
+          window.log.debug('inserting into user wrapper', wrapperLegacyGroup);
           await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
+        } else {
+          window.log.debug(
+            'not inserting legacy group as name, or encryption keypair is empty',
+            foundConvo.id
+          );
         }
 
         await refreshCachedUserGroup(convoId);
diff --git a/ts/test/session/unit/onion/SnodeNamespace_test.ts b/ts/test/session/unit/onion/SnodeNamespace_test.ts
new file mode 100644
index 000000000..b6a88952a
--- /dev/null
+++ b/ts/test/session/unit/onion/SnodeNamespace_test.ts
@@ -0,0 +1,30 @@
+import { expect } from 'chai';
+import Sinon from 'sinon';
+import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces';
+
+// tslint:disable-next-line: max-func-body-length
+describe('Snode namespaces', () => {
+  describe('maxSizeMap', () => {
+    afterEach(() => {
+      Sinon.restore();
+    });
+
+    it('single namespace 0 returns -1', () => {
+      expect(SnodeNamespace.maxSizeMap([0])).to.be.deep.eq([{ namespace: 0, maxSize: -1 }]);
+    });
+
+    it('single namespace config 5 returns -1', () => {
+      expect(SnodeNamespace.maxSizeMap([5])).to.be.deep.eq([{ namespace: 5, maxSize: -1 }]);
+    });
+
+    it('multiple namespaces config 0,2,3,4,5 returns [-2,-8,-8,-8,-8]', () => {
+      expect(SnodeNamespace.maxSizeMap([0, 2, 3, 4, 5])).to.be.deep.eq([
+        { namespace: 0, maxSize: -2 }, // 0 has a priority of 10 so takes its own bucket
+        { namespace: 2, maxSize: -8 }, //  the 4 other ones are sharing the next bucket
+        { namespace: 3, maxSize: -8 },
+        { namespace: 4, maxSize: -8 },
+        { namespace: 5, maxSize: -8 },
+      ]);
+    });
+  });
+});

From 2a4bbbd5879f7ad25b57ce3eac41c62e0e46117c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 10 May 2023 13:29:38 +1000
Subject: [PATCH 091/178] feat: add the deleteContact and deleteConversation
 only menu items

---
 _locales/en/messages.json                     |   1 +
 .../dialog/AdminLeaveClosedGroupDialog.tsx    |   4 +-
 ts/components/menu/ConversationHeaderMenu.tsx |  10 +-
 .../menu/ConversationListItemContextMenu.tsx  |  10 +-
 ts/components/menu/Menu.tsx                   | 143 +++++++++++-------
 ts/interactions/conversationInteractions.ts   |   4 +-
 ts/mains/main_renderer.tsx                    |   2 +-
 ts/node/sql.ts                                |   4 +-
 ts/receiver/configMessage.ts                  |  91 +++++++++--
 .../opengroupV2/JoinOpenGroupV2.ts            |   4 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   4 +-
 ts/session/apis/snode_api/batchRequest.ts     |   2 +-
 .../conversations/ConversationController.ts   |  48 ++++--
 ts/session/crypto/index.ts                    |   2 +-
 .../ExpirationTimerUpdateMessage.ts           |   2 +-
 ts/session/sending/MessageQueue.ts            |   2 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   3 +-
 .../utils/libsession/libsession_utils.ts      |   2 +-
 .../libsession/libsession_utils_contacts.ts   |   5 +-
 ts/state/selectors/conversations.ts           |   4 +
 ts/test/automation/password.spec.ts           |   3 +-
 .../unit/reactions/ReactionMessage_test.ts    |   2 +-
 .../unit/sending/MessageSender_test.ts        |   3 -
 .../unit/swarm_polling/SwarmPolling_test.ts   |  10 +-
 .../unit/utils/job_runner/JobRunner_test.ts   |  19 +--
 ts/types/LocalizerKeys.ts                     |   1 +
 26 files changed, 266 insertions(+), 119 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 132d92303..cb37315f7 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Delete Messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From:",
diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
index c42cd999f..567322b90 100644
--- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
+++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
@@ -29,7 +29,9 @@ export const AdminLeaveClosedGroupDialog = (props: { conversationId: string }) =
     }
     setLoading(true);
     // we know want to delete a closed group right after we've left it, so we can call the deleteContact which takes care of it all
-    await getConversationController().deleteContact(props.conversationId, false);
+    await getConversationController().deleteContact(props.conversationId, {
+      fromSyncMessage: false,
+    });
     setLoading(false);
     closeDialog();
   };
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 7108413f4..36a149ba2 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -29,7 +29,8 @@ import {
   BlockMenuItem,
   ChangeNicknameMenuItem,
   ClearNicknameMenuItem,
-  DeleteContactMenuItem,
+  DeletePrivateContactMenuItem,
+  DeleteGroupOrCommunityMenuItem,
   DeleteMessagesMenuItem,
   InviteContactMenuItem,
   LeaveGroupMenuItem,
@@ -38,6 +39,7 @@ import {
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
+  DeletePrivateConversationMenuItem,
 } from './Menu';
 import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
 
@@ -71,7 +73,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
           <MarkAllReadMenuItem />
           <ChangeNicknameMenuItem />
           <ClearNicknameMenuItem />
-          <DeleteMessagesMenuItem />
           <AddModeratorsMenuItem />
           <RemoveModeratorsMenuItem />
           <BanMenuItem />
@@ -79,7 +80,10 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
           <UpdateGroupNameMenuItem />
           <LeaveGroupMenuItem />
           <InviteContactMenuItem />
-          <DeleteContactMenuItem />
+          <DeleteMessagesMenuItem />
+          <DeletePrivateConversationMenuItem />
+          <DeletePrivateContactMenuItem />
+          <DeleteGroupOrCommunityMenuItem />
           <ShowUserDetailsMenuItem />
         </Menu>
       </SessionContextMenuContainer>
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 7704286a5..f91e03c32 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -17,7 +17,8 @@ import {
   CopyMenuItem,
   DeclineAndBlockMsgRequestMenuItem,
   DeclineMsgRequestMenuItem,
-  DeleteContactMenuItem,
+  DeletePrivateContactMenuItem,
+  DeleteGroupOrCommunityMenuItem,
   DeleteMessagesMenuItem,
   InviteContactMenuItem,
   LeaveGroupMenuItem,
@@ -25,6 +26,7 @@ import {
   MarkConversationUnreadMenuItem,
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
+  DeletePrivateConversationMenuItem,
 } from './Menu';
 
 export type PropsContextConversationItem = {
@@ -48,7 +50,6 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
         {/* Read state actions */}
         <MarkAllReadMenuItem />
         <MarkConversationUnreadMenuItem />
-        <DeleteMessagesMenuItem />
         {/* Nickname actions */}
         <ChangeNicknameMenuItem />
         <ClearNicknameMenuItem />
@@ -56,7 +57,10 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
         <BanMenuItem />
         <UnbanMenuItem />
         <InviteContactMenuItem />
-        <DeleteContactMenuItem />
+        <DeleteMessagesMenuItem />
+        <DeletePrivateConversationMenuItem />
+        <DeletePrivateContactMenuItem />
+        <DeleteGroupOrCommunityMenuItem />
         <LeaveGroupMenuItem />
         <ShowUserDetailsMenuItem />
       </Menu>
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index d22ca79c6..5617252ca 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -35,6 +35,7 @@ import {
   unblockConvoById,
 } from '../../interactions/conversationInteractions';
 import { getConversationController } from '../../session/conversations';
+import { PubKey } from '../../session/types';
 import {
   changeNickNameModal,
   updateConfirmModal,
@@ -44,39 +45,6 @@ import { getIsMessageSection } from '../../state/selectors/section';
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
-import { PubKey } from '../../session/types';
-
-function showDeleteContact(
-  isGroup: boolean,
-  isPublic: boolean,
-  isGroupLeft: boolean,
-  isKickedFromGroup: boolean,
-  isRequest: boolean
-): boolean {
-  // you need to have left a closed group first to be able to delete it completely.
-  return (!isGroup && !isRequest) || (isGroup && (isGroupLeft || isKickedFromGroup || isPublic));
-}
-
-function showUpdateGroupName(
-  weAreAdmin: boolean,
-  isKickedFromGroup: boolean,
-  left: boolean
-): boolean {
-  return !isKickedFromGroup && !left && weAreAdmin;
-}
-
-function showLeaveGroup(
-  isKickedFromGroup: boolean,
-  left: boolean,
-  isGroup: boolean,
-  isPublic: boolean
-): boolean {
-  return !isKickedFromGroup && !left && isGroup && !isPublic;
-}
-
-function showInviteContact(isPublic: boolean): boolean {
-  return isPublic;
-}
 
 /** Menu items standardized */
 
@@ -84,7 +52,7 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
   const convoId = useConvoIdFromContext();
   const isPublic = useIsPublic(convoId);
 
-  if (showInviteContact(isPublic)) {
+  if (isPublic) {
     return (
       <Item
         onClick={() => {
@@ -116,24 +84,21 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
   return null;
 };
 
-export const DeleteContactMenuItem = () => {
+/**
+ * This menu item can be used to completely remove a contact and reset the flags of that conversation.
+ * i.e. after confirmation is made, this contact will be removed from the ContactWrapper, and its blocked and approved state reset.
+ * Note: We keep the entry in the database as the user profile might still be needed for communities/groups where this user.
+ */
+export const DeletePrivateContactMenuItem = () => {
   const dispatch = useDispatch();
   const convoId = useConvoIdFromContext();
-  const isPublic = useIsPublic(convoId);
-  const isLeft = useIsLeft(convoId);
-  const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const isPrivate = useIsPrivate(convoId);
   const isRequest = useIsIncomingRequest(convoId);
 
-  if (showDeleteContact(!isPrivate, isPublic, isLeft, isKickedFromGroup, isRequest)) {
+  if (isPrivate && !isRequest) {
     let menuItemText: string;
-    if (isPublic) {
-      menuItemText = window.i18n('leaveGroup');
-    } else {
-      menuItemText = isPrivate
-        ? window.i18n('editMenuDeleteContact')
-        : window.i18n('editMenuDeleteGroup');
-    }
+
+    menuItemText = window.i18n('editMenuDeleteContact');
 
     const onClickClose = () => {
       dispatch(updateConfirmModal(null));
@@ -143,13 +108,53 @@ export const DeleteContactMenuItem = () => {
       dispatch(
         updateConfirmModal({
           title: menuItemText,
-          message: isPrivate
-            ? window.i18n('deleteContactConfirmation')
-            : window.i18n('leaveGroupConfirmation'),
+          message: window.i18n('deleteContactConfirmation'),
           onClickClose,
           okTheme: SessionButtonColor.Danger,
           onClickOk: async () => {
-            await getConversationController().deleteContact(convoId, false);
+            await getConversationController().deleteContact(convoId, {
+              fromSyncMessage: false,
+              justHidePrivate: false,
+            });
+          },
+        })
+      );
+    };
+
+    return <Item onClick={showConfirmationModal}>{menuItemText}</Item>;
+  }
+  return null;
+};
+
+export const DeleteGroupOrCommunityMenuItem = () => {
+  const dispatch = useDispatch();
+  const convoId = useConvoIdFromContext();
+  const isPublic = useIsPublic(convoId);
+  const isLeft = useIsLeft(convoId);
+  const isKickedFromGroup = useIsKickedFromGroup(convoId);
+  const isPrivate = useIsPrivate(convoId);
+  const isGroup = !isPrivate && !isPublic;
+
+  // You need to have left a closed group first to be able to delete it completely as there is a leaving message to send first.
+  // A community can just be removed right away.
+  if (isPublic || (isGroup && (isLeft || isKickedFromGroup))) {
+    const menuItemText = isPublic ? window.i18n('leaveGroup') : window.i18n('editMenuDeleteGroup');
+
+    const onClickClose = () => {
+      dispatch(updateConfirmModal(null));
+    };
+
+    const showConfirmationModal = () => {
+      dispatch(
+        updateConfirmModal({
+          title: menuItemText,
+          message: window.i18n('leaveGroupConfirmation'),
+          onClickClose,
+          okTheme: SessionButtonColor.Danger,
+          onClickOk: async () => {
+            await getConversationController().deleteContact(convoId, {
+              fromSyncMessage: false,
+            });
           },
         })
       );
@@ -167,7 +172,7 @@ export const LeaveGroupMenuItem = () => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const isPrivate = useIsPrivate(convoId);
 
-  if (showLeaveGroup(isKickedFromGroup, isLeft, !isPrivate, isPublic)) {
+  if (!isKickedFromGroup && !isLeft && !isPrivate && !isPublic) {
     return (
       <Item
         onClick={() => {
@@ -217,7 +222,7 @@ export const UpdateGroupNameMenuItem = () => {
   const isKickedFromGroup = useIsKickedFromGroup(convoId);
   const weAreAdmin = useWeAreAdmin(convoId);
 
-  if (showUpdateGroupName(weAreAdmin, isKickedFromGroup, left)) {
+  if (!isKickedFromGroup && !left && weAreAdmin) {
     return (
       <Item
         onClick={async () => {
@@ -406,13 +411,17 @@ export const ChangeNicknameMenuItem = () => {
   );
 };
 
+/**
+ * This menu is always available and can be used to clear the messages in the local database only.
+ * No messages are sent, no update are made in the wrappers.
+ * Note: Will ask for confirmation before processing.
+ */
 export const DeleteMessagesMenuItem = () => {
   const convoId = useConvoIdFromContext();
 
   if (!convoId) {
     return null;
   }
-
   return (
     <Item
       onClick={() => {
@@ -424,6 +433,34 @@ export const DeleteMessagesMenuItem = () => {
   );
 };
 
+/**
+ * This menu item can be used to delete a private conversation after confirmation.
+ * It does not reset the flags of that conversation, but just removes the messages locally and hide it from the left pane list.
+ * Note: A dialog is opened to ask for confirmation before processing.
+ */
+export const DeletePrivateConversationMenuItem = () => {
+  const convoId = useConvoIdFromContext();
+  const isRequest = useIsIncomingRequest(convoId);
+  const isPrivate = useIsPrivate(convoId);
+
+  if (!convoId || !isPrivate || isRequest) {
+    return null;
+  }
+
+  return (
+    <Item
+      onClick={async () => {
+        await getConversationController().deleteContact(convoId, {
+          fromSyncMessage: false,
+          justHidePrivate: true,
+        });
+      }}
+    >
+      {window.i18n('deleteConversation')}
+    </Item>
+  );
+};
+
 export const AcceptMsgRequestMenuItem = () => {
   const convoId = useConvoIdFromContext();
   const isRequest = useIsIncomingRequest(convoId);
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index a2f7ec463..eb2b2da3c 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -249,7 +249,9 @@ export function showLeaveGroupByConvoId(conversationId: string) {
         title,
         message,
         onClickOk: async () => {
-          await getConversationController().deleteContact(conversation.id, false);
+          await getConversationController().deleteContact(conversation.id, {
+            fromSyncMessage: false,
+          });
           onClickClose();
         },
         onClickClose,
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index e1acb2191..b4bac9a83 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -162,7 +162,7 @@ Storage.onready(async () => {
       // Stop background processing
       AttachmentDownloads.stop();
       // Stop processing incoming messages
-      // TODO stop polling opengroupv2 and swarm nodes
+      // TODOLATER stop polling opengroupv2 and swarm nodes
 
       // Shut down the data interface cleanly
       await Data.shutdown();
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 53de2d8c0..4e3fb2f8a 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -595,7 +595,7 @@ function getUsBlindedInThatServerIfNeeded(
     const blindedId = found?.blindedId;
     return isString(blindedId) ? blindedId : usNaked;
   } catch (e) {
-    console.warn('getUsBlindedInThatServerIfNeeded failed with ', e.message);
+    console.error('getUsBlindedInThatServerIfNeeded failed with ', e.message);
   }
 
   return usNaked;
@@ -1621,7 +1621,7 @@ const unprocessed: UnprocessedDataNode = {
 
   removeUnprocessed: (id: string): void => {
     if (Array.isArray(id)) {
-      console.warn('removeUnprocessed only supports single ids at a time');
+      console.error('removeUnprocessed only supports single ids at a time');
       throw new Error('removeUnprocessed only supports single ids at a time');
     }
     assertGlobalInstance()
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index b930acaca..3498a32a1 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,4 +1,4 @@
-import { compact, isEmpty, isNumber, toNumber } from 'lodash';
+import { compact, difference, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data } from '../data/data';
 import { SettingsKey } from '../data/settings-key';
@@ -47,6 +47,9 @@ import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGr
 import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
+import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
+import { ContactInfo } from 'libsession_util_nodejs';
+import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations';
 
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
@@ -136,14 +139,77 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
   return result;
 }
 
+function getContactsToRemoveFromDB(contactsInWrapper: Array<ContactInfo>) {
+  const allContactsInDBWhichShouldBeInWrapperIds = getConversationController()
+    .getConversations()
+    .filter(SessionUtilContact.isContactToStoreInWrapper)
+    .map(m => m.id as string);
+
+  const currentlySelectedConversationId = getCurrentlySelectedConversationOutsideRedux();
+  const currentlySelectedConvo = currentlySelectedConversationId
+    ? getConversationController().get(currentlySelectedConversationId)
+    : undefined;
+
+  // we might have some contacts not in the wrapper anymore, so let's clean things up.
+
+  const convoIdsInDbButNotWrapper = difference(
+    allContactsInDBWhichShouldBeInWrapperIds,
+    contactsInWrapper.map(m => m.id)
+  );
+
+  // When starting a conversation with a new user, it is not in the wrapper yet, only when we send the first message.
+  // We do not want to forcefully remove that contact as the user might be typing a message to him.
+  // So let's check if that currently selected conversation should be forcefully closed or not
+  if (
+    currentlySelectedConversationId &&
+    currentlySelectedConvo &&
+    convoIdsInDbButNotWrapper.includes(currentlySelectedConversationId)
+  ) {
+    if (
+      currentlySelectedConvo.isPrivate() &&
+      !currentlySelectedConvo.isApproved() &&
+      !currentlySelectedConvo.didApproveMe()
+    ) {
+      const foundIndex = convoIdsInDbButNotWrapper.findIndex(
+        m => m === currentlySelectedConversationId
+      );
+      if (foundIndex !== -1) {
+        convoIdsInDbButNotWrapper.splice(foundIndex, 1);
+      }
+    }
+  }
+  return convoIdsInDbButNotWrapper;
+}
+
+async function deleteContactsFromDB(contactsToRemove: Array<string>) {
+  window.log.debug('contacts to fully remove after wrapper merge', contactsToRemove);
+  for (let index = 0; index < contactsToRemove.length; index++) {
+    const contactToRemove = contactsToRemove[index];
+    try {
+      await getConversationController().deleteContact(contactToRemove, {
+        fromSyncMessage: true,
+        justHidePrivate: false,
+      });
+    } catch (e) {
+      window.log.warn(
+        `after merge: deleteContactsFromDB ${contactToRemove} failed with `,
+        e.message
+      );
+    }
+  }
+}
+
 // tslint:disable-next-line: cyclomatic-complexity
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   const us = UserUtils.getOurPubKeyStrFromCache();
 
-  const allContacts = await ContactsWrapperActions.getAll();
+  const allContactsInWrapper = await ContactsWrapperActions.getAll();
+  const contactsToRemoveFromDB = getContactsToRemoveFromDB(allContactsInWrapper);
+  await deleteContactsFromDB(contactsToRemoveFromDB);
 
-  for (let index = 0; index < allContacts.length; index++) {
-    const wrapperConvo = allContacts[index];
+  // create new contact conversation here, and update their state with what is part of the wrapper
+  for (let index = 0; index < allContactsInWrapper.length; index++) {
+    const wrapperConvo = allContactsInWrapper[index];
 
     if (wrapperConvo.id === us) {
       // our profile update comes from our userProfile, not from the contacts wrapper.
@@ -259,8 +325,10 @@ async function handleCommunitiesUpdate() {
 
   for (let index = 0; index < communitiesToLeaveInDB.length; index++) {
     const toLeave = communitiesToLeaveInDB[index];
-    console.warn('leaving community with convoId ', toLeave.id);
-    await getConversationController().deleteContact(toLeave.id, true);
+    window.log.info('leaving community with convoId ', toLeave.id);
+    await getConversationController().deleteContact(toLeave.id, {
+      fromSyncMessage: true,
+    });
   }
 
   // this call can take quite a long time and should not cause issues to not be awaited
@@ -328,7 +396,10 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
 
   for (let index = 0; index < legacyGroupsToLeaveInDB.length; index++) {
     const toLeave = legacyGroupsToLeaveInDB[index];
-    console.warn('leaving legacy group from configuration sync message with convoId ', toLeave.id);
+    window.log.info(
+      'leaving legacy group from configuration sync message with convoId ',
+      toLeave.id
+    );
     const toLeaveFromDb = getConversationController().get(toLeave.id);
 
     // if we were kicked from that group, leave it as is until the user manually deletes it
@@ -336,13 +407,15 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     if (!toLeaveFromDb?.get('isKickedFromGroup')) {
       window.log.debug(`we were kicked from ${toLeave.id} so we keep it until manually deleted`);
 
-      await getConversationController().deleteContact(toLeave.id, true);
+      await getConversationController().deleteContact(toLeave.id, {
+        fromSyncMessage: true,
+      });
     }
   }
 
   for (let index = 0; index < legacyGroupsToJoinInDB.length; index++) {
     const toJoin = legacyGroupsToJoinInDB[index];
-    console.warn(
+    window.log.info(
       'joining legacy group from configuration sync message with convoId ',
       toJoin.pubkeyHex
     );
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index a1d12453e..e2ad61955 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -82,7 +82,9 @@ async function joinOpenGroupV2(
     // we already have a convo associated with it. Remove everything related to it so we start fresh
     window?.log?.warn('leaving before rejoining open group v2 room', conversationId);
 
-    await getConversationController().deleteContact(conversationId, true);
+    await getConversationController().deleteContact(conversationId, {
+      fromSyncMessage: true,
+    });
   }
 
   // Try to connect to server
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index a6ae4ac66..868e0bbb8 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -152,7 +152,9 @@ export class OpenGroupManagerV2 {
 
             await OpenGroupData.removeV2OpenGroupRoom(roomConvoId);
             getOpenGroupManager().removeRoomFromPolledRooms(infos);
-            await getConversationController().deleteContact(roomConvoId, false);
+            await getConversationController().deleteContact(roomConvoId, {
+              fromSyncMessage: false,
+            });
           }
         } catch (e) {
           window?.log?.warn('cleanup roomInfos error', e);
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index baba864af..01affdf87 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -63,7 +63,7 @@ export async function doSnodeBatchRequest(
  */
 function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchResults {
   try {
-    // console.warn('decodeBatch: ', snodeResponse);
+    // console.error('decodeBatch: ', snodeResponse);
     if (snodeResponse.status !== 200) {
       throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`);
     }
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 7849443b4..1012e5ee4 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -24,7 +24,7 @@ import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
-import { isEmpty } from 'lodash';
+import { isEmpty, isNil } from 'lodash';
 
 let instance: ConversationController | null;
 
@@ -200,9 +200,12 @@ export class ConversationController {
     await conversation.commit();
   }
 
-  public async deleteContact(id: string, fromSyncMessage: boolean) {
+  public async deleteContact(
+    id: string,
+    options: { fromSyncMessage: boolean; justHidePrivate?: boolean }
+  ) {
     if (!this._initialFetchComplete) {
-      throw new Error('getConversationController().deleteContact() needs complete initial fetch');
+      throw new Error('getConversationController.deleteContact  needs complete initial fetch');
     }
 
     window.log.info(`deleteContact with ${id}`);
@@ -227,18 +230,31 @@ export class ConversationController {
     switch (convoType) {
       case '1o1':
         // if this conversation is a private conversation it's in fact a `contact` for desktop.
-        // we just set the hidden field to true
-        // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
-        // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
-        window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
-        conversation.set({
-          priority: CONVERSATION_PRIORITIES.hidden,
-        });
-        // we currently do not wish to reset the approved/approvedMe state when marking a private conversation as hidden
-        // await conversation.setIsApproved(false, false);
-        await conversation.commit(); // this updates the wrappers content to reflect the hidden state
 
-        // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
+        if (options.justHidePrivate || isNil(options.justHidePrivate) || conversation.isMe()) {
+          // we just set the hidden field to true
+          // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
+          // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
+          window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
+          conversation.set({
+            priority: CONVERSATION_PRIORITIES.hidden,
+          });
+          // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
+          await conversation.commit(); // this updates the wrappers content to reflect the hidden state
+        } else {
+          window.log.info(`deleteContact isPrivate, reset fields and removing from wrapper: ${id}`);
+
+          await conversation.setIsApproved(false, false);
+          await conversation.setDidApproveMe(false, false);
+          conversation.set('active_at', 0);
+          await BlockedNumberController.unblockAll([conversation.id]);
+          await conversation.commit(); // first commit to DB so the DB knows about the changes
+          if (SessionUtilContact.isContactToStoreInWrapper(conversation)) {
+            window.log.warn('isContactToStoreInWrapper still true for ', conversation.attributes);
+          }
+          await SessionUtilContact.removeContactFromWrapper(conversation.id); // then remove the entry alltogether from the wrapper
+        }
+
         break;
       case 'Community':
         window?.log?.info('leaving open group v2', conversation.id);
@@ -280,14 +296,14 @@ export class ConversationController {
         break;
       case 'LegacyGroup':
         window.log.info(`deleteContact ClosedGroup case: ${conversation.id}`);
-        await leaveClosedGroup(conversation.id, fromSyncMessage); // this removes the data from the group and convo volatile info
+        await leaveClosedGroup(conversation.id, options.fromSyncMessage); // this removes the data from the group and convo volatile info
         await this.cleanUpGroupConversation(conversation.id);
         break;
       default:
         assertUnreachable(convoType, `deleteContact: convoType ${convoType} not handled`);
     }
 
-    if (!fromSyncMessage) {
+    if (!options.fromSyncMessage) {
       await ConfigurationSync.queueNewJobIfNeeded();
     }
   }
diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts
index 1c8640b59..c2d63d5a3 100644
--- a/ts/session/crypto/index.ts
+++ b/ts/session/crypto/index.ts
@@ -68,7 +68,7 @@ export async function generateGroupV3Keypair() {
   preprendedPubkey.set(publicKey, 1);
   preprendedPubkey[0] = 3;
 
-  console.warn(`generateGroupV3Keypair: pubkey${toHex(preprendedPubkey)}`);
+  // console.warn(`generateGroupV3Keypair: pubkey${toHex(preprendedPubkey)}`);
 
   return { pubkey: toHex(preprendedPubkey), privateKey: toHex(ed25519KeyPair.privateKey) };
 }
diff --git a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
index 05ad7d874..d99a31ab0 100644
--- a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts
@@ -29,7 +29,7 @@ export class ExpirationTimerUpdateMessage extends DataMessage {
 
     data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
 
-    // TODO we shouldn't need this once android recieving refactor is done.
+    // TODOLATER we won't need this once legacy groups are not supported anymore
     // the envelope stores the groupId for a closed group already.
     if (this.groupId) {
       const groupMessage = new SignalService.GroupContext();
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 99eaf4f36..b7401fb78 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -331,7 +331,7 @@ export class MessageQueue {
       // or a message with a syncTarget set.
 
       if (MessageSender.isSyncMessage(message)) {
-        window?.log?.warn('OutgoingMessageQueue: Processing sync message');
+        window?.log?.info('OutgoingMessageQueue: Processing sync message');
         isSyncMessage = true;
       } else {
         window?.log?.warn('Dropping message in process() to be sent to ourself');
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index d2a64a26c..48d77bfa3 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -287,11 +287,12 @@ async function queueNewJobIfNeeded() {
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
   ) {
+    window.log.debug('Scheduling ConfSyncJob: ASAP');
+    // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + 1000 })
     );
-    window.log.debug('Scheduling ConfSyncJob: ASAP'); // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
   } else {
     // if we did run at t=100, and it is currently t=110, the difference is 10
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 79cb65977..153a46e72 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -139,7 +139,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
       namespace,
     });
   }
-  window.log.debug(`those variants needs push: "${[...variantsNeedingPush]}"`);
+  window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`);
 
   return results;
 }
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index fb0cba9fa..5a52f724d 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -33,7 +33,6 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean {
     !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.hasBlindedPrefix(convo.id)
   );
 }
-// TODOLATER should we allow a blinded pubkey to be in the contact wrapper when we blocked it (can we block a blinded message request?)
 
 /**
  * Fetches the specified convo and updates the required field in the wrapper.
@@ -47,9 +46,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   }
 
   if (!isContactToStoreInWrapper(foundConvo)) {
-    console.warn(
-      `insertContactFromDBIntoWrapperAndRefresh: convo ${id} should not be saved. Skipping`
-    );
     return;
   }
 
@@ -124,6 +120,7 @@ async function removeContactFromWrapper(id: string) {
   } catch (e) {
     window.log.warn(`ContactsWrapperActions.erase of ${id} failed with ${e.message}`);
   }
+  await refreshMappedValue(id);
 }
 export const SessionUtilContact = {
   isContactToStoreInWrapper,
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index a3e5a7bbb..30e3b394c 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1055,3 +1055,7 @@ export const getIsSelectedConvoInitialLoadingInProgress = createSelector(
   getSelectedConversation,
   (convo: ReduxConversationType | undefined): boolean => Boolean(convo?.isInitialFetchingInProgress)
 );
+
+export function getCurrentlySelectedConversationOutsideRedux() {
+  return window?.inboxStore?.getState().conversations.selectedConversation as string | undefined;
+}
diff --git a/ts/test/automation/password.spec.ts b/ts/test/automation/password.spec.ts
index 17c9cf177..b2063bf3a 100644
--- a/ts/test/automation/password.spec.ts
+++ b/ts/test/automation/password.spec.ts
@@ -11,6 +11,7 @@ import {
   waitForTestIdWithText,
 } from './utils';
 let window: Page | undefined;
+// tslint:disable: no-console
 
 test.beforeEach(beforeAllClean);
 
@@ -61,7 +62,7 @@ test.describe('Password checks', () => {
     // Change password
     await clickOnTestIdWithText(window, 'change-password-settings-button', 'Change Password');
 
-    console.warn('clicked Change Password');
+    console.info('clicked Change Password');
     // Enter old password
     await typeIntoInput(window, 'password-input', testPassword);
     // Enter new password
diff --git a/ts/test/session/unit/reactions/ReactionMessage_test.ts b/ts/test/session/unit/reactions/ReactionMessage_test.ts
index 2a53368d9..8961626d1 100644
--- a/ts/test/session/unit/reactions/ReactionMessage_test.ts
+++ b/ts/test/session/unit/reactions/ReactionMessage_test.ts
@@ -106,7 +106,7 @@ describe('ReactionMessage', () => {
     expect(reaction, 'no reaction should be returned since we are over the rate limit').to.be
       .undefined;
 
-    clock = useFakeTimers(Date.now());
+    clock = useFakeTimers({ now: Date.now(), shouldAdvanceTime: true });
 
     // Wait a miniute for the rate limit to clear
     clock.tick(1 * 60 * 1000);
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 2245a1f3a..4626fae4d 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -80,13 +80,10 @@ describe('MessageSender', () => {
       });
 
       it('should only retry the specified amount of times before throwing', async () => {
-        // const clock = sinon.useFakeTimers();
-
         sessionMessageAPISendStub.throws(new Error('API error'));
         const attempts = 2;
         const promise = MessageSender.send(rawMessage, attempts, 10);
         await expect(promise).is.rejectedWith('API error');
-        // clock.restore();
         expect(sessionMessageAPISendStub.callCount).to.equal(attempts);
       });
 
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 6060d4ae6..de03273fa 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -64,7 +64,7 @@ describe('SwarmPolling', () => {
     swarmPolling.resetSwarmPolling();
     pollOnceForKeySpy = Sinon.spy(swarmPolling, 'pollOnceForKey');
 
-    clock = sinon.useFakeTimers(Date.now());
+    clock = sinon.useFakeTimers({ now: Date.now(), shouldAdvanceTime: true });
   });
 
   afterEach(() => {
@@ -321,14 +321,16 @@ describe('SwarmPolling', () => {
         const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         clock.tick(9000);
         // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
         /** this is not easy to explain, but
-         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od)
+         * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id)
          * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
          * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
          */
-        clock.restore();
         await sleepFor(10);
 
         expect(pollOnceForKeySpy.callCount).to.eq(4);
@@ -360,7 +362,6 @@ describe('SwarmPolling', () => {
          * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
          * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
          */
-        clock.restore();
         await sleepFor(10);
         // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
@@ -386,6 +387,7 @@ describe('SwarmPolling', () => {
         convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000);
 
         clock.tick(1 * 60 * 1000);
+        await sleepFor(10);
 
         // we should have only one more call here, the one for our direct pubkey fetch
         expect(pollOnceForKeySpy.callCount).to.eq(3);
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index f8a024950..675fb04d1 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -11,6 +11,7 @@ import {
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
 import { TestUtils } from '../../../../test-utils';
+// tslint:disable: no-console
 
 function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
   const job = new FakeSleepForJob({
@@ -200,12 +201,12 @@ describe('JobRunner', () => {
       expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]);
       expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier);
 
-      console.warn(
+      console.info(
         'runnerMulti.getJobList() initial',
         runnerMulti.getJobList().map(m => m.identifier),
         Date.now()
       );
-      console.warn('=========== awaiting first job ==========');
+      console.info('=========== awaiting first job ==========');
 
       // each job takes 5s to finish, so let's tick once the first one should be done
       clock.tick(5000);
@@ -214,10 +215,10 @@ describe('JobRunner', () => {
       expect(awaited).to.eq('await');
       await sleepFor(10);
 
-      console.warn('=========== awaited first job ==========');
+      console.info('=========== awaited first job ==========');
       expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job2.persistedData.identifier);
 
-      console.warn('=========== awaiting second job ==========');
+      console.info('=========== awaiting second job ==========');
 
       clock.tick(5000);
 
@@ -225,7 +226,7 @@ describe('JobRunner', () => {
       expect(awaited).to.eq('await');
       await sleepFor(10); // those sleep for is just to let the runner the time to finish writing the tests to the DB and exit the handling of the previous test
 
-      console.warn('=========== awaited second job ==========');
+      console.info('=========== awaited second job ==========');
 
       expect(runnerMulti.getCurrentJobIdentifier()).to.eq(null);
 
@@ -245,27 +246,27 @@ describe('JobRunner', () => {
       expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier);
 
       clock.tick(5000);
-      console.warn('=========== awaiting first job ==========');
+      console.info('=========== awaiting first job ==========');
 
       await runnerMulti.waitCurrentJob();
       // just give some time for the runnerMulti to pick up a new job
       await sleepFor(10);
       expect(runnerMulti.getJobList()).to.deep.eq([]);
       expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(null);
-      console.warn('=========== awaited first job ==========');
+      console.info('=========== awaited first job ==========');
 
       // the first job should already be finished now
       result = await runnerMulti.addJob(job2);
       expect(result).to.eq('job_started');
       expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]);
 
-      console.warn('=========== awaiting second job ==========');
+      console.info('=========== awaiting second job ==========');
 
       // each job takes 5s to finish, so let's tick once the first one should be done
       clock.tick(5010);
       await runnerMulti.waitCurrentJob();
       await sleepFor(10);
-      console.warn('=========== awaited second job ==========');
+      console.info('=========== awaited second job ==========');
 
       expect(runnerMulti.getJobList()).to.deep.eq([]);
     });
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index a180e1659..1c7f7a0e0 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -100,6 +100,7 @@ export type LocalizerKeys =
   | 'deleteMessagesQuestion'
   | 'deleteMessageQuestion'
   | 'deleteMessages'
+  | 'deleteConversation'
   | 'deleted'
   | 'messageDeletedPlaceholder'
   | 'from'

From 4d0e79f1954efd8e68ff71a3d243f4839284e53b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 12 May 2023 11:41:45 +1000
Subject: [PATCH 092/178] fix: legacy group with wrapper and disable right
 click while searching

---
 package.json                                  |  2 +-
 ts/components/menu/ConversationHeaderMenu.tsx |  5 ++
 .../menu/ConversationListItemContextMenu.tsx  |  5 ++
 ts/mains/main_renderer.tsx                    |  2 +-
 ts/models/message.ts                          |  8 +--
 ts/node/migration/sessionMigrations.ts        | 51 ++++++++++++-------
 ts/receiver/closedGroups.ts                   |  1 -
 ts/receiver/configMessage.ts                  | 28 ++++++----
 ts/session/apis/snode_api/expire.ts           |  2 +-
 .../conversations/ConversationController.ts   | 15 +++++-
 ts/session/group/closed-group.ts              | 15 ++----
 .../libsession/libsession_utils_contacts.ts   |  1 +
 .../libsession_utils_convo_info_volatile.ts   | 16 +++++-
 .../libsession_utils_user_groups.ts           | 24 +++------
 .../libsession_utils_user_profile.ts          | 21 ++++----
 ts/types/sqlSharedTypes.ts                    |  2 +-
 ts/util/releaseFeature.ts                     |  5 +-
 .../browser/libsession_worker_interface.ts    |  5 ++
 yarn.lock                                     |  6 +--
 19 files changed, 130 insertions(+), 84 deletions(-)

diff --git a/package.json b/package.json
index bc2955de3..283adc168 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.20",
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 36a149ba2..8250e8b60 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -42,6 +42,7 @@ import {
   DeletePrivateConversationMenuItem,
 } from './Menu';
 import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
+import { isSearching } from '../../state/selectors/search';
 
 export type PropsConversationHeaderMenu = {
   triggerId: string;
@@ -53,10 +54,14 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
   const convoId = useSelectedConversationKey();
   const isPrivateFriend = useSelectedIsPrivateFriend();
   const isPrivate = useSelectedIsPrivate();
+  const isSearchingMode = useSelector(isSearching);
 
   if (!convoId) {
     throw new Error('convoId must be set for a header to be visible!');
   }
+  if (isSearchingMode) {
+    return null;
+  }
 
   // we do not want the triple dots menu at all if this is not a friend at all
   if (isPrivate && !isPrivateFriend) {
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index f91e03c32..c8cbeda5e 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -28,6 +28,7 @@ import {
   UnbanMenuItem,
   DeletePrivateConversationMenuItem,
 } from './Menu';
+import { isSearching } from '../../state/selectors/search';
 
 export type PropsContextConversationItem = {
   triggerId: string;
@@ -35,7 +36,11 @@ export type PropsContextConversationItem = {
 
 const ConversationListItemContextMenu = (props: PropsContextConversationItem) => {
   const { triggerId } = props;
+  const isSearchingMode = useSelector(isSearching);
 
+  if (isSearchingMode) {
+    return null;
+  }
   return (
     <SessionContextMenuContainer>
       <Menu id={triggerId} animation={animation.fade}>
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index b4bac9a83..f67e06b3b 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -198,7 +198,6 @@ Storage.onready(async () => {
     }
     await initialiseEmojiData(nativeEmojiData);
     await AttachmentDownloads.initAttachmentPaths();
-    await startJobRunners();
 
     await Promise.all([
       getConversationController().load(),
@@ -206,6 +205,7 @@ Storage.onready(async () => {
       OpenGroupData.opengroupRoomsLoad(),
       loadKnownBlindedKeys(),
     ]);
+    await startJobRunners();
   } catch (error) {
     window.log.error(
       'main_renderer: ConversationController failed to load:',
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 842d64db8..c0281c84a 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -447,10 +447,12 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return 'read';
     }
     const sent = this.get('sent');
-    // control messages we've sent, synced from the network appear to just have the sent_at field set.
-    const sentAt = this.get('sent_at');
+    // control messages we've sent, synced from the network appear to just have the sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine.,
+    // TODOLATER
+    // const sentAt = this.get('sent_at');
     const sentTo = this.get('sent_to') || [];
-    if (sent || sentTo.length > 0 || sentAt) {
+
+    if (sent || sentTo.length > 0) {
       return 'sent';
     }
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index abc67ceaa..be682b929 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -34,7 +34,9 @@ import {
 
 import { getIdentityKeys, sqlNode } from '../sql';
 
-// tslint:disable: no-console quotemark one-variable-per-declaration
+const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG);
+
+// tslint:disable: no-console quotemark one-variable-per-declaration no-unused-expression
 
 function getSessionSchemaVersion(db: BetterSqlite3.Database) {
   const result = db
@@ -1237,7 +1239,7 @@ function insertContactIntoContactWrapper(
     });
 
     try {
-      console.info('Inserting contact into wrapper: ', wrapperContact);
+      hasDebugEnvVariable && console.info('Inserting contact into wrapper: ', wrapperContact);
       contactsConfigWrapper.set(wrapperContact);
     } catch (e) {
       console.error(
@@ -1245,7 +1247,7 @@ function insertContactIntoContactWrapper(
       );
       // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
       try {
-        console.info('Inserting edited contact into wrapper: ', contact.id);
+        hasDebugEnvVariable && console.info('Inserting edited contact into wrapper: ', contact.id);
         contactsConfigWrapper.set(
           getContactInfoFromDBValues({
             id: contact.id,
@@ -1286,7 +1288,8 @@ function insertContactIntoContactWrapper(
 
     const maxRead = rows?.max_sent_at;
     const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`);
+    hasDebugEnvVariable &&
+      console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`);
     volatileConfigWrapper.set1o1(contact.id, lastRead, false);
   } catch (e) {
     console.error(
@@ -1305,6 +1308,7 @@ function insertCommunityIntoWrapper(
   const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
 
   const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
+  hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community);
 
   if (
     !roomDetails ||
@@ -1320,9 +1324,10 @@ function insertCommunityIntoWrapper(
     );
     return;
   }
-  console.info(
-    `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"`
-  );
+  hasDebugEnvVariable ??
+    console.info(
+      `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"`
+    );
 
   const fullUrl = userGroupConfigWrapper.buildFullUrlFromDetails(
     roomDetails.serverUrl,
@@ -1335,7 +1340,7 @@ function insertCommunityIntoWrapper(
   });
 
   try {
-    console.info('Inserting community into group wrapper: ', wrapperComm);
+    hasDebugEnvVariable && console.info('Inserting community into group wrapper: ', wrapperComm);
     userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority);
     const rows = db
       .prepare(
@@ -1353,7 +1358,10 @@ function insertCommunityIntoWrapper(
 
     const maxRead = rows?.max_sent_at;
     const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    console.info(`Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`);
+    hasDebugEnvVariable &&
+      console.info(
+        `Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`
+      );
     volatileConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, lastRead, false);
   } catch (e) {
     console.error(
@@ -1399,7 +1407,8 @@ function insertLegacyGroupIntoWrapper(
   });
 
   try {
-    console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
+    hasDebugEnvVariable &&
+      console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
     userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup);
 
     const rows = db
@@ -1418,7 +1427,8 @@ function insertLegacyGroupIntoWrapper(
 
     const maxRead = rows?.max_sent_at;
     const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`);
+    hasDebugEnvVariable &&
+      console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`);
     volatileInfoConfigWrapper.setLegacyGroup(id, lastRead, false);
   } catch (e) {
     console.error(
@@ -1434,7 +1444,7 @@ function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) {
       return [];
     }
     const foundBlocked = blockedItem?.value;
-    console.info('foundBlockedNumbers during migration', foundBlocked);
+    hasDebugEnvVariable && console.info('foundBlockedNumbers during migration', foundBlocked);
     if (isArray(foundBlocked)) {
       return foundBlocked;
     }
@@ -1557,6 +1567,13 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite
       ).run({ newId, oldConvoId: convoDetails.oldConvoId });
     });
 
+    // priority was isPinned before. Make sure that it was set to something, rather than allowing null values.
+    db.prepare(
+      `UPDATE ${CONVERSATIONS_TABLE} SET
+        priority = ${CONVERSATION_PRIORITIES.default}
+        WHERE priority IS NULL;`
+    ).run({});
+
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
@@ -1657,12 +1674,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
 
       if (isArray(contactsToWriteInWrapper) && contactsToWriteInWrapper.length) {
         console.info(
-          '===================== Starting contact inserting into wrapper ======================='
-        );
-
-        console.info(
-          'Writing contacts to wrapper during migration. length: ',
-          contactsToWriteInWrapper?.length
+          `===================== Starting contact inserting into wrapper ${contactsToWriteInWrapper?.length} =======================`
         );
 
         contactsToWriteInWrapper.forEach(contact => {
@@ -1743,7 +1755,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
 
         legacyGroupsToWriteInWrapper.forEach(legacyGroup => {
           try {
-            console.info('Writing legacy group: ', JSON.stringify(legacyGroup));
+            hasDebugEnvVariable &&
+              console.info('Writing legacy group: ', JSON.stringify(legacyGroup));
 
             insertLegacyGroupIntoWrapper(
               legacyGroup,
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index a2474de8d..b7393741c 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -298,7 +298,6 @@ export async function handleNewClosedGroup(
     members: members,
     admins,
     activeAt: envelopeTimestamp,
-    weWereJustAdded: true,
   };
 
   // be sure to call this before sending the message.
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 3498a32a1..dbf842190 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,9 +1,10 @@
+import { ContactInfo } from 'libsession_util_nodejs';
 import { compact, difference, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
 import { Data } from '../data/data';
 import { SettingsKey } from '../data/settings-key';
 import { ConversationInteraction } from '../interactions';
-import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../models/conversationAttributes';
 import { SignalService } from '../protobuf';
 import { ClosedGroup } from '../session';
 import {
@@ -22,9 +23,11 @@ import { UserUtils } from '../session/utils';
 import { toHex } from '../session/utils/String';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
+import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
 import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups';
 import { configurationMessageReceived, trigger } from '../shims/events';
+import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { BlockedNumberController } from '../util';
 import { Registration } from '../util/registration';
@@ -47,9 +50,7 @@ import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGr
 import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
-import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
-import { ContactInfo } from 'libsession_util_nodejs';
-import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations';
+import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions';
 
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
@@ -228,7 +229,14 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (wrapperConvo.priority !== contactConvo.get('priority')) {
+      const currentPriority = contactConvo.get('priority');
+      if (wrapperConvo.priority !== currentPriority) {
+        if (wrapperConvo.priority === CONVERSATION_PRIORITIES.hidden) {
+          window.log.info(
+            'contact marked as hidden and was not before. Deleting all messages from that user'
+          );
+          await deleteAllMessagesByConvoIdNoConfirmation(wrapperConvo.id);
+        }
         await contactConvo.setPriorityFromWrapper(wrapperConvo.priority);
         changes = true;
       }
@@ -426,6 +434,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       ConversationTypeEnum.GROUP
     );
   }
+
   for (let index = 0; index < allLegacyGroupsInWrapper.length; index++) {
     const fromWrapper = allLegacyGroupsInWrapper[index];
 
@@ -453,7 +462,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
         legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp
           ? legacyGroupConvo.get('active_at')
           : latestEnvelopeTimestamp,
-      weWereJustAdded: false, // TODOLATER to remove once legacy groups support is dropped
     };
 
     await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
@@ -461,8 +469,11 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     let changes = await legacyGroupConvo.setPriorityFromWrapper(fromWrapper.priority, false);
 
     const existingTimestampMs = legacyGroupConvo.get('lastJoinedTimestamp');
-    if (Math.floor(existingTimestampMs / 1000) !== fromWrapper.joinedAtSeconds) {
-      legacyGroupConvo.set({ lastJoinedTimestamp: fromWrapper.joinedAtSeconds * 1000 });
+    const existingJoinedAtSeconds = Math.floor(existingTimestampMs / 1000);
+    if (existingJoinedAtSeconds !== fromWrapper.joinedAtSeconds) {
+      legacyGroupConvo.set({
+        lastJoinedTimestamp: fromWrapper.joinedAtSeconds * 1000,
+      });
       changes = true;
     }
 
@@ -729,7 +740,6 @@ async function handleConfigMessagesViaLibSession(
   );
 
   const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages);
-
   await processMergingResults(incomingMergeResult);
 }
 
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
index 7a3d9f8c0..0819023e0 100644
--- a/ts/session/apis/snode_api/expire.ts
+++ b/ts/session/apis/snode_api/expire.ts
@@ -224,7 +224,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
 
   try {
     // TODO make this whole function `expireMessageOnSnode` retry
-    const successfulSend = await expireOnNodes(snode, params);
+    await expireOnNodes(snode, params);
   } catch (e) {
     const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
     window?.log?.warn(
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 1012e5ee4..a9a9d2fad 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -1,7 +1,10 @@
 import { Data } from '../../data/data';
 import { OpenGroupData } from '../../data/opengroups';
 import { ConversationCollection, ConversationModel } from '../../models/conversation';
-import { actions as conversationActions } from '../../state/ducks/conversations';
+import {
+  actions as conversationActions,
+  resetConversationExternal,
+} from '../../state/ducks/conversations';
 import { BlockedNumberController } from '../../util';
 import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmFor } from '../apis/snode_api/snodePool';
@@ -25,6 +28,7 @@ import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
 import { isEmpty, isNil } from 'lodash';
+import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations';
 
 let instance: ConversationController | null;
 
@@ -252,7 +256,14 @@ export class ConversationController {
           if (SessionUtilContact.isContactToStoreInWrapper(conversation)) {
             window.log.warn('isContactToStoreInWrapper still true for ', conversation.attributes);
           }
-          await SessionUtilContact.removeContactFromWrapper(conversation.id); // then remove the entry alltogether from the wrapper
+          if (conversation.id.startsWith('05')) {
+            // make sure to filter blinded contacts as it will throw otherwise
+            await SessionUtilContact.removeContactFromWrapper(conversation.id); // then remove the entry alltogether from the wrapper
+            await SessionUtilConvoInfoVolatile.removeContactFromWrapper(conversation.id);
+          }
+          if (getCurrentlySelectedConversationOutsideRedux() === conversation.id) {
+            window.inboxStore?.dispatch(resetConversationExternal());
+          }
         }
 
         break;
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 17a289044..87faacf54 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -14,7 +14,7 @@ import {
   distributingClosedGroupEncryptionKeyPairs,
 } from '../../receiver/closedGroups';
 import { ECKeyPair } from '../../receiver/keypairs';
-import { BlockedNumberController } from '../../util/blockedNumberController';
+import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { getConversationController } from '../conversations';
 import { generateCurve25519KeyPairWithoutPrefix } from '../crypto';
@@ -26,7 +26,6 @@ import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { UserUtils } from '../utils';
 import { fromHexToArray, toHex } from '../utils/String';
-import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 
 export type GroupInfo = {
   id: string;
@@ -35,9 +34,7 @@ export type GroupInfo = {
   zombies?: Array<string>;
   activeAt?: number;
   expireTimer?: number | null;
-  blocked?: boolean;
   admins?: Array<string>;
-  weWereJustAdded?: boolean;
 };
 
 export interface GroupDiff extends MemberChanges {
@@ -208,7 +205,7 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff
 }
 
 export async function updateOrCreateClosedGroup(details: GroupInfo) {
-  const { id, weWereJustAdded, expireTimer } = details;
+  const { id, expireTimer } = details;
 
   const conversation = await getConversationController().getOrCreateAndWait(
     id,
@@ -217,7 +214,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
 
   const updates: Pick<
     ConversationAttributes,
-    'type' | 'members' | 'displayNameInProfile' | 'active_at' | 'left' | 'lastJoinedTimestamp'
+    'type' | 'members' | 'displayNameInProfile' | 'active_at' | 'left'
   > = {
     displayNameInProfile: details.name,
     members: details.members,
@@ -225,17 +222,11 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     type: ConversationTypeEnum.GROUP,
     active_at: details.activeAt ? details.activeAt : 0,
     left: details.activeAt ? false : true,
-    lastJoinedTimestamp: details.activeAt && weWereJustAdded ? Date.now() : details.activeAt || 0,
   };
 
   conversation.set(updates);
   await conversation.unhideIfNeeded(false);
 
-  const isBlocked = details.blocked || false;
-  if (conversation.isClosedGroup()) {
-    await BlockedNumberController.setBlocked(conversation.id as string, isBlocked);
-  }
-
   if (details.admins?.length) {
     await conversation.updateGroupAdmins(details.admins, false);
   }
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 5a52f724d..9283b684e 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -73,6 +73,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   });
 
   try {
+    window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));
     await ContactsWrapperActions.set(wrapperContact);
   } catch (e) {
     window.log.warn(`ContactsWrapperActions.set of ${id} failed with ${e.message}`);
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index 9e187f40e..abcf92dcc 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -78,7 +78,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
       : 0;
 
   window.log.debug(
-    `convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadMessageTimestamp};forcedUnread:${isForcedUnread}...`
+    `inserting into convoVolatile wrapper: ${convoId} lastMessageReadTimestamp:${lastReadMessageTimestamp} forcedUnread:${isForcedUnread}...`
   );
 
   const convoType = getConvoType(foundConvo);
@@ -242,6 +242,18 @@ async function removeLegacyGroupFromWrapper(convoId: string) {
   mappedLegacyGroupWrapperValues.delete(convoId);
 }
 
+/**
+ * Removes the matching legacy group from the wrapper and from the cached list of legacy groups
+ */
+async function removeContactFromWrapper(convoId: string) {
+  try {
+    await ConvoInfoVolatileWrapperActions.erase1o1(convoId);
+  } catch (e) {
+    window.log.warn('removeContactFromWrapper failed with ', e.message);
+  }
+  mapped1o1WrapperValues.delete(convoId);
+}
+
 /**
  * This function can be used where there are things to do for all the types handled by this wrapper.
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
@@ -262,7 +274,7 @@ export const SessionUtilConvoInfoVolatile = {
   getVolatileInfoCached,
 
   // 1o1
-  // at the moment, we cannot remove a contact from the conversation volatile info so there is nothing here
+  removeContactFromWrapper,
 
   // legacy group
   removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 560cea9ec..5000cdf2b 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -10,7 +10,6 @@ import {
 import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { OpenGroupUtils } from '../../apis/open_group_api/utils';
 import { getConversationController } from '../../conversations';
-import { isEmpty } from 'lodash';
 
 /**
  * The key of this map is the convoId as stored in the database.
@@ -101,7 +100,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       });
 
       try {
-        window.log.debug(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
+        window.log.debug(`inserting into usergroup wrapper "${JSON.stringify(wrapperComm)}"...`);
         // this does the create or the update of the matching existing community
         await UserGroupsWrapperActions.setCommunityByFullUrl(
           wrapperComm.fullUrl,
@@ -129,23 +128,12 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
       });
 
       try {
-        window.log.debug(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
-
+        window.log.debug(
+          `inserting into usergroup wrapper "${foundConvo.id}"... }`,
+          JSON.stringify(wrapperLegacyGroup)
+        );
         // this does the create or the update of the matching existing legacy group
-        if (
-          !isEmpty(wrapperLegacyGroup.name) &&
-          !isEmpty(wrapperLegacyGroup.encPubkey) &&
-          !isEmpty(wrapperLegacyGroup.encSeckey)
-        ) {
-          window.log.debug('inserting into user wrapper', wrapperLegacyGroup);
-          await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
-        } else {
-          window.log.debug(
-            'not inserting legacy group as name, or encryption keypair is empty',
-            foundConvo.id
-          );
-        }
-
+        await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
         await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 02e6ef3a8..8a7cfefc5 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -19,19 +19,20 @@ async function insertUserProfileIntoWrapper(convoId: string) {
   const dbName = ourConvo.get('displayNameInProfile') || '';
   const dbProfileUrl = ourConvo.get('avatarPointer') || '';
   const dbProfileKey = fromHexToArray(ourConvo.get('profileKey') || '');
+  const priority = ourConvo.get('priority') || CONVERSATION_PRIORITIES.default;
 
-  if (dbProfileUrl && !isEmpty(dbProfileKey)) {
-    await UserConfigWrapperActions.setUserInfo(
-      dbName,
-      ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
+  window.log.debug(
+    `inserting into userprofile wrapper: username:"${dbName}", priority:${priority} image:${JSON.stringify(
       { url: dbProfileUrl, key: dbProfileKey }
-    );
+    )} `
+  );
+  if (dbProfileUrl && !isEmpty(dbProfileKey)) {
+    await UserConfigWrapperActions.setUserInfo(dbName, priority, {
+      url: dbProfileUrl,
+      key: dbProfileKey,
+    });
   } else {
-    await UserConfigWrapperActions.setUserInfo(
-      dbName,
-      ourConvo.get('priority') || CONVERSATION_PRIORITIES.default,
-      null
-    );
+    await UserConfigWrapperActions.setUserInfo(dbName, priority, null);
   }
 }
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 9b6fc9a69..8653c89bf 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -172,7 +172,7 @@ export function getCommunityInfoFromDBValues({
 }) {
   const community = {
     fullUrl,
-    priority,
+    priority: priority || 0,
   };
 
   return community;
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 94d4c0a20..552f3fcbc 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -1,4 +1,5 @@
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
+import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { Storage } from './storage';
 
@@ -46,7 +47,7 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
     //   return 1677488400000; // testing:  unix 27/02/2023 09:00
     case 'user_config_libsession':
       // TODO update to agreed value between platforms for `user_config_libsession`
-
+      // FIXME once we are done with testing the user config over libsession feature
       return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
     //   return 1677488400000; // testing: unix 27/02/2023 09:00
 
@@ -81,6 +82,8 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<
     window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`);
     await Storage.put(`featureReleased-${featureName}`, true);
     setIsFeatureReleasedCached(featureName, true);
+    // trigger a sync right away so our user data is online
+    await ConfigurationSync.queueNewJobIfNeeded();
   }
 
   const isReleased = Boolean(getIsFeatureReleasedCached(featureName));
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 115a8f0ac..030515e35 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -256,6 +256,11 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
       unread,
     ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['set1o1']>>,
 
+  erase1o1: async (pubkeyHex: string) =>
+    callLibSessionWorker(['ConvoInfoVolatileConfig', 'erase1o1', pubkeyHex]) as Promise<
+      ReturnType<ConvoInfoVolatileWrapperActionsCalls['erase1o1']>
+    >,
+
   // legacy groups
   getLegacyGroup: async (pubkeyHex: string) =>
     callLibSessionWorker(['ConvoInfoVolatileConfig', 'getLegacyGroup', pubkeyHex]) as Promise<
diff --git a/yarn.lock b/yarn.lock
index 343ddc196..c96295189 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz":
-  version "0.1.14"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.14/libsession_util_nodejs-v0.1.14.tar.gz#effb7e83ad6f09fb236b3f25497306b0236732ef"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz":
+  version "0.1.15"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz#276b878bbd68261009dd1081b97e25ee6769fd62"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From c336ad05249ec1391aa722c5d5dc1c0050aad506 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 12 May 2023 15:40:05 +1000
Subject: [PATCH 093/178] chore: pull translation from crowdin

---
 _locales/ar/messages.json     |  70 ++-
 _locales/be/messages.json     |  62 ++-
 _locales/bg/messages.json     |  62 ++-
 _locales/ca/messages.json     |  62 ++-
 _locales/cs/messages.json     | 256 ++++-----
 _locales/da/messages.json     |  62 ++-
 _locales/de/messages.json     | 272 +++++-----
 _locales/el/messages.json     | 670 ++++++++++++-----------
 _locales/en/messages.json     |   1 -
 _locales/eo/messages.json     | 486 +++++++++--------
 _locales/es/messages.json     | 142 ++---
 _locales/es_419/messages.json | 442 +++++++--------
 _locales/et/messages.json     |  62 ++-
 _locales/fa/messages.json     |  49 +-
 _locales/fi/messages.json     | 258 ++++-----
 _locales/fil/messages.json    | 402 +++++++-------
 _locales/fr/messages.json     | 240 +++++----
 _locales/he/messages.json     |  62 ++-
 _locales/hi/messages.json     | 388 ++++++-------
 _locales/hr/messages.json     |  62 ++-
 _locales/hu/messages.json     | 116 ++--
 _locales/hy-AM/messages.json  | 990 +++++++++++++++++-----------------
 _locales/id/messages.json     | 412 +++++++-------
 _locales/it/messages.json     | 228 ++++----
 _locales/ja/messages.json     | 250 +++++----
 _locales/ka/messages.json     |  62 ++-
 _locales/km/messages.json     | 676 +++++++++++------------
 _locales/kmr/messages.json    | 508 +++++++++++++++++
 _locales/kn/messages.json     |  62 ++-
 _locales/ko/messages.json     |  62 ++-
 _locales/lt/messages.json     |  62 ++-
 _locales/lv/messages.json     |  62 ++-
 _locales/mk/messages.json     |  62 ++-
 _locales/nb/messages.json     |  62 ++-
 _locales/nl/messages.json     | 190 ++++---
 _locales/no/messages.json     |  62 ++-
 _locales/pa/messages.json     |  62 ++-
 _locales/pl/messages.json     | 286 +++++-----
 _locales/pt_BR/messages.json  | 250 +++++----
 _locales/pt_PT/messages.json  | 158 +++---
 _locales/ro/messages.json     |  62 ++-
 _locales/ru/messages.json     | 248 +++++----
 _locales/si/messages.json     |  62 ++-
 _locales/sk/messages.json     | 540 ++++++++++---------
 _locales/sl/messages.json     | 120 +++--
 _locales/sq/messages.json     |  72 ++-
 _locales/sr/messages.json     |  62 ++-
 _locales/sv/messages.json     | 298 +++++-----
 _locales/ta/messages.json     |  62 ++-
 _locales/th/messages.json     |  62 ++-
 _locales/tl/messages.json     | 508 +++++++++++++++++
 _locales/tr/messages.json     |  72 ++-
 _locales/uk/messages.json     |  62 ++-
 _locales/uz/messages.json     | 232 ++++----
 _locales/vi/messages.json     |  72 ++-
 _locales/zh_CN/messages.json  | 252 +++++----
 _locales/zh_TW/messages.json  | 266 ++++-----
 57 files changed, 6828 insertions(+), 4956 deletions(-)
 create mode 100644 _locales/kmr/messages.json
 create mode 100644 _locales/tl/messages.json

diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index 3b5c41606..14c453191 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -28,10 +28,10 @@
   "viewMenuToggleFullScreen": "غيِر الى كل الشاشة",
   "viewMenuToggleDevTools": "اِذهب إلى أدوات المطور",
   "contextMenuNoSuggestions": "لا اقتراحات",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "دعوة المجتمع",
   "joinOpenGroupAfterInvitationConfirmationTitle": "انضَم إلى $roomName$؟",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "هل أنت متحقِّق أنك تريد الانضمام إلى المجموعة المفتوحة $roomName$؟",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "أدخل عنوان التعريف أو اسم ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "جاري التحميل",
@@ -40,7 +40,7 @@
   "youGotKickedFromGroup": "تم اِلغائك من المجموعة.",
   "unreadMessages": "الرسائل غير المقروءة",
   "debugLogExplanation": "السجل سوف يُحفظ على سطح مكتبك",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "الإبلاغ عن خطأ",
   "markAllAsRead": "تحديد الكل كمقروء",
   "incomingError": "خطأ في معالجة الرسالة الواردة",
   "media": "الوسائط",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "جهات الاتصال و المجموعات",
   "contactsHeader": "جهات الإتصال",
-  "messagesHeader": "الرسائل",
+  "messagesHeader": "Conversations",
   "settingsHeader": "التعديلات",
   "typingAlt": "مؤثرات الكتابة لهذه المحادثة",
   "contactAvatarAlt": "صورة المتصل $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "هل تريد حذف هذه الرسالة ؟",
   "deleteMessages": "حذف الرسائل",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "تم حذف هذه الرسالة",
   "from": "مِن",
@@ -107,29 +108,30 @@
   "sent": "أُرسلت",
   "received": "استُقبلت",
   "sendMessage": "أرسل رسالة",
-  "groupMembers": "أفراد المجموعة",
+  "groupMembers": "الأعضاء",
   "moreInformation": "المزيد من المعلومات",
   "resend": "ارسل مجددا",
   "deleteConversationConfirmation": "حذف المحادثة بصفة نهائية ؟",
   "clear": "Clear",
   "clearAllData": "اِمسح جميع البيانات",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "هل أنت متأكد من حذفك المحادثة؟",
   "quoteThumbnailAlt": "الصورة المصغرة للصورة من الرسالة المقتبسة",
   "imageAttachmentAlt": "صورة مرفقة بالرسالة",
-  "videoAttachmentAlt": "لقطة شاشة للفيديو المرفق بالرسالة",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "تم ارسال الصورة للمحادثة",
   "imageCaptionIconAlt": "أيقونة تظهر أن للصورة تعليق",
   "addACaption": "أضف تعليق...",
   "copySessionID": "اِنسخ رابط التعريف",
-  "copyOpenGroupURL": "اِنسخ رابط المجموعة",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "حفظ",
   "saveLogToDesktop": "اِحفظ السجل على سطح المكتب",
   "saved": "تم الحفظ",
   "tookAScreenshot": "قام $name$ بتصوير الشاشة",
   "savedTheFile": "قام $name$ بحفظ الوسائط",
   "linkPreviewsTitle": "أرسل معاينات الرابط",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "لن يكون لديك حماية كاملة للبيانات الوصفية عند إرسال معاينات الرابط.",
   "mediaPermissionsTitle": "ميكروفون",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "مؤشرات الكتابة",
   "zoomFactorSettingTitle": "عامل التكبير",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,17 +157,17 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "الاسم والرسالة",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "لا الاسم ولا الرسالة",
   "nameOnly": "اسم المُرسِل فقط",
   "newMessage": "رسالة جديدة",
   "createConversationNewContact": "Create a conversation with a new contact",
   "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
+  "joinACommunity": "انضم إلى مُجتمع",
   "chooseAnAction": "Choose an action to start a conversation",
   "newMessages": "رسائل جديدة",
   "notificationMostRecentFrom": "Most recent from:",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 ساعة",
   "timerOption_1_day": "1 يوم",
   "timerOption_1_week": "1 أسبوع",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "الرسائل المختفية",
   "changeNickname": "غَير الاسم",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12سا",
   "timerOption_1_day_abbreviated": "1يوم",
   "timerOption_1_week_abbreviated": "1أسبوع",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "تم تعطيل الرسائل المختفية",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "تم تحديد المؤقت على $time$",
   "noteToSelf": "ملاحظة لنفسي",
   "hideMenuBarTitle": "إخفاء شريط القائمة",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "رقم خاطئ ",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "فشل في حل اسم ONS",
   "autoUpdateSettingTitle": "تحديث تلقائي",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "تمت إزالة $name$ من المجموعة.",
   "multipleKickedFromTheGroup": "$name$ تم اِلغاءهم من المجموعة.",
-  "blockUser": "اِحظَر",
-  "unblockUser": "الغاء الحظر",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "تم الغاء الحظر",
   "blocked": "تم الحظر",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "جارٍ تحديث $name$...",
   "showRecoveryPhrase": "جملة الاسترجاع",
   "yourSessionID": "عنوان تعريفك",
-  "setAccountPasswordTitle": "فَعِل كلمة مرور للحساب",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "غَيٍر كلمة مرور الحساب",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "أَلغي كلمة مرور الحساب",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "إدخل كلمة المرور من فضلك",
   "confirmPassword": "أَكِد كلمة المرور",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "أَدخِل كلمة المرور من فضلك",
   "recoveryPhraseSavePromptMain": "عبارة الاسترجاع هي مفتاح عنوان تعريفك - يمكنك استخدامها لاسترجاع عنوان تعريفك اذا فقدت الوصول لجهازك. قم بحفظها في مكان امن و لا تعطها الى اي أحد.",
   "invalidOpenGroupUrl": "عنوان تعريف خاطئ",
-  "copiedToClipboard": "تم النسخ الى الحافظة المؤقتة",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "كلمة المرور",
   "setPassword": "عَيٍن كلمة المرور",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "كلمتا المرور لا تتطابقان",
   "changePasswordInvalid": "كلمة المرور القديمة خاطئة",
   "removePasswordInvalid": "كلمة المرور خاطئة",
-  "setPasswordTitle": "عَيٍن كلمة المرور",
-  "changePasswordTitle": "تم تغيير كلمة المرور",
-  "removePasswordTitle": "تم الغاء كلمة المرور",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "تم تعيين كلمة المرور. احفظها في مامن من فضلك.",
   "changePasswordToastDescription": "تم تغيير كلمة المرور. احفظها في مامن.",
-  "removePasswordToastDescription": "لقد قمت بالغاء كلمة المرور.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "يتم الاتصال...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "المظهر",
   "privacySettingsTitle": "الخصوصية",
   "notificationsSettingsTitle": "التنبيهات",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "ادخل عبارة الاسترجاع",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ عضو",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "ادخل إسم مجموعة أقصر من فضلك",
   "pickClosedGroupMember": "اختر عضو واحد على الاقل من فضلك",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "لا يوجد متصلين محظورين",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "أو انضم إلى واحدة من...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "هل انت متأكد من تنزيل الوسيط المرسل من طرف $name$؟",
   "pinConversation": "ثَبِت المحادثة",
   "unpinConversation": "ألغِي تثبيت المحادثة",
+  "markUnread": "Mark Unread",
   "showUserDetails": "اظهر تفاصيل المستخدم",
   "sendRecoveryPhraseTitle": "أرسل جملة الاسترجاع",
   "sendRecoveryPhraseMessage": "انت تحاول ارسال جملة الاسترجاع التي تسمح بالوصول للحساب. متاكد من ارسالها؟",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "هل تريد حذف البيانات فقط من هذا الجهاز؟",
   "dialogClearAllDataDeletionFailedMultiple": "البيانات لم تحذف من هذه الخوادم: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "مل انت متاكد من حذف بيانات جهازك فقط؟",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "مكالمة لم يتم الرد عليها من '$name$' بسبب عدم تفعيل صلاحيات 'مكالمات الصوت و الفيديو' في تعديلات الخصوصية.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "لقد قمت بالاتصال ب $name$",
   "answeredACall": "اتصال مع $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/be/messages.json b/_locales/be/messages.json
index bd7e2f439..35e26b3f4 100644
--- a/_locales/be/messages.json
+++ b/_locales/be/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results found for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Contacts",
-  "messagesHeader": "Messages",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Delete Messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From:",
@@ -107,29 +108,30 @@
   "sent": "Sent",
   "received": "Received",
   "sendMessage": "Message",
-  "groupMembers": "Group members",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear Nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json
index f7423f676..93abe166f 100644
--- a/_locales/bg/messages.json
+++ b/_locales/bg/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Включване в $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Загрузка...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Результаты не найдены для \"$searchTerm$\"",
   "conversationsHeader": "Контакти и Групи",
   "contactsHeader": "Контакты",
-  "messagesHeader": "Сообщения",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Настройки",
   "typingAlt": "Анимация набора текста для этого разговора",
   "contactAvatarAlt": "Аватар для контакта $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Изтрийте $count$ съобщения?",
   "deleteMessageQuestion": "Изтриване на това съобщение?",
   "deleteMessages": "Удалить сообщения",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ изтрити",
   "messageDeletedPlaceholder": "Това съобщение беше изтрито",
   "from": "От:",
@@ -107,29 +108,30 @@
   "sent": "Отправлено",
   "received": "Получено",
   "sendMessage": "Отправить сообщение",
-  "groupMembers": "Участники группы",
+  "groupMembers": "Members",
   "moreInformation": "Больше информации",
   "resend": "Отправить ещё раз",
   "deleteConversationConfirmation": "Удалить этот разговор без возможности восстановления?",
   "clear": "Clear",
   "clearAllData": "Очистить все данные",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Вы уверены, что хотите удалить этот разговор?",
   "quoteThumbnailAlt": "Миниатюра изображения из цитируемого сообщения",
   "imageAttachmentAlt": "Изображение, прикрепленное к сообщению",
-  "videoAttachmentAlt": "Скриншот видео, прикрепленного к сообщению",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Изображение, отправленное в разговоре",
   "imageCaptionIconAlt": "Иконка, показывающая, что у этого изображения есть подпись",
   "addACaption": "Добавить субтитры...",
   "copySessionID": "Копирайте Session ID",
-  "copyOpenGroupURL": "Копирайте URL адреса на групата",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Сохранить",
   "saveLogToDesktop": "Запази лога на работния плот",
   "saved": "Запазено",
   "tookAScreenshot": "$name$ направи екранна снимка",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Отправлять Предпросмотр Ссылки",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Микрофон",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Индикаторы Ввода",
   "zoomFactorSettingTitle": "Масштабирование Приложения",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "И имя отправителя, и сообщение",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Ни имени, ни сообщения",
   "nameOnly": "Только имя отправителя",
   "newMessage": "Новое сообщение",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 часов",
   "timerOption_1_day": "1 день",
   "timerOption_1_week": "1 неделя",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Исчезающие сообщения",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12ч",
   "timerOption_1_day_abbreviated": "1д",
   "timerOption_1_week_abbreviated": "1нед.",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Исчезающие сообщения отключены",
-  "disabledDisappearingMessages": "$name$ отключил(а) исчезающие сообщения.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Вы отключили исчезающие сообщения.",
   "timerSetTo": "Время исчезновения сообщений – $time$",
   "noteToSelf": "Заметка для себя",
   "hideMenuBarTitle": "Спрятать Системное Меню",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Начать новый разговор…",
-  "invalidNumberError": "Неверный номер",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Автоматические обновления",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ присоединились к группе.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Заблокировать",
-  "unblockUser": "Разблокировать",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Обновляем $name$...",
   "showRecoveryPhrase": "Секретная фраза",
   "yourSessionID": "Ваш Session ID",
-  "setAccountPasswordTitle": "Установить Пароль",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Изменить Пароль",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Удалить Пароль",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Ваша секретная фраза является главным ключом к вашему Session ID. Вы можете использовать ее для восстановления Session ID, если потеряете доступ к своему устройству. Сохраните свою секретную фразу в безопасном месте, и никому её не передавайте.",
   "invalidOpenGroupUrl": "Невалиден URL адрес",
-  "copiedToClipboard": "Скопировано в буфер обмена",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Парола",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Соединяемся...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Внешний вид",
   "privacySettingsTitle": "Конфиденциальность",
   "notificationsSettingsTitle": "Уведомления",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Введите секретную фразу",
   "displayNameEmpty": "Пожалуйста, выберите отображаемое имя",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ члена",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Пожалуйста, введите более короткое имя группы",
   "pickClosedGroupMember": "Пожалуйста, выберите как минимум 1 участников группы",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Няма блокирани контакти",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json
index 13a6b4022..0a0f1d2f9 100644
--- a/_locales/ca/messages.json
+++ b/_locales/ca/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Uneix-t'hi $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Introdueix Session ID o nom ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "S'està carregant...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No hi ha cap resultat per a \"$searchTerm$\".",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Contactes",
-  "messagesHeader": "Missatges",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Configuració",
   "typingAlt": "Animació d'escriptura per a aquesta conversa",
   "contactAvatarAlt": "Avatar per al contacte $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Suprimeix els missatges",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "De",
@@ -107,29 +108,30 @@
   "sent": "Enviament",
   "received": "Rebut",
   "sendMessage": "Envia un missatge",
-  "groupMembers": "Membres del grup",
+  "groupMembers": "Members",
   "moreInformation": "Més informació",
   "resend": "Reenviar",
   "deleteConversationConfirmation": "Voleu suprimir aquesta conversa de forma permanent?",
   "clear": "Clear",
   "clearAllData": "Esborrar totes les dades",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Estàs segur que vols esborrar aquesta conversa?",
   "quoteThumbnailAlt": "Miniatura d'una imatge d'un missatge citat",
   "imageAttachmentAlt": "Imatge adjunta al missatge",
-  "videoAttachmentAlt": "Captura de pantalla d'un vídeo adjuntat al missatge",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "S'ha enviat una imatge a la conversa",
   "imageCaptionIconAlt": "Icona que mostra que aquesta imatge té un títol",
   "addACaption": "Afegiu-hi un títol...",
   "copySessionID": "Copia l'ID de Session",
-  "copyOpenGroupURL": "Copia l'URL del grup",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Desa",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Desat",
   "tookAScreenshot": "$name$ ha fet una captura de pantalla",
   "savedTheFile": "Mèdia desada per $name$",
   "linkPreviewsTitle": "Envia previsualitzacions d'enllaços",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Indicadors de tecleig",
   "zoomFactorSettingTitle": "Factor de zoom",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "El nom de l'emissor i el missatge",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Ni el nom de l'emissor ni el missatge",
   "nameOnly": "Només el nom de l'emissor",
   "newMessage": "Missatge nou",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hores",
   "timerOption_1_day": "1 dia",
   "timerOption_1_week": "1 setmana",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Missatges efímers",
   "changeNickname": "Canvia sobrenom",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 dia",
   "timerOption_1_week_abbreviated": "1 set",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "S'han desactivat els missatges efímers",
-  "disabledDisappearingMessages": "$name$ ha inhabilitat els missatges efímers.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Heu desactivat els missatges efímers",
   "timerSetTo": "Temporitzador establert a $time$",
   "noteToSelf": "Notifica-m'ho",
   "hideMenuBarTitle": "Amaga la barra de menú",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Comença una conversa nova...",
-  "invalidNumberError": "El número no és vàlid",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "No s'ha pogut resoldre el nom ONS",
   "autoUpdateSettingTitle": "Actualització automàtica",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ s'ha unit al grup",
   "kickedFromTheGroup": "$name$ s'ha suprimit del grup.",
   "multipleKickedFromTheGroup": "$name$ s'ha suprimit del grup.",
-  "blockUser": "Bloca",
-  "unblockUser": "Desbloquejar",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Desbloquejat",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Actualitzant $name$...",
   "showRecoveryPhrase": "Frase de recuperació",
   "yourSessionID": "La teva ID de Session",
-  "setAccountPasswordTitle": "Defineix una contrasenya per al compte",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Canviar contrasenya del compte",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Elimina la contrasenya del compte",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Si us plau, introdueix la teva contrasenya",
   "confirmPassword": "Confirma la contrasenya",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Si us plau, introdueix la teva contrasenya",
   "recoveryPhraseSavePromptMain": "La teva frase de recuperació és la clau principal del teu ID de Session — pots fer-la servir per a restaurar la teva ID de Session si perds l'accés al dispositiu. Emmagatzema la frase de recuperació en un lloc segur i no la donis a ningú.",
   "invalidOpenGroupUrl": "La URL no és vàlida",
-  "copiedToClipboard": "Copiat al porta-retalls",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Contrasenya",
   "setPassword": "Establir contrasenya",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Les contrassenyes no coincideixen",
   "changePasswordInvalid": "La contrasenya antiga que has introduït és incorrecta",
   "removePasswordInvalid": "Contrasenya incorrecta",
-  "setPasswordTitle": "Establir contrasenya",
-  "changePasswordTitle": "Canvia la contrasenya",
-  "removePasswordTitle": "Contrasenya suprimida",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "La vostra contrasenya s'ha definit. Mantingueu-la segura.",
   "changePasswordToastDescription": "La vostra contrasenya s'ha definit. Mantingueu-la segura.",
-  "removePasswordToastDescription": "Has eliminat la teva contrasenya.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connectant...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Aparença",
   "privacySettingsTitle": "Privadesa",
   "notificationsSettingsTitle": "Notificacions",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Introdueix la frase de recuperació",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ membres",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Introdueix un nom de grup mes curt",
   "pickClosedGroupMember": "Com a mínim, tria 1 membre per al grup, si us plau",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No hi ha contactes bloquejats",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "O uneix-te a alguns d'aquests...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index defd8c868..13e1ba28a 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Přepnout na plnou obrazovku",
   "viewMenuToggleDevTools": "Přepnout na nástroje vývojáře",
   "contextMenuNoSuggestions": "Žádné návrhy",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Pozvánka do komunity",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Připojit se k $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Nepodařilo se najít odpovídající opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Jste si jisti, že se chcete připojit ke komunitě $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Zadej Session ID nebo ONS jméno",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Začněte novou konverzaci zadáním Session ID jiného uživatele, a nebo sdílejte své Session ID s ostatními.",
   "loading": "Nahrávání...",
   "done": "Dokončeno",
   "youLeftTheGroup": "Opustil jste skupinu",
-  "youGotKickedFromGroup": "Byly jste odstrňeny ze skupiny.",
+  "youGotKickedFromGroup": "Byli jste odebráni ze skupiny.",
   "unreadMessages": "Nepřečtené zprávy",
   "debugLogExplanation": "Tento záznam bude uložen na tvou plochu.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Nahlásit chybu",
   "markAllAsRead": "Označit vše jako přečtené",
   "incomingError": "Chyba při zpracování příchozí zprávy",
   "media": "Média",
@@ -55,15 +55,15 @@
   "stagedPreviewThumbnail": "Návrh náhledu odkazu pro $domain$",
   "previewThumbnail": "Náhled odkazu pro $domain$",
   "stagedImageAttachment": "Návrh obrázkové přílohy: $path$",
-  "oneNonImageAtATimeToast": "When including a non-image attachment, the limit is one attachment per message.",
+  "oneNonImageAtATimeToast": "Je nám líto, ale v jedné zprávě lze odeslat pouze jednu přílohu (výjimkou jsou obrázky a fotografie).",
   "cannotMixImageAndNonImageAttachments": "You cannot mix non-image and image attachments in one message.",
   "maximumAttachments": "You cannot add any more attachments to this message.",
   "fileSizeWarning": "Omlouváme se, vybraný soubor překročil limit velikosti zprávy.",
   "unableToLoadAttachment": "Nelze načít vybranou přílohu.",
   "offline": "Offline",
   "debugLog": "Ladící log",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportovat logy",
+  "shareBugDetails": "Exportujte své logy, a po té, nahrajte soubor přes portál podpory Session.",
   "goToReleaseNotes": "Přejít na poznámky k vydání",
   "goToSupportPage": "Přejít na stránky podpory",
   "about": "Informace",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Kontakty a skupiny",
   "contactsHeader": "Kontakty",
-  "messagesHeader": "Zprávy",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Nastavení",
   "typingAlt": "Animace psaní pro tuto konverzaci",
   "contactAvatarAlt": "Avatar pro kontakt $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Smazat $count$ zpráv?",
   "deleteMessageQuestion": "Smazat tuto zprávu?",
   "deleteMessages": "Smazat zprávy",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ smazáno",
   "messageDeletedPlaceholder": "Tato zpráva byla odstraněna",
   "from": "Od",
@@ -107,66 +108,67 @@
   "sent": "Odeslána",
   "received": "Přijata",
   "sendMessage": "Poslat zprávu",
-  "groupMembers": "Členové skupiny",
+  "groupMembers": "Členové",
   "moreInformation": "Více informací",
   "resend": "Odeslat znovu",
   "deleteConversationConfirmation": "Trvale smazat tuto konverzaci?",
-  "clear": "Clear",
+  "clear": "Vyčistit",
   "clearAllData": "Smazat všechna data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Tímto trvale odstraníte vaše zprávy a kontakty.",
+  "deleteAccountFromLogin": "Jste si jisti, že chcete vyčistit vaše zařízení?",
   "deleteContactConfirmation": "Opravdu chcete smazat tuto konverzaci?",
   "quoteThumbnailAlt": "Náhled obrázku z citované zprávy",
   "imageAttachmentAlt": "Obrázek přiložen ke zprávě",
-  "videoAttachmentAlt": "Náhled videa připojen ke zprávě",
+  "videoAttachmentAlt": "Snímek obrazovky videa ve zprávě",
   "lightboxImageAlt": "Obrázek odeslán v konverzaci",
   "imageCaptionIconAlt": "Ikona informuje, že tento obrázek obsahuje popisek",
   "addACaption": "Přidat titulek...",
   "copySessionID": "Kopírovat Session ID",
-  "copyOpenGroupURL": "Kopírovat URL skupiny",
+  "copyOpenGroupURL": "Kopírovat adresu skupiny",
   "save": "Uložit",
   "saveLogToDesktop": "Uložit protokol na plochu",
   "saved": "Uloženo",
   "tookAScreenshot": "$name$ pořídil snímek obrazovky",
   "savedTheFile": "Uživatel $name$ uložil přílohu",
   "linkPreviewsTitle": "Odesílat náhledy odkazů",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Zobrazit náhledy odkazů pro podporované URL adresy.",
   "linkPreviewsConfirmMessage": "Při odesílání náhledů odkazů nebudeš mít plnou ochranu metadat.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Povolit přístup k mikrofonu.",
   "spellCheckTitle": "Kontrola pravopisu",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Povolit kontrolu pravopisu při psaní zpráv.",
   "spellCheckDirty": "Pro použití nových nastavení musíte restartovat Session",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Odeslat potvrzení o přečtení při konverzaci s jedním uživatelem.",
   "readReceiptSettingTitle": "Potvrzení o přečtení",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Zobrazit a sdílet indikátor psaní v konverzaci s jedním uživatelem.",
   "typingIndicatorsSettingTitle": "Indikátory psaní",
   "zoomFactorSettingTitle": "Měřítko přiblížení (lupa)",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Motivy",
+  "primaryColor": "Výchozí barva",
+  "primaryColorGreen": "Výchozí barva zelená",
+  "primaryColorBlue": "Výchozí barva modrá",
+  "primaryColorYellow": "Výchozí barva žlutá",
+  "primaryColorPink": "Výchozí barva růžová",
+  "primaryColorPurple": "Výchozí barva purpurová",
+  "primaryColorOrange": "Výchozí barva oranžová",
+  "primaryColorRed": "Výchozí barva červená",
+  "classicDarkThemeTitle": "Klasický Tmavý",
+  "classicLightThemeTitle": "Klasický Světlý",
+  "oceanDarkThemeTitle": "Oceán Tmavá",
+  "oceanLightThemeTitle": "Oceán Světlá",
+  "pruneSettingTitle": "Pročistit komunity",
+  "pruneSettingDescription": "Z komunit vymazat zprávy starší než 6 měsíců a ponechat maximálně 2000 nejnovějších zpráv v každé komunitě.",
   "enable": "Zapnout",
   "keepDisabled": "Ponechat vypnuté",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Jméno odesílatele i zprávu",
+  "notificationSettingsDialog": "Informace uvedené v oznámeních.",
+  "nameAndMessage": "Jméno a obsah",
   "noNameOrMessage": "Ani jméno ani zprávu",
   "nameOnly": "Jen jméno odesílatele",
   "newMessage": "Nová zpráva",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Vytvořit konverzaci s novým kontaktem",
+  "createConversationNewGroup": "Vytvořit skupinu s existujícími kontakty",
+  "joinACommunity": "Připojit se ke komunitě",
+  "chooseAnAction": "Zvolte akci pro zahájení konverzace",
   "newMessages": "Nové zprávy",
   "notificationMostRecentFrom": "Most recent from:",
   "notificationFrom": "Od:",
@@ -174,7 +176,7 @@
   "sendFailed": "Odeslání selhalo",
   "mediaMessage": "Multimediální zpráva",
   "messageBodyMissing": "Prosím zadej obsah zprávy.",
-  "messageBody": "Message body",
+  "messageBody": "Tělo zprávy",
   "unblockToSend": "Pro odeslání zprávy tento kontakt odblokujte.",
   "unblockGroupToSend": "Odblokujte tuto skupinu pro odeslání zprávy.",
   "youChangedTheTimer": "Nastavili jste časovač pro zmizení zprávy na $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hodin",
   "timerOption_1_day": "1 den",
   "timerOption_1_week": "1 týden",
+  "timerOption_2_weeks": "2 týdny",
   "disappearingMessages": "Mizející zprávy",
   "changeNickname": "Změnit pseudonym",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 d",
   "timerOption_1_week_abbreviated": "1 týd.",
+  "timerOption_2_weeks_abbreviated": "2t",
   "disappearingMessagesDisabled": "Zmizení zpráv vypnuto",
-  "disabledDisappearingMessages": "$name$ vypnul zmizení zpráv",
+  "disabledDisappearingMessages": "$name$ vypnul/a mizející zprávy.",
   "youDisabledDisappearingMessages": "Vypnul jste zmizení zpráv",
   "timerSetTo": "Časovač nastaven na $time$",
   "noteToSelf": "Poznámka sobě",
   "hideMenuBarTitle": "Skrýt menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Přepínač viditelnosti horní lišty s menu této aplikace.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Neplatné číslo",
+  "invalidNumberError": "Zkontrolujte prosím své Session ID nebo název ONS a zkuste to znovu",
   "failedResolveOns": "Nepodařilo se přeložit ONS jméno",
   "autoUpdateSettingTitle": "Automatické aktualizace",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Automaticky kontrolovat aktualizace při spuštění.",
   "autoUpdateNewVersionTitle": "Dostupná aktualizace Session",
   "autoUpdateNewVersionMessage": "Je k dispozici nová verze aplikace Session.",
   "autoUpdateNewVersionInstructions": "Stiskněte na Restartovat Session pro aplikování změn",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$ se připojil ke skupině",
   "kickedFromTheGroup": "Uživatel $name$ byl odstraněn ze skupiny.",
   "multipleKickedFromTheGroup": "Uživatelé $name$ byli odstraněni ze skupiny.",
-  "blockUser": "Zablokovat",
-  "unblockUser": "Odblokovat",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Odblokováno",
   "blocked": "Zablokováno",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Blokované kontakty",
+  "conversationsSettingsTitle": "Konverzace",
   "unbanUser": "Zrušit vyhození uživatele",
   "userUnbanned": "Vyhození uživatele úspěšně zrušeno",
   "userUnbanFailed": "Zrušení vyhození selhalo!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Vyhození selhalo!",
   "leaveGroup": "Odejít ze skupiny",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Odejít ze skupiny a smazat pro všechny",
   "leaveGroupConfirmation": "Určitě chceš odejít z této skupiny?",
   "leaveGroupConfirmationAdmin": "Jste správcem této skupiny, pokud ji opustíte, bude odstraněna i pro všechny aktuální členy. Opravdu chcete tuto skupinu opustit?",
   "cannotRemoveCreatorFromGroup": "Tohoto uživatele nelze odstranit",
   "cannotRemoveCreatorFromGroupDesc": "Tohoto uživatele nemůžeš odstranit, protože je tvůrcem skupiny.",
   "noContactsForGroup": "Zatím nemáš žádné kontakty",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Nepodařilo se přidat uživatele jako správce",
+  "failedToRemoveFromModerator": "Nepodařilo se odstranit uživatele ze seznamu správců",
   "copyMessage": "Kopírovat text zprávy",
   "selectMessage": "Zvolit zprávu",
   "editGroup": "Upravit skupinu",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "$name$ se aktualizuje...",
   "showRecoveryPhrase": "Fráze pro obnovení",
   "yourSessionID": "Tvé Session ID",
-  "setAccountPasswordTitle": "Nastavit heslo účtu",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Změnit heslo účtu",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Odstranit heslo účtu",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Heslo",
+  "setAccountPasswordDescription": "Vyžadovat heslo pro odemknutí Session.",
+  "changeAccountPasswordTitle": "Změnit heslo",
+  "changeAccountPasswordDescription": "Změnit heslo pro odemykání Session.",
+  "removeAccountPasswordTitle": "Odstranit heslo",
+  "removeAccountPasswordDescription": "Odebrat heslo pro odemykání Session.",
   "enterPassword": "Prosím zadej své heslo",
   "confirmPassword": "Potvrď své helo",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Prosím, zadejte své nové heslo",
+  "confirmNewPassword": "Potvrďte nové heslo",
   "showRecoveryPhrasePasswordRequest": "Potvrď své heslo",
   "recoveryPhraseSavePromptMain": "Obnovovací fráze je reprezentace privátního klíče k Vašemu Session účtu — pokud ztratíte přístup k Vašemu zařízení, můžete ji použít k obnovení Vašeho Session ID. Uschovejte Vaši obnovovací frázi na bezpečném místě a nikomu ji nesdělujte.",
   "invalidOpenGroupUrl": "Neplatná URL",
   "copiedToClipboard": "Zkopírováno",
-  "passwordViewTitle": "Enter Password",
+  "passwordViewTitle": "Zadejte heslo",
   "password": "Heslo",
   "setPassword": "Nastavit heslo",
   "changePassword": "Změnit heslo",
-  "createPassword": "Create your password",
+  "createPassword": "Vytvořte si heslo",
   "removePassword": "Odstranit heslo",
   "maxPasswordAttempts": "Neplatné heslo. Chceš obnovit databázi?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Prosím, zadej své aktuální heslo",
   "invalidOldPassword": "Staré heslo je neplatné",
   "invalidPassword": "Neplatné heslo",
   "noGivenPassword": "Prosím zadej své heslo",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Hesla se nezhodují",
   "changePasswordInvalid": "Zadané staré heslo není správné",
   "removePasswordInvalid": "Nesprávné heslo",
-  "setPasswordTitle": "Heslo nastaveno",
-  "changePasswordTitle": "Heslo změněno",
-  "removePasswordTitle": "Heslo odstraněno",
+  "setPasswordTitle": "Nastavení hesla",
+  "changePasswordTitle": "Změna hesla",
+  "removePasswordTitle": "Odstranění hesla",
   "setPasswordToastDescription": "Tvé heslo bylo nastaveno. Pečlivě si ho odlož.",
   "changePasswordToastDescription": "Tvé heslo bylo změněno. Pečlivě si ho odlož.",
-  "removePasswordToastDescription": "Tvé heslo bylo ostraněno.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Vaše heslo bylo odstraněno.",
+  "publicChatExists": "Již jste připojeni k této komunitě",
+  "connectToServerFail": "Nepodařilo se připojit ke komunitě",
   "connectingToServer": "Probíhá připojování...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Úspěšně připojeno ke komunitě",
   "setPasswordFail": "Heslo se nepodařilo nastavit",
   "passwordLengthError": "Heslo musí mít od 6 do 64 znaků",
   "passwordTypeError": "Heslo musí obsahovat znaky",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Název skupiny",
   "inviteContacts": "Pozvat kontakty",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Přidat správce",
+  "removeModerators": "Odebrat správce",
+  "addAsModerator": "Přidat jako správce",
+  "removeFromModerators": "Odebrat ze správců",
   "add": "Přidat",
   "addingContacts": "Přidávání kontaktů do $name$",
   "noContactsToAdd": "Žádné kontakty k přidání",
   "noMembersInThisGroup": "Žádní další členové v této skupine",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "žádní správci k odebrání",
   "onlyAdminCanRemoveMembers": "Nejsi tvůrce",
   "onlyAdminCanRemoveMembersDesc": "Jen tvůrce skupiny může ostranit uživatele",
   "createAccount": "Create Account",
   "startInTrayTitle": "Zavírat umístěním na lištu",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Po zavření okna nechat Session běžet na pozadí.",
   "yourUniqueSessionID": "Pozdrav se, toto je tvoje Session ID",
   "allUsersAreRandomly...": "Tvé Session ID je unikátní adresa, kterou můžou lidé použít, aby tě kontaktovali přes Session. Není nijak spojená s tvou reálnou identitou a tvé Session ID je plně anonymní a soukromé.",
   "getStarted": "Začínáme",
@@ -344,40 +348,43 @@
   "linkDevice": "Propojit zařížení",
   "restoreUsingRecoveryPhrase": "Obnov svůj účet",
   "or": "a nebo",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Používáním této služby souhlasíte s <a href=\"https://getsession.org/terms-of-service \">Podmínkami používání</a> a <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Zásadami ochrany osobních údajů</a>",
   "beginYourSession": "Začni nový Session.",
   "welcomeToYourSession": "Vitej, toto je tvůj Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Hledat konverzace a kontakty",
+  "searchForContactsOnly": "Hledat kontakty",
   "enterSessionID": "Zadej Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Zadejte Session ID nebo ONS cizího kontaktu",
   "message": "Zpráva",
   "appearanceSettingsTitle": "Vzhled",
   "privacySettingsTitle": "Soukromí",
   "notificationsSettingsTitle": "Upozornění",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Obsah oznámení",
+  "notificationPreview": "Náhled",
   "recoveryPhraseEmpty": "Zadej svou frázi pro obnovení",
   "displayNameEmpty": "Prosím zadejte pseudonym",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ členů",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Připojit se",
+  "joinOpenGroup": "Připojit se ke komunitě",
+  "createGroup": "Vytvořit skupinu",
+  "create": "Vytvořit",
   "createClosedGroupNamePrompt": "Název skupiny",
   "createClosedGroupPlaceholder": "Zadej název skupiny",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Adresa komunity",
+  "enterAnOpenGroupURL": "Zadejte adresu komunity",
   "next": "Další",
   "invalidGroupNameTooShort": "Prosím zadej název skupiny",
   "invalidGroupNameTooLong": "Prosím zadej kratší název skupiny",
   "pickClosedGroupMember": "Prosím vyber alespoň 1 člena skupiny",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Žádné blokované kontakty",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Uzavřená skupina nemůže mít více než 100 členů",
+  "noBlockedContacts": "Nemáte žádné blokované kontakty.",
+  "userAddedToModerators": "Uživatel přidán do seznamu správců",
+  "userRemovedFromModerators": "Uživatel byl odebrán ze seznamu správců",
   "orJoinOneOfThese": "Nebo se přidej do jedné z těchto...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Přeložit Session",
   "closedGroupInviteFailTitle": "Pozvánka do skupiny selhala",
   "closedGroupInviteFailTitlePlural": "Pozvánky od skupiny selhaly",
   "closedGroupInviteFailMessage": "Nepodařilo se úspěšně pozvat člena skupiny",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Opakovat odeslání pozvánek",
   "closedGroupInviteSuccessTitlePlural": "Pozvánky do skupiny odeslány",
   "closedGroupInviteSuccessTitle": "Pozvánka do skupiny odeslána",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Členové skupiny byli úspěšně pozváni",
   "notificationForConvo": "Upozornění",
   "notificationForConvo_all": "Vše",
   "notificationForConvo_disabled": "Vypnuto",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Otevřít tento odkaz ve svém prohlížeči?",
   "linkVisitWarningMessage": "Určitě chceš otevřít stránku $url$ ve svém prohlížeči?",
   "open": "Otevřít",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Automaticky přehrát zvukové zprávy",
+  "audioMessageAutoplayDescription": "Automaticky přehrát po sobě následující zvukové zprávy.",
   "clickToTrustContact": "Klikni pro stáhnutí obsahu",
   "trustThisContactDialogTitle": "Důvěřuješ $name$?",
   "trustThisContactDialogDescription": "Určitě chceš stáhnout obsah odeslán uživatelem $name$?",
   "pinConversation": "Připnout konverzaci",
   "unpinConversation": "Odepnout konverzaci",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Zobrazit podrobnosti uživatele",
   "sendRecoveryPhraseTitle": "Odesílání fráze pro obnovení",
   "sendRecoveryPhraseMessage": "Pokoušíš se odeslat svou frázu pro obnovení, díky které se lze přihlásit do tvého účtu. Opravdu chceš tuto zprávu odeslat?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Data nebyla vymazána z důvodu neznámé chyby. Přejete si odstranit data alespoň z tohoto zařízení?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Chcete odstranit data pouze z tohoto zařízení?",
   "dialogClearAllDataDeletionFailedMultiple": "Data nebyla odstraněna těmito provozními uzly: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Chcete smazat data pouze na tomto zařízení, nebo vaše data i ze sítě?",
+  "clearDevice": "Vyčistit zařízení",
+  "tryAgain": "Zkuste to znovu",
+  "areYouSureClearDevice": "Jste si jisti, že chcete vyčistit vaše zařízení?",
+  "deviceOnly": "Vymazat pouze data na zařízení",
+  "entireAccount": "Vymazat data na zařízení i na síti",
   "areYouSureDeleteDeviceOnly": "Opravdu chceš vymazat jen údaje ze svého zařízení?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Jste si jisti, že chcete odstranit svá data ze sítě? Pokud budete pokračovat, nebudete moci obnovit své zprávy nebo kontakty.",
   "iAmSure": "Ano, opravdu",
   "recoveryPhraseSecureTitle": "Jsi téměr u konce!",
   "recoveryPhraseRevealMessage": "Zabezpeč svůj účet uložením své fráze pro obnovení. Odhal svou frázi pro obnovení a pak si ji pečlivě odlož.",
   "recoveryPhraseRevealButtonText": "Zobrazit frázi pro obnovení",
   "notificationSubtitle": "Upozornění - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "Chtěli bychom znát váš názor",
+  "faq": "Časté dotazy",
+  "support": "Podpora",
   "clearAll": "Smazat vše",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Vymazat data",
   "messageRequests": "Žádosti o chat",
   "requestsSubtitle": "Čekající žádosti",
   "requestsPlaceholder": "Žádné žádosti",
@@ -438,8 +449,8 @@
   "accept": "Přijmout",
   "decline": "Odmítnout",
   "endCall": "Ukončit hovor",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Oprávnění",
+  "helpSettingsTitle": "Nápověda",
   "cameraPermissionNeededTitle": "Vyžadována oprávnění k hlasovému hovoru/videohovoru",
   "cameraPermissionNeeded": "Oprávnění pro hlasové a video hovory můžeš povolit v Nastavení soukromí.",
   "unableToCall": "Nejprve ukončete probíhající hovor",
@@ -449,12 +460,12 @@
   "noCameraFound": "Nebyla nalezena žádná kamera",
   "noAudioInputFound": "Nenalezeny žádné zvukové vstupy",
   "noAudioOutputFound": "Nenalezeny žádné zvukové výstupy",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Hlasové a video hovory (Beta)",
   "callMissedCausePermission": "Zmeškali jste hovor od '$name$', protože nemáte povoleny Hlasové a video hovory v Nastavení soukromí.",
   "callMissedNotApproved": "Zmeškali jste hovor od '$name$', protože jste ještě neschválili tuto konverzaci. Nejprve si pošlete textovou zprávu.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Zapne hlasové a video hovory k ostatním uživatelům i od nich.",
+  "callMediaPermissionsDialogContent": "Vaše IP adresa je při používání beta hovorů viditelná pro toho s kým si voláte i pro Oxen Foundation server. Jste si jisti, že chcete povolit hlasové a video hovory?",
+  "callMediaPermissionsDialogTitle": "Hlasové a video hovory (Beta)",
   "startedACall": "Zavolal(a) jsi $name$",
   "answeredACall": "Hovor s $name$",
   "trimDatabase": "Vyčistit Databázi",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Jste si jisti, že chcete odmítnout tuto žádost o zprávu?",
   "respondingToRequestWarning": "Odesláním zprávy tomuto uživateli automaticky přijmete jejich požadavek na zprávu a odhalíte jim své Session ID.",
   "hideRequestBanner": "Skrýt banner žádosti o zprávu",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Žádosti o zprávy",
   "noMessageRequestsPending": "Žádné nevyřízené žádosti o zprávu",
   "noMediaUntilApproved": "Nemůžete odeslat přílohy, dokud nebude konverzace schválena",
   "mustBeApproved": "Tato konverzace musí být přijata pro použití této funkce",
   "youHaveANewFriendRequest": "Máte novou žádost o přátelství",
   "clearAllConfirmationTitle": "Vymazat všechny žádosti o zprávy",
   "clearAllConfirmationBody": "Jste si jisti, že chcete vymazat všechny žádosti o zprávy?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Skrýt",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Zobrazit příchozí žádosti o zprávu",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Jste si jisti, že chcete vymazat všechny $emoji$?",
+  "expandedReactionsText": "Zobrazit méně",
+  "reactionNotification": "Reaguje na zprávu $emoji$",
+  "rateLimitReactMessage": "Zpomalte! Poslali jste příliš mnoho emoji reakcí. Zkuste to za chvilku",
+  "otherSingular": "$number$ další",
+  "otherPlural": "$number$ dalších",
+  "reactionPopup": "reagovali",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "A $otherSingular$ reagoval na tuto zprávu <span>$emoji$</span>",
+  "reactionListCountPlural": "A $otherPlural$ reagovali na tuto zprávu <span>$emoji$</span>"
 }
diff --git a/_locales/da/messages.json b/_locales/da/messages.json
index ce81ece74..ffdec7c71 100644
--- a/_locales/da/messages.json
+++ b/_locales/da/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Deltag i $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Kunne ikke finde den tilsvarende offentlige-server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Indtast Sessions-id eller ONS-navn",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Indlæser...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Ingen resultater for \"$searchTerm$\"",
   "conversationsHeader": "Kontakter og grupper",
   "contactsHeader": "Kontakter",
-  "messagesHeader": "Beskeder",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Indstillinger",
   "typingAlt": "Skrive animation for denne samtale",
   "contactAvatarAlt": "Avatar for kontakt $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Slet $count$ beskeder?",
   "deleteMessageQuestion": "Slet denne besked?",
   "deleteMessages": "Slet beskeder",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ slettet",
   "messageDeletedPlaceholder": "Denne besked er slettet",
   "from": "Fra",
@@ -107,29 +108,30 @@
   "sent": "Sendt",
   "received": "Modtaget",
   "sendMessage": "Send en besked",
-  "groupMembers": "Gruppemedlemmer",
+  "groupMembers": "Members",
   "moreInformation": "Mere information",
   "resend": "Send igen",
   "deleteConversationConfirmation": "Slet samtale permanent?",
   "clear": "Clear",
   "clearAllData": "Slet alle data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Er du sikker på, at du vil slette denne samtale?",
   "quoteThumbnailAlt": "Miniatur af billede fra citeret besked",
   "imageAttachmentAlt": "Billede vedhæftet til beskeden",
-  "videoAttachmentAlt": "Skærmbillede af video knyttet til beskeden",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Billede sendt i samtale",
   "imageCaptionIconAlt": "Ikon, der viser, at dette billede har en billedtekst",
   "addACaption": "Tilføj en billedtekst...",
   "copySessionID": "Kopier Session ID",
-  "copyOpenGroupURL": "Kopier Gruppe URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Gem",
   "saveLogToDesktop": "Gemt til desktop",
   "saved": "Gemt",
   "tookAScreenshot": "$name$ kopierede skærmbillede",
   "savedTheFile": "Medie gemt af $name$",
   "linkPreviewsTitle": "Send Link Preview",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Du har ikke fuld beskyttelse af metadata når du sender link previews.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Skrive indikator",
   "zoomFactorSettingTitle": "Zoomfaktor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Aktivér",
   "keepDisabled": "Forbliv deaktiveret",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Både navn og besked",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Hverken navn eller besked",
   "nameOnly": "Kun navn",
   "newMessage": "Ny besked",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 timer",
   "timerOption_1_day": "1 dag",
   "timerOption_1_week": "1 uge",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Beskeder der forsvinder",
   "changeNickname": "Ændre dit brugernavn",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12t",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1u",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Forsvindende beskeder slået fra",
-  "disabledDisappearingMessages": "$name$ slog forsvindende beskeder fra",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Du slog forsvindende beskeder fra",
   "timerSetTo": "Timer sat til $time$",
   "noteToSelf": "Note til dig selv",
   "hideMenuBarTitle": "Skjul Menulinje",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start ny samtale...",
-  "invalidNumberError": "Ugyldigt nummer",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Kunne ikke finde ONS navn",
   "autoUpdateSettingTitle": "Auto Opdatér",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ tilsluttede sig gruppen",
   "kickedFromTheGroup": "$name$ blev fjernet fra gruppen.",
   "multipleKickedFromTheGroup": "$name$ er blevet fjernet fra gruppen.",
-  "blockUser": "Blokér",
-  "unblockUser": "Fjern blokering",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Afblokeret",
   "blocked": "Blokeret",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Opdaterer $name$...",
   "showRecoveryPhrase": "Gendannelsesssætning",
   "yourSessionID": "Din Session ID",
-  "setAccountPasswordTitle": "Opret Kontor kodeord",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Skift kontoadgangskode",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Fjern konto kodeord",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Indtast venligst din adgangskode",
   "confirmPassword": "Bekræft kodeord",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Indtast dit kodeord",
   "recoveryPhraseSavePromptMain": "Din gendannelsesfrase er hovednøglen til dit Session ID - du kan bruge den til at gendanne dit Session ID, hvis du mister adgangen til din enhed. Opbevar din gendannelsesfrase et sikkert sted, og giv den ikke til nogen.",
   "invalidOpenGroupUrl": "Ugyldig URL",
-  "copiedToClipboard": "Kopieret til udklipsholderen",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Adgangskode",
   "setPassword": "Indstil adgangskode",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Adgangskoder matcher ikke",
   "changePasswordInvalid": "Den gamle adgangskode du indtastede var ugyldig",
   "removePasswordInvalid": "Forkert adgangskode",
-  "setPasswordTitle": "Indstil adgangskode",
-  "changePasswordTitle": "Ændret adgangskode",
-  "removePasswordTitle": "Fjernet adgangskoden",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Din adgangskode er blevet indstillet. Venligst hold den sikker.",
   "changePasswordToastDescription": "Din adgangskode er blevet ændret. Venligst hold den sikker.",
-  "removePasswordToastDescription": "Du har fjernet din adgangskode.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Forbinder...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Udseende",
   "privacySettingsTitle": "Privatliv",
   "notificationsSettingsTitle": "Notifikationer",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Angiv din hemmelige gendannelsessætning",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ medlemmer",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Indtast venligst et kortere gruppenavn",
   "pickClosedGroupMember": "Vælg venligst mindst 1 gruppemedlem",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Ingen blokerede kontakter",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Eller deltag i en af disse...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Er du sikker på du vil downloade medier sendt af $name$?",
   "pinConversation": "Fastgør samtale",
   "unpinConversation": "Frigør samtale",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Vis bruger detaljer",
   "sendRecoveryPhraseTitle": "Sender Gendannelsessætning",
   "sendRecoveryPhraseMessage": "Du forsøger at sende din gendannelsessætning, som kan bruges til at få adgang til din konto. Er du sikker på, at du vil sende denne besked?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Vil du slette data fra denne enhed?",
   "dialogClearAllDataDeletionFailedMultiple": "Data ikke slettet af disse Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Er du sikker på, at du kun vil slette dine enhedsdata?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Du ringede til $name$",
   "answeredACall": "Opkald med $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 0479fcca4..3c0a8e673 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Vollbild an/aus",
   "viewMenuToggleDevTools": "Entwicklerwerkzeuge an/aus",
   "contextMenuNoSuggestions": "Keine Vorschläge",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Community-Einladung",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Trete $roomName$ bei?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Konnte den zugehörigen Opengroup-Server nicht finden",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Bist du sicher, dass du der Community $roomName$ beitreten möchtest?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session-ID oder ONS-Name eingeben",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Beginne eine neue Unterhaltung, indem du die Session ID einer Person eingibst, oder deine Session ID mit dieser Person teilst.",
   "loading": "Wird geladen …",
   "done": "Abgeschlossen",
   "youLeftTheGroup": "Du hast die Gruppe verlassen",
   "youGotKickedFromGroup": "Du wurdest aus der Gruppe entfernt.",
   "unreadMessages": "Ungelesene Nachrichten",
-  "debugLogExplanation": "Dieser Log wird auf Ihrem Desktop gespeichert.",
-  "reportIssue": "Report a Bug",
+  "debugLogExplanation": "Dieser Log wird auf deinem Desktop gespeichert.",
+  "reportIssue": "Fehler melden",
   "markAllAsRead": "Alle als gelesen markieren",
   "incomingError": "Fehler bei eingehender Nachricht",
   "media": "Medieninhalte",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.",
   "offline": "Keine Netzverbindung",
   "debugLog": "Diagnoseprotokoll",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Protokolle exportieren",
+  "shareBugDetails": "Exportiere deine Fehlerprotokolle und lade die Datei über Session's Service-Center hoch.",
   "goToReleaseNotes": "Versionshinweise",
   "goToSupportPage": "Support",
   "about": "Über",
@@ -72,7 +72,7 @@
   "noSearchResults": "Keine Ergebnisse für »%s« gefunden",
   "conversationsHeader": "Kontakte und Gruppen",
   "contactsHeader": "Kontakte",
-  "messagesHeader": "Nachrichten",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Einstellungen",
   "typingAlt": "Tipp-Animation für diese Unterhaltung",
   "contactAvatarAlt": "Kontaktavatar für $name$",
@@ -96,77 +96,79 @@
   "delete": "Löschen",
   "messageDeletionForbidden": "Ihnen fehlt die Berechtigung, Nachrichten anderer Teilnehmer zu löschen",
   "deleteJustForMe": "Nur für mich löschen",
-  "deleteForEveryone": "Für jeden löschen",
+  "deleteForEveryone": "Für alle löschen",
   "deleteMessagesQuestion": "$count$ Nachricht(en) löschen?",
   "deleteMessageQuestion": "Diese Nachricht löschen?",
   "deleteMessages": "Alle Nachrichten löschen",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ gelöscht",
-  "messageDeletedPlaceholder": "Die Nachricht wurde gelöscht",
+  "messageDeletedPlaceholder": "Diese Nachricht wurde gelöscht",
   "from": "Von:",
   "to": "An:",
   "sent": "Gesendet",
   "received": "Empfangen",
   "sendMessage": "Eine Nachricht senden",
-  "groupMembers": "Gruppenmitglieder",
+  "groupMembers": "Mitglieder",
   "moreInformation": "Mehr Informationen",
   "resend": "Erneut Senden",
   "deleteConversationConfirmation": "Soll diese Unterhaltung unwiderruflich gelöscht werden?",
-  "clear": "Clear",
+  "clear": "Gerät zurücksetzen",
   "clearAllData": "Alle Daten löschen",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Dies wird Deine Nachrichten und Kontakte dauerhaft löschen.",
+  "deleteAccountFromLogin": "Bist du sicher, dass du dein Gerät zurücksetzen willst?",
   "deleteContactConfirmation": "Möchten Sie diese Unterhaltung wirklich löschen?",
   "quoteThumbnailAlt": "Miniaturbild aus zitierter Nachricht",
   "imageAttachmentAlt": "Bildanhang",
-  "videoAttachmentAlt": "Vorschaubild für Videoanhang",
+  "videoAttachmentAlt": "Bildschirmfoto vom angehängtem Video",
   "lightboxImageAlt": "In Unterhaltung gesendetes Bild",
   "imageCaptionIconAlt": "Symbol, das auf eine Beschriftung des Bildes hinweist",
   "addACaption": "Beschriftung hinzufügen...",
   "copySessionID": "Session-ID kopieren",
-  "copyOpenGroupURL": "Gruppen-URL kopieren",
+  "copyOpenGroupURL": "Gruppenlink kopieren",
   "save": "Speichern",
   "saveLogToDesktop": "Protokoll auf dem Desktop speichern",
   "saved": "Gespeichert",
   "tookAScreenshot": "$name$ hat ein Bildschirmfoto gemacht",
   "savedTheFile": "Medien gespeichert von $name$",
   "linkPreviewsTitle": "Link-Vorschauen Senden",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generiere Link-Vorschauen für unterstützte URLs.",
   "linkPreviewsConfirmMessage": "Beim Senden von Link-Vorschauen sind Metadaten nicht vollständig geschützt.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Erlaube Zugriff auf das Mikrofon.",
   "spellCheckTitle": "Rechtschreibprüfung",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Rechtschreibprüfung bei der Eingabe von Nachrichten aktivieren.",
   "spellCheckDirty": "Sie müssen Session neu starten, um die neuen Einstellungen zu übernehmen",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Sende Lesebestätigungen in Einzelchats.",
   "readReceiptSettingTitle": "Lesebestätigungen",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Tipp-Benachrichtigungen in Zweier-Chats senden und anzeigen.",
   "typingIndicatorsSettingTitle": "Tipp-Indikatoren",
   "zoomFactorSettingTitle": "Zoomstufe",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "primaryColor": "Grundfarbe",
+  "primaryColorGreen": "Grundfarbe Grün",
+  "primaryColorBlue": "Grundfarbe Blau",
+  "primaryColorYellow": "Grundfarbe Gelb",
+  "primaryColorPink": "Grundfarbe Pink",
+  "primaryColorPurple": "Grundfarbe Lila",
+  "primaryColorOrange": "Grundfarbe Orange",
+  "primaryColorRed": "Grundfarbe Rot",
+  "classicDarkThemeTitle": "Klassisch Dunkel",
+  "classicLightThemeTitle": "Klassisch Hell",
+  "oceanDarkThemeTitle": "Ozean Dunkel",
+  "oceanLightThemeTitle": "Ozean Hell",
+  "pruneSettingTitle": "Communities kürzen",
+  "pruneSettingDescription": "Lösche Nachrichten, die älter als 6 Monate sind, aus Communities mit über 2.000 Nachrichten.",
   "enable": "Aktivieren",
   "keepDisabled": "Deaktiviert lassen",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Kontaktname und Nachricht",
+  "notificationSettingsDialog": "Die Informationen, die in den Benachrichtigungen angezeigt werden.",
+  "nameAndMessage": "Name und Inhalt",
   "noNameOrMessage": "Weder Name noch Nachricht",
   "nameOnly": "Nur Kontaktname",
   "newMessage": "Neue Nachricht",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Erstelle eine Unterhaltung mit einem neuen Kontakt",
+  "createConversationNewGroup": "Erstelle eine Gruppe mit bestehenden Kontakten",
+  "joinACommunity": "Einer Community beitreten",
+  "chooseAnAction": "Wähle eine Aktion, um eine Unterhaltung zu starten",
   "newMessages": "Neue Nachrichten",
   "notificationMostRecentFrom": "Neueste von: $name$",
   "notificationFrom": "Von:",
@@ -174,7 +176,7 @@
   "sendFailed": "Versand Gescheitert",
   "mediaMessage": "Nachricht mit Medieninhalten",
   "messageBodyMissing": "Bitte geben Sie einen Nachrichtentext ein.",
-  "messageBody": "Message body",
+  "messageBody": "Nachrichtentext",
   "unblockToSend": "Gib die Blockierung dieses Kontakts frei, um eine Nachricht zu senden.",
   "unblockGroupToSend": "Gib die Blockierung dieser Gruppe frei, um eine Nachricht zu senden.",
   "youChangedTheTimer": "Du hast die Zeit für verschwindende Nachrichten auf $time$ festgelegt",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 Stunden",
   "timerOption_1_day": "1 Tag",
   "timerOption_1_week": "1 Woche",
+  "timerOption_2_weeks": "2 Wochen",
   "disappearingMessages": "Verschwindende Nachrichten",
   "changeNickname": "Spitzname bearbeiten",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1T",
   "timerOption_1_week_abbreviated": "1W",
+  "timerOption_2_weeks_abbreviated": "2W",
   "disappearingMessagesDisabled": "Verschwindende Nachrichten deaktiviert",
   "disabledDisappearingMessages": "$name$ hat verschwindende Nachrichten deaktiviert.",
   "youDisabledDisappearingMessages": "Du hast verschwindende Nachrichten deaktiviert.",
   "timerSetTo": "Zeit für verschwindende Nachrichten auf $time$ festgelegt",
   "noteToSelf": "Notiz an mich",
   "hideMenuBarTitle": "Menüleiste ausblenden",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Schalte Sichtbarkeit der Menüleiste um.",
   "startConversation": "Neue Unterhaltung Beginnen",
-  "invalidNumberError": "Ungültige Rufnummer",
+  "invalidNumberError": "Bitte überprüfe die Session-ID oder den ONS-Namen und versuche es erneut",
   "failedResolveOns": "Fehler beim Auflösen des ONS-Namens",
   "autoUpdateSettingTitle": "Automatische Aktualisierung",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Beim Start automatisch nach Updates suchen.",
   "autoUpdateNewVersionTitle": "Aktualisierung für Session verfügbar",
   "autoUpdateNewVersionMessage": "Eine neue Version von Session ist verfügbar.",
   "autoUpdateNewVersionInstructions": "Zum Aktualisieren klicke auf »Session neu starten«.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ sind der Gruppe beigetreten.",
   "kickedFromTheGroup": "$name$ wurde aus der Gruppe entfernt.",
   "multipleKickedFromTheGroup": "$name$ wurden aus der Gruppe entfernt.",
-  "blockUser": "Blockieren",
-  "unblockUser": "Freigeben",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Freigegeben",
   "blocked": "Gesperrt",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Blockierte Kontakte",
+  "conversationsSettingsTitle": "Unterhaltungen",
   "unbanUser": "Benutzer entsperren",
   "userUnbanned": "Benutzer erfolgreich freigegeben",
   "userUnbanFailed": "Freigabe fehlgeschlagen!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Blockieren fehlgeschlagen!",
   "leaveGroup": "Gruppe Verlassen",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Gruppe verlassen und für alle löschen",
   "leaveGroupConfirmation": "Sind Sie sich sicher, dass Sie diese Gruppe verlassen möchten?",
   "leaveGroupConfirmationAdmin": "Da du Admin dieser Gruppe bist wird sie für alle derzeitigen Mitglieder gelöscht. Bist du dir sicher das du die Gruppe verlassen möchtest?",
   "cannotRemoveCreatorFromGroup": "Dieser Nutzer kann nicht entfernt werden",
   "cannotRemoveCreatorFromGroupDesc": "Du kannst diesen Nutzer nicht entfernen da er der Ersteller der Gruppe ist.",
   "noContactsForGroup": "Sie haben noch keine Kontakte",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Benutzer kann nicht als Administrator hinzugefügt werden",
+  "failedToRemoveFromModerator": "Konnte Benutzer nicht von der Admin-Liste entfernen",
   "copyMessage": "Nachrichtentext kopieren",
   "selectMessage": "Nachricht auswählen",
   "editGroup": "Gruppe bearbeiten",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "$name$ wird aktualisiert...",
   "showRecoveryPhrase": "Wiederherstellungssatz",
   "yourSessionID": "Ihre Session ID",
-  "setAccountPasswordTitle": "Accountpasswort festlegen",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Accountpasswort ändern",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Accountpasswort entfernen",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Passwort",
+  "setAccountPasswordDescription": "Passwort zum Entsperren von Session erforderlich.",
+  "changeAccountPasswordTitle": "Passwort ändern",
+  "changeAccountPasswordDescription": "Das Passwort zum Entsperren von Session ändern.",
+  "removeAccountPasswordTitle": "Passwort entfernen",
+  "removeAccountPasswordDescription": "Das Passwort zum Entsperren von Session entfernen.",
   "enterPassword": "Bitte dein Passwort eingeben",
   "confirmPassword": "Passwort bestätigen",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Bitte neues Passwort eingeben",
+  "confirmNewPassword": "Neues Passwort bestätigen",
   "showRecoveryPhrasePasswordRequest": "Bitte dein Passwort eingeben",
   "recoveryPhraseSavePromptMain": "Ihr Wiederherstellungssatz ist der Hauptschlüssel für Ihre Session ID. Mit diesem Satz können Sie Ihre Session ID wiederherstellen, wenn Sie den Zugriff auf Ihr Gerät verlieren. Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf und geben Sie ihn an niemandem weiter.",
   "invalidOpenGroupUrl": "Ungültige URL",
-  "copiedToClipboard": "In die Zwischenablage kopiert.",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Kopiert",
+  "passwordViewTitle": "Passwort eingeben",
   "password": "Passwort",
   "setPassword": "Passwort festlegen",
   "changePassword": "Passwort ändern",
-  "createPassword": "Create your password",
+  "createPassword": "Passwort erstellen",
   "removePassword": "Passwort entfernen",
   "maxPasswordAttempts": "Ungültiges Passwort. Möchtest du die Datenbank zurücksetzen?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Bitte gib dein aktuelles Passwort ein",
   "invalidOldPassword": "Altes Passwort ungültig",
   "invalidPassword": "Ungültiges Passwort",
   "noGivenPassword": "Bitte dein Passwort eingeben",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Die Passwörter stimmen nicht überein",
   "changePasswordInvalid": "Das eingegebene alte Passwort ist falsch",
   "removePasswordInvalid": "Falsches Passwort",
-  "setPasswordTitle": "Passwort festlegen",
-  "changePasswordTitle": "Geändertes Passwort",
-  "removePasswordTitle": "Entferntes Passwort",
+  "setPasswordTitle": "Passwort festgelegt",
+  "changePasswordTitle": "Passwort geändert",
+  "removePasswordTitle": "Passwort entfernt",
   "setPasswordToastDescription": "Dein Passwort wurde eingerichtet. Bitte sicher verwahren.",
   "changePasswordToastDescription": "Dein Passwort wurde eingerichtet. Bitte sicher verwahren.",
-  "removePasswordToastDescription": "Du hast dein Passwort entfernt.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Dein Passwort wurde entfernt.",
+  "publicChatExists": "Du bist bereits mit dieser Community verbunden",
+  "connectToServerFail": "Konnte der Community nicht beitreten",
   "connectingToServer": "Verbindung wird hergestellt …",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Erfolgreich mit Community verbunden",
   "setPasswordFail": "Passwort setzen fehlgeschlagen",
   "passwordLengthError": "Das Passwort muss zwischen 6 und 64 Zeichen lang sein",
   "passwordTypeError": "Das Passwort muss eine Zeichenkette sein",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Gruppenname",
   "inviteContacts": "Freunde Einladen",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Administrator / Administratorin hinzufügen",
+  "removeModerators": "Administrator / Administratorin entfernen",
+  "addAsModerator": "Als Admin hinzufügen",
+  "removeFromModerators": "Als Administrator / Administratorin entfernen",
   "add": "Hinzufügen",
   "addingContacts": "Kontakt hinzufügen",
   "noContactsToAdd": "Keine Kontakte zum hinzufügen",
   "noMembersInThisGroup": "Keine Gruppenmitglieder",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "kein Administrator / keine Administratorin zu entfernen",
   "onlyAdminCanRemoveMembers": "Du bist nicht der Ersteller",
   "onlyAdminCanRemoveMembersDesc": "Nur der Ersteller der Gruppe kann Benutzer entfernen",
   "createAccount": "Konto Erstellen",
   "startInTrayTitle": "In der Systemleiste behalten",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Session läuft im Hintergrund weiter, wenn du das Fenster schließt.",
   "yourUniqueSessionID": "Das ist Ihre Session ID.",
   "allUsersAreRandomly...": "Ihre Session ID ist die eindeutige Adresse, unter der Personen Sie über Session kontaktieren können. Ihre Session ID ist nicht mit Ihrer realen Identität verbunden, völlig anonym und von Natur aus privat.",
   "getStarted": "Loslegen",
@@ -344,40 +348,43 @@
   "linkDevice": "Gerät verbinden",
   "restoreUsingRecoveryPhrase": "Ihr Konto wiederherstellen",
   "or": "oder",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Durch die Nutzung dieses Dienstes stimmst du unseren <a href=\"https://getsession.org/terms-of-service \">Nutzungsbedingungen</a> und unserer <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Datenschutzerklärung</a> zu",
   "beginYourSession": "Beginnen Sie Ihre Session.",
   "welcomeToYourSession": "Willkommen bei Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Unterhaltungen und Kontakte durchsuchen",
+  "searchForContactsOnly": "Kontakte durchsuchen",
   "enterSessionID": "Session ID eingeben",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Session-ID oder ONS deines Kontakts eingeben",
   "message": "Nachricht",
   "appearanceSettingsTitle": "Darstellung",
   "privacySettingsTitle": "Datenschutz",
   "notificationsSettingsTitle": "Benachrichtigungen",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Inhalt der Benachrichtigungen",
+  "notificationPreview": "Vorschau",
   "recoveryPhraseEmpty": "Ihr Wiederherstellungssatz",
   "displayNameEmpty": "Bitte wählen Sie einen Anzeigenamen",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ mitglied",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Beitreten",
+  "joinOpenGroup": "Community beitreten",
+  "createGroup": "Gruppe erstellen",
+  "create": "Erstellen",
   "createClosedGroupNamePrompt": "Gruppenname",
   "createClosedGroupPlaceholder": "Geben Sie einen Gruppennamen ein.",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Community-URL",
+  "enterAnOpenGroupURL": "Community-URL eingeben",
   "next": "Weiter",
   "invalidGroupNameTooShort": "Bitte geben Sie einen Gruppennamen ein.",
   "invalidGroupNameTooLong": "Bitte geben Sie einen kürzeren Gruppennamen ein.",
   "pickClosedGroupMember": "Bitte wählen Sie mindestens zwei Gruppenmitglieder aus.",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Keine blockierten Kontakte",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Eine Gruppe kann maximal 100 Mitglieder haben",
+  "noBlockedContacts": "Du hast keine blockierten Kontakte.",
+  "userAddedToModerators": "Nutzer / Nutzerin zur Admin-Liste hinzugefügt",
+  "userRemovedFromModerators": "Nutzer / Nutzerin von der Admin-Liste entfernt",
   "orJoinOneOfThese": "Oder tritt einer von diesen bei...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Session übersetzen",
   "closedGroupInviteFailTitle": "Einladung in die Gruppe fehlgeschlagen",
   "closedGroupInviteFailTitlePlural": "Einladungen in die Gruppe fehlgeschlagen",
   "closedGroupInviteFailMessage": "Gruppenmitglied konnte nicht eingeladen werden",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Einladungen erneut senden",
   "closedGroupInviteSuccessTitlePlural": "Gruppeneinladungen abgeschlossen",
   "closedGroupInviteSuccessTitle": "Gruppeneinladung erfolgreich",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Gruppenmitglieder wurden erfolgreich eingeladen",
   "notificationForConvo": "Benachrichtigungen",
   "notificationForConvo_all": "Alle",
   "notificationForConvo_disabled": "Deaktiviert",
@@ -399,67 +406,71 @@
   "linkVisitWarningTitle": "Diesen Link in deinem Browser öffnen?",
   "linkVisitWarningMessage": "Bist du sicher, dass du $url$ in deinem Browser öffnen willst?",
   "open": "Öffnen",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Audio-Nachrichten automatisch abspielen",
+  "audioMessageAutoplayDescription": "Automatisches Abspielen aufeinanderfolgender Audio-Nachrichten.",
   "clickToTrustContact": "Klicken um Medien herunterzuladen",
   "trustThisContactDialogTitle": "$name$ vertrauen?",
   "trustThisContactDialogDescription": "Bist du sicher, dass du die von $name$ gesendeten Medien herunterladen möchtest?",
   "pinConversation": "Unterhaltung anheften",
   "unpinConversation": "Unterhaltung abnehmen",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Nutzerdetails ansehen",
   "sendRecoveryPhraseTitle": "Wiederherstellungsphrase zusenden",
   "sendRecoveryPhraseMessage": "Mit der Wiederherstellungsphrase kann auf deinen Account zugegriffen werden. Bist du dir sicher das du sie dir zusenden lassen möchtest?",
   "dialogClearAllDataDeletionFailedTitle": "Daten nicht gelöscht",
   "dialogClearAllDataDeletionFailedDesc": "Die Daten wurden aufgrund eines unbekannten Fehlers nicht gelöscht. Möchtest du deine Daten nur von diesem Gerät löschen?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Sollen die Daten nur von diesem Gerät gelöscht werden?",
-  "dialogClearAllDataDeletionFailedMultiple": "Daten wurden von folgenden Dienstknoten nicht gelöscht: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionFailedMultiple": "Daten wurden von diesen Dienstknoten nicht gelöscht: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Möchtest du deine Daten nur aus diesem Gerät oder auch aus dem gesamten Netzwerk löschen?",
+  "clearDevice": "Gerät entfernen",
+  "tryAgain": "Erneut versuchen",
+  "areYouSureClearDevice": "Bist du sicher, dass du dein Gerät zurücksetzen willst?",
+  "deviceOnly": "Nur Gerät entfernen",
+  "entireAccount": "Geräte- und Netzwerkdaten löschen",
   "areYouSureDeleteDeviceOnly": "Möchtest du die Daten von diesem Gerät wirklich löschen?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Bist du sicher, dass du deine Daten aus dem Netzwerk löschen möchtest? Wenn du fortfährst, kannst du deine Nachrichten oder Kontakte nicht wiederherstellen.",
   "iAmSure": "Ich bin mir sicher",
   "recoveryPhraseSecureTitle": "Du bist fast fertig!",
-  "recoveryPhraseRevealMessage": "Lasse dir deinen Widerherstellungssatz anzeigen und bewahre ihn sicher auf, um dein Konto zu sichern.",
+  "recoveryPhraseRevealMessage": "Sichere Dein Konto, indem Du Deinen Wiederherstellungsschlüssel speicherst. Lasse Dir diesen anzeigen und speichere ihn dann, um ihn zu sichern.",
   "recoveryPhraseRevealButtonText": "Wiederherstellungsphrase anzeigen",
   "notificationSubtitle": "Benachrichtigungen - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
+  "surveyTitle": "Wir würden uns über Dein Feedback freuen",
   "faq": "FAQ",
   "support": "Support",
   "clearAll": "Alles löschen",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Daten löschen",
   "messageRequests": "Nachrichtenanfragen",
   "requestsSubtitle": "Ausstehende Anfragen",
   "requestsPlaceholder": "Keine Anfragen",
   "hideRequestBannerDescription": "Banner für Nachrichtenanfragen ausblenden, bis du eine neue Nachrichtenanfrage erhältst.",
   "incomingCallFrom": "Eingehender Anruf von '$name$'",
-  "ringing": "Klingelt...",
+  "ringing": "Anrufen...",
   "establishingConnection": "Verbindung wird aufgebaut …",
   "accept": "Akzeptieren",
   "decline": "Ablehnen",
   "endCall": "Anruf beenden",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Berechtigungen",
+  "helpSettingsTitle": "Hilfe",
   "cameraPermissionNeededTitle": "Sprach-/Videoanruf-Berechtigungen erforderlich",
-  "cameraPermissionNeeded": "Die Berechtigung für \"Spach und Videoanrufe\" kannst du in den Datenschutzeinstellungen aktivieren.",
-  "unableToCall": "Laufenden Anruf zuerst abbrechen",
+  "cameraPermissionNeeded": "Die Berechtigung für \"Spach- und Videoanrufe\" kannst du in den Datenschutzeinstellungen aktivieren.",
+  "unableToCall": "Beende zunächst den laufenden Anruf",
   "unableToCallTitle": "Neuer Anruf konnte nicht gestartet werden",
-  "callMissed": "Verpasster Anruf von $name$",
+  "callMissed": "Entgangener Anruf von $name$",
   "callMissedTitle": "Anruf verpasst",
   "noCameraFound": "Keine Kamera gefunden",
   "noAudioInputFound": "Keine Audioeingabe gefunden",
   "noAudioOutputFound": "Keine Audioausgabe gefunden",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Sprach- und Videoanrufe (Beta)",
   "callMissedCausePermission": "Der Anruf von '$name$' konnte nicht entgegengenommen werden, da du zuerst die Berechtigung für „Anrufe und Videoanrufe“ in den Datenschutzeinstellungen aktivieren musst.",
-  "callMissedNotApproved": "Verpasster Anruf von '$name$', da du diese Unterhaltung noch nicht genehmigt hast. Sende zuerst eine Nachricht.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMissedNotApproved": "Verpasster Anruf von '$name$', da du diese Unterhaltung noch nicht genehmigt hast. Sende dem Benutzer zuerst eine Nachricht.",
+  "callMediaPermissionsDescription": "Aktiviert Sprach- und Videoanrufe an und von anderen Benutzern.",
+  "callMediaPermissionsDialogContent": "Deine IP-Adresse ist bei Beta-Anrufen für Deinen Gesprächspartner und einen Oxen Foundation Server sichtbar. Bist Du sicher, dass Du Sprach- und Videoanrufe aktivieren möchtest?",
+  "callMediaPermissionsDialogTitle": "Sprach- und Videoanrufe (Beta)",
   "startedACall": "Du hast $name$ angerufen",
   "answeredACall": "Anruf mit $name$",
   "trimDatabase": "Datenbank kürzen",
   "trimDatabaseDescription": "Verringert die Größe der Nachrichtendatenbank auf die letzten 10.000 Nachrichten.",
-  "trimDatabaseConfirmationBody": "Sind Sie sicher, dass Sie Ihre $deleteAmount$ ältesten Nachrichten löschen möchten?",
+  "trimDatabaseConfirmationBody": "Bist Du sicher, dass Du Deine $deleteAmount$ ältesten Nachrichten löschen möchtest?",
   "pleaseWaitOpenAndOptimizeDb": "Bitte warte, bis deine Datenbank geöffnet und optimiert wurde...",
   "messageRequestPending": "Deine Nachrichtenanfrage ist derzeit ausstehend",
   "messageRequestAccepted": "Deine Nachrichtenanfrage wurde angenommen",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Möchtest du diese Nachrichtenanfrage wirklich löschen?",
   "respondingToRequestWarning": "Das Senden einer Nachricht an diesen Benutzer bestätigt automatisch seine Nachrichtenanfrage und gibt deine Session ID bekannt.",
   "hideRequestBanner": "Banner für Nachrichtenanfragen ausblenden",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Nachrichtenanfragen",
   "noMessageRequestsPending": "Keine ausstehenden Nachrichtenanfragen",
   "noMediaUntilApproved": "Du kannst keine Anhänge versenden, bis die Unterhaltung genehmigt ist",
   "mustBeApproved": "Diese Unterhaltung muss akzeptiert werden, um diese Funktion zu nutzen",
   "youHaveANewFriendRequest": "Du hast eine neue Freundschaftsanfrage",
   "clearAllConfirmationTitle": "Alle Nachrichtenanfragen löschen",
-  "clearAllConfirmationBody": "Sind Sie sicher, dass Sie alle Nachrichtenanfragen löschen möchten?",
+  "clearAllConfirmationBody": "Bist Du sicher, dass Du alle Nachrichtenanfragen löschen möchtest?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Ausblenden",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Posteingang für Nachrichtenanfragen anzeigen",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Bist du sicher, dass du alle $emoji$ löschen möchtest?",
+  "expandedReactionsText": "Weniger anzeigen",
+  "reactionNotification": "Reagiert auf eine Nachricht mit $emoji$",
+  "rateLimitReactMessage": "Langsam! Du hast zu viele Emoji-Reaktionen geschickt. Versuche es später erneut",
+  "otherSingular": "$number$ weiterer",
+  "otherPlural": "$number$ weitere",
+  "reactionPopup": "reagierten mit",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupMany": "$name$, $name2$ & $name3$ &",
+  "reactionListCountSingular": "Und $otherSingular$ hat mit <span>$emoji$</span> auf diese Nachricht reagiert",
+  "reactionListCountPlural": "Und $otherPlural$ haben mit <span>$emoji$</span> auf diese Nachricht reagiert"
 }
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index b04a9fade..c9e2859ea 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -1,24 +1,24 @@
 {
-  "copyErrorAndQuit": "Αντιγραφή λάθους και έξοδος",
+  "copyErrorAndQuit": "Αντιγραφή σφάλματος και έξοδος",
   "unknown": "Άγνωστο",
-  "databaseError": "Λάθος της βάσης δεδομένων",
-  "mainMenuFile": "&Φάκελος",
+  "databaseError": "Σφάλμα Βάσης Δεδομένων",
+  "mainMenuFile": "&Αρχείο",
   "mainMenuEdit": "&Επεξεργασία",
-  "mainMenuView": "&Προβολή",
-  "mainMenuWindow": "&Παράθυρο",
+  "mainMenuView": "Π&ροβολή",
+  "mainMenuWindow": "Παρά&θυρο",
   "mainMenuHelp": "&Βοήθεια",
   "appMenuHide": "Απόκρυψη",
   "appMenuHideOthers": "Απόκρυψη Άλλων",
   "appMenuUnhide": "Εμφάνιση Όλων",
-  "appMenuQuit": "Αποσύνδεση από το Session",
+  "appMenuQuit": "Έξοδος από το Session",
   "editMenuUndo": "Αναίρεση",
-  "editMenuRedo": "Επαναφορά",
+  "editMenuRedo": "Επανάληψη",
   "editMenuCut": "Αποκοπή",
   "editMenuCopy": "Αντιγραφή",
   "editMenuPaste": "Επικόλληση",
   "editMenuDeleteContact": "Διαγραφή επαφής",
-  "editMenuDeleteGroup": "Διαγραφή ομάδας",
-  "editMenuSelectAll": "Επιλογή Όλων",
+  "editMenuDeleteGroup": "Διαγραφή Ομάδας",
+  "editMenuSelectAll": "Επιλογή όλων",
   "windowMenuClose": "Κλείσιμο Παραθύρου",
   "windowMenuMinimize": "Ελαχιστοποίηση",
   "windowMenuZoom": "Μεγέθυνση",
@@ -27,160 +27,162 @@
   "viewMenuZoomOut": "Σμίκρυνση",
   "viewMenuToggleFullScreen": "Εναλλαγή Πλήρους Οθόνης",
   "viewMenuToggleDevTools": "Εναλλαγή Εργαλείων Προγραμματιστή",
-  "contextMenuNoSuggestions": "Καμία πρόταση",
-  "openGroupInvitation": "Community invitation",
-  "joinOpenGroupAfterInvitationConfirmationTitle": "Συμμετοχή $roomName$;",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Δεν βρέθηκε ο αντίστοιχος εξυπηρετητής opengroup",
-  "enterSessionIDOrONSName": "Εισάγετε το Session ID ή το ONS όνομα",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
-  "loading": "Λήψη...",
+  "contextMenuNoSuggestions": "Χωρίς Προτάσεις",
+  "openGroupInvitation": "Πρόσκληση σε κοινότητα",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Συμμετοχή σε $roomName$;",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Σίγουρα θέλετε να γίνετε μέλος στην κοινότητα $roomName$;",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "Εισαγάγετε Session ID ή όνομα ONS",
+  "startNewConversationBy...": "Ξεκινήστε μια νέα συνομιλία εισάγοντας το Session ID κάποιου ή μοιραστείτε το δικό σας Session ID μαζί τους.",
+  "loading": "Φόρτωση...",
   "done": "Ολοκληρώθηκε",
-  "youLeftTheGroup": "Αποχωρήσατε από την ομάδα",
-  "youGotKickedFromGroup": "Έχετε διαγραφεί από αυτή την ομάδα.",
-  "unreadMessages": "Αδιάβαστα μηνύματα",
-  "debugLogExplanation": "Το αρχείο καταγραφής θα αποθηκευτεί στην επιφάνεια εργασίας σας.",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "Σήμανση όλων ως αναγνωσμένα",
-  "incomingError": "Σφάλμα κατά την διαχείριση εισερχόμενου μηνύματος.",
-  "media": "Μέσα ",
-  "mediaEmptyState": "Δεν έχετε μέσα σε αυτή τη συνομιλία",
+  "youLeftTheGroup": "Αποχωρήσατε από την ομάδα.",
+  "youGotKickedFromGroup": "Έχετε αφαιρεθεί από την ομάδα.",
+  "unreadMessages": "Μη Αναγνωσμένα Μηνύματα",
+  "debugLogExplanation": "Αυτό το αρχείο καταγραφής θα αποθηκευτεί στην επιφάνεια εργασίας σας.",
+  "reportIssue": "Αναφορά Σφάλματος",
+  "markAllAsRead": "Επισήμανση όλων ως Αναγνωσμένα",
+  "incomingError": "Σφάλμα χειρισμού εισερχόμενου μηνύματος",
+  "media": "Πολυμέσα",
+  "mediaEmptyState": "Δεν υπάρχουν πολυμέσα",
   "documents": "Έγγραφα",
-  "documentsEmptyState": "Δεν έχετε έγγραφα σε αυτή τη συνομιλία",
+  "documentsEmptyState": "Δεν υπάρχουν έγγραφα",
   "today": "Σήμερα",
   "yesterday": "Εχθές",
   "thisWeek": "Αυτή την εβδομάδα",
   "thisMonth": "Αυτό τον μήνα",
-  "voiceMessage": "Φωνητικό Μήνυμα",
-  "stagedPreviewThumbnail": "Πρόχειρη μικρή προεσκόπιση συνδέσμου για $domain$",
-  "previewThumbnail": "Μικρή προεσκόπιση συνδέσμου για $domain$",
-  "stagedImageAttachment": "Πρόχειρη συνημμένη εικόνα: $path$",
-  "oneNonImageAtATimeToast": "Για συνημμένα αρχεία που δεν είναι εικόνες, το όριο είναι ένα αρχείο ανά μήνυμα.",
-  "cannotMixImageAndNonImageAttachments": "Δεν είναι δυνατό να συνάψετε εικόνες μαζί με αρχεία άλλου τύπου στο ίδιο μήνυμα.",
-  "maximumAttachments": "Δεν είναι δυνατή η προσθήκη άλλων συνημμένων αρχείων σε αυτό το μήνυμα.",
-  "fileSizeWarning": "Δυστυχώς το επιλεγμένο αρχείο υπερβαίνει το όριο μεγέθους μηνυμάτων.",
-  "unableToLoadAttachment": "Δεν είναι δυνατή η φόρτωση του επιλεγμένου συνημμένου.",
+  "voiceMessage": "Ηχητικό Μήνυμα",
+  "stagedPreviewThumbnail": "Πρόχειρη προεπισκόπηση μικρογραφίας συνδέσμου για $domain$",
+  "previewThumbnail": "Προεπισκόπηση μικρογραφίας συνδέσμου για $domain$",
+  "stagedImageAttachment": "Πρόχειρο συνημμένο εικόνας: $path$",
+  "oneNonImageAtATimeToast": "Δυστυχώς, υπάρχει όριο ενός συνημμένου που δεν είναι εικόνα, ανά μήνυμα.",
+  "cannotMixImageAndNonImageAttachments": "Δυστυχώς, δεν μπορείτε να συνδυάσετε εικόνες με άλλους τύπους αρχείων, στο ίδιο μήνυμα.",
+  "maximumAttachments": "Συμπληρώθηκε ο μέγιστος αριθμός συνημμένων. Παρακαλώ στείλτε τα υπόλοιπα συνημμένα σε ξεχωριστό μήνυμα.",
+  "fileSizeWarning": "Το συνημμένο υπερβαίνει τα όρια μεγέθους για το είδος μηνύματος που στέλνετε.",
+  "unableToLoadAttachment": "Δυστυχώς, παρουσιάστηκε σφάλμα κατά την προσθήκη του συνημμένου σας.",
   "offline": "Εκτός σύνδεσης",
-  "debugLog": "Αρχείο καταγραφής αποσφαλμάτωσης",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "debugLog": "Αρχείο καταγραφής Αποσφαλμάτωσης",
+  "showDebugLog": "Εξαγωγή Αρχείων Καταγραφής",
+  "shareBugDetails": "Εξαγάγετε τo αρχείο καταγραφής σας και στη συνέχεια μεταφορτώστε το αρχείο μέσω του Help Desk του Session.",
   "goToReleaseNotes": "Μετάβαση στις Σημειώσεις Έκδοσης",
   "goToSupportPage": "Μετάβαση στη Σελίδα Υποστήριξης",
-  "about": "Σχετικά με",
+  "about": "Σχετικά",
   "show": "Εμφάνιση",
   "sessionMessenger": "Session",
-  "noSearchResults": "No results for \"$searchTerm$\"",
+  "noSearchResults": "Δε βρέθηκαν αποτελέσματα για «$searchTerm$»",
   "conversationsHeader": "Επαφές και Ομάδες",
   "contactsHeader": "Επαφές",
-  "messagesHeader": "Μηνύματα",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Ρυθμίσεις",
-  "typingAlt": "Κινούμενη εικόνα που δείχνει πληκτρολόγηση για αυτή τη συζήτηση",
-  "contactAvatarAlt": "Εικόνα προφίλ της επαφής $name$",
+  "typingAlt": "Κινούμενο εικονίδιο πληκτρολόγησης για αυτή τη συνομιλία",
+  "contactAvatarAlt": "Avatar για την επαφή $name$",
   "downloadAttachment": "Λήψη Συνημμένου",
-  "replyToMessage": "Απαντήστε στο μήνυμα ",
+  "replyToMessage": "Απάντηση στο μήνυμα",
   "replyingToMessage": "Απάντηση σε:",
-  "originalMessageNotFound": "Δεν βρέθηκε το αρχικό μήνυμα",
+  "originalMessageNotFound": "Το αρχικό μήνυμα δε βρέθηκε",
   "you": "Εσείς",
-  "audioPermissionNeededTitle": "Microphone access required",
-  "audioPermissionNeeded": "Για να στείλετε μηνύματα ήχου, επιτρέψτε στο Session Desktop να έχει πρόσβαση στο μικρόφωνό σας.",
+  "audioPermissionNeededTitle": "Απαιτείται Πρόσβαση Μικροφώνου",
+  "audioPermissionNeeded": "Μπορείτε να επιτρέψετε την πρόσβαση στο μικρόφωνο από: Ρυθμίσεις (εικονίδιο γραναζιού) => Απόρρητο",
   "audio": "Ήχος",
   "video": "Βίντεο",
   "photo": "Φωτογραφία ",
   "cannotUpdate": "Αδυναμία Ενημέρωσης",
-  "cannotUpdateDetail": "Αποτυχία ενημέρωσης της εφαρμογής, αλλά υπάρχει μια νέα διαθέσιμη έκδοση. Παρακαλώ πηγαίνετε στο https://getsession.org/ και εγκαταστήστε τη νέα έκδοση με μη αυτόματο τρόπο. Στη συνέχεια επικοινωνήστε με την υποστήριξη ή στείλτε ένα αρχείο καταγραφής σφαλμάτων.",
+  "cannotUpdateDetail": "Η ενημέρωση του Session Desktop απέτυχε, αλλά υπάρχει διαθέσιμην μια νέα έκδοση. Μεταβείτε στη διεύθυνση https://getsession.org/ και εγκαταστήστε τη νέα έκδοση με μη αυτόματο τρόπο και, στη συνέχεια, επικοινωνήστε με την υποστήριξη ή υποβάλετε μια αναφορά σφάλματος σχετικά με αυτό το πρόβλημα.",
   "ok": "ΟΚ",
-  "cancel": "Άκυρο",
+  "cancel": "Ακύρωση",
   "close": "Κλείσιμο",
   "continue": "Συνέχεια",
   "error": "Σφάλμα",
   "delete": "Διαγραφή",
   "messageDeletionForbidden": "Δεν έχετε άδεια να διαγράψετε τα μηνύματα άλλων",
-  "deleteJustForMe": "Διαγραφή μόνο για μενα",
+  "deleteJustForMe": "Διαγραφή μόνο για εμένα",
   "deleteForEveryone": "Διαγραφή για όλους",
   "deleteMessagesQuestion": "Διαγραφή $count$ μηνυμάτων;",
   "deleteMessageQuestion": "Διαγραφή αυτού του μηνύματος;",
   "deleteMessages": "Διαγραφή Μηνυμάτων",
-  "deleted": "$count$ διαγράφηκε",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "Διαγράφηκαν $count$",
   "messageDeletedPlaceholder": "Αυτό το μήνυμα έχει διαγραφεί",
-  "from": "Από",
-  "to": "to",
-  "sent": "Στάλθηκε",
-  "received": "Παρελήφθη",
-  "sendMessage": "Αποστολή μηνύματος",
-  "groupMembers": "Μέλη ομάδας",
+  "from": "Από:",
+  "to": "Προς:",
+  "sent": "Απεσταλμένα",
+  "received": "Ληφθέντα",
+  "sendMessage": "Μήνυμα",
+  "groupMembers": "Μέλη",
   "moreInformation": "Περισσότερες πληροφορίες",
-  "resend": "Αποστολή ξανά",
-  "deleteConversationConfirmation": "Οριστική διαγραφή αυτής της συνομιλίας;",
-  "clear": "Clear",
-  "clearAllData": "Εκκαθάριση όλων των δεδομένων",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
-  "deleteContactConfirmation": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την συνομιλία;",
-  "quoteThumbnailAlt": "Μικρογραφία της εικόνας από το αναφερόμενο μήνυμα",
-  "imageAttachmentAlt": "Εικόνα επισυνημμένη στο μήνυμα",
-  "videoAttachmentAlt": "Στιγμιότυπο οθόνης του βίντεο που έχει επισυναφθεί στο μήνυμα",
-  "lightboxImageAlt": "Στάλθηκε μια εικόνα στη συνομιλία",
-  "imageCaptionIconAlt": "Εικονίδιο που ενδεικνύει ότι αυτή η εικόνα έχει υπότιτλο",
+  "resend": "Επαναποστολή",
+  "deleteConversationConfirmation": "Να διαγραφούν οριστικά τα μηνύματα σε αυτήν τη συνομιλία;",
+  "clear": "Διαγραφή",
+  "clearAllData": "Διαγραφή Όλων των Δεδομένων",
+  "deleteAccountWarning": "Αυτό θα διαγράψει μόνιμα τα μηνύματα και τις επαφές σας.",
+  "deleteAccountFromLogin": "Σίγουρα θέλετε να διαγράψετε τη συσκευή σας;",
+  "deleteContactConfirmation": "Σίγουρα θέλετε να διαγράψετε αυτή τη συνομιλία;",
+  "quoteThumbnailAlt": "Μικρογραφία της εικόνας από το μήνυμα σε παράθεση",
+  "imageAttachmentAlt": "Εικόνα συνημμένη στο μήνυμα",
+  "videoAttachmentAlt": "Στιγμιότυπο του βίντεο στο μήνυμα",
+  "lightboxImageAlt": "Εικόνα που έχει σταλεί στη συνομιλία",
+  "imageCaptionIconAlt": "Εικονίδιο που δείχνει ότι αυτή η εικόνα έχει λεζάντα",
   "addACaption": "Προσθήκη λεζάντας...",
-  "copySessionID": "Αντιγραφή Ταυτότητας",
-  "copyOpenGroupURL": "Αντιγραφή Διεύθυνση Ομάδας",
+  "copySessionID": "Αντιγραφή Session ID",
+  "copyOpenGroupURL": "Αντιγραφή URL Ομάδας",
   "save": "Αποθήκευση",
   "saveLogToDesktop": "Αποθήκευση αρχείου καταγραφής στην επιφάνεια εργασίας",
   "saved": "Αποθηκεύτηκε",
-  "tookAScreenshot": "$name$ πήρε ένα στιγμιότυπο οθόνης",
-  "savedTheFile": "Τα μέσα αποθηκεύτηκαν από τον/την $name$",
-  "linkPreviewsTitle": "Αποστολή προεπισκοπήσεων συνδέσμων",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "Δεν θα έχετε πλήρη προστασία μεταδεδομένων κατά την αποστολή προεπισκοπήσεων συνδέσμου.",
+  "tookAScreenshot": "Λήφθηκε στιγμιότυπο οθόνης από $name$",
+  "savedTheFile": "Αποθηκεύτηκαν μέσα από $name$",
+  "linkPreviewsTitle": "Αποστολή Προεπισκοπήσεων Συνδέσμων",
+  "linkPreviewDescription": "Δημιουργία προεπισκοπήσεων συνδέσμων για υποστηριζόμενα URL.",
+  "linkPreviewsConfirmMessage": "Δε θα έχετε πλήρη προστασία μεταδεδομένων αν αποστέλλετε προεπισκοπήσεις συνδέσμων.",
   "mediaPermissionsTitle": "Μικρόφωνο",
-  "mediaPermissionsDescription": "Allow access to microphone.",
-  "spellCheckTitle": "Ορθογραφικός έλεγχος",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "Πρέπει να επανεκκινήσετε τη συνεδρία για να εφαρμόσετε τις νέες ρυθμίσεις σας",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Αναφορές ανάγνωσης",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "mediaPermissionsDescription": "Να επιτρέπεται η πρόσβαση στο μικρόφωνο.",
+  "spellCheckTitle": "Ορθογραφικός Έλεγχος",
+  "spellCheckDescription": "Ενεργοποίηση ορθογραφικού ελέγχου κατά την πληκτρολόγηση μηνυμάτων.",
+  "spellCheckDirty": "Πρέπει να επανεκκινήσετε το Session για να εφαρμόσετε τις νέες ρυθμίσεις σας",
+  "readReceiptSettingDescription": "Αποστολή αναφορών ανάγνωσης σε ένας προς έναν συνομιλίες.",
+  "readReceiptSettingTitle": "Αναφορές Ανάγνωσης",
+  "typingIndicatorsSettingDescription": "Δείτε και κοινοποιήστε δείκτες πληκτρολόγησης σε ένας προς έναν συνομιλίες.",
   "typingIndicatorsSettingTitle": "Δείκτες Πληκτρολόγησης",
-  "zoomFactorSettingTitle": "Συντελεστής Ζουμ",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "zoomFactorSettingTitle": "Συντελεστής Μεγέθυνσης",
+  "themesSettingTitle": "Θέματα",
+  "primaryColor": "Κύριο Χρώμα",
+  "primaryColorGreen": "Κύριο χρώμα πράσινο",
+  "primaryColorBlue": "Κύριο χρώμα μπλε",
+  "primaryColorYellow": "Κύριο χρώμα κίτρινο",
+  "primaryColorPink": "Κύριο χρώμα ροζ",
+  "primaryColorPurple": "Κύριο χρώμα μοβ",
+  "primaryColorOrange": "Κύριο χρώμα πορτοκαλί",
+  "primaryColorRed": "Κύριο χρώμα κόκκινο",
+  "classicDarkThemeTitle": "Κλασσικό Σκούρο",
+  "classicLightThemeTitle": "Κλασσικό Φωτεινό",
+  "oceanDarkThemeTitle": "Σκοτεινό Ωκεανού",
+  "oceanLightThemeTitle": "Φωτεινό Ωκεανού",
+  "pruneSettingTitle": "Περικοπή Κοινοτήτων",
+  "pruneSettingDescription": "Διαγράψτε μηνύματα παλαιότερα των 6 μηνών από τις Κοινότητες που έχουν πάνω από 2.000 μηνύματα.",
   "enable": "Ενεργοποίηση",
-  "keepDisabled": "Διατήρηση ανενεργού",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Όνομα αποστολέα και μήνυμα",
-  "noNameOrMessage": "Ούτε όνομα αποστολέα, ούτε μήνυμα",
-  "nameOnly": "Μόνο όνομα αποστολέα",
+  "keepDisabled": "Διατήρηση Απενεργοποιημένο",
+  "notificationSettingsDialog": "Πληροφορίες που εμφανίζονται στις ειδοποιήσεις.",
+  "nameAndMessage": "Όνομα & Περιεχόμενο",
+  "noNameOrMessage": "Χωρίς όνομα ή περιεχόμενο",
+  "nameOnly": "Μόνο Όνομα",
   "newMessage": "Νέο Μήνυμα",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Δημιουργία συνομιλίας με μια νέα επαφή",
+  "createConversationNewGroup": "Δημιουργία ομάδας με υπάρχουσες επαφές",
+  "joinACommunity": "Γίνετε μέλος σε μια κοινότητα",
+  "chooseAnAction": "Επιλέξτε μια ενέργεια για να ξεκινήσετε μια συνομιλία",
   "newMessages": "Νέα Μηνύματα",
-  "notificationMostRecentFrom": "Πιο πρόσφατα από:",
+  "notificationMostRecentFrom": "Πρόσφατα από: $name$",
   "notificationFrom": "Από:",
-  "notificationMostRecent": "Πιο πρόσφατα:",
-  "sendFailed": "Αποτυχία αποστολής",
-  "mediaMessage": "Μήνυμα μέσου",
-  "messageBodyMissing": "Παρακαλώ εισάγετε ένα μήνυμα.",
-  "messageBody": "Message body",
-  "unblockToSend": "Καταργήστε τον αποκλεισμό αυτής την επαφής για να στείλετε ένα μήνυμα.",
-  "unblockGroupToSend": "Καταργήστε τον αποκλεισμό αυτής της ομάδας για να στείλετε ένα μήνυμα.",
-  "youChangedTheTimer": "Ορίσατε το χρονοδιακόπτη μηνυμάτων που εξαφανίζονται σε  $time$",
-  "timerSetOnSync": "Ενημέρωση χρονοδιακόπτη μηνυμάτων που εξαφανίζονται σε $time$",
-  "theyChangedTheTimer": "Ο/Η $name$ όρισε το χρονοδιακόπτη σε $time$",
-  "timerOption_0_seconds": "απενεργοποιημένο",
+  "notificationMostRecent": "Πρόσφατα:",
+  "sendFailed": "Αποτυχία Αποστολής",
+  "mediaMessage": "Μήνυμα πολυμέσων",
+  "messageBodyMissing": "Παρακαλώ εισάγετε ένα σώμα μηνύματος.",
+  "messageBody": "Σώμα μηνύματος",
+  "unblockToSend": "Καταργήστε τη φραγή αυτής τη επαφής για να στείλετε ένα μήνυμα.",
+  "unblockGroupToSend": "Αυτή η ομάδα είναι σε φραγή. Καταργήστε την φραγή αν θέλετε να στείλετε ένα μήνυμα.",
+  "youChangedTheTimer": "Ρυθμίσατε τον χρόνο εξαφάνισης μηνυμάτων σε $time$",
+  "timerSetOnSync": "Ενημερώθηκε ο χρόνος εξαφάνισης μηνυμάτων σε $time$",
+  "theyChangedTheTimer": "Ρυθμίστηκε ο χρόνος εξαφάνισης μηνυμάτων από $name$ σε $time$",
+  "timerOption_0_seconds": "Απενεργοποιημένο",
   "timerOption_5_seconds": "5 δευτερόλεπτα",
   "timerOption_10_seconds": "10 δευτερόλεπτα",
   "timerOption_30_seconds": "30 δευτερόλεπτα",
@@ -192,11 +194,12 @@
   "timerOption_12_hours": "12 ώρες",
   "timerOption_1_day": "1 ημέρα",
   "timerOption_1_week": "1 εβδομάδα",
-  "disappearingMessages": "Μηνύματα που εξαφανίζονται",
-  "changeNickname": "Αλλαγή Ψευδωνύμου",
-  "clearNickname": "Clear nickname",
+  "timerOption_2_weeks": "2 εβδομάδες",
+  "disappearingMessages": "Εξαφανιζόμενα μηνύματα",
+  "changeNickname": "Αλλαγή Ψευδώνυμου",
+  "clearNickname": "Διαγραφή Ψευδώνυμου",
   "nicknamePlaceholder": "Νέο Ψευδώνυμο",
-  "changeNicknameMessage": "Εισάγετε ένα ψευδώνυμο για αυτόν το χρήστη",
+  "changeNicknameMessage": "Εισαγάγετε ένα ψευδώνυμο για αυτόν τον χρήστη",
   "timerOption_0_seconds_abbreviated": "απενεργοποιημένο",
   "timerOption_5_seconds_abbreviated": "5δ",
   "timerOption_10_seconds_abbreviated": "10δ",
@@ -207,286 +210,299 @@
   "timerOption_1_hour_abbreviated": "1ω",
   "timerOption_6_hours_abbreviated": "6ω",
   "timerOption_12_hours_abbreviated": "12ω",
-  "timerOption_1_day_abbreviated": "1η",
-  "timerOption_1_week_abbreviated": "1ε",
-  "disappearingMessagesDisabled": "Απενεργοποιήθηκαν τα μηνύματα που εξαφανίζονται",
-  "disabledDisappearingMessages": "Ο/Η $name$ απενεργοποίησε τα μηνύματα που εξαφανίζονται",
-  "youDisabledDisappearingMessages": " Απενεργοποιήσατε τα μηνύματα που εξαφανίζονται",
-  "timerSetTo": "Ο χρονοδιακόπτης έχει οριστεί σε $time$",
-  "noteToSelf": "Να μην ξεχάσω ",
+  "timerOption_1_day_abbreviated": "1ημ",
+  "timerOption_1_week_abbreviated": "1εβδ",
+  "timerOption_2_weeks_abbreviated": "2εβδ",
+  "disappearingMessagesDisabled": "Τα εξαφανιζόμενα μηνύματα απενεργοποιήθηκαν",
+  "disabledDisappearingMessages": "Τα εξαφανιζόμενα μηνύματα απενεργοποιήθηκαν από $name$.",
+  "youDisabledDisappearingMessages": "Απενεργοποιήσατε τα εξαφανιζόμενα μηνύματα.",
+  "timerSetTo": "Ο χρόνος εξαφάνισης του μηνύματος ρυθμίστηκε σε $time$",
+  "noteToSelf": "Να μην Ξεχάσω",
   "hideMenuBarTitle": "Απόκρυψη Γραμμής Μενού",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
-  "startConversation": "Start new conversation…",
-  "invalidNumberError": "Μη έγκυρος αριθμός",
+  "hideMenuBarDescription": "Εναλλαγή προβολής γραμμής μενού συστήματος.",
+  "startConversation": "Έναρξη Νέας Συνομιλίας",
+  "invalidNumberError": "Παρακαλώ ελέγξτε το Session ID ή το όνομα ONS και δοκιμάστε ξανά",
   "failedResolveOns": "Αποτυχία επίλυσης ονόματος ONS",
   "autoUpdateSettingTitle": "Αυτόματη Ενημέρωση",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Αυτόματος έλεγχος για ενημερώσεις κατά την εκκίνηση.",
   "autoUpdateNewVersionTitle": "Διαθέσιμη ενημέρωση του Session",
-  "autoUpdateNewVersionMessage": "Μια νέα έκδοση του Session είναι διαθέσιμη.",
-  "autoUpdateNewVersionInstructions": "Πατήστε Επανεκκίνηση για να γίνει εφαρμογή των αναβαθμίσεων.",
+  "autoUpdateNewVersionMessage": "Υπάρχει μια νέα έκδοση του Session διαθέσιμη.",
+  "autoUpdateNewVersionInstructions": "Πατήστε Επανεκκίνηση του Session για να εφαρμόσετε τις ενημερώσεις.",
   "autoUpdateRestartButtonLabel": "Επανεκκίνηση του Session",
   "autoUpdateLaterButtonLabel": "Αργότερα",
   "autoUpdateDownloadButtonLabel": "Λήψη",
-  "autoUpdateDownloadedMessage": "The new update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Θα θέλατε να κατεβάσετε την ενημέρωση;",
-  "leftTheGroup": "Ο/Η $name$ αποχώρησε από την ομάδα",
-  "multipleLeftTheGroup": "Ο/Η $name$ αποχώρησε από την ομάδα",
-  "updatedTheGroup": "Η ομάδα ανανεώθηκε.",
-  "titleIsNow": "Ο τίτλος είναι πλέον \"$name$\".",
-  "joinedTheGroup": "Ο/Η $name$ συμμετέχει στην ομάδα.",
+  "autoUpdateDownloadedMessage": "Ολοκληρώθηκε η λήψη της ενημέρωσης.",
+  "autoUpdateDownloadInstructions": "Θέλετε να κάνετε λήψη της ενημέρωσης;",
+  "leftTheGroup": "Το μέλος $name$ αποχώρησε από την ομάδα.",
+  "multipleLeftTheGroup": "$name$ αποχώρησαν από την ομάδα.",
+  "updatedTheGroup": "Η ομάδα ενημερώθηκε",
+  "titleIsNow": "Το όνομα της ομάδας είναι πλέον «$name$».",
+  "joinedTheGroup": "$name$ έγινε μέλος της ομάδας.",
   "multipleJoinedTheGroup": "Ο/Η $names$ συμμετέχει στην ομάδα.",
-  "kickedFromTheGroup": "$name$ αφαιρέθηκε από την ομάδα.",
-  "multipleKickedFromTheGroup": "$name$ αφαιρέθηκαν από την ομάδα.",
-  "blockUser": "Φραγή",
-  "unblockUser": "Ξεμπλοκάρισμα",
-  "unblocked": "Μη-αποκλεισμενο",
-  "blocked": "Αποκλείστηκε",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Unban Χρήστη",
-  "userUnbanned": "Το ban αφαιρέθηκε με επιτυχία",
-  "userUnbanFailed": "Το unban απέτυχε!",
-  "banUser": "Αποβολή χρήστη",
-  "banUserAndDeleteAll": "Αποκλεισμός και διαγραφή όλων",
-  "userBanned": "User banned successfully",
+  "kickedFromTheGroup": "Το μέλος $name$ έχει αφαιρεθεί από την ομάδα.",
+  "multipleKickedFromTheGroup": "Τα μέλη $name$ έχουν αφαιρεθεί από την ομάδα.",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Καταργήθηκε η φραγή",
+  "blocked": "Σε φραγή",
+  "blockedSettingsTitle": "Επαφές σε Φραγή",
+  "conversationsSettingsTitle": "Συνομιλίες",
+  "unbanUser": "Κατάργηση Αποκλεισμού Χρήστη",
+  "userUnbanned": "Έγινε κατάργηση αποκλεισμού του χρήστη επιτυχώς",
+  "userUnbanFailed": "Η κατάργηση αποκλεισμού απέτυχε!",
+  "banUser": "Αποκλεισμός Χρήστη",
+  "banUserAndDeleteAll": "Αποκλεισμός και Διαγραφή Όλων",
+  "userBanned": "Αποκλείστηκε επιτυχώς",
   "userBanFailed": "Ο αποκλεισμός απέτυχε!",
-  "leaveGroup": "Έξοδος Από Ομάδα",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Είστε βέβαιοι ότι θέλετε να φύγετε από αυτή την ομάδα;",
-  "leaveGroupConfirmationAdmin": "Όντας ο διαχειριστής αυτής της ομάδας, αν φύγετε θα αφαιρεθεί για όλα τα τρέχοντα μέλη. Είστε βέβαιοι ότι θέλετε να εγκαταλείψετε αυτήν την ομάδα;",
-  "cannotRemoveCreatorFromGroup": "Αδυναμία αφαίρεσης αυτού του χρήστη",
+  "leaveGroup": "Αποχώρηση από την Ομάδα",
+  "leaveAndRemoveForEveryone": "Αποχώρηση Ομάδας και Αφαίρεση σε Όλους",
+  "leaveGroupConfirmation": "Σίγουρα θέλετε να αποχωρήσετε από αυτήν την ομάδα;",
+  "leaveGroupConfirmationAdmin": "Καθώς είστε ο διαχειριστής αυτής της ομάδας, εάν αποχωρήσετε από αυτήν, θα αφαιρεθεί για όλα τα τρέχοντα μέλη. Σίγουρα θέλετε να αποχωρήσετε από αυτήν την ομάδα;",
+  "cannotRemoveCreatorFromGroup": "Δεν είναι δυνατή η αφαίρεση αυτού του χρήστη",
   "cannotRemoveCreatorFromGroupDesc": "Δεν μπορείτε να αφαιρέσετε αυτόν τον χρήστη, καθώς είναι ο δημιουργός της ομάδας.",
-  "noContactsForGroup": "Δεν έχετε επαφές ακόμη",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "noContactsForGroup": "Δεν έχετε επαφές ακόμα",
+  "failedToAddAsModerator": "Αποτυχία προσθήκης χρήστη ως διαχειριστή",
+  "failedToRemoveFromModerator": "Αποτυχία αφαίρεσης χρήστη από τη λίστα διαχειριστών",
   "copyMessage": "Αντιγραφή κειμένου μηνύματος",
   "selectMessage": "Επιλογή μηνύματος",
   "editGroup": "Επεξεργασία ομάδας",
   "editGroupName": "Επεξεργασία ονόματος ομάδας",
-  "updateGroupDialogTitle": "Ενημέρωση $name$...",
+  "updateGroupDialogTitle": "Ενημέρωση $name$…",
   "showRecoveryPhrase": "Φράση Ανάκτησης",
-  "yourSessionID": "Το Session ID",
-  "setAccountPasswordTitle": "Ορισμός Κωδικού Πρόσβασης",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Αλλαγή Κωδικού Λογαριασμού",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Αφαίρεση Κωδικού Λογαριασμού",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
-  "enterPassword": "Παρακαλώ εισάγετε τον κωδικό σας",
-  "confirmPassword": "Επιβεβαίωση Κωδικού",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
-  "showRecoveryPhrasePasswordRequest": "Παρακαλώ εισάγετε τον κωδικό σας",
-  "recoveryPhraseSavePromptMain": "Η φράση ανάκτησης είναι το κύριο κλειδί στο Session ID σας - μπορείτε να τη χρησιμοποιήσετε για να επαναφέρετε το Session ID σας εάν χάσετε πρόσβαση στη συσκευή σας. Αποθηκεύστε τη φράση ανάκτησης σε ασφαλές μέρος, και μην τη δώσετε σε κανέναν.",
-  "invalidOpenGroupUrl": "Μη έγκυρη URL",
-  "copiedToClipboard": "Αντιγράφηκε στο πρόχειρο",
-  "passwordViewTitle": "Enter Password",
-  "password": "Κωδικός",
-  "setPassword": "Ορισμός Κωδικού",
-  "changePassword": "Αλλαγή κωδικού",
-  "createPassword": "Create your password",
-  "removePassword": "Αφαίρεση Κωδικού",
-  "maxPasswordAttempts": "Μη έγκυρος κωδικός. Θα θέλατε να επαναφέρετε τη βάση δεδομένων;",
-  "typeInOldPassword": "Please enter your current password",
+  "yourSessionID": "Το Session ID σας",
+  "setAccountPasswordTitle": "Κωδικός Πρόσβασης",
+  "setAccountPasswordDescription": "Να απαιτείται κωδικός πρόσβασης για το ξεκλείδωμα του Session.",
+  "changeAccountPasswordTitle": "Αλλαγή Κωδικού Πρόσβασης",
+  "changeAccountPasswordDescription": "Αλλαγή του κωδικού πρόσβασης που απαιτείται για το ξεκλείδωμα του Session.",
+  "removeAccountPasswordTitle": "Αφαίρεση Κωδικού Πρόσβασης",
+  "removeAccountPasswordDescription": "Αφαίρεση του κωδικού πρόσβασης που απαιτείται για το ξεκλείδωμα του Session.",
+  "enterPassword": "Παρακαλώ εισαγάγετε τον κωδικό πρόσβασής σας",
+  "confirmPassword": "Επιβεβαίωση κωδικού πρόσβασης",
+  "enterNewPassword": "Παρακαλώ εισαγάγετε τον νέο σας κωδικό πρόσβασης",
+  "confirmNewPassword": "Επιβεβαιώστε τον νέο κωδικό πρόσβασης",
+  "showRecoveryPhrasePasswordRequest": "Παρακαλώ εισαγάγετε τον κωδικό πρόσβασής σας",
+  "recoveryPhraseSavePromptMain": "Η φράση σας ανάκτησης είναι το κύριο κλειδί στο Session ID σας - μπορείτε να τη χρησιμοποιήσετε για να επαναφέρετε το Session ID σας εάν χάσετε πρόσβαση στη συσκευή σας. Αποθηκεύστε τη φράση ανάκτησης σε ένα ασφαλές μέρος, και μην τη δώσετε σε κανέναν.",
+  "invalidOpenGroupUrl": "Λανθασμένο URL",
+  "copiedToClipboard": "Αντιγράφηκε",
+  "passwordViewTitle": "Εισαγάγετε τον Κωδικό Πρόσβασης",
+  "password": "Κωδικός Πρόσβασης",
+  "setPassword": "Ορισμός Κωδικού Πρόσβασης",
+  "changePassword": "Αλλαγή Κωδικού Πρόσβασης",
+  "createPassword": "Δημιουργήστε τον κωδικό σας πρόσβασης",
+  "removePassword": "Αφαίρεση Κωδικού Πρόσβασης",
+  "maxPasswordAttempts": "Λανθασμένος Κωδικός Πρόσβασης. Θέλετε να επαναφέρετε τη βάση δεδομένων;",
+  "typeInOldPassword": "Παρακαλώ εισαγάγετε τον τρέχον σας κωδικό πρόσβασης",
   "invalidOldPassword": "Ο παλιός κωδικός πρόσβασης δεν είναι έγκυρος",
-  "invalidPassword": "Μη έγκυρος κωδικός",
-  "noGivenPassword": "Παρακαλώ εισάγετε τον κωδικό σας",
-  "passwordsDoNotMatch": "Οι κωδικοί δεν ταιριάζουν",
-  "setPasswordInvalid": "Οι κωδικοί δεν ταιριάζουν",
-  "changePasswordInvalid": "Ο παλιός κωδικός που εισάγατε είναι λάθος",
-  "removePasswordInvalid": "Λάθος κωδικός",
-  "setPasswordTitle": "Ορισμός Κωδικού",
-  "changePasswordTitle": "Αλλαγμένος Κωδικός",
-  "removePasswordTitle": "Αφαιρέθηκε o Κωδικός",
-  "setPasswordToastDescription": "Έχει οριστεί κωδικός πρόσβασης. Κρατήστε τον ασφαλή.",
-  "changePasswordToastDescription": "Ο κωδικός σας άλλαξε. Παρακαλώ διατηρήστε τον ασφαλή.",
-  "removePasswordToastDescription": "Έχετε αφαιρέσει τον κωδικό σας.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Γίνεται σύνδεση...",
-  "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Αποτυχία ορισμού κωδικού",
-  "passwordLengthError": "Ο κωδικός πρόσβασης πρέπει να είναι μεταξύ 6 και 64 χαρακτήρων",
+  "invalidPassword": "Λανθασμένος κωδικός πρόσβασης",
+  "noGivenPassword": "Παρακαλώ εισαγάγετε τον κωδικό πρόσβασής σας",
+  "passwordsDoNotMatch": "Οι Κωδικοί Πρόσβασης δεν ταιριάζουν",
+  "setPasswordInvalid": "Οι Κωδικοί Πρόσβασης δεν ταιριάζουν",
+  "changePasswordInvalid": "Ο παλιός κωδικός πρόσβασης που εισαγάγατε είναι λάθος",
+  "removePasswordInvalid": "Λάθος κωδικός πρόσβασης",
+  "setPasswordTitle": "Ορίστηκε ο Κωδικός Πρόσβασης",
+  "changePasswordTitle": "Ο Κωδικός Πρόσβασης Άλλαξε",
+  "removePasswordTitle": "Ο Κωδικός Πρόσβασης Καταργήθηκε",
+  "setPasswordToastDescription": "Ο κωδικός πρόσβασής σας έχει οριστεί. Παρακαλώ κρατήστε τον ασφαλή.",
+  "changePasswordToastDescription": "Ο κωδικός πρόσβασής σας έχει αλλάξει. Παρακαλώ κρατήστε τον ασφαλή.",
+  "removePasswordToastDescription": "Ο κωδικός πρόσβασής σας έχει αφαιρεθεί.",
+  "publicChatExists": "Έχετε συνδεθεί ήδη με αυτή την κοινότητα",
+  "connectToServerFail": "Δεν ήταν δυνατή η συμμετοχή στην κοινότητα",
+  "connectingToServer": "Σύνδεση...",
+  "connectToServerSuccess": "Συνδεθήκατε επιτυχώς με την κοινότητα",
+  "setPasswordFail": "Αποτυχία ορισμού κωδικού πρόσβασης",
+  "passwordLengthError": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από 6 έως 64 χαρακτήρες",
   "passwordTypeError": "Ο κωδικός πρόσβασης πρέπει να είναι συμβολοσειρά",
   "passwordCharacterError": "Ο κωδικός πρόσβασης πρέπει να περιέχει μόνο γράμματα, αριθμούς και σύμβολα",
   "remove": "Αφαίρεση",
   "invalidSessionId": "Μη έγκυρο Session ID",
-  "invalidPubkeyFormat": "Μη έγκυρο Pubkey Format",
-  "emptyGroupNameError": "Παρακαλώ εισάγετε όνομα ομάδας",
+  "invalidPubkeyFormat": "Μη Έγκυρη Μορφή Pubkey",
+  "emptyGroupNameError": "Παρακαλώ εισαγάγετε ένα όνομα ομάδας",
   "editProfileModalTitle": "Προφίλ",
   "groupNamePlaceholder": "Όνομα Ομάδας",
-  "inviteContacts": "Πρόσκληση φίλων",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "inviteContacts": "Πρόσκληση Επαφών",
+  "addModerators": "Προσθήκη Διαχειριστών",
+  "removeModerators": "Αφαίρεση Διαχειριστών",
+  "addAsModerator": "Προσθήκη ως Διαχειριστής",
+  "removeFromModerators": "Αφαίρεση από Διαχειριστές",
   "add": "Προσθήκη",
-  "addingContacts": "Προσθήκη επαφών στο $name$",
+  "addingContacts": "Γίνεται προσθήκη επαφών σε $name$",
   "noContactsToAdd": "Δεν υπάρχουν επαφές για προσθήκη",
-  "noMembersInThisGroup": "Κανένα άλλο μέλος σε αυτήν την ομάδα",
-  "noModeratorsToRemove": "no admins to remove",
+  "noMembersInThisGroup": "Δεν υπάρχουν άλλα μέλη σε αυτήν την ομάδα",
+  "noModeratorsToRemove": "δεν υπάρχουν διαχειριστές για αφαίρεση",
   "onlyAdminCanRemoveMembers": "Δεν είστε ο δημιουργός",
   "onlyAdminCanRemoveMembersDesc": "Μόνο ο δημιουργός της ομάδας μπορεί να αφαιρέσει χρήστες",
-  "createAccount": "Create Account",
-  "startInTrayTitle": "Διατήρηση στο πλαίσιο συστήματος",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "createAccount": "Δημιουργία λογαριασμού",
+  "startInTrayTitle": "Διατήρηση στην Περιοχή Ειδοποιήσεων",
+  "startInTrayDescription": "Διατήρηση του Session στο παρασκήνιο όταν κλείνετε το παράθυρο.",
   "yourUniqueSessionID": "Πείτε γεια στο Session ID σας",
-  "allUsersAreRandomly...": "Το Session ID σας είναι η μοναδική διεύθυνση που μπορούν να χρησιμοποιήσουν κάποιοι ώστε να επικοινωνήσουν μαζί σας στο Session. Χωρίς συσχέτιση με την πραγματική σας ταυτότητα, το Session ID σας είναι εντελώς ανώνυμο και ιδιωτικό βάση σχεδιασμού.",
+  "allUsersAreRandomly...": "Το Session ID σας είναι η μοναδική διεύθυνση που μπορούν να χρησιμοποιήσουν κάποιοι για να επικοινωνήσουν μαζί σας στο Session. Χωρίς σύνδεση με την πραγματική σας ταυτότητα, το Session ID σας είναι σχεδιασμένο να είναι εντελώς ανώνυμο και ιδιωτικό.",
   "getStarted": "Ας ξεκινήσουμε",
   "createSessionID": "Δημιουργία Session ID",
   "recoveryPhrase": "Φράση Ανάκτησης",
-  "enterRecoveryPhrase": "Εισάγετε τη φράση ανάκτησης σας",
-  "displayName": "Εμφανιζόμενο Όνομα",
+  "enterRecoveryPhrase": "Εισαγάγετε τη φράση σας ανάκτησης",
+  "displayName": "Όνομα Εμφάνισης",
   "anonymous": "Ανώνυμος",
-  "removeResidueMembers": "Κάνοντας κλικ στο ok θα αφαιρέσετε επίσης αυτά τα μέλη καθώς έφυγαν από την ομάδα.",
-  "enterDisplayName": "Εισάγετε ένα εμφανιζόμενο όνομα",
-  "continueYourSession": "Συνέχεια συνομιλίας",
+  "removeResidueMembers": "Κάνοντας κλικ στο ok θα αφαιρεθούν επίσης αυτά τα μέλη καθώς αποχώρησαν από την ομάδα.",
+  "enterDisplayName": "Εισαγάγετε ένα όνομα εμφάνισης",
+  "continueYourSession": "Συνεχίστε το Session σας",
   "linkDevice": "Σύνδεση Συσκευής",
   "restoreUsingRecoveryPhrase": "Επαναφορά του λογαριασμού σας",
   "or": "ή",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
-  "beginYourSession": "Ξεκινήστε τη συνεδρία σας.",
+  "ByUsingThisService...": "Χρησιμοποιώντας αυτήν την υπηρεσία, συμφωνείτε με τους <a href=\"https://getsession.org/terms-of-service \">Όρους Παροχής Υπηρεσιών</a> και την <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Πολιτική Απορρήτου</a> μας",
+  "beginYourSession": "Ξεκινήστε ένα Session.",
   "welcomeToYourSession": "Καλώς ήλθατε στο Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
-  "enterSessionID": "Εισαγωγή Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "searchFor...": "Αναζήτηση σε συνομιλίες και επαφές",
+  "searchForContactsOnly": "Αναζήτηση σε επαφές",
+  "enterSessionID": "Εισαγάγετε Session ID",
+  "enterSessionIDOfRecipient": "Εισαγάγετε το Session ID ή το ONS της επαφής σας",
   "message": "Μήνυμα",
   "appearanceSettingsTitle": "Εμφάνιση",
   "privacySettingsTitle": "Απόρρητο",
   "notificationsSettingsTitle": "Ειδοποιήσεις",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
-  "recoveryPhraseEmpty": "Εισάγετε τη φράση ανάκτησης σας",
-  "displayNameEmpty": "Please pick a display name",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Περιεχόμενο Ειδοποίησης",
+  "notificationPreview": "Προεπισκόπηση",
+  "recoveryPhraseEmpty": "Εισαγάγετε τη φράση σας ανάκτησης",
+  "displayNameEmpty": "Παρακαλώ εισαγάγετε ένα όνομα εμφάνισης",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ μέλη",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Γίνετε μέλος",
+  "joinOpenGroup": "Γίνετε μέλος της Κοινότητας",
+  "createGroup": "Δημιουργία Ομάδας",
+  "create": "Δημιουργία",
   "createClosedGroupNamePrompt": "Όνομα Ομάδας",
-  "createClosedGroupPlaceholder": "Εισάγετε όνομα ομάδας",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "createClosedGroupPlaceholder": "Εισαγάγετε ένα όνομα ομάδας",
+  "openGroupURL": "URL Κοινότητας",
+  "enterAnOpenGroupURL": "Εισαγάγετε URL Κοινότητας",
   "next": "Επόμενο",
-  "invalidGroupNameTooShort": "Παρακαλούμε εισάγετε ένα νέο όνομα ομάδας",
-  "invalidGroupNameTooLong": "Παρακαλούμε εισάγετε ένα μικρότερο όνομα ομάδας",
-  "pickClosedGroupMember": "Παρακαλώ επιλέξτε τουλάχιστον 1 μέλος ομάδας",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Καμία μπλοκαρισμένη επαφή",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
-  "orJoinOneOfThese": "Ή συνδεθείτε σε ένα από αυτά...",
-  "helpUsTranslateSession": "Translate Session",
-  "closedGroupInviteFailTitle": "Η Πρόσκληση Στην Ομάδα Απέτυχε",
-  "closedGroupInviteFailTitlePlural": "Οι Προσκλήσεις Ομάδας Απέτυχε",
-  "closedGroupInviteFailMessage": "Αδυναμία επιτυχούς πρόσκλησης ενός μέλους ομάδας",
+  "invalidGroupNameTooShort": "Παρακαλώ εισαγάγετε ένα όνομα ομάδας",
+  "invalidGroupNameTooLong": "Παρακαλώ εισαγάγετε ένα μικρότερο όνομα ομάδας",
+  "pickClosedGroupMember": "Παρακαλώ επιλέξτε τουλάχιστον 1 μέλος από την ομάδα",
+  "closedGroupMaxSize": "Μια ομάδα δεν μπορεί να έχει πάνω από 100 μέλη",
+  "noBlockedContacts": "Δεν έχετε επαφές σε φραγή.",
+  "userAddedToModerators": "Ο χρήστης προστέθηκε στη λίστα διαχειριστών",
+  "userRemovedFromModerators": "Ο χρήστης αφαιρέθηκε από τη λίστα διαχειριστών",
+  "orJoinOneOfThese": "Ή γίνετε μέλος σε ένα από αυτά...",
+  "helpUsTranslateSession": "Μετάφραση του Session",
+  "closedGroupInviteFailTitle": "Η Πρόσκληση σε Ομάδα Απέτυχε",
+  "closedGroupInviteFailTitlePlural": "Οι Προσκλήσεις σε Ομάδα Απέτυχαν",
+  "closedGroupInviteFailMessage": "Δεν είναι δυνατή η πρόσκληση μέλους της ομάδας",
   "closedGroupInviteFailMessagePlural": "Δεν είναι δυνατή η πρόσκληση όλων των μελών της ομάδας",
-  "closedGroupInviteOkText": "Επαναλάβετε τις προσκλήσεις",
-  "closedGroupInviteSuccessTitlePlural": "Προσκλήσεις Ομάδας Ολοκληρώθηκαν",
+  "closedGroupInviteOkText": "Επανάληψη προσκλήσεων",
+  "closedGroupInviteSuccessTitlePlural": "Επιτυχείς Προσκλήσεις Ομάδας",
   "closedGroupInviteSuccessTitle": "Επιτυχής Πρόσκληση Ομάδας",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Επιτυχής πρόσκληση μελών ομάδας",
   "notificationForConvo": "Ειδοποιήσεις",
-  "notificationForConvo_all": "Όλα",
-  "notificationForConvo_disabled": "Ανενεργό",
+  "notificationForConvo_all": "Όλες",
+  "notificationForConvo_disabled": "Απενεργοποιημένη",
   "notificationForConvo_mentions_only": "Μόνο αναφορές",
   "onionPathIndicatorTitle": "Διαδρομή",
-  "onionPathIndicatorDescription": "Το Session αποκρύπτει την IP σας, δρομολογώντας τα μηνύματά σας μέσω αρκετών Κόμβων υπηρεσιών στο αποκεντρωμένο Session δίκτυο. Αυτές είναι οι χώρες που δρομολογείται η σύνδεση σας αυτή τη στιγμή:",
+  "onionPathIndicatorDescription": "Το Session κρύβει την IP σας δρομολογώντας τα μηνύματά σας μέσω αρκετών Κόμβων Εξυπηρέτησης στο αποκεντρωμένο δίκτυο του Session. Αυτές είναι οι χώρες από τις οποίες δρομολογείται η σύνδεσή σας αυτήν τη στιγμή:",
   "unknownCountry": "Άγνωστη Χώρα",
   "device": "Συσκευή",
   "destination": "Προορισμός",
   "learnMore": "Μάθετε περισσότερα",
-  "linkVisitWarningTitle": "Ανοίξτε αυτόν τον σύνδεσμο στον περιηγητή σας;",
-  "linkVisitWarningMessage": "Είστε βέβαιοι ότι θέλετε να ανοίξετε το $url$ στο πρόγραμμα περιήγησής σας;",
+  "linkVisitWarningTitle": "Άνοιγμα αυτού του συνδέσμου στο πρόγραμμα περιήγησής σας;",
+  "linkVisitWarningMessage": "Σίγουρα θέλετε να ανοίξετε το $url$ στο πρόγραμμα περιήγησής σας;",
   "open": "Άνοιγμα",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Αυτόματη Αναπαραγωγή Ηχητικών Μηνυμάτων",
+  "audioMessageAutoplayDescription": "Αυτόματη αναπαραγωγή διαδοχικών ηχητικών μηνυμάτων.",
   "clickToTrustContact": "Κλικ για λήψη πολυμέσων",
-  "trustThisContactDialogTitle": "Έμπιστο $name$;",
-  "trustThisContactDialogDescription": "Είστε βέβαιοι ότι θέλετε να κατεβάσετε τα πολυμέσα που στάλθηκαν από $name$;",
+  "trustThisContactDialogTitle": "Εμπιστεύεστε την επαφή $name$;",
+  "trustThisContactDialogDescription": "Σίγουρα θέλετε να κάνετε λήψη των πολυμέσων που έχουν σταλεί από $name$;",
   "pinConversation": "Καρφίτσωμα Συνομιλίας",
   "unpinConversation": "Ξεκαρφίτσωμα Συνομιλίας",
-  "showUserDetails": "Εμφάνιση Στοιχείων Χρήστη",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Εμφάνιση Λεπτομερειών Χρήστη",
   "sendRecoveryPhraseTitle": "Αποστολή Φράσης Ανάκτησης",
-  "sendRecoveryPhraseMessage": "Προσπαθείτε να στείλετε τη φράση ανάκτησης σας, η οποία μπορεί να χρησιμοποιηθεί για να έχει πρόσβαση στο λογαριασμό σας. Είστε βέβαιοι ότι θέλετε να στείλετε αυτό το μήνυμα;",
-  "dialogClearAllDataDeletionFailedTitle": "Τα δεδομένα δεν διαγράφηκαν",
-  "dialogClearAllDataDeletionFailedDesc": "Τα δεδομένα δεν διαγράφονται με άγνωστο σφάλμα. Θέλετε να διαγράψετε δεδομένα από αυτήν τη συσκευή;",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Θέλετε να διαγράψετε δεδομένα από αυτή τη συσκευή;",
-  "dialogClearAllDataDeletionFailedMultiple": "Τα δεδομένα δεν διαγράφονται από αυτούς τους Κόμβους Υπηρεσίας: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τα δεδομένα της συσκευής σας μόνο;",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "Είμαι σίγουρος",
+  "sendRecoveryPhraseMessage": "Προσπαθείτε να στείλετε τη φράση σας ανάκτησης που μπορεί να χρησιμοποιηθεί από κάποιον για να αποκτήσει πρόσβαση στον λογαριασμό σας. Σίγουρα θέλετε να στείλετε αυτό το μήνυμα;",
+  "dialogClearAllDataDeletionFailedTitle": "Τα δεδομένα δε διαγράφηκαν",
+  "dialogClearAllDataDeletionFailedDesc": "Τα δεδομένα δε διαγράφηκαν, με άγνωστο σφάλμα. Θέλετε να διαγράψετε τα δεδομένα μόνο από αυτή τη συσκευή;",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Θέλετε να διαγράψετε τα δεδομένα μόνο από αυτή τη συσκευή;",
+  "dialogClearAllDataDeletionFailedMultiple": "Τα δεδομένα δε διαγράφηκαν από αυτούς τους Κόμβους Εξυπηρέτησης: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Θέλετε να διαγράψετε μόνο αυτή τη συσκευή ή να διαγράψετε και τα δεδομένα σας από το δίκτυο;",
+  "clearDevice": "Διαγραφή Συσκευής",
+  "tryAgain": "Προσπαθήστε Ξανά",
+  "areYouSureClearDevice": "Σίγουρα θέλετε να διαγράψετε τη συσκευή σας;",
+  "deviceOnly": "Διαγραφή Μόνο Συσκευής",
+  "entireAccount": "Διαγραφή Συσκευή Και Δίκτυο",
+  "areYouSureDeleteDeviceOnly": "Σίγουρα θέλετε να διαγράψετε μόνο τα δεδομένα της συσκευής σας;",
+  "areYouSureDeleteEntireAccount": "Σίγουρα θέλετε να διαγράψετε τα δεδομένα σας από το δίκτυο; Εάν συνεχίσετε, δε θα μπορείτε να επαναφέρετε τα μηνύματα ή τις επαφές σας.",
+  "iAmSure": "Σίγουρα",
   "recoveryPhraseSecureTitle": "Σχεδόν τελειώσατε!",
-  "recoveryPhraseRevealMessage": "Ασφαλίστε το λογαριασμό σας αποθηκεύοντας τη φράση ανάκτησης σας. Αποκαλύψτε τη φράση ανάκτησης σας και στη συνέχεια αποθηκεύστε την με ασφάλεια για να την ασφαλίσετε.",
+  "recoveryPhraseRevealMessage": "Ασφαλίστε τον λογαριασμό σας αποθηκεύοντας τη φράση σας ανάκτησης. Αποκαλύψτε τη φράση ανάκτησης και, στη συνέχεια, αποθηκεύστε τη με ασφάλεια για να την ασφαλίσετε.",
   "recoveryPhraseRevealButtonText": "Αποκάλυψη Φράσης Ανάκτησης",
   "notificationSubtitle": "Ειδοποιήσεις - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Απαλοιφή Όλων",
-  "clearDataSettingsTitle": "Clear Data",
+  "surveyTitle": "Θα Θέλαμε Πολύ τα Σχόλιά σας",
+  "faq": "Συχνές Ερωτήσεις",
+  "support": "Υποστήριξη",
+  "clearAll": "Διαγραφή Όλων",
+  "clearDataSettingsTitle": "Διαγραφή Δεδομένων",
   "messageRequests": "Αιτήματα Μηνυμάτων",
   "requestsSubtitle": "Αιτήματα σε Εκκρεμότητα",
   "requestsPlaceholder": "Δεν υπάρχουν αιτήματα",
-  "hideRequestBannerDescription": "Απόκρυψη του banner αιτήματος μηνύματος, μέχρι να λάβετε ένα νέο αίτημα.",
-  "incomingCallFrom": "Εισερχόμενη κλήση από '$name$'",
-  "ringing": "Χτυπάει...",
+  "hideRequestBannerDescription": "Απόκρυψη του banner Αιτήματος Μηνύματος μέχρι να λάβετε ένα νέο αίτημα μηνύματος.",
+  "incomingCallFrom": "Εισερχόμενη κλήση από «$name$»",
+  "ringing": "Καλεί...",
   "establishingConnection": "Δημιουργία σύνδεσης...",
   "accept": "Αποδοχή",
   "decline": "Απόρριψη",
   "endCall": "Τέλος κλήσης",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Απαιτούνται δικαιώματα φωνής/βιντεοκλήσεων",
-  "cameraPermissionNeeded": "Μπορείτε να ενεργοποιήσετε τα δικαιώματα 'Φωνητικές και βίντεο κλήσεων' στις Ρυθμίσεις Απορρήτου.",
+  "permissionsSettingsTitle": "Άδειες",
+  "helpSettingsTitle": "Βοήθεια",
+  "cameraPermissionNeededTitle": "Απαιτείται άδεια για Κλήσεις Φωνής και Βίντεο",
+  "cameraPermissionNeeded": "Μπορείτε να ενεργοποιήσετε την άδεια «Κλήσεις Φωνής και Βίντεο» στις Ρυθμίσεις Απορρήτου.",
   "unableToCall": "Ακυρώστε πρώτα την τρέχουσα κλήση σας",
-  "unableToCallTitle": "Αδυναμία έναρξης νέας κλήσης",
+  "unableToCallTitle": "Δεν είναι δυνατή η έναρξη νέας κλήσης",
   "callMissed": "Αναπάντητη κλήση από $name$",
   "callMissedTitle": "Αναπάντητη κλήση",
-  "noCameraFound": "Δεν βρέθηκε κάμερα",
-  "noAudioInputFound": "Δεν βρέθηκε είσοδος ήχου",
-  "noAudioOutputFound": "Δεν βρέθηκε έξοδος ήχου",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
-  "callMissedCausePermission": "Η αναπάντητη από '$name$' χάθηκε επειδή πρέπει να ενεργοποιήσετε την άδεια 'Φωνητικά και βίντεοκλήσεις' στις Ρυθμίσεις Απορρήτου.",
-  "callMissedNotApproved": "Η κλήση χάθηκε από το '$name$' καθώς δεν έχετε εγκρίνει αυτή τη συνομιλία ακόμα. Στείλτε πρώτοι ένα μήνυμα.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "noCameraFound": "Δε βρέθηκε κάμερα",
+  "noAudioInputFound": "Δε βρέθηκε είσοδος ήχου",
+  "noAudioOutputFound": "Δε βρέθηκε έξοδος ήχου",
+  "callMediaPermissionsTitle": "Κλήσεις Φωνής και Βίντεο (Beta)",
+  "callMissedCausePermission": "Η κλήση από «$name$» χάθηκε επειδή πρέπει να ενεργοποιήσετε την άδεια «Κλήσεις Φωνής και Βίντεο» στις Ρυθμίσεις Απορρήτου.",
+  "callMissedNotApproved": "Η κλήση από «$name$» χάθηκε καθώς δεν έχετε εγκρίνει αυτή τη συνομιλία ακόμα. Στείλτε ένα μήνυμα πρώτα.",
+  "callMediaPermissionsDescription": "Ενεργοποιεί κλήσεις φωνής και βίντεο από και προς άλλους χρήστες.",
+  "callMediaPermissionsDialogContent": "Η IP διεύθυνσή σας είναι ορατή στον συνομιλητή σας και σε έναν Oxen Foundation server κατά τη χρήση κλήσεων beta. Σίγουρα θέλετε να ενεργοποιήσετε τις Κλήσεις Φωνής και Βίντεο;",
+  "callMediaPermissionsDialogTitle": "Κλήσεις Φωνής και Βίντεο (Beta)",
   "startedACall": "Καλέσατε $name$",
   "answeredACall": "Κλήση με $name$",
   "trimDatabase": "Περικοπή Βάσης Δεδομένων",
-  "trimDatabaseDescription": "Μειώνει το μέγεθος της βάσης δεδομένων μηνυμάτων στα τελευταία 10.000 μηνύματά σας.",
-  "trimDatabaseConfirmationBody": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τα $deleteAmount$ παλαιότερα ληφθέντα μηνύματα;",
-  "pleaseWaitOpenAndOptimizeDb": "Παρακαλώ περιμένετε όσο η βάση δεδομένων σας ανοίγει και βελτιστοποιείται...",
-  "messageRequestPending": "Το αίτημα μηνύματος σας είναι σε εκκρεμότητα αυτή τη στιγμή",
-  "messageRequestAccepted": "Το αίτημα του μηνύματος σας έχει γίνει αποδεκτό",
-  "messageRequestAcceptedOurs": "Αποδεχθήκατε το αίτημα μηνύματος $name$",
-  "messageRequestAcceptedOursNoName": "Αποδεχθήκατε το αίτημα μηνύματος",
-  "declineRequestMessage": "Είστε βέβαιοι ότι θέλετε να απορρίψετε αυτό το αίτημα μηνύματος;",
-  "respondingToRequestWarning": "Η αποστολή ενός μηνύματος σε αυτόν τον χρήστη θα αποδεχθεί αυτόματα το αίτημά του και θα αποκαλύψει το Session ID σας.",
-  "hideRequestBanner": "Απόκρυψη Banner Αίτησης Μηνύματος",
-  "openMessageRequestInbox": "Message Requests",
+  "trimDatabaseDescription": "Μειώνει το μέγεθος της βάσης δεδομένων των μηνυμάτων σας στα τελευταία 10.000 μηνύματα.",
+  "trimDatabaseConfirmationBody": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τα $deleteAmount$ παλαιότερα εισερχόμενα μηνύματα;",
+  "pleaseWaitOpenAndOptimizeDb": "Παρακαλώ περιμένετε όσο η βάση δεδομένων σας ανοίγει και βελτιστοποιείται…",
+  "messageRequestPending": "Το αίτημα μηνύματός σας βρίσκεται σε εκκρεμότητα",
+  "messageRequestAccepted": "Το αίτημα μηνύματός σας έγινε δεκτό",
+  "messageRequestAcceptedOurs": "Αποδεχτήκατε το αίτημα μηνύματος από $name$",
+  "messageRequestAcceptedOursNoName": "Αποδεχτήκατε το αίτημα μηνύματος",
+  "declineRequestMessage": "Σίγουρα θέλετε να απορρίψετε αυτό το αίτημα μηνύματος;",
+  "respondingToRequestWarning": "Η αποστολή μηνύματος σε αυτόν τον χρήστη θα αποδεχτεί αυτόματα το αίτημα μηνύματός του και θα αποκαλύψει το Session ID σας.",
+  "hideRequestBanner": "Απόκρυψη Banner Αιτήματος Μηνύματος",
+  "openMessageRequestInbox": "Αιτήματα Μηνυμάτων",
   "noMessageRequestsPending": "Δεν υπάρχουν αιτήματα μηνυμάτων σε εκκρεμότητα",
-  "noMediaUntilApproved": "Δεν μπορείτε να στείλετε συνημμένα μέχρι να εγκριθεί η συνομιλία",
-  "mustBeApproved": "Αυτή η συνομιλία πρέπει να γίνει αποδεκτή για να χρησιμοποιηθεί αυτή η δυνατότητα",
+  "noMediaUntilApproved": "Δεν μπορείτε να στείλετε συνημμένα έως ότου η συνομιλία εγκριθεί",
+  "mustBeApproved": "Αυτή η συνομιλία πρέπει να γίνει αποδεκτή για να χρησιμοποιηθεί αυτή η λειτουργία",
   "youHaveANewFriendRequest": "Έχετε ένα νέο αίτημα φιλίας",
-  "clearAllConfirmationTitle": "Εκκαθάριση Όλων Των Αιτήσεων Μηνυμάτων",
-  "clearAllConfirmationBody": "Είστε βέβαιοι ότι θέλετε να καθαρίσετε όλα τα αιτήματα μηνύματος;",
+  "clearAllConfirmationTitle": "Διαγραφή Όλων των Αιτημάτων Μηνυμάτων",
+  "clearAllConfirmationBody": "Σίγουρα θέλετε να διαγράψετε όλα τα αιτήματα μηνυμάτων;",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Απόκρυψη",
-  "openMessageRequestInboxDescription": "Δείτε τα εισερχόμενα αιτήματος μηνύματος σας",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Δείτε τα εισερχόμενα Αιτήματα Μηνύματος",
+  "clearAllReactions": "Σίγουρα θέλετε να διαγράψετε όλα τα $emoji$;",
+  "expandedReactionsText": "Εμφάνιση Λιγότερων",
+  "reactionNotification": "Αντιδρά σε ένα μήνυμα με $emoji$",
+  "rateLimitReactMessage": "Ηρεμήστε! Έχετε στείλει πάρα πολλές αντιδράσεις emoji. Δοκιμάστε ξανά σύντομα",
+  "otherSingular": "άλλος $number$",
+  "otherPlural": "$number$ άλλοι",
+  "reactionPopup": "αντέδρασαν με",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "Και άλλος $otherSingular$ αντέδρασε με <span>$emoji$</span> σε αυτό το μήνυμα",
+  "reactionListCountPlural": "Και άλλοι $otherPlural$ αντέδρασαν με <span>$emoji$</span> σε αυτό το μήνυμα"
 }
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index cb37315f7..35e26b3f4 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -412,7 +412,6 @@
   "trustThisContactDialogTitle": "Trust $name$?",
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
-
   "unpinConversation": "Unpin Conversation",
   "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json
index 744c02304..76fdb6f0e 100644
--- a/_locales/eo/messages.json
+++ b/_locales/eo/messages.json
@@ -16,8 +16,8 @@
   "editMenuCut": "Eltondi",
   "editMenuCopy": "Kopii",
   "editMenuPaste": "Alglui",
-  "editMenuDeleteContact": "Delete Contact",
-  "editMenuDeleteGroup": "Delete Group",
+  "editMenuDeleteContact": "Forigi kontakton",
+  "editMenuDeleteGroup": "Forigi grupon",
   "editMenuSelectAll": "Elekti ĉion",
   "windowMenuClose": "Fermi fenestron",
   "windowMenuMinimize": "Plejetigi",
@@ -27,21 +27,21 @@
   "viewMenuZoomOut": "Elzomi",
   "viewMenuToggleFullScreen": "Baskuligi plenekranan reĝimon",
   "viewMenuToggleDevTools": "Baskuligi programistajn ilojn",
-  "contextMenuNoSuggestions": "No Suggestions",
-  "openGroupInvitation": "Community invitation",
-  "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
-  "enterSessionIDOrONSName": "Enter Session ID or ONS name",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "contextMenuNoSuggestions": "Neniaj proponoj",
+  "openGroupInvitation": "Komunuma invitilo",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Ĉu aliĝi $roomName$",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Ĉu vi certe volas algrupiĝi ĉi tie",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "Enigu sesian ID aŭ ONS-an nomon",
+  "startNewConversationBy...": "Ekrekonversiu per enigi sesian ID de iu aŭ diskonigi vian ID kun ili.",
   "loading": "Ŝargante…",
   "done": "Farite",
   "youLeftTheGroup": "Vi forlasis la grupon",
   "youGotKickedFromGroup": "Vi estas forigita el la grupo.",
-  "unreadMessages": "Unread Messages",
-  "debugLogExplanation": "This log will be saved to your desktop.",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "Mark All as Read",
+  "unreadMessages": "Nelegitaj mesaĝoj",
+  "debugLogExplanation": "Ĉi tiu protokolo konservitos al via labortablo.",
+  "reportIssue": "Raporti eraron",
+  "markAllAsRead": "Marki ĉiujn kiel legitaj",
   "incomingError": "Okazis eraro dum ricevo de mesaĝo",
   "media": "Aŭdvidaĵo",
   "mediaEmptyState": "Vi havas neniun aŭdvidaĵon en tiu interparolo",
@@ -62,23 +62,23 @@
   "unableToLoadAttachment": "Ne eblas ŝargi la elektitan kunsendaĵon.",
   "offline": "Eksterrete",
   "debugLog": "Sencimiga protokolo",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Eksporti protokolojn",
+  "shareBugDetails": "Eksportu viajn protokolojn, post tiam alŝutu per helpejo de sesio.",
   "goToReleaseNotes": "Iri al eldonaj notoj",
   "goToSupportPage": "Iri al helppaĝo",
-  "about": "About",
+  "about": "Pri",
   "show": "Malkaŝi",
-  "sessionMessenger": "Session",
+  "sessionMessenger": "Sesio",
   "noSearchResults": "Neniu rezulto pri „$searchTerm$“",
-  "conversationsHeader": "Contacts and Groups",
+  "conversationsHeader": "Kontaktoj kaj grupoj",
   "contactsHeader": "Kontaktaro",
-  "messagesHeader": "Mesaĝoj",
-  "settingsHeader": "Settings",
+  "messagesHeader": "Conversations",
+  "settingsHeader": "Argordoj",
   "typingAlt": "Tajp-indikiloj por tiu interparolo",
   "contactAvatarAlt": "Avataro el kontakto $name$",
   "downloadAttachment": "Elŝuti kunsendaĵon",
   "replyToMessage": "Respondi al la mesaĝo",
-  "replyingToMessage": "Replying to:",
+  "replyingToMessage": "Respondi al:",
   "originalMessageNotFound": "Origina mesaĝo ne troveblas",
   "you": "Vi",
   "audioPermissionNeededTitle": "Microphone access required",
@@ -86,95 +86,97 @@
   "audio": "Sono",
   "video": "Videaĵo",
   "photo": "Foto",
-  "cannotUpdate": "Cannot Update",
-  "cannotUpdateDetail": "Session Desktop failed to update, but there is a new version available. Please go to https://getsession.org/ and install the new version manually, then either contact support or file a bug about this problem.",
+  "cannotUpdate": "Neaktualebligas",
+  "cannotUpdateDetail": "Session Desktop ne povis aktualigi, nova versio elŝuteblas, bonvolu iru al https://getsession.org/ kaj instalu ĝin malaŭtomate, post tiam raportu ĉi tiun problem.",
   "ok": "Bone",
   "cancel": "Nuligi",
-  "close": "Close",
-  "continue": "Continue",
+  "close": "Fermi",
+  "continue": "Daŭrigi",
   "error": "Eraro",
   "delete": "Forigi",
-  "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
-  "deleteJustForMe": "Delete just for me",
-  "deleteForEveryone": "Delete for everyone",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
-  "deleteMessageQuestion": "Delete this message?",
+  "messageDeletionForbidden": "Vi ne permesiĝas forigi la mesaĝojn de aliuloj",
+  "deleteJustForMe": "Forigi nur por mi",
+  "deleteForEveryone": "Forigi por ĉiuj",
+  "deleteMessagesQuestion": "Ĉu vi volas forigi la mesaĝojn de $count$",
+  "deleteMessageQuestion": "Ĉu vi volas forigi la mesaĝon",
   "deleteMessages": "Forigi mesaĝojn",
-  "deleted": "$count$ deleted",
-  "messageDeletedPlaceholder": "This message has been deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ forigitis",
+  "messageDeletedPlaceholder": "Ĉi tiu mesaĝo forigitis",
   "from": "El",
   "to": "al",
   "sent": "Sendita",
   "received": "Ricevita",
   "sendMessage": "Sendi mesaĝon",
-  "groupMembers": "Grupanoj",
-  "moreInformation": "More information",
-  "resend": "Resend",
+  "groupMembers": "Uloj",
+  "moreInformation": "Pli informoj",
+  "resend": "Resendi",
   "deleteConversationConfirmation": "Ĉu porĉiame forigi tiun ĉi tutan interparolon?",
-  "clear": "Clear",
-  "clearAllData": "Clear All Data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
-  "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
+  "clear": "Forviŝi",
+  "clearAllData": "Forviŝi ĉiujn datumojn",
+  "deleteAccountWarning": "Tio daŭre forigos viajn mesaĝojn kaj kontaktojn.",
+  "deleteAccountFromLogin": "Ĉu vi certas forviŝi la historion",
+  "deleteContactConfirmation": "Ĉu vi certas forigi ĉi tiun konversacion",
   "quoteThumbnailAlt": "Bildominiaturo el citita mesaĝo",
   "imageAttachmentAlt": "Bildo kunsendita kun la mesaĝo",
-  "videoAttachmentAlt": "Ekrankopio de videaĵo kunsendita kun la mesaĝo",
+  "videoAttachmentAlt": "Foto de filmeto enmesaĝe",
   "lightboxImageAlt": "Bildo sendita en interparolo",
   "imageCaptionIconAlt": "Piktogramo montranta, ke tiu bildo havas priskribon",
   "addACaption": "Aldoni priskribon...",
   "copySessionID": "Kopii Session ID-on",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Kopii adreson de grupo",
   "save": "Konservi",
-  "saveLogToDesktop": "Save log to desktop",
-  "saved": "Saved",
-  "tookAScreenshot": "$name$ took a screenshot",
-  "savedTheFile": "Media saved by $name$",
-  "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
-  "mediaPermissionsTitle": "Microphone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
-  "spellCheckTitle": "Spell Check",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
+  "saveLogToDesktop": "Konservi protokolon al labortablon",
+  "saved": "Konservita",
+  "tookAScreenshot": "$name$ fotis",
+  "savedTheFile": "Dosiero konservitis de $name$",
+  "linkPreviewsTitle": "Sendi antaŭrigardojn de ligilo",
+  "linkPreviewDescription": "Generi antaŭrigardligilojn por subtenataj adresoj.",
+  "linkPreviewsConfirmMessage": "Kiam vi sendos antaŭrigardojn de ligilo, la metadatenoj ne tutprotektas.",
+  "mediaPermissionsTitle": "Mikrofono",
+  "mediaPermissionsDescription": "Permesi uzi la mikrofonon.",
+  "spellCheckTitle": "Literumkontrolo",
+  "spellCheckDescription": "Ebligi literumkontrolon dum skribadi mesaĝojn.",
+  "spellCheckDirty": "Restartigu Sessionon por vidi la novajn ŝangojn",
   "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
   "readReceiptSettingTitle": "Read Receipts",
   "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
+  "typingIndicatorsSettingTitle": "Tajpantaj indikiloj",
+  "zoomFactorSettingTitle": "Zomo-Faktoro",
+  "themesSettingTitle": "Aspekto",
+  "primaryColor": "Ĉefkoloro",
+  "primaryColorGreen": "Ĉefkoloro verda",
+  "primaryColorBlue": "Ĉefkoloro blua",
+  "primaryColorYellow": "Ĉefkoloro flava",
+  "primaryColorPink": "Ĉefkoloro roza",
+  "primaryColorPurple": "Ĉefkoloro viola",
+  "primaryColorOrange": "Ĉefkoloro oranĝa",
+  "primaryColorRed": "Ĉefkoloro ruĝa",
+  "classicDarkThemeTitle": "Klasike malhela",
+  "classicLightThemeTitle": "Klasike luma",
+  "oceanDarkThemeTitle": "Oceane malhela",
+  "oceanLightThemeTitle": "Oceane luma",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Ambaŭ sendanto-nomon kaj mesaĝon",
+  "pruneSettingDescription": "Forigi mesaĝojn kiuj plimalnovas ol 6 monatoj el grupoj kiuj enhavas pli ol 2,000 mesaĝojn.",
+  "enable": "Ŝalti",
+  "keepDisabled": "Lasi malŝaltita",
+  "notificationSettingsDialog": "La informoj kiuj montritas ensciige.",
+  "nameAndMessage": "Nomo kaj enhavo",
   "noNameOrMessage": "Nek nomon nek mesaĝon",
   "nameOnly": "Nur la sendanto-nomon",
   "newMessage": "Novan mesaĝon",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Kreii konversacion kun nova kontakto",
+  "createConversationNewGroup": "Kreii grupon kun ekzistantaj kontaktoj",
+  "joinACommunity": "Aliĝi al grupo",
+  "chooseAnAction": "Elektu agon ekkonversacii",
   "newMessages": "Novajn mesaĝojn",
   "notificationMostRecentFrom": "Lasta de:",
   "notificationFrom": "De:",
   "notificationMostRecent": "Lasta:",
   "sendFailed": "Sendo malsukcesis",
   "mediaMessage": "Mesaĝo kun enmetitaĵo",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
+  "messageBodyMissing": "Enigu vian mesaĝon.",
+  "messageBody": "Korpo de mesaĝo",
   "unblockToSend": "Malbloki tiun kontakton por sendi mesaĝon.",
   "unblockGroupToSend": "Malbloki tiun grupon por sendi mesaĝon.",
   "youChangedTheTimer": "Vi agordis la malaperon de la memviŝontaj mesaĝoj al $time$",
@@ -192,11 +194,12 @@
   "timerOption_12_hours": "12 horojn",
   "timerOption_1_day": "1 tagon",
   "timerOption_1_week": "1 semajnon",
+  "timerOption_2_weeks": "2 semajnoj",
   "disappearingMessages": "Memviŝontaj mesaĝoj",
-  "changeNickname": "Change Nickname",
+  "changeNickname": "Ŝangi alnomon",
   "clearNickname": "Clear nickname",
-  "nicknamePlaceholder": "New Nickname",
-  "changeNicknameMessage": "Enter a nickname for this user",
+  "nicknamePlaceholder": "Nova kromnomo",
+  "changeNicknameMessage": "Enigu alnomon por tiu uzanto",
   "timerOption_0_seconds_abbreviated": "malŝaltita",
   "timerOption_5_seconds_abbreviated": "5s",
   "timerOption_10_seconds_abbreviated": "10s",
@@ -209,216 +212,224 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1t",
   "timerOption_1_week_abbreviated": "1sem",
+  "timerOption_2_weeks_abbreviated": "2sem",
   "disappearingMessagesDisabled": "Memviŝontaj mesaĝoj malŝaltitaj",
-  "disabledDisappearingMessages": "$name$ malŝaltis memviŝontajn mesaĝojn",
+  "disabledDisappearingMessages": "$name$ malŝaltis memviŝontatajn mesaĝojn.",
   "youDisabledDisappearingMessages": "Vi malŝaltis memviŝontajn mesaĝojn",
   "timerSetTo": "Malapero de la memviŝontaj mesaĝoj post $time$",
   "noteToSelf": "Noto al mi mem",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Krei novan interparolon...",
-  "invalidNumberError": "Nevalida numero",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Aŭtomate serĉi ĝisdatigojn kiam komenciĝas.",
   "autoUpdateNewVersionTitle": "Ĝisdatiĝo de Session disponeblas",
   "autoUpdateNewVersionMessage": "Nova versio de Session disponeblas.",
   "autoUpdateNewVersionInstructions": "Premu „Restartigi Session-on“ por ĝisdatigi.",
   "autoUpdateRestartButtonLabel": "Restartigi Session-on",
   "autoUpdateLaterButtonLabel": "Poste",
-  "autoUpdateDownloadButtonLabel": "Download",
+  "autoUpdateDownloadButtonLabel": "Elŝuti",
   "autoUpdateDownloadedMessage": "The new update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Would you like to download the update?",
+  "autoUpdateDownloadInstructions": "Ĉu vi volas elŝuti la aktualigon",
   "leftTheGroup": "$name$ forlasis la grupon",
   "multipleLeftTheGroup": "$name$ forlasis la grupon",
   "updatedTheGroup": "Grupo ĝisdatiĝis",
   "titleIsNow": "Titolo nun estas „$name$“",
   "joinedTheGroup": "$name$ grupaniĝis",
   "multipleJoinedTheGroup": "$names$ grupaniĝis",
-  "kickedFromTheGroup": "$name$ was removed from the group.",
-  "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
-  "unblocked": "Unblocked",
-  "blocked": "Blocked",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Unban User",
-  "userUnbanned": "User unbanned successfully",
-  "userUnbanFailed": "Unban failed!",
-  "banUser": "Ban User",
-  "banUserAndDeleteAll": "Ban and Delete All",
+  "kickedFromTheGroup": "$name$ forigitis el la grupo.",
+  "multipleKickedFromTheGroup": "$name$ forigitis elgrupe.",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Malbarita",
+  "blocked": "Baritas",
+  "blockedSettingsTitle": "Baritaj kontaktoj",
+  "conversationsSettingsTitle": "Babiloj",
+  "unbanUser": "Repermesi al uzanto",
+  "userUnbanned": "Vi sukcese repermesis la uzanton",
+  "userUnbanFailed": "La malpermesado malsukcesis!",
+  "banUser": "Bari uzanton",
+  "banUserAndDeleteAll": "Forigi kaj foviŝi ĉiujn",
   "userBanned": "User banned successfully",
-  "userBanFailed": "Ban failed!",
-  "leaveGroup": "Leave Group",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Are you sure you want to leave this group?",
-  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
-  "cannotRemoveCreatorFromGroup": "Cannot remove this user",
-  "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
-  "noContactsForGroup": "You don't have any contacts yet",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
-  "copyMessage": "Copy message text",
-  "selectMessage": "Select message",
-  "editGroup": "Edit group",
-  "editGroupName": "Edit group name",
-  "updateGroupDialogTitle": "Updating $name$...",
-  "showRecoveryPhrase": "Recovery Phrase",
-  "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
-  "enterPassword": "Please enter your password",
-  "confirmPassword": "Confirm password",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
-  "showRecoveryPhrasePasswordRequest": "Please enter your password",
+  "userBanFailed": "Malpermeso malsukcesis!",
+  "leaveGroup": "Elgrupiĝi",
+  "leaveAndRemoveForEveryone": "Forlasi grupon kaj Forigi por Ĉiuj",
+  "leaveGroupConfirmation": "Ĉu vi certas, ke vi volas forlasi ĉi tiun grupon?",
+  "leaveGroupConfirmationAdmin": "Ĉar vi estas la administranto de ĉi tiu grupo, se vi forlasus ĝin, ĝi estos forigita por ĉiu nuntempa membro. Ĉu vi certas, ke vi volas forlasi ĉi tiun grupon?",
+  "cannotRemoveCreatorFromGroup": "Ne povas forigi ĉi tiun uzanton",
+  "cannotRemoveCreatorFromGroupDesc": "Vi ne povas forigi ĉi tiun uzanton ĉar ri estas la kreanto de la grupo.",
+  "noContactsForGroup": "Vi ankoraŭ ne havas kontaktpersonojn",
+  "failedToAddAsModerator": "Malsukcesis aldoni uzanton kiel administranton",
+  "failedToRemoveFromModerator": "Malsukcesis forigi uzanton el la administra listo",
+  "copyMessage": "Kopii tekston de mesaĝo",
+  "selectMessage": "Elekti mesaĝon",
+  "editGroup": "Redakti grupon",
+  "editGroupName": "Redakti grupnomon",
+  "updateGroupDialogTitle": "Ĝisdatigante $name$...",
+  "showRecoveryPhrase": "Ripara Frazo",
+  "yourSessionID": "Via Session ID",
+  "setAccountPasswordTitle": "Pasvorto",
+  "setAccountPasswordDescription": "Postuli pasvorton por malŝlosi Session.",
+  "changeAccountPasswordTitle": "Ŝanĝi Pasvorton",
+  "changeAccountPasswordDescription": "Ŝanĝi la pasvorton, kiu necesas por malŝlosi Session.",
+  "removeAccountPasswordTitle": "Forigi Pasvorton",
+  "removeAccountPasswordDescription": "Forigi la pasvorton, kiu necesas por malŝlosi Session.",
+  "enterPassword": "Bonvolu enigi vian pasvorton",
+  "confirmPassword": "Konfirmi pasvorton",
+  "enterNewPassword": "Bonvolu enigi vian novan pasvorton",
+  "confirmNewPassword": "Konfirmi novan pasvorton",
+  "showRecoveryPhrasePasswordRequest": "Bonvolu enigi vian pasvorton",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
-  "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
-  "passwordViewTitle": "Enter Password",
-  "password": "Password",
-  "setPassword": "Set Password",
-  "changePassword": "Change Password",
-  "createPassword": "Create your password",
-  "removePassword": "Remove Password",
-  "maxPasswordAttempts": "Invalid Password. Would you like to reset the database?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Old password is invalid",
-  "invalidPassword": "Invalid password",
-  "noGivenPassword": "Please enter your password",
-  "passwordsDoNotMatch": "Passwords do not match",
-  "setPasswordInvalid": "Passwords do not match",
-  "changePasswordInvalid": "The old password you entered is incorrect",
-  "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Connecting...",
+  "invalidOpenGroupUrl": "Nevalida URL",
+  "copiedToClipboard": "Kopiite",
+  "passwordViewTitle": "Enigi Pasvorton",
+  "password": "Pasvorto",
+  "setPassword": "Agordi pasvorton",
+  "changePassword": "Ŝanĝi Pasvorton",
+  "createPassword": "Kreu vian pasvorton",
+  "removePassword": "Forigi Pasvorton",
+  "maxPasswordAttempts": "Nevalida Pasvorto. Ĉu vi ŝatus restarigi la datumbazon?",
+  "typeInOldPassword": "Bonvolu enigi vian nuntempan pasvorton",
+  "invalidOldPassword": "Malnova pasvorto estas nevalida",
+  "invalidPassword": "Nevalida pasvorto",
+  "noGivenPassword": "Bonvolu enigi vian pasvorton",
+  "passwordsDoNotMatch": "Pasvortoj ne kongruas",
+  "setPasswordInvalid": "Pasvortoj ne kongruas",
+  "changePasswordInvalid": "La malnova pasvorto, kiun vi enigis, estas malĝusta",
+  "removePasswordInvalid": "Malĝusta pasvorto",
+  "setPasswordTitle": "Pasvorto agordita",
+  "changePasswordTitle": "Pasvorto Ŝanĝita",
+  "removePasswordTitle": "Pasvorto Forigita",
+  "setPasswordToastDescription": "Via pasvorto estas agordita. Bonvolu konservi ĝin sekura.",
+  "changePasswordToastDescription": "Via pasvorto estas ŝanĝita. Bonvolu konservi ĝin sekura.",
+  "removePasswordToastDescription": "Via pasvorto estas forigita.",
+  "publicChatExists": "Vi jam estas konektita al ĉi tiu komunumo",
+  "connectToServerFail": "Ne povis algrupiĝi",
+  "connectingToServer": "Konektante...",
   "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
-  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
-  "remove": "Remove",
-  "invalidSessionId": "Invalid Session ID",
+  "setPasswordFail": "Malsukcesis agordi pasvorton",
+  "passwordLengthError": "Necesas, ke pasvorto estu inter 6 kaj 64 longe",
+  "passwordTypeError": "Necesas, ke pasvorto estu signoĉeno",
+  "passwordCharacterError": "Necesas, ke pasvorto enhavu nur literojn, ciferojn kaj simbolojn",
+  "remove": "Forigi",
+  "invalidSessionId": "Nevalida Session ID-o",
   "invalidPubkeyFormat": "Invalid Pubkey Format",
-  "emptyGroupNameError": "Please enter a group name",
-  "editProfileModalTitle": "Profile",
-  "groupNamePlaceholder": "Group Name",
-  "inviteContacts": "Invite Contacts",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
-  "add": "Add",
-  "addingContacts": "Adding contacts to $name$",
-  "noContactsToAdd": "No contacts to add",
-  "noMembersInThisGroup": "No other members in this group",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
-  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "emptyGroupNameError": "Bonvolu enigi grupnomon",
+  "editProfileModalTitle": "Profilo",
+  "groupNamePlaceholder": "Grupnomo",
+  "inviteContacts": "Inviti Kontaktpersonojn",
+  "addModerators": "Aldoni Administrantojn",
+  "removeModerators": "Forigi Administrantojn",
+  "addAsModerator": "Aldoni kiel Administranton",
+  "removeFromModerators": "Forigi el Administrantoj",
+  "add": "Aldoni",
+  "addingContacts": "Aldonante kontaktpersonojn al $name$",
+  "noContactsToAdd": "Ne estas kontaktpersonoj por aldoni",
+  "noMembersInThisGroup": "Neniuj aliaj membroj en ĉi tiu grupo",
+  "noModeratorsToRemove": "ne estas administrantoj por forigi",
+  "onlyAdminCanRemoveMembers": "Vi ne estas la kreanto",
+  "onlyAdminCanRemoveMembersDesc": "Nur la kreanto de la grupo povas forigi uzantojn",
   "createAccount": "Create Account",
   "startInTrayTitle": "Keep in System Tray",
   "startInTrayDescription": "Keep Session running in the background when you close the window.",
-  "yourUniqueSessionID": "Say hello to your Session ID",
+  "yourUniqueSessionID": "Salutu vian Session ID-on",
   "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
-  "getStarted": "Get started",
-  "createSessionID": "Create Session ID",
-  "recoveryPhrase": "Recovery Phrase",
-  "enterRecoveryPhrase": "Enter your recovery phrase",
-  "displayName": "Display Name",
+  "getStarted": "Komenciĝi",
+  "createSessionID": "Krei Session ID-on",
+  "recoveryPhrase": "Ripara Frazo",
+  "enterRecoveryPhrase": "Enigu vian riparan frazon",
+  "displayName": "Montrata Nomo",
   "anonymous": "Anonymous",
   "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
-  "enterDisplayName": "Enter a display name",
-  "continueYourSession": "Continue Your Session",
-  "linkDevice": "Link Device",
-  "restoreUsingRecoveryPhrase": "Restore your account",
-  "or": "or",
+  "enterDisplayName": "Enigu montrotan nomon",
+  "continueYourSession": "Daŭrigu Vian Session",
+  "linkDevice": "Ligi Aparaton",
+  "restoreUsingRecoveryPhrase": "Restaŭri vian konton",
+  "or": "aŭ",
   "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
-  "beginYourSession": "Begin your Session.",
-  "welcomeToYourSession": "Welcome to your Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
-  "enterSessionID": "Enter Session ID",
+  "beginYourSession": "Komencu vian Session.",
+  "welcomeToYourSession": "Bonvenon al via Session",
+  "searchFor...": "Serĉi konversaciojn kaj kontaktpersonojn",
+  "searchForContactsOnly": "Serĉi kontaktpersonojn",
+  "enterSessionID": "Enigu Session ID-on",
   "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
-  "message": "Message",
-  "appearanceSettingsTitle": "Appearance",
-  "privacySettingsTitle": "Privacy",
-  "notificationsSettingsTitle": "Notifications",
+  "message": "Mesaĝo",
+  "appearanceSettingsTitle": "Aspekto",
+  "privacySettingsTitle": "Privateco",
+  "notificationsSettingsTitle": "Sciigoj",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
-  "recoveryPhraseEmpty": "Enter your recovery phrase",
+  "recoveryPhraseEmpty": "Enigu vian riparan frazon",
   "displayNameEmpty": "Please pick a display name",
-  "members": "$count$ members",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
-  "createClosedGroupNamePrompt": "Group Name",
-  "createClosedGroupPlaceholder": "Enter a group name",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "displayNameTooLong": "Display name is too long",
+  "members": "$count$ membroj",
+  "activeMembers": "$count$ active members",
+  "join": "Aliĝi",
+  "joinOpenGroup": "Algrupiĝi",
+  "createGroup": "Krei Grupon",
+  "create": "Krei",
+  "createClosedGroupNamePrompt": "Grupnomo",
+  "createClosedGroupPlaceholder": "Enigu grupnomon",
+  "openGroupURL": "Komunumo-URL",
+  "enterAnOpenGroupURL": "Enigu Komunumo-URL-on",
   "next": "Next",
-  "invalidGroupNameTooShort": "Please enter a group name",
-  "invalidGroupNameTooLong": "Please enter a shorter group name",
-  "pickClosedGroupMember": "Please pick at least 1 group member",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "invalidGroupNameTooShort": "Bonvolu enigi grupnomon",
+  "invalidGroupNameTooLong": "Bonvolu enigi pli mallongan grupnomon",
+  "pickClosedGroupMember": "Bonvolu elekti almenaŭ 1 grupanon",
+  "closedGroupMaxSize": "Grupo ne povas havi pli ol 100 membrojn",
+  "noBlockedContacts": "Vi havas neniujn blokitajn kontakpersonojn.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
-  "orJoinOneOfThese": "Or join one of these...",
-  "helpUsTranslateSession": "Translate Session",
+  "orJoinOneOfThese": "Aŭ algrupiĝu tie...",
+  "helpUsTranslateSession": "Traduki Session",
   "closedGroupInviteFailTitle": "Group Invitation Failed",
   "closedGroupInviteFailTitlePlural": "Group Invitations Failed",
-  "closedGroupInviteFailMessage": "Unable to successfully invite a group member",
-  "closedGroupInviteFailMessagePlural": "Unable to successfully invite all group members",
-  "closedGroupInviteOkText": "Retry invitations",
+  "closedGroupInviteFailMessage": "Maleblas sukcese inviti grupanon",
+  "closedGroupInviteFailMessagePlural": "Maleblas sukcese inviti ĉiujn grupanojn",
+  "closedGroupInviteOkText": "Reprovi invitojn",
   "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
   "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
   "closedGroupInviteSuccessMessage": "Successfully invited group members",
-  "notificationForConvo": "Notifications",
+  "notificationForConvo": "Sciigoj",
   "notificationForConvo_all": "All",
   "notificationForConvo_disabled": "Disabled",
-  "notificationForConvo_mentions_only": "Mentions only",
-  "onionPathIndicatorTitle": "Path",
+  "notificationForConvo_mentions_only": "Nur mencioj",
+  "onionPathIndicatorTitle": "Vojo",
   "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
-  "linkVisitWarningTitle": "Open this link in your browser?",
+  "unknownCountry": "Nekonita Lando",
+  "device": "Aparato",
+  "destination": "Celo",
+  "learnMore": "Lerni pli",
+  "linkVisitWarningTitle": "Ĉu malfermi ĉi tiun ligilon en via retumilo?",
   "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
+  "open": "Malfermi",
   "audioMessageAutoplayTitle": "Autoplay Audio Messages",
   "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
   "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
+  "trustThisContactDialogTitle": "Ĉu fidi $name$?",
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Montri Uzanto-Detalojn",
+  "sendRecoveryPhraseTitle": "Sendante Riparan Frazon",
+  "sendRecoveryPhraseMessage": "Vi estas provanta sendi vian riparan frazon, kiun oni povas uzi por aliri vian konton. Ĉu vi certas, ke vi volas sendi ĉi tiun mesaĝon?",
+  "dialogClearAllDataDeletionFailedTitle": "Datumo ne forigita",
+  "dialogClearAllDataDeletionFailedDesc": "Datumo ne forigita pro nekonita eraro. Ĉu vi volas forigi datumon nur el ĉi tiu aparato?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Ĉu vi volas forigi datumon nur el ĉi tiu aparato?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Provi Denove",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
   "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
+  "iAmSure": "Mi certas",
   "recoveryPhraseSecureTitle": "You're almost finished!",
   "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
   "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
@@ -435,7 +446,7 @@
   "incomingCallFrom": "Incoming call from '$name$'",
   "ringing": "Ringing...",
   "establishingConnection": "Establishing connection...",
-  "accept": "Accept",
+  "accept": "Akcepti",
   "decline": "Decline",
   "endCall": "End call",
   "permissionsSettingsTitle": "Permissions",
@@ -443,7 +454,7 @@
   "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
   "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
   "unableToCall": "Cancel your ongoing call first",
-  "unableToCallTitle": "Cannot start new call",
+  "unableToCallTitle": "Ne povas komenci novan vokon",
   "callMissed": "Missed call from $name$",
   "callMissedTitle": "Call missed",
   "noCameraFound": "No camera found",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index e9ff24478..31e2d7921 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Activar pantalla completa",
   "viewMenuToggleDevTools": "Activar herramientas de desarrollador",
   "contextMenuNoSuggestions": "Sin sugerencias",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Invitación de la comunidad",
   "joinOpenGroupAfterInvitationConfirmationTitle": "¿Unirse a $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
   "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
   "enterSessionIDOrONSName": "Ingresa el ID de Session o el nombre ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Inicie una nueva conversación ingresando la Session ID de alguien o comparta su Session ID con ellos.. ",
   "loading": "Cargando ...",
   "done": "Hecho",
   "youLeftTheGroup": "Has abandonado el grupo.",
   "youGotKickedFromGroup": "Has sido eliminado del grupo.",
   "unreadMessages": "Mensajes Sin Leer",
   "debugLogExplanation": "Este registro se guardará en tu escritorio.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Reportar Error",
   "markAllAsRead": "Marcar todo como leído",
   "incomingError": "Fallo al procesar el mensaje recibido",
   "media": "Multimedia",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Lo sentimos, ha habido un fallo al adjuntar el archivo.",
   "offline": "Desconectado",
   "debugLog": "Registro de depuración",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportar Registros",
+  "shareBugDetails": "Exporte sus registros, luego cargue el archivo a través de la sección Ayuda de Session Desktop.",
   "goToReleaseNotes": "Ir a las notas de versión",
   "goToSupportPage": "Ir a la página de soporte técnico",
   "about": "Info",
@@ -100,7 +100,8 @@
   "deleteMessagesQuestion": "¿Borrar $count$ mensajes?",
   "deleteMessageQuestion": "¿Borrar este mensaje?",
   "deleteMessages": "Eliminar mensajes",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ eliminado",
   "messageDeletedPlaceholder": "Este mensaje ha sido borrado",
   "from": "Desde:",
   "to": "Para:",
@@ -111,9 +112,10 @@
   "moreInformation": "Más detalles",
   "resend": "Reenviar",
   "deleteConversationConfirmation": "¿Eliminar este chat permanentemente?",
-  "clear": "Clear",
+  "clear": "Borrar",
   "clearAllData": "Borrar todos los datos",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Esto eliminará permanentemente sus mensajes y contactos.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "¿Seguro que quieres eliminar esta conversación?",
   "quoteThumbnailAlt": "Miniatura de una foto como cita de un mensaje",
   "imageAttachmentAlt": "Imagen adjunta al mensaje",
@@ -129,10 +131,10 @@
   "tookAScreenshot": "$name$ tomó una captura de pantalla",
   "savedTheFile": "$name$ guardó el archivo",
   "linkPreviewsTitle": "Enviar Previsualizaciones",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Mostrar previsualización de enlaces para las URLs soportadas.",
   "linkPreviewsConfirmMessage": "No estarás completamente protegido contra los metadatos al enviar previsualizaciones de enlaces.",
   "mediaPermissionsTitle": "Micrófono",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Permitir acceso al micrófono.",
   "spellCheckTitle": "Revisión ortográfica",
   "spellCheckDescription": "Enable spell check when typing messages.",
   "spellCheckDirty": "Debes reiniciar Session para aplicar las nuevas configuraciones",
@@ -141,32 +143,32 @@
   "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
   "typingIndicatorsSettingTitle": "Indicadores De Tecleo",
   "zoomFactorSettingTitle": "Zoom general",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
+  "themesSettingTitle": "Temas",
+  "primaryColor": "Color primario",
+  "primaryColorGreen": "Color primario verde",
+  "primaryColorBlue": "Color primario azul",
+  "primaryColorYellow": "Color primario amarillo",
+  "primaryColorPink": "Color primario rosa",
+  "primaryColorPurple": "Color primario purpura",
+  "primaryColorOrange": "Color primario naranja",
+  "primaryColorRed": "Color primario rojo",
   "classicDarkThemeTitle": "Classic Dark",
   "classicLightThemeTitle": "Classic Light",
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
+  "pruneSettingTitle": "Recortar Comunidades",
+  "pruneSettingDescription": "Eliminar mensajes de Comunidades con más de 6 meses de antigüedad y donde haya más de 2000 mensajes.",
+  "enable": "Permitir",
+  "keepDisabled": "Mantener deshabilitado",
+  "notificationSettingsDialog": "La información que se muestra en las notificaciones.",
   "nameAndMessage": "Nombre de contacto y mensaje",
   "noNameOrMessage": "Ni nombre ni mensaje",
   "nameOnly": "Solo nombre de contacto",
   "newMessage": "Mensaje nuevo",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Crear una conversación con un nuevo contacto",
+  "createConversationNewGroup": "Crear un grupo con contactos existentes",
+  "joinACommunity": "Ingresar a la comunidad",
+  "chooseAnAction": "Elija una acción para iniciar una conversación",
   "newMessages": "Mensajes nuevos",
   "notificationMostRecentFrom": "Más recientes desde: $name$",
   "notificationFrom": "Desde:",
@@ -174,7 +176,7 @@
   "sendFailed": "Fallo Al Enviar",
   "mediaMessage": "Mensaje multimedia",
   "messageBodyMissing": "Por favor ingresa algún mensaje.",
-  "messageBody": "Message body",
+  "messageBody": "Cuerpo del mensaje",
   "unblockToSend": "Desbloquea este contacto para enviar mensajes.",
   "unblockGroupToSend": "Desbloquea este grupo para enviar mensajes.",
   "youChangedTheTimer": "Has fijado la desaparición de mensajes en $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 horas",
   "timerOption_1_day": "1 día ",
   "timerOption_1_week": "1 semana",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Desaparición de mensajes",
   "changeNickname": "Cambiar apodo",
   "clearNickname": "Quitar apodo",
@@ -209,6 +212,7 @@
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 d",
   "timerOption_1_week_abbreviated": "7 d",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Desaparición de mensajes desactivada.",
   "disabledDisappearingMessages": "$name$ ha desactivado la desaparición de mensajes.",
   "youDisabledDisappearingMessages": "Has desactivado la desaparición de mensajes.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ se han unido al grupo.",
   "kickedFromTheGroup": "$name$ fue eliminado del grupo.",
   "multipleKickedFromTheGroup": "$name$ fueron eliminados del grupo.",
-  "blockUser": "Bloquear",
-  "unblockUser": "Desbloquear",
+  "block": "Bloquear",
+  "unblock": "Desbloquear",
   "unblocked": "Desbloqueado",
   "blocked": "Bloqueado",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Contactos Bloqueados",
+  "conversationsSettingsTitle": "Conversaciones",
   "unbanUser": "Desbloquear usuario",
   "userUnbanned": "Usuario desbloqueado con éxito",
   "userUnbanFailed": "¡Error al desbloquear!",
@@ -251,7 +255,7 @@
   "userBanned": "Baneado correctamente",
   "userBanFailed": "¡Bloqueo fallido!",
   "leaveGroup": "Abandonar Grupo",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Dejar el grupo y eliminar para todos",
   "leaveGroupConfirmation": "¿Seguro que quieres salir de este grupo?",
   "leaveGroupConfirmationAdmin": "Ya que eres el administrador del grupo, si lo dejas, será eliminado para todos los miembros. ¿Estás seguro de que querer abandonarlo?",
   "cannotRemoveCreatorFromGroup": "No se puede eliminar este usuario",
@@ -267,27 +271,27 @@
   "showRecoveryPhrase": "Frase de recuperación",
   "yourSessionID": "Tu ID de Session",
   "setAccountPasswordTitle": "Establecer contraseña de la cuenta",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
+  "setAccountPasswordDescription": "Se requiere contraseña para desbloquear Session.",
   "changeAccountPasswordTitle": "Cambiar la Contraseña de la Cuenta",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
   "removeAccountPasswordTitle": "Borrar contraseña",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Por favor, introduce tu contraseña",
   "confirmPassword": "Confirmar contraseña",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Por favor, ingrese su nueva contraseña",
+  "confirmNewPassword": "Confirme su nueva contraseña",
   "showRecoveryPhrasePasswordRequest": "Introduce tu contraseña",
   "recoveryPhraseSavePromptMain": "Tu frase de recuperación es la llave maestra de tu ID de Session, puedes usarla para recuperar tu ID de Session en caso de pérdida de acceso a tu dispositivo. Guarda tu frase de recuperación en un lugar seguro y no se la digas a nadie.",
   "invalidOpenGroupUrl": "URL no válida",
   "copiedToClipboard": "Copiado en el portapapeles",
-  "passwordViewTitle": "Enter Password",
+  "passwordViewTitle": "Introducir contraseña",
   "password": "Contraseña",
   "setPassword": "Establecer Contraseña",
   "changePassword": "Cambiar Contraseña",
   "createPassword": "Create your password",
   "removePassword": "Eliminar Contraseña",
   "maxPasswordAttempts": "Contraseña inválida. ¿Restablecer la base de datos?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Por favor, introduzca su antigua contraseña",
   "invalidOldPassword": "La contraseña antigua es inválida",
   "invalidPassword": "Contraseña inválida",
   "noGivenPassword": "Por favor, introduce tu contraseña",
@@ -329,7 +333,7 @@
   "onlyAdminCanRemoveMembersDesc": "Sólo el creador del grupo puede eliminar usuarios",
   "createAccount": "Create Account",
   "startInTrayTitle": "Ejecutar en Segundo Plano",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Mantener Session funcionando en segundo plano cuando cierre la ventana.",
   "yourUniqueSessionID": "Saluda a tu ID de Session",
   "allUsersAreRandomly...": "Tu ID de Session es la dirección única que las personas pueden usar para contactarte en Session. Por diseño, tu ID de Session es totalmente anónima y privada, sin vínculo con tu identidad real.",
   "getStarted": "Comenzar",
@@ -347,22 +351,25 @@
   "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
   "beginYourSession": "Comienza tu Session.",
   "welcomeToYourSession": "Bienvenido a tu Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Buscar conversaciones y contactos",
+  "searchForContactsOnly": "Buscar contactos",
   "enterSessionID": "Session ID",
   "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
   "message": "Mensaje",
   "appearanceSettingsTitle": "Apariencia",
   "privacySettingsTitle": "Privacidad",
   "notificationsSettingsTitle": "Notificaciones",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "notificationPreview": "Previsualizar",
   "recoveryPhraseEmpty": "Ingresa tu frase de recuperación",
   "displayNameEmpty": "Por favor, elige un nombre para mostrar",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ miembros",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
+  "activeMembers": "$count$ active members",
+  "join": "Unirse",
+  "joinOpenGroup": "Unirse a la Comunidad",
+  "createGroup": "Crear Grupo",
   "create": "Create",
   "createClosedGroupNamePrompt": "Nombre Del Grupo",
   "createClosedGroupPlaceholder": "Ingresa un nombre de grupo",
@@ -377,7 +384,7 @@
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "O únete a uno de estos...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Traducir Session",
   "closedGroupInviteFailTitle": "La invitación de grupo falló",
   "closedGroupInviteFailTitlePlural": "Las invitaciones de grupo fallaron",
   "closedGroupInviteFailMessage": "No se pudo invitar al usuario",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "¿Abrir este enlace en su navegador?",
   "linkVisitWarningMessage": "¿Estás seguro de querer abrir $url$ en tu navegador?",
   "open": "Abrir",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
+  "audioMessageAutoplayTitle": "Autoreproducir mensajes de Audio",
   "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
   "clickToTrustContact": "Haga clic para descargar",
   "trustThisContactDialogTitle": "¿Confiar en $name$?",
   "trustThisContactDialogDescription": "¿Estás seguro de querer descargar este archivo que $name$ te ha enviado?",
   "pinConversation": "Anclar conversación",
   "unpinConversation": "Desanclar conversación",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Mostrar Detalles del Usuario",
   "sendRecoveryPhraseTitle": "Enviando Frase de Recuperación",
   "sendRecoveryPhraseMessage": "Estás intentando enviar tu frase de recuperación, que puede utilizarse para acceder a tu cuenta. ¿Estás seguro de que deseas enviar este mensaje?",
@@ -414,8 +422,11 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "¿Quieres eliminar sólo los datos de este dispositivo?",
   "dialogClearAllDataDeletionFailedMultiple": "Datos no eliminados por los siguientes nodos de servicio: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
+  "deviceOnly": "Borrar solo de este dispositivo",
+  "entireAccount": "Borrar del dispositivo y de la red",
   "areYouSureDeleteDeviceOnly": "¿Estás seguro de querer eliminar sólo los datos del dispositivo?",
   "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
   "iAmSure": "Estoy seguro",
@@ -425,9 +436,9 @@
   "notificationSubtitle": "Notificaciones - $setting$",
   "surveyTitle": "We'd Love Your Feedback",
   "faq": "FAQ",
-  "support": "Support",
+  "support": "Soporte",
   "clearAll": "Borrar todo",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Borrar Datos",
   "messageRequests": "Solicitudes de Mensaje",
   "requestsSubtitle": "Solicitudes Pendientes",
   "requestsPlaceholder": "Sin solicitudes",
@@ -438,8 +449,8 @@
   "accept": "Aceptar",
   "decline": "Rechazar",
   "endCall": "Finalizar llamada",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Permisos",
+  "helpSettingsTitle": "Ayuda",
   "cameraPermissionNeededTitle": "Se requieren los permisos de Voz/Video",
   "cameraPermissionNeeded": "Puedes habilitar los permisos de \"llamada de voz y video\" en las Configuraciones de Privacidad.",
   "unableToCall": "Debes cancelar la llamada en curso",
@@ -449,12 +460,12 @@
   "noCameraFound": "Cámara no encontrada",
   "noAudioInputFound": "No se detectó dispositivo de entrada",
   "noAudioOutputFound": "No se encontró dispositivo de salida",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Llamadas de Voz y Video (Beta)",
   "callMissedCausePermission": "Llamada perdida de '$name$' porque no activaste los permisos de \"llamadas de voz y video\" en las configuraciones de privacidad.",
   "callMissedNotApproved": "Llamada perdida de '$name$' debido a que no has aprovado esta conversación todavía. Tienes que enviar un mensaje primero.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
   "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDialogTitle": "Llamadas de Voz y Video (Beta)",
   "startedACall": "Llamada saliente a $name$",
   "answeredACall": "Llamada con $name$",
   "trimDatabase": "Reducir Base de Datos",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "¿Estás seguro/a que quieres rechazar esta solicitud de mensaje?",
   "respondingToRequestWarning": "Enviar un mensaje a este usuario/a va a aceptar su solicitud de mensaje y revelar tu ID de Session automáticamente.",
   "hideRequestBanner": "Ocultar el banner de solicitud de mensajes",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Solicitudes de mensajes",
   "noMessageRequestsPending": "No hay solicitudes de mensajes pendientes",
   "noMediaUntilApproved": "No puedes enviar archivos adjuntos hasta que la conversación sea aceptada",
   "mustBeApproved": "Esta conversación debe ser aceptada para usar esta función",
   "youHaveANewFriendRequest": "Tienes una nueva solicitud de amistad",
   "clearAllConfirmationTitle": "Borrar todas las solicitudes de mensajes",
   "clearAllConfirmationBody": "¿Estás seguro/a que quieres borrar todas las solicitudes de mensajes?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Ocultar",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Ver tu bandeja de solicitudes de mensajes",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
+  "expandedReactionsText": "Mostrar menos",
   "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
+  "otherSingular": "$number$ otro",
+  "otherPlural": "$number$ otros",
+  "reactionPopup": "reaccionó con",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "Y $otherSingular$ ha reaccionado <span>$emoji$</span> a este mensaje",
+  "reactionListCountPlural": "Y $otherPlural$ han reaccionado <span>$emoji$</span> a este mensaje"
 }
diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json
index 93531bf5a..f68b3fb40 100644
--- a/_locales/es_419/messages.json
+++ b/_locales/es_419/messages.json
@@ -10,7 +10,7 @@
   "appMenuHide": "Ocultar",
   "appMenuHideOthers": "Ocultar otros",
   "appMenuUnhide": "Mostrar todo",
-  "appMenuQuit": "Cerrar sesión",
+  "appMenuQuit": "Cerrar Session",
   "editMenuUndo": "Deshacer",
   "editMenuRedo": "Rehacer",
   "editMenuCut": "Cortar",
@@ -23,24 +23,24 @@
   "windowMenuMinimize": "Minimizar",
   "windowMenuZoom": "Zoom",
   "viewMenuResetZoom": "Tamaño original",
-  "viewMenuZoomIn": "Aumentar Zoom",
+  "viewMenuZoomIn": "Ampliar",
   "viewMenuZoomOut": "Disminuir Zoom",
   "viewMenuToggleFullScreen": "Activar pantalla completa",
   "viewMenuToggleDevTools": "Activar herramientas de desarrollador",
   "contextMenuNoSuggestions": "Sin sugerencias",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Invitación de comunidad",
   "joinOpenGroupAfterInvitationConfirmationTitle": "¿Unirse a $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "¿Estás seguro de que quieres unirte a la comunidad $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Introduzca el ID de Session o el nombre ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Inicia una nueva conversación ingresando el ID de Session de alguien o comparta su ID de Session con ellos.",
   "loading": "Cargando...",
-  "done": "Terminado",
+  "done": "Hecho",
   "youLeftTheGroup": "Has abandonado el grupo.",
   "youGotKickedFromGroup": "Has sido eliminado del grupo.",
   "unreadMessages": "Mensajes No Leídos",
   "debugLogExplanation": "Este registro se guardará en tu escritorio.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Reportar un error",
   "markAllAsRead": "Marcar todo como leído",
   "incomingError": "Error en la gestión de los mensajes entrantes",
   "media": "Multimedia",
@@ -56,14 +56,14 @@
   "previewThumbnail": "Miniatura de previsualización para $domain$",
   "stagedImageAttachment": "Preparando adjunto múltiple: $path$",
   "oneNonImageAtATimeToast": "Lo sentimos, hay un límite de un archivo adjunto sin imagen por mensaje",
-  "cannotMixImageAndNonImageAttachments": "No se pueden combinar adjuntos de otro tipo junto a imágenes",
+  "cannotMixImageAndNonImageAttachments": "Lo sentimos, no puedes mezclar imágenes con otros tipos de archivo en un mensaje",
   "maximumAttachments": "Se ha alcanzado el número máximo de archivos adjuntos. Por favor, envíe los archivos adjuntos restantes en un mensaje separado.",
   "fileSizeWarning": "El archivo adjunto excede los límites de tamaño para el mensaje.",
   "unableToLoadAttachment": "Lo sentimos, hubo un fallo al adjuntar el archivo.",
   "offline": "Desconectado",
   "debugLog": "Registro de Depuración",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportar registros",
+  "shareBugDetails": "Exporta tus registros, luego sube el archivo a través de la Ayuda de Session.",
   "goToReleaseNotes": "Ir a las notas de versión",
   "goToSupportPage": "Ir a la página de soporte técnico",
   "about": "Acerca de",
@@ -72,7 +72,7 @@
   "noSearchResults": "No se encontraron resultados para $searchTerm$",
   "conversationsHeader": "Contactos y grupos",
   "contactsHeader": "Contactos",
-  "messagesHeader": "Mensajes",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Ajustes",
   "typingAlt": "Animación de tecleo para este chat",
   "contactAvatarAlt": "Avatar del contacto $name$",
@@ -82,11 +82,11 @@
   "originalMessageNotFound": "Mensaje original no encontrado",
   "you": "Tú",
   "audioPermissionNeededTitle": "Microphone access required",
-  "audioPermissionNeeded": "Puedes habilitar el acceso al micrófono en: Ajustes (icono de engranaje) => Privacidad",
+  "audioPermissionNeeded": "Puedes habilitar el acceso al micrófono en: Ajustes (icono del engranaje) => Privacidad",
   "audio": "Audio",
   "video": "Video",
   "photo": "Foto",
-  "cannotUpdate": "Error al actualizar",
+  "cannotUpdate": "No se pudo actualizar",
   "cannotUpdateDetail": "Session Desktop no pudo actualizarse, pero hay una nueva versión disponible. Por favor dirígete a https://getsession.org e instala la nueva versión manualmente, o ponte en contacto con el soporte y cuéntanos sobre este error.",
   "ok": "Aceptar",
   "cancel": "Cancelar",
@@ -100,87 +100,89 @@
   "deleteMessagesQuestion": "¿Eliminar $count$ mensajes?",
   "deleteMessageQuestion": "¿Eliminar este mensaje?",
   "deleteMessages": "Eliminar mensajes",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ eliminados",
   "messageDeletedPlaceholder": "Este mensaje ha sido eliminado",
   "from": "De:",
   "to": "Para:",
   "sent": "Enviado",
   "received": "Recibido",
   "sendMessage": "Mensaje",
-  "groupMembers": "Miembros del grupo",
+  "groupMembers": "Miembros",
   "moreInformation": "Más información",
   "resend": "Reenviar",
   "deleteConversationConfirmation": "¿Eliminar esta conversación permanentemente?",
-  "clear": "Clear",
+  "clear": "Eliminar",
   "clearAllData": "Eliminar todos los datos",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Esto eliminará permanentemente tus mensajes y contactos.",
+  "deleteAccountFromLogin": "¿Estás seguro de querer eliminar tu cuenta?",
   "deleteContactConfirmation": "¿Estás seguro de que quieres eliminar esta conversación?",
   "quoteThumbnailAlt": "Vista miniatura de la imagen del mensaje citado",
   "imageAttachmentAlt": "Imagen adjunta al mensaje",
-  "videoAttachmentAlt": "Captura del video adjunto al mensaje",
+  "videoAttachmentAlt": "Captura de pantalla del vídeo en el mensaje",
   "lightboxImageAlt": "La imagen ha sido enviada en la conversación",
   "imageCaptionIconAlt": "Ícono que muestra que esta imagen incluye un subtexto",
   "addACaption": "Añade un texto...",
   "copySessionID": "Copiar Session ID",
   "copyOpenGroupURL": "Copiar la URL del grupo",
   "save": "Guardar",
-  "saveLogToDesktop": "Guardar el log en el Escritorio",
+  "saveLogToDesktop": "Guardar registro en el escritorio",
   "saved": "Guardado",
   "tookAScreenshot": "$name$ ha hecho una captura de pantalla",
   "savedTheFile": "$name$ guardó el archivo",
-  "linkPreviewsTitle": "Enviar previsualizaciones",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewsTitle": "Enviar previsualizaciones de links",
+  "linkPreviewDescription": "Generar previsualizaciones de enlaces para URLs compatibles.",
   "linkPreviewsConfirmMessage": "No tendrás una privacidad completa de metadatos al enviar previsualizaciones de enlaces.",
   "mediaPermissionsTitle": "Micrófono",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Permitir acceso al micrófono.",
   "spellCheckTitle": "Revisión ortográfica",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Activar el corrector ortográfico al escribir mensajes.",
   "spellCheckDirty": "Debes reiniciar Session para aplicar las nuevas configuraciones",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Enviar recibos de lectura en chats de uno a uno.",
   "readReceiptSettingTitle": "Recibos de lectura",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
+  "typingIndicatorsSettingDescription": "Ver y compartir indicadores de escritura en chats de uno a uno.",
+  "typingIndicatorsSettingTitle": "Indicadores de escritura",
+  "zoomFactorSettingTitle": "Zoom general",
+  "themesSettingTitle": "Temas",
+  "primaryColor": "Color primario",
+  "primaryColorGreen": "Color primario verde",
+  "primaryColorBlue": "Color primario azul",
+  "primaryColorYellow": "Color primario amarillo",
+  "primaryColorPink": "Color primario rosa",
+  "primaryColorPurple": "Color primario púrpura",
+  "primaryColorOrange": "Color primario naranja",
+  "primaryColorRed": "Color primario rojo",
   "classicDarkThemeTitle": "Classic Dark",
   "classicLightThemeTitle": "Classic Light",
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Nombre de contacto y mensaje",
-  "noNameOrMessage": "Sin nombre ni contenido",
+  "pruneSettingTitle": "Recortar Comunidades",
+  "pruneSettingDescription": "Eliminar mensajes anteriores a 6 meses de las Comunidades que tengan más de 2.000 mensajes.",
+  "enable": "Activar",
+  "keepDisabled": "Mantener desactivado",
+  "notificationSettingsDialog": "Información mostrada en las notificaciones.",
+  "nameAndMessage": "Nombre y Contenido",
+  "noNameOrMessage": "Sin nombre o contenido",
   "nameOnly": "Solo nombre de contacto",
   "newMessage": "Nuevo mensaje",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Crear una conversación con un nuevo contacto",
+  "createConversationNewGroup": "Crear un grupo con contactos existentes",
+  "joinACommunity": "Unirse a una comunidad",
+  "chooseAnAction": "Seleccione una acción para iniciar una conversación",
   "newMessages": "Mensajes nuevos",
   "notificationMostRecentFrom": "Más recientes desde: $name$",
   "notificationFrom": "Desde:",
   "notificationMostRecent": "Más reciente:",
   "sendFailed": "Fallo al enviar",
   "mediaMessage": "Mensaje multimedia",
-  "messageBodyMissing": "Por favor ingresa algún mensaje.",
-  "messageBody": "Message body",
+  "messageBodyMissing": "Por favor, introduzca un cuerpo de mensaje.",
+  "messageBody": "Cuerpo del mensaje",
   "unblockToSend": "Desbloquea este contacto para enviarle mensajes.",
   "unblockGroupToSend": "Desbloquea este grupo para enviar mensajes.",
   "youChangedTheTimer": "Has fijado la desaparición de mensajes en $time$",
   "timerSetOnSync": "Actualizando el temporizador de desaparición en $time$",
   "theyChangedTheTimer": "$name$ ha fijado la desaparición de mensajes en $time$",
-  "timerOption_0_seconds": "Inactivo",
+  "timerOption_0_seconds": "Apagado",
   "timerOption_5_seconds": "5 segundos",
   "timerOption_10_seconds": "10 segundos",
   "timerOption_30_seconds": "30 segundos",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 horas",
   "timerOption_1_day": "1 día",
   "timerOption_1_week": "1 semana",
+  "timerOption_2_weeks": "2 semanas",
   "disappearingMessages": "Desaparición de mensajes",
   "changeNickname": "Cambiar nombre de usuario",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 d",
   "timerOption_1_week_abbreviated": "7 d",
+  "timerOption_2_weeks_abbreviated": "2sem",
   "disappearingMessagesDisabled": "Desaparición de mensajes desactivada",
-  "disabledDisappearingMessages": "$name$ ha desactivado la desaparición de mensajes.",
+  "disabledDisappearingMessages": "$name$ ha desactivado que los mensajes desaparezcan.",
   "youDisabledDisappearingMessages": "Has desactivado la desaparición de mensajes.",
   "timerSetTo": "El tiempo de desaparición de mensajes se ha fijado en $time$",
   "noteToSelf": "Notas personales",
-  "hideMenuBarTitle": "Esconder barra de menú",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
-  "startConversation": "Comienza con un chat",
-  "invalidNumberError": "Número incorrecto",
+  "hideMenuBarTitle": "Ocultar barra de menú",
+  "hideMenuBarDescription": "Alterna la visibilidad de la barra de menú.",
+  "startConversation": "Comenzar nueva conversación",
+  "invalidNumberError": "Por favor, compruebe el Session ID o el nombre ONS e inténtelo de nuevo",
   "failedResolveOns": "Error al resolver el nombre ONS",
   "autoUpdateSettingTitle": "Actualizar automáticamente",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Comprobar automáticamente actualizaciones al iniciar.",
   "autoUpdateNewVersionTitle": "Actualización de Session disponible",
   "autoUpdateNewVersionMessage": "Hay disponible una nueva versión de Session.",
   "autoUpdateNewVersionInstructions": "Pulsa en 'Reiniciar Session' para aplicar cambios.",
@@ -234,15 +238,15 @@
   "updatedTheGroup": "Grupo actualizado",
   "titleIsNow": "El nombre del grupo ahora es: '$name$'.",
   "joinedTheGroup": "$name$ se ha unido al grupo.",
-  "multipleJoinedTheGroup": "$name$ se han unido al grupo.",
+  "multipleJoinedTheGroup": "$name$ se ha unido al grupo.",
   "kickedFromTheGroup": "$name$ ha sido expulsado del grupo.",
   "multipleKickedFromTheGroup": "$name$ han sido expulsados del grupo.",
-  "blockUser": "Bloquear",
-  "unblockUser": "Desbloquear",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Desbloqueado",
   "blocked": "Bloqueado",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Contactos bloqueados",
+  "conversationsSettingsTitle": "Conversaciones",
   "unbanUser": "Desbloquear usuario",
   "userUnbanned": "Usuario desbloqueado exitosamente",
   "userUnbanFailed": "¡Bloqueo fallido!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "¡Bloqueo fallido!",
   "leaveGroup": "Abandonar grupo",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Abandonar grupo y remover a todos",
   "leaveGroupConfirmation": "¿Estás seguro de abandonar éste grupo?",
   "leaveGroupConfirmationAdmin": "Ya que eres el administrador del grupo, si lo dejas, será eliminado para todos los miembros. ¿Estás seguro de que querer abandonarlo?",
   "cannotRemoveCreatorFromGroup": "No puedes eliminar a éste usuario",
   "cannotRemoveCreatorFromGroupDesc": "No puedes eliminar este usuario ya que es el creador del grupo.",
   "noContactsForGroup": "No tienes ningún contacto",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Error al agregar usuario como administrador",
+  "failedToRemoveFromModerator": "Error al eliminar el usuario de la lista de administradores",
   "copyMessage": "Copiar mensaje",
   "selectMessage": "Seleccionar mensaje",
   "editGroup": "Editar grupo",
@@ -266,118 +270,121 @@
   "updateGroupDialogTitle": "Actualizando $name$...",
   "showRecoveryPhrase": "Frase de recuperación",
   "yourSessionID": "Tu ID de Session",
-  "setAccountPasswordTitle": "Establecer contraseña de la cuenta",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Cambiar la Contraseña de la Cuenta",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Borrar contraseña de la cuenta",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Contraseña",
+  "setAccountPasswordDescription": "Necesita contraseña para desbloquear Session.",
+  "changeAccountPasswordTitle": "Cambiar Contraseña",
+  "changeAccountPasswordDescription": "Cambio de contraseña necesario para desbloquear Session.",
+  "removeAccountPasswordTitle": "Eliminar Contraseña",
+  "removeAccountPasswordDescription": "Eliminar la contraseña necesaria para desbloquear Session.",
   "enterPassword": "Por favor, introduce tu contraseña",
   "confirmPassword": "Confirmar contraseña",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Por favor, introduzca su nueva contraseña",
+  "confirmNewPassword": "Confirmar nueva contraseña",
   "showRecoveryPhrasePasswordRequest": "Por favor, introduce tu contraseña",
   "recoveryPhraseSavePromptMain": "Tu frase de recuperación es la llave maestra de tu ID de Session, puedes usarla para recuperar tu ID de Session en caso de pérdida de acceso a tu dispositivo. Guarda tu frase de recuperación en un lugar seguro y no se la digas a nadie.",
   "invalidOpenGroupUrl": "URL no válida",
-  "copiedToClipboard": "Copiado en el portapapeles",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Copiado",
+  "passwordViewTitle": "Introducir contraseña",
   "password": "Contraseña",
   "setPassword": "Establecer Contraseña",
   "changePassword": "Cambiar Contraseña",
-  "createPassword": "Create your password",
+  "createPassword": "Crea tu contraseña",
   "removePassword": "Eliminar Contraseña",
   "maxPasswordAttempts": "Contraseña inválida. ¿Restablecer la base de datos?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Old password is invalid",
-  "invalidPassword": "Invalid password",
-  "noGivenPassword": "Please enter your password",
-  "passwordsDoNotMatch": "Passwords do not match",
-  "setPasswordInvalid": "Passwords do not match",
-  "changePasswordInvalid": "The old password you entered is incorrect",
-  "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Connecting...",
-  "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
-  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
-  "remove": "Remove",
-  "invalidSessionId": "Invalid Session ID",
-  "invalidPubkeyFormat": "Invalid Pubkey Format",
-  "emptyGroupNameError": "Please enter a group name",
-  "editProfileModalTitle": "Profile",
-  "groupNamePlaceholder": "Group Name",
-  "inviteContacts": "Invite Contacts",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
-  "add": "Add",
-  "addingContacts": "Adding contacts to $name$",
-  "noContactsToAdd": "No contacts to add",
-  "noMembersInThisGroup": "No other members in this group",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
-  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "typeInOldPassword": "Por favor, introduzca su contraseña actual",
+  "invalidOldPassword": "La contraseña antigua es inválida",
+  "invalidPassword": "Contraseña inválida",
+  "noGivenPassword": "Por favor, introduce tu contraseña",
+  "passwordsDoNotMatch": "Las contraseñas no coinciden",
+  "setPasswordInvalid": "Las contraseñas no coinciden",
+  "changePasswordInvalid": "La contraseña antigua que ingresaste es incorrecta",
+  "removePasswordInvalid": "Contraseña incorrecta",
+  "setPasswordTitle": "Contraseña establecida",
+  "changePasswordTitle": "Contraseña modificada",
+  "removePasswordTitle": "Contraseña eliminada",
+  "setPasswordToastDescription": "Su contraseña ha sido establecida. Por favor, manténgala segura.",
+  "changePasswordToastDescription": "Su contraseña ha sido cambiada. Por favor, manténla segura.",
+  "removePasswordToastDescription": "Su contraseña ha sido eliminada.",
+  "publicChatExists": "Usted ya está conectado a esta comunidad",
+  "connectToServerFail": "No se ha podido unir a la comunidad",
+  "connectingToServer": "Conectando...",
+  "connectToServerSuccess": "Conectado con éxito a la comunidad",
+  "setPasswordFail": "Error al establecer la contraseña",
+  "passwordLengthError": "La contraseña debe tener entre 6 y 64 caracteres",
+  "passwordTypeError": "La contraseña debe ser una cadena",
+  "passwordCharacterError": "La contraseña solo debe contener letras, números y símbolos",
+  "remove": "Eliminar",
+  "invalidSessionId": "La Session ID es inválida",
+  "invalidPubkeyFormat": "Formato de Clave Pública inválido",
+  "emptyGroupNameError": "Por favor, ingresa un nombre de grupo",
+  "editProfileModalTitle": "Perfil",
+  "groupNamePlaceholder": "Nombre del grupo",
+  "inviteContacts": "Invitar contactos",
+  "addModerators": "Añadir administradores",
+  "removeModerators": "Eliminar Administradores",
+  "addAsModerator": "Añadir como administrador",
+  "removeFromModerators": "Eliminar administrador",
+  "add": "Añadir",
+  "addingContacts": "Añadiendo contactos a $name$",
+  "noContactsToAdd": "No hay contactos para añadir",
+  "noMembersInThisGroup": "No hay otros miembros en este grupo",
+  "noModeratorsToRemove": "no hay administradores para eliminar",
+  "onlyAdminCanRemoveMembers": "No eres el creador",
+  "onlyAdminCanRemoveMembersDesc": "Sólo el creador del grupo puede eliminar usuarios",
   "createAccount": "Create Account",
-  "startInTrayTitle": "Keep in System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
-  "yourUniqueSessionID": "Say hello to your Session ID",
-  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
-  "getStarted": "Get started",
-  "createSessionID": "Create Session ID",
-  "recoveryPhrase": "Recovery Phrase",
-  "enterRecoveryPhrase": "Enter your recovery phrase",
-  "displayName": "Display Name",
+  "startInTrayTitle": "Conservar en la bandeja del sistema",
+  "startInTrayDescription": "Mantener Session funcionando en segundo plano cuando cierre la ventana.",
+  "yourUniqueSessionID": "Dile hola a tu Session ID",
+  "allUsersAreRandomly...": "Su Session ID es la única dirección que las personas pueden usar para contactarle en Session. Por diseño, su Session ID es totalmente anónima y privada, sin vínculo con su identidad real.",
+  "getStarted": "Empezar",
+  "createSessionID": "Crear Session ID",
+  "recoveryPhrase": "Frase de recuperación",
+  "enterRecoveryPhrase": "Ingresa tu frase de recuperación",
+  "displayName": "Nombre de usuario",
   "anonymous": "Anónimo",
-  "removeResidueMembers": "Hacer esto eliminará a esos miebros cuando abandonen el grupo.",
+  "removeResidueMembers": "Al presionar \"ok\" también eliminará a los miembros cuando abandonen el grupo.",
   "enterDisplayName": "Ingresa un nombre para mostrar",
   "continueYourSession": "Continúa tu Session",
   "linkDevice": "Vincular dispositivo",
   "restoreUsingRecoveryPhrase": "Restaura tu cuenta",
   "or": "o",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Al usar este servicio, aceptas nuestros <a href=\"https://getsession.org/terms-of-service \">Terminos y condiciones</a> y la <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Política de privacidad</a>",
   "beginYourSession": "Comienza tu Session.",
   "welcomeToYourSession": "Bienvenido a tu Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
-  "enterSessionID": "Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "searchFor...": "Buscar conversaciones y contactos",
+  "searchForContactsOnly": "Buscar contactos",
+  "enterSessionID": "Ingresa Session ID",
+  "enterSessionIDOfRecipient": "Introduzca el Session ID de su contacto o ONS",
   "message": "Mensaje",
   "appearanceSettingsTitle": "Apariencia",
   "privacySettingsTitle": "Privacidad",
   "notificationsSettingsTitle": "Notificaciones",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Contenido de notificaciones",
+  "notificationPreview": "Vista previa",
   "recoveryPhraseEmpty": "Ingresa tu frase de recuperación",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ miembros",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Unirse",
+  "joinOpenGroup": "Unirse a comunidad",
+  "createGroup": "Crear grupo",
+  "create": "Crear",
   "createClosedGroupNamePrompt": "Nombre Del Grupo",
   "createClosedGroupPlaceholder": "Ingresa un nombre de grupo",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL de comunidad",
+  "enterAnOpenGroupURL": "Introduzca el URL de la comunidad",
   "next": "Siguiente",
   "invalidGroupNameTooShort": "Por favor, ingresa un nombre de grupo",
   "invalidGroupNameTooLong": "Por favor, ingresa un nombre de grupo más corto",
   "pickClosedGroupMember": "Por favor, elige al menos 1 miembro del grupo",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No hay contactos bloqueados",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Un grupo no puede tener más de 100 miembros",
+  "noBlockedContacts": "No tienes contactos bloqueados.",
+  "userAddedToModerators": "Usuario añadido a la lista de administradores",
+  "userRemovedFromModerators": "Usuario eliminado de la lista de administradores",
   "orJoinOneOfThese": "O únete a uno de estos...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Traducir Session",
   "closedGroupInviteFailTitle": "Invitación al grupo fallida",
   "closedGroupInviteFailTitlePlural": "Invitaciones al grupo fallidas",
   "closedGroupInviteFailMessage": "No se pudo invitar al usuario",
@@ -385,76 +392,80 @@
   "closedGroupInviteOkText": "Reintentar invitaciones",
   "closedGroupInviteSuccessTitlePlural": "Invitaciones de grupo exitosas",
   "closedGroupInviteSuccessTitle": "Invitación al grupo exitosa",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Miembros del grupo invitados correctamente",
   "notificationForConvo": "Notificaciones",
   "notificationForConvo_all": "Todo",
   "notificationForConvo_disabled": "Desactivado",
   "notificationForConvo_mentions_only": "Solo menciones",
   "onionPathIndicatorTitle": "Ruta",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
-  "linkVisitWarningTitle": "Open this link in your browser?",
-  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
-  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
-  "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
-  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
-  "notificationSubtitle": "Notifications - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Message Requests",
-  "requestsSubtitle": "Pending Requests",
-  "requestsPlaceholder": "No requests",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
-  "incomingCallFrom": "Incoming call from '$name$'",
-  "ringing": "Ringing...",
-  "establishingConnection": "Establishing connection...",
-  "accept": "Accept",
-  "decline": "Decline",
-  "endCall": "End call",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
-  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "unableToCall": "Cancel your ongoing call first",
+  "onionPathIndicatorDescription": "Session oculta su IP rebotando sus mensajes a través de varios Nodos de Servicio en la red descentralizada de Session. Estos son los países a los que tu conexión se está rebotando actualmente:",
+  "unknownCountry": "País desconocido",
+  "device": "Dispositivo",
+  "destination": "Destino",
+  "learnMore": "Saber más",
+  "linkVisitWarningTitle": "¿Abrir este enlace en su navegador?",
+  "linkVisitWarningMessage": "¿Estás seguro de querer abrir $url$ en tu navegador?",
+  "open": "Abrir",
+  "audioMessageAutoplayTitle": "Reproducir mensajes de audio automáticamente",
+  "audioMessageAutoplayDescription": "Reproducir mensajes de audio consecutivos automáticamente.",
+  "clickToTrustContact": "Haga clic para descargar",
+  "trustThisContactDialogTitle": "¿Confiar en $name$?",
+  "trustThisContactDialogDescription": "¿Estás seguro de querer descargar archivos que $name$ te envió?",
+  "pinConversation": "Fijar conversación",
+  "unpinConversation": "Desfijar conversación",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Mostrar detalles del usuario",
+  "sendRecoveryPhraseTitle": "Enviando Frase de Recuperación",
+  "sendRecoveryPhraseMessage": "Estás intentando compartir tu frase de recuperación que puede usarse para acceder a tu cuenta. ¿Estás seguro de que deseas enviar este mensaje?",
+  "dialogClearAllDataDeletionFailedTitle": "Error al eliminar los datos",
+  "dialogClearAllDataDeletionFailedDesc": "Los datos no se eliminaron por un error desconocido. ¿Quieres eliminar los datos de solo este dispositivo?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "¿Quieres eliminar los datos sólo de este dispositivo?",
+  "dialogClearAllDataDeletionFailedMultiple": "Datos no eliminados por los siguientes Nodos de Servicio: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "¿Quieres borrar este dispositivo solamente, o borrar tus datos de la red también?",
+  "clearDevice": "Limpiar dispositivo",
+  "tryAgain": "Intentar de nuevo",
+  "areYouSureClearDevice": "¿Estás seguro de querer limpiar tu dispositivo?",
+  "deviceOnly": "Limpiar sólo el dispositivo",
+  "entireAccount": "Limpiar dispositivo y red",
+  "areYouSureDeleteDeviceOnly": "¿Estás seguro de querer eliminar sólo los datos del dispositivo?",
+  "areYouSureDeleteEntireAccount": "¿Está seguro que desea eliminar sus datos de la red? Si continúa no podrá restaurar sus mensajes o contactos.",
+  "iAmSure": "Estoy seguro",
+  "recoveryPhraseSecureTitle": "¡Ya casi terminas!",
+  "recoveryPhraseRevealMessage": "Protege tu cuenta guardando tu frase de recuperación. Revela tu frase de recuperación y guárdala de forma segura para protegerla.",
+  "recoveryPhraseRevealButtonText": "Mostrar frase de recuperación",
+  "notificationSubtitle": "Notificaciones - $setting$",
+  "surveyTitle": "Nos encantaría saber tu opinión",
+  "faq": "Preguntas frecuentes",
+  "support": "Soporte",
+  "clearAll": "Limpiar todo",
+  "clearDataSettingsTitle": "Limpiar datos",
+  "messageRequests": "Solicitudes de mensaje",
+  "requestsSubtitle": "Solicitudes pendientes",
+  "requestsPlaceholder": "Sin solicitudes",
+  "hideRequestBannerDescription": "Ocultar el apartado de solicitud de mensaje hasta que reciba una nueva solicitud de mensaje.",
+  "incomingCallFrom": "Llamada entrante de '$name$'",
+  "ringing": "Llamando...",
+  "establishingConnection": "Estableciendo conexión...",
+  "accept": "Aceptar",
+  "decline": "Rechazar",
+  "endCall": "Finalizar llamada",
+  "permissionsSettingsTitle": "Permisos",
+  "helpSettingsTitle": "Ayuda",
+  "cameraPermissionNeededTitle": "Se requieren los permisos de voz/videollamada",
+  "cameraPermissionNeeded": "Puede activar el permiso 'Voz y videollamadas' en la Configuración de privacidad.",
+  "unableToCall": "Primero debes cancelar la llamada en curso",
   "unableToCallTitle": "No se ha podido iniciar la llamada",
   "callMissed": "Llamada perdida de $name$",
   "callMissedTitle": "Llamada perdida",
   "noCameraFound": "Cámara no encontrada",
   "noAudioInputFound": "No se encontró entrada de audio",
   "noAudioOutputFound": "No se encontró salida de audio",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Llamadas de voz y video (Experimental)",
   "callMissedCausePermission": "Llamada perdida de '$name$' porque necesitas habilitar el permiso de 'Llamadas de voz y video' en la configuración de privacidad.",
   "callMissedNotApproved": "Llamada perdida de '$name$' porque no has aceptado esta conversación. Envía un mensaje primero.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Permite llamadas de voz y video hacia y de otros usuarios.",
+  "callMediaPermissionsDialogContent": "Su dirección IP será visible para quien vaya a llamar y un servidor de la Fundación Oxen mientras utilice las llamadas experimentales. ¿Está seguro de que desea activar las llamadas de voz y video?",
+  "callMediaPermissionsDialogTitle": "Llamadas de voz y video (Experimental)",
   "startedACall": "Has llamado a $name$",
   "answeredACall": "Llamada con $name$",
   "trimDatabase": "Reducir Base de Datos",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "¿Estás seguro/a que quieres rechazar esta solicitud de mensaje?",
   "respondingToRequestWarning": "Enviar un mensaje a este usuario/a va aceptará su solicitud de mensaje y revelará tu ID de Session automáticamente.",
   "hideRequestBanner": "Ocultar el banner de solicitud de mensajes",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Solicitudes de mensaje",
   "noMessageRequestsPending": "No hay solicitudes de mensajes pendientes",
   "noMediaUntilApproved": "No puedes enviar archivos adjuntos hasta que la conversación sea aceptada",
   "mustBeApproved": "Esta conversación debe ser aceptada para usar esta función",
   "youHaveANewFriendRequest": "Tiene una nueva solicitud de amistad",
   "clearAllConfirmationTitle": "Borrar todas las solicitudes de mensajes",
   "clearAllConfirmationBody": "¿Estás seguro/a que quieres borrar todas las solicitudes de mensajes?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Ocultar",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Ver su bandeja de entrada de solicitudes de mensaje",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "¿Estás seguro de que quieres eliminar todos los $emoji$?",
+  "expandedReactionsText": "Mostrar menos",
+  "reactionNotification": "Reacciona a un mensaje con $emoji$",
+  "rateLimitReactMessage": "¡Despacio! Has enviado demasiados emojis. Prueba de nuevo pronto",
+  "otherSingular": "$number$ otro",
+  "otherPlural": "$number$ otros",
+  "reactionPopup": "reaccionaron con",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ y $name2$",
+  "reactionPopupThree": "$name$, $name2$ y $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ y",
+  "reactionListCountSingular": "Y $otherSingular$ ha reaccionado <span>$emoji$</span> a este mensaje",
+  "reactionListCountPlural": "Y $otherPlural$ han reaccionado <span>$emoji$</span> a este mensaje"
 }
diff --git a/_locales/et/messages.json b/_locales/et/messages.json
index 79ae4a4a0..7443a461d 100644
--- a/_locales/et/messages.json
+++ b/_locales/et/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Laadimine...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Kontaktid",
-  "messagesHeader": "Sõnumid",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Selle vestluse sisestuse animatsioon",
   "contactAvatarAlt": "Kontakti $name$ pilt",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Kustuta sõnumid",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "Saatja",
@@ -107,29 +108,30 @@
   "sent": "Saadetud",
   "received": "Saadud",
   "sendMessage": "Saada sõnum",
-  "groupMembers": "Grupi liikmed",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Kas kustutada see vestlus jäädavalt?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Tsiteeritud sõnumist pärit pildi pisipilt",
   "imageAttachmentAlt": "Pilt lisatud sõnumile",
-  "videoAttachmentAlt": "Sõnumile lisatud video ekraanipilt",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Vestluses saadetud pilt",
   "imageCaptionIconAlt": "Ikoon näitamaks, et sellel pildil on seletus.",
   "addACaption": "Lisa pealkiri...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Salvesta",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Nii saatja nime kui sõnumi sisu",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Ei nime ega sisu",
   "nameOnly": "Ainult saatja nime",
   "newMessage": "Uus sõnum",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 tundi",
   "timerOption_1_day": "1 päev",
   "timerOption_1_week": "1 nädal",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Kaduvad sõnumid",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1p",
   "timerOption_1_week_abbreviated": "1ndl",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Kaduvad sõnumid on keelatud",
-  "disabledDisappearingMessages": "$name$ keelas kaduvad sõnumid",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Sa keelasid kaduvad sõnumid",
   "timerSetTo": "Taimer on määratud: $time$",
   "noteToSelf": "Märkus endale",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Vigane number",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ ühinesid grupiga",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json
index 5f13ebe3e..a98dd4bd7 100644
--- a/_locales/fa/messages.json
+++ b/_locales/fa/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "دعوت انجمن",
   "joinOpenGroupAfterInvitationConfirmationTitle": "جوین شدن به $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "آیا مطمئن هستید که میخواهید عضو انجمن $roomName$ شوید؟",
-  "couldntFindServerMatching": "سرور گروه عمومی مورد نظر یافت نشد",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "شناسه Session یا نام ONS را وارید کنید",
   "startNewConversationBy...": "یک مکالمه جدید را با وارد کردن شناسه Session شخصی شروع کنید یا شناسه جلسه خود را با آنها به اشتراک بگذارید.",
   "loading": "در حال بارگذاری...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "گروه ها و مخاطبین",
   "contactsHeader": "مخاطبین",
-  "messagesHeader": "پیام ها",
+  "messagesHeader": "Conversations",
   "settingsHeader": "تنظیمات",
   "typingAlt": "در حال تایپ انیمیشن برای این مکالمه",
   "contactAvatarAlt": "آواتار متعلق به مخاطب $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "حذف $count$ پیام؟",
   "deleteMessageQuestion": "این پیام حذف شود؟",
   "deleteMessages": "حذف پیام‌ها",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ پیام حذف شد",
   "messageDeletedPlaceholder": "این پیام حذف شده است",
   "from": "از",
@@ -114,7 +115,7 @@
   "clear": "پاک ",
   "clearAllData": "پاک کردن همه داتا",
   "deleteAccountWarning": "این کار پیام‌ها و مخاطبین شما را برای همیشه حذف می‌کند.",
-  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
+  "deleteAccountFromLogin": "آیا مطمئن هستید میخواهید دستگاهتان را پاکسازی کنید؟",
   "deleteContactConfirmation": "آیا مطمئن هستید که می‌خواهید این مکالمه را حذف کنید؟",
   "quoteThumbnailAlt": "پیش‌نمایش تصویر از پیام نقل قول شده",
   "imageAttachmentAlt": "تصویر پیوست شده به پیام",
@@ -123,14 +124,14 @@
   "imageCaptionIconAlt": "آیکون نشان می‌دهد که این تصویر دارای یک عنوان است",
   "addACaption": "یک عنوان اضافه کنید...",
   "copySessionID": "کپی شناسه‌ی Session",
-  "copyOpenGroupURL": "کپی کردن URL گروه",
+  "copyOpenGroupURL": "رونوشت از پیوست گروه",
   "save": "ذخیره",
   "saveLogToDesktop": "ذخیره گزارش در دسکتاپ",
   "saved": "ذخیره شده",
   "tookAScreenshot": "$name$ از صفحه یک عکس گرفت",
   "savedTheFile": "رسانه توسط $name$ ذخیره شد",
   "linkPreviewsTitle": "ارسال پیش‌نمایش‌های لینک",
-  "linkPreviewDescription": "ایجاد پیش‌نمایش‌های لینک برای URLهای تحت پشتیبانی.",
+  "linkPreviewDescription": "ایجاد پیش‌نمایش‌ برای پیوست های تحت پشتیبانی.",
   "linkPreviewsConfirmMessage": "با ارسال پیش‌نمایش لینک‌ها محافظت کامل از متادیتا نخواهید داشت.",
   "mediaPermissionsTitle": "میکروفون",
   "mediaPermissionsDescription": "اجازه دسترسی به میکروفون",
@@ -143,7 +144,7 @@
   "typingIndicatorsSettingTitle": "نشانگر‌های در حال تایپ",
   "zoomFactorSettingTitle": "فاکتور زوم",
   "themesSettingTitle": "تم‌ها",
-  "primaryColor": "رنگ اولیه",
+  "primaryColor": "رنگ اصلی",
   "primaryColorGreen": "رنگ اصلی سبز",
   "primaryColorBlue": "رنگ اصلی آبی",
   "primaryColorYellow": "رنگ اصلی زرد",
@@ -156,7 +157,7 @@
   "oceanDarkThemeTitle": "آبی اقیانوسی تیره",
   "oceanLightThemeTitle": "آبی اقیانوسی روشن",
   "pruneSettingTitle": "مرتب‌سازی انجمن‌ها",
-  "pruneSettingDescription": "پیام‌های قدیمی‌تر از ۶ ماه را از انجمن‌های دارای بیش از ۲۰۰۰ پیام، حذف کنید.",
+  "pruneSettingDescription": "حذف پیام‌های قدیمی‌تر از ۶ ماه از انجمن‌های دارای بیش از ۲۰۰۰ پیام.",
   "enable": "فعال سازی",
   "keepDisabled": "غیر فعال بماند",
   "notificationSettingsDialog": "اطلاعات که در اعلانات نمایش میشود.",
@@ -213,7 +214,7 @@
   "timerOption_1_week_abbreviated": "۱ ه",
   "timerOption_2_weeks_abbreviated": "۲ ه",
   "disappearingMessagesDisabled": "پیام های نابود شونده غیر فعال شدند",
-  "disabledDisappearingMessages": "$name$ پیام های نابود شونده را غیر فعال کرد",
+  "disabledDisappearingMessages": "$name$ پیام های ناپدید شونده را غیر فعال کرده است.",
   "youDisabledDisappearingMessages": "شما پیام های نابود شونده را غیر فعال کردید",
   "timerSetTo": "تایمر روی $time$ تنظیم شد",
   "noteToSelf": "یادداشت به خود",
@@ -240,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ عضو گروه شد",
   "kickedFromTheGroup": "$name$ از گروه حذف شد.",
   "multipleKickedFromTheGroup": "$name$ از گروه حذف شدند.",
-  "blockUser": "مسدود کردن",
-  "unblockUser": "رفع مسدودیت",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "رفع مسدودی",
   "blocked": "مسدود شده",
   "blockedSettingsTitle": "مخاطبین مسدود شده",
@@ -269,11 +270,11 @@
   "updateGroupDialogTitle": "به روز رسانی $name$...",
   "showRecoveryPhrase": "عبارت بازیابی",
   "yourSessionID": "شناسه Session شما",
-  "setAccountPasswordTitle": "رمز عبور",
+  "setAccountPasswordTitle": "گذرواژه",
   "setAccountPasswordDescription": "نیاز به رمزعبور برای باز کردن قفل Session",
-  "changeAccountPasswordTitle": "تغییر رمز عبور",
+  "changeAccountPasswordTitle": "تغییر گذرواژه",
   "changeAccountPasswordDescription": "رمز عبور لازم برای باز کردن قفل Session را تغییر دهید.",
-  "removeAccountPasswordTitle": "حذف رمز عبور حساب‌کاربری",
+  "removeAccountPasswordTitle": "حذف گذرواژه",
   "removeAccountPasswordDescription": "رمز عبور لازم برای باز کردن قفل Session را حذف کنید.",
   "enterPassword": "لطفاً رمز عبورتان را وارد نمایید.",
   "confirmPassword": "تأیید رمز عبور",
@@ -298,12 +299,12 @@
   "setPasswordInvalid": "رمزهای عبور مطابقت ندارند",
   "changePasswordInvalid": "رمز عبور قدیمی وارد شده صحیح نیست",
   "removePasswordInvalid": "رمز عبور نادرست است",
-  "setPasswordTitle": "رمز عبور تنظیم شد",
-  "changePasswordTitle": "رمز عبور تغییر یافت",
-  "removePasswordTitle": "رمز عبور حذف شد",
+  "setPasswordTitle": "گذرواژه تنظیم شد",
+  "changePasswordTitle": "گذرواژه تغییر کرد",
+  "removePasswordTitle": "گذرواژه حذف شد",
   "setPasswordToastDescription": "رمز عبور شما تنظیم شده است. لطفاً آن را فراموش نکنید.",
   "changePasswordToastDescription": "رمز عبور شما تغییر یافته است. لطفاً آن را فراموش نکنید.",
-  "removePasswordToastDescription": "رمز عبور شما حذف شده است.",
+  "removePasswordToastDescription": "گذرواژه شما حذف شده است.",
   "publicChatExists": "شما قبلا عضو این گروه شده اید",
   "connectToServerFail": "نمی‌توانید محلق شوید",
   "connectingToServer": "در حال اتصال...",
@@ -358,11 +359,14 @@
   "appearanceSettingsTitle": "ظاهر",
   "privacySettingsTitle": "حریم خصوصی",
   "notificationsSettingsTitle": "اعلانات",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "محتوی اعلان",
   "notificationPreview": "پیش نمایش",
   "recoveryPhraseEmpty": "عبارت بازیابی خود را وارد کنید",
   "displayNameEmpty": "لطفا یک نام نمایشی وارد کنید",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ عضو",
+  "activeMembers": "$count$ active members",
   "join": "پیوستن",
   "joinOpenGroup": "پیوستن به انجمن",
   "createGroup": "ایجاد گروه",
@@ -409,6 +413,7 @@
   "trustThisContactDialogDescription": "آیا مطمئنید که میخواهید رسانه های ارسال شده توسط $name$ را بارگذاری کنید؟",
   "pinConversation": "سنجاق کردن گفتگو",
   "unpinConversation": "گفتگو را از حالت پین خارج کنید",
+  "markUnread": "Mark Unread",
   "showUserDetails": "نمایش جزئیات کاربر",
   "sendRecoveryPhraseTitle": "ارسال عبارت بازیابی",
   "sendRecoveryPhraseMessage": "شما در حال تلاش برای ارسال عبارت بازیابی خود هستید که می تواند برای دسترسی به حساب خود استفاده شود. آیا مطمئن هستید که می خواهید این پیام را ارسال کنید؟",
@@ -418,8 +423,8 @@
   "dialogClearAllDataDeletionFailedMultiple": "داده‌هایی که توسط گره‌های سرویس حذف نشده‌اند: $snodes$",
   "dialogClearAllDataDeletionQuestion": "آیا می‌خواهید فقط این دستگاه را پاک کنید یا داتا خود را از شبکه نیز حذف کنید؟",
   "clearDevice": "پاک کردن دستگاه",
-  "tryAgain": "تلاش مجدد کنید",
-  "areYouSureClearDevice": "آیا مطمئن هستید که می‌خواهید دستگاه‌تان را پاک کنید؟",
+  "tryAgain": "دوباره امتحان کنید",
+  "areYouSureClearDevice": "آیا از پاک سازی دستگاه خود اطمینان دارید؟",
   "deviceOnly": "فقط پاک کردن دستگاه",
   "entireAccount": "پاک کردن دستگاه و شبکه",
   "areYouSureDeleteDeviceOnly": "آیا مطمئن هستید که می خواهید فقط داده های دستگاه خود را حذف کنید؟",
@@ -481,12 +486,16 @@
   "youHaveANewFriendRequest": "شما درخواست دوستی جدیدی دارید",
   "clearAllConfirmationTitle": "پاک کردن تمام درخواست ها",
   "clearAllConfirmationBody": "از پاک کردن تمام درخواست مکالمات مطمئن هستید?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "پنهان کردن",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "نشان دادن بخش درخواست های پیام رسانی شما",
   "clearAllReactions": "آیا مطمئن هستید میخواید کل $emoji$ را پاک کنید؟",
   "expandedReactionsText": "نمایش کمتر",
   "reactionNotification": "به یک پیام با $emoji$ واکنش بده",
-  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
+  "rateLimitReactMessage": "آهسته! شما بیش از اندازه ایموجی واکنش ارسال کرده اید. بزودی دوباره تلاش کنید",
   "otherSingular": "$number$ دیگر",
   "otherPlural": "$number$ دیگران",
   "reactionPopup": "واکنش داده با",
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index 136fcf569..493922c05 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Vaihda kokoruututila",
   "viewMenuToggleDevTools": "Näytä/piilota kehittäjätyökalut",
   "contextMenuNoSuggestions": "Ei ehdotuksia",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Yhteisökutsu",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Liity huoneeseen $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Vastaavaa avointa Open Group -ryhmäpalvelinta ei löytynyt",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Haluatko varmasti liittyä yhteisöön $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Syötä Session ID tai OSN-nimi",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Aloita uusi keskustelu syöttämällä käyttäjän Session ID tai jaa oma ID:si heille.",
   "loading": "Ladataan...",
   "done": "Valmis",
   "youLeftTheGroup": "Olet poistunut ryhmästä.",
   "youGotKickedFromGroup": "Sinut poistettiin ryhmästä.",
   "unreadMessages": "Lukemattomat viestit",
   "debugLogExplanation": "Tämä loki tallennetaan työpöydällesi.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Ilmoita virheestä",
   "markAllAsRead": "Merkitse kaikki luetuiksi",
   "incomingError": "Virhe saapuvan viestin käsittelyssä",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Valittua liitettä ei voitu ladata.",
   "offline": "Ei yhteyttä",
   "debugLog": "Virheenkorjausloki",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Vie lokitiedot",
+  "shareBugDetails": "Vie lokitiedot ja lähetä tiedosto Sessionin tukipalvelusta.",
   "goToReleaseNotes": "Siirry julkaisutietoihin",
   "goToSupportPage": "Siirry tukisivulle",
   "about": "Tietoja",
@@ -72,7 +72,7 @@
   "noSearchResults": "Ei tuloksia haulle: \"$searchTerm$\"",
   "conversationsHeader": "Yhteystiedot ja ryhmät",
   "contactsHeader": "Yhteystiedot",
-  "messagesHeader": "Viestit",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Asetukset",
   "typingAlt": "Kirjoitusanimaatio tälle keskustelulle",
   "contactAvatarAlt": "Yhteystiedon $name$ kuvake",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Poistetaanko $count$ viestiä?",
   "deleteMessageQuestion": "Poistetaanko viesti?",
   "deleteMessages": "Poista viestit",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ poistettiin",
   "messageDeletedPlaceholder": "Viesti on poistettu",
   "from": "Lähettäjä",
@@ -107,17 +108,18 @@
   "sent": "Lähetetty",
   "received": "Vastaanotettu",
   "sendMessage": "Lähetä viesti",
-  "groupMembers": "Ryhmän jäsenet",
+  "groupMembers": "Jäsenet",
   "moreInformation": "Lisätietoja",
   "resend": "Lähetä uudelleen",
   "deleteConversationConfirmation": "Poistetaanko tämä keskustelu pysyvästi?",
-  "clear": "Clear",
+  "clear": "Tyhjennä",
   "clearAllData": "Tyhjennä kaikki tiedot",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Tämä poistaa kaikki viestisi ja yhteystietosi pysyvästi.",
+  "deleteAccountFromLogin": "Haluatko varmasti tyhjentää laitteesi?",
   "deleteContactConfirmation": "Haluatko varmasti poistaa keskustelun?",
   "quoteThumbnailAlt": "Lainatun kuvaviestin pikkukuva",
   "imageAttachmentAlt": "Viestiin liitetty kuva",
-  "videoAttachmentAlt": "Viestiin liitetyn videon pikkukuva",
+  "videoAttachmentAlt": "Kuvankaappaus viestin videosta",
   "lightboxImageAlt": "Lähetetty kuva",
   "imageCaptionIconAlt": "Kuvake, joka näyttää, että tällä kuvalla on kuvateksti",
   "addACaption": "Lisää kuvateksti...",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$ otti kuvakaappauksen!",
   "savedTheFile": "$name$ tallensi median",
   "linkPreviewsTitle": "Lähetä linkkien esikatselut",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Luo linkkien esikatselut tuetuille URL-osoitteille.",
   "linkPreviewsConfirmMessage": "Sinulla ei ole täyttä metatietosuojaa lähetettäessä linkkien esikatseluita.",
   "mediaPermissionsTitle": "Mikrofoni",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Myönnä mikrofonin käyttöoikeus.",
   "spellCheckTitle": "Oikeinkirjoituksen tarkistus",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Käytä oikolukua kirjoitettaessa viestejä.",
   "spellCheckDirty": "Session on käynnistettävä asetusmuutosten käyttöönottamiseksi uudelleen",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Lähetä lukukuittauksia kahdenkeskisissä keskusteluissa.",
   "readReceiptSettingTitle": "Lukukuittaukset",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Näe ja jaa kirjoitusindikaattorit kahdenkeskisissä keskusteluissa.",
   "typingIndicatorsSettingTitle": "Kirjoitusindikaattorit",
   "zoomFactorSettingTitle": "Zoomauskerroin",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Teemat",
+  "primaryColor": "Pääväri",
+  "primaryColorGreen": "Pääväri vihreä",
+  "primaryColorBlue": "Pääväri sininen",
+  "primaryColorYellow": "Pääväri keltainen",
+  "primaryColorPink": "Pääväri pinkki",
+  "primaryColorPurple": "Pääväri violetti",
+  "primaryColorOrange": "Pääväri oranssi",
+  "primaryColorRed": "Pääväri punainen",
+  "classicDarkThemeTitle": "Tumma klassinen",
+  "classicLightThemeTitle": "Vaalea klassinen",
+  "oceanDarkThemeTitle": "Tumma valtameri",
+  "oceanLightThemeTitle": "Vaalea valtameri",
+  "pruneSettingTitle": "Tiivistä yhteisöt",
+  "pruneSettingDescription": "Poista yli 2000 viestin yhteisöistä 6 kuukautta vanhemmat viestit.",
   "enable": "Ota käyttöön",
   "keepDisabled": "Pidä poissa käytöstä",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "sekä nimi että viesti",
+  "notificationSettingsDialog": "Ilmoituksissa näytettävät tiedot.",
+  "nameAndMessage": "Nimi ja sisältö",
   "noNameOrMessage": "ei nimeä eikä viestiä",
   "nameOnly": "vain lähettäjän nimi",
   "newMessage": "Uusi viesti",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Luo keskustelu uuden yhteystiedon kanssa",
+  "createConversationNewGroup": "Luo ryhmä olemassa olevista yhteystiedoista",
+  "joinACommunity": "Liity yhteisöön",
+  "chooseAnAction": "Valitse toiminto aloittaksesi keskustelun",
   "newMessages": "uutta viestiä",
   "notificationMostRecentFrom": "Viimeisimmät yhteystiedolta:",
   "notificationFrom": "Yhteystiedolta:",
@@ -174,7 +176,7 @@
   "sendFailed": "Lähetys epäonnistui",
   "mediaMessage": "Mediaviesti",
   "messageBodyMissing": "Ole hyvä ja syötä viestin keho.",
-  "messageBody": "Message body",
+  "messageBody": "Viestin sisältö",
   "unblockToSend": "Lähettääksesi viestin tälle yhteystiedolle sinun tulee ensin poistaa asettamasi esto.",
   "unblockGroupToSend": "Lähettääksesi viestin tälle ryhmälle sinun tulee ensin poistaa asettamasi esto.",
   "youChangedTheTimer": "Sinä asetit viestien katoamisajan: $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 tuntia",
   "timerOption_1_day": "1 päivä",
   "timerOption_1_week": "1 viikko",
+  "timerOption_2_weeks": "2 viikkoa",
   "disappearingMessages": "Katoavat viestit",
   "changeNickname": "Vaihda lempinimeä",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12t",
   "timerOption_1_day_abbreviated": "1p",
   "timerOption_1_week_abbreviated": "1vk",
+  "timerOption_2_weeks_abbreviated": "2 vk",
   "disappearingMessagesDisabled": "Katoavat viestit poistettu käytöstä",
-  "disabledDisappearingMessages": "$name$asetti katoavat viestit pois päältä",
+  "disabledDisappearingMessages": "$name$ poisti katoavat viestit käytöstä.",
   "youDisabledDisappearingMessages": "Sinä asetit katoavat viestit pois päältä",
   "timerSetTo": "Ajastin asetettu: $time$",
   "noteToSelf": "Viestit itselleni",
   "hideMenuBarTitle": "Piilota valikkopalkki",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Valitse järjestelmän valikkopalkin näkyvyys.",
   "startConversation": "Aloita uusi keskustelu...",
-  "invalidNumberError": "Virheellinen numero",
+  "invalidNumberError": "Tarkista Session-tunnus tai ONS-nimi ja yritä uudelleen",
   "failedResolveOns": "ONS-nimen selvitys epäonnistui",
   "autoUpdateSettingTitle": "Automaattinen päivitys",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Tarkista päivitykset automaattisesti käynnistäessä.",
   "autoUpdateNewVersionTitle": "Session päivitys saatavilla",
   "autoUpdateNewVersionMessage": "Uusi versio Session on saatavilla.",
   "autoUpdateNewVersionInstructions": "Paina Käynnistä Session uudelleen asentaaksesi päivitykset.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$ liittyivät ryhmään",
   "kickedFromTheGroup": "$name$ poistettiin ryhmästä.",
   "multipleKickedFromTheGroup": "$name$ poistettiin ryhmästä.",
-  "blockUser": "Estä",
-  "unblockUser": "Poista esto",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Esto poistettiin",
   "blocked": "Estetty",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Estetyt yhteystiedot",
+  "conversationsSettingsTitle": "Keskustelut",
   "unbanUser": "Poista käyttäjän esto",
   "userUnbanned": "Käyttäjän esto poistettiin",
   "userUnbanFailed": "Käyttäjän eston poisto epäonnistui!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Esto epäonnistui!",
   "leaveGroup": "Poistu ryhmästä",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Poistu ryhmästä ja poista kaikilta",
   "leaveGroupConfirmation": "Haluatko varmasti poistua ryhmästä?",
   "leaveGroupConfirmationAdmin": "Koska olet ryhmän ylläpitäjä, poistetaan se kaikilta nykyisiltä jäseniltä, jos poistut siitä. Haluatko varmasti poistua ryhmästä?",
   "cannotRemoveCreatorFromGroup": "Käyttäjää ei voida poistaa",
   "cannotRemoveCreatorFromGroupDesc": "Et voi poistaa käyttäjää, koska hän on ryhmän luoja.",
   "noContactsForGroup": "Sinulla ei ole yhteystietoja",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Käyttäjän lisäys valvojaksi epäonnistui",
+  "failedToRemoveFromModerator": "Käyttäjän poisto valvojista epäonnistui",
   "copyMessage": "Kopioi viestin teksti",
   "selectMessage": "Valitse viesti",
   "editGroup": "Muokkaa ryhmää",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Päivitetään $name$...",
   "showRecoveryPhrase": "Palautuslauseke",
   "yourSessionID": "Oma Session ID",
-  "setAccountPasswordTitle": "Aseta tilin salasana",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Vaihda tilin salasana",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Poista tilin salasana",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Salasana",
+  "setAccountPasswordDescription": "Vaadi Sessionin avaukseen salasana.",
+  "changeAccountPasswordTitle": "Vaihda salasana",
+  "changeAccountPasswordDescription": "Vaihda Sessionin avaukseen tarvittava salasana.",
+  "removeAccountPasswordTitle": "Poista salasana",
+  "removeAccountPasswordDescription": "Poista Sessionin avaukseen tarvittava salasana.",
   "enterPassword": "Syötä salasanasi",
   "confirmPassword": "Vahvista salasana",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Syötä uusi salasana",
+  "confirmNewPassword": "Vahvista uusi salasana",
   "showRecoveryPhrasePasswordRequest": "Syötä salasanasi",
   "recoveryPhraseSavePromptMain": "Palautuslausekkeesi on Session ID -tunnuksesi pääavain - sen avulla voit palauttaa Session ID:si, jos menetät pääsyn laitteeseesi. Säilytä palautuslausekkeesi turvallisesti, äläkä luovuta sitä muille.",
   "invalidOpenGroupUrl": "Virheellinen URL-osoite",
-  "copiedToClipboard": "Kopioitu leikepöydälle",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Kopioitu",
+  "passwordViewTitle": "Syötä salasana",
   "password": "Salasana",
   "setPassword": "Aseta salasana",
   "changePassword": "Vaihda salasana",
-  "createPassword": "Create your password",
+  "createPassword": "Luo salasana",
   "removePassword": "Poista salasana",
   "maxPasswordAttempts": "Virheellinen salasana. Haluatko tyhjentää tietokannan?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Syötä nykyinen salasanasi",
   "invalidOldPassword": "Vanha salasana on virheellinen",
   "invalidPassword": "Virheellinen salasana",
   "noGivenPassword": "Syötä salasanasi",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Salasanat eivät täsmää",
   "changePasswordInvalid": "Syöttämäsi vanha salasana on virheellinen",
   "removePasswordInvalid": "Virheellinen salasana",
-  "setPasswordTitle": "Aseta salasana",
-  "changePasswordTitle": "Salasana vaihdettu",
-  "removePasswordTitle": "Salasana poistettu",
+  "setPasswordTitle": "Salasana asetettiin",
+  "changePasswordTitle": "Salasana vaihdettiin",
+  "removePasswordTitle": "Salasana poistettiin",
   "setPasswordToastDescription": "Salasanasi on asetettu. Pidä se turvassa.",
   "changePasswordToastDescription": "Salasanasi on vaihdettu. Pidä se turvassa.",
-  "removePasswordToastDescription": "Olet poistanut salasanasi.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Salasanasi on on poistettu.",
+  "publicChatExists": "Olet jo yhteydessä tähän yhteisöön",
+  "connectToServerFail": "Yhteisöön ei voitu liittyä",
   "connectingToServer": "Yhdistetään...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Yhteisöön liittyminen onnistui",
   "setPasswordFail": "Salasanan asetus epäonnistui",
   "passwordLengthError": "Salasanan tulee olla 6-64 merkkiä pitkä",
   "passwordTypeError": "Salasanan on oltava merkkijono",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profiili",
   "groupNamePlaceholder": "Ryhmän nimi",
   "inviteContacts": "Kutsu yhteystietoja",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Lisätä valvojia",
+  "removeModerators": "Poista valvoja",
+  "addAsModerator": "Lisää valvojana",
+  "removeFromModerators": "Poista valvojista",
   "add": "Lisää",
   "addingContacts": "Lisätään yhteystietoja ryhmään $name$",
   "noContactsToAdd": "Ei lisättäviä yhteystietoja",
   "noMembersInThisGroup": "Ryhmässä ei ole muita jäseniä",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "poistettavia valvojia ei ole",
   "onlyAdminCanRemoveMembers": "Et ole luoja",
   "onlyAdminCanRemoveMembersDesc": "Vain ryhmän luoja voi poistaa käyttäjiä",
   "createAccount": "Create Account",
   "startInTrayTitle": "Säilytä tehtäväpalkin ilmoitusalueella",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Pidä Session taustalla käynnissä, kun ikkuna suljetaan.",
   "yourUniqueSessionID": "Tervehdi Session ID:täsi",
   "allUsersAreRandomly...": "Session ID on yksilöllinen osoite, jonka avulla muut voivat ottaa sinuun yhteyttä Sessionissa. Sillä ei ole yhteyttä todelliseen identiteettiisi ja se on suunniteltu täysin anonyymiksi ja yksityiseksi.",
   "getStarted": "Aloita",
@@ -344,40 +348,43 @@
   "linkDevice": "Liitä laite",
   "restoreUsingRecoveryPhrase": "Palauta tilisi",
   "or": "tai",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Käyttämällä palvelua hyväksyt <a href=\"https://getsession.org/terms-of-service \">käyttöehdot</a> ja <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">tietosuojakäytännön</a>",
   "beginYourSession": "Aloita keskustelu.",
   "welcomeToYourSession": "Tervetuloa Sessioniisi",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Etsi keskusteluita ja yhteystietoja",
+  "searchForContactsOnly": "Etsi yhteystietoja",
   "enterSessionID": "Syötä Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Syötä yhteystietosi Session ID tai ONS",
   "message": "Viesti",
   "appearanceSettingsTitle": "Ulkoasu",
   "privacySettingsTitle": "Yksityisyys",
   "notificationsSettingsTitle": "Ilmoitukset",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Ilmoituksen sisältö",
+  "notificationPreview": "Esikatselu",
   "recoveryPhraseEmpty": "Syötä palautuslausekkeesi",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ jäsentä",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Liity",
+  "joinOpenGroup": "Liity yhteisöön",
+  "createGroup": "Luo ryhmä",
+  "create": "Luo",
   "createClosedGroupNamePrompt": "Ryhmän nimi",
   "createClosedGroupPlaceholder": "Syötä ryhmän nimi",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Yhteisön URL",
+  "enterAnOpenGroupURL": "Syötä yhteisön URL-osoite",
   "next": "Seuraava",
   "invalidGroupNameTooShort": "Syötä ryhmän nimi",
   "invalidGroupNameTooLong": "Syötä ryhmälle lyhyempi nimi",
   "pickClosedGroupMember": "Valitse ainakin 1 ryhmän jäsen",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Ei estettyjä yhteystietoja",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Ryhmässä voi olla enintään 100 jäsentä",
+  "noBlockedContacts": "Sinulla ei ole estettyjä yhteystietoja.",
+  "userAddedToModerators": "Käyttäjä lisättiin valvojalistaan",
+  "userRemovedFromModerators": "Käyttäjä poistettiin valvojalistalta",
   "orJoinOneOfThese": "Tai liity johonkin näistä...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Käännä Session",
   "closedGroupInviteFailTitle": "Ryhmään kutsuminen epäonnistui",
   "closedGroupInviteFailTitlePlural": "Ryhmäkutsut epäonnistuivat",
   "closedGroupInviteFailMessage": "Ryhmän jäsenen kutsuminen epäonnistui",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Yritä kutsuja uudelleen",
   "closedGroupInviteSuccessTitlePlural": "Ryhmäkutsut suoritettu",
   "closedGroupInviteSuccessTitle": "Ryhmäkutsut suoritettu",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Ryhmän jäsenet kutsuttiin onnistuneesti",
   "notificationForConvo": "Ilmoitukset",
   "notificationForConvo_all": "Kaikki",
   "notificationForConvo_disabled": "Ei käytössä",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Avataanko linkki selaimessa?",
   "linkVisitWarningMessage": "Haluatko varmasti avata osoitteen $url$ selaimessa?",
   "open": "Avaa",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Toista ääniviestit automaattisesti",
+  "audioMessageAutoplayDescription": "Toista peräkkäiset ääniviestit automaattisesti.",
   "clickToTrustContact": "Lataa media painamalla",
   "trustThisContactDialogTitle": "Luotatko yhteystietoon $name$?",
   "trustThisContactDialogDescription": "Haluatko varmasti ladata käyttäjän $name$ lähettämän median?",
   "pinConversation": "Kiinnitä keskustelu",
   "unpinConversation": "Irroita keskustelu",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Näytä käyttäjän tiedot",
   "sendRecoveryPhraseTitle": "Palautuslausekkeen lähetys",
   "sendRecoveryPhraseMessage": "Olet lähettämässä palautuslausekettasi, jonka avulla päästään tilillesi. Haluatko varmasti lähettää viestin?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Tietoja ei poistettu tuntemattoman virheen vuoksi. Haluatko poistaa tiedot vain tästä laitteesta?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Haluatko poistaa teidot vain tästä laitteesta?",
   "dialogClearAllDataDeletionFailedMultiple": "Tietoja ei poistettu palvelusolmuista: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Haluatko tyhjentää vain tämän laitteen vai poistaa tietosi myös verkosta?",
+  "clearDevice": "Tyhjennä laitteelta",
+  "tryAgain": "Yritä uudelleen",
+  "areYouSureClearDevice": "Haluatko varmasti tyhjentää laitteesi?",
+  "deviceOnly": "Tyhjennä vain laitteelta",
+  "entireAccount": "Tyhjennä laitteelta ja verkosta",
   "areYouSureDeleteDeviceOnly": "Haluatko varmasti poistaa vain oman laitteesi tiedot?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Haluatko varmasti poistaa tietosi verkosta? Jos jatkat, et voi palauttaa viestejäsi etkä yhteystietojasi.",
   "iAmSure": "Olen varma",
   "recoveryPhraseSecureTitle": "Olet melkein valmis!",
   "recoveryPhraseRevealMessage": "Suojaa tilisi tallentamalla palautuslausekkeesi. Paljasta palautuslauseke ja säilytä se turvallisesti sen suojaamiseksi.",
   "recoveryPhraseRevealButtonText": "Paljasta palautuslauseke",
   "notificationSubtitle": "Ilmoitukset - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "Haluaisimme kuulla mielipiteesi",
+  "faq": "UKK",
+  "support": "Tue",
   "clearAll": "Tyhjennä kaikki",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Tyhjennä tiedot",
   "messageRequests": "Viestipyynnöt",
   "requestsSubtitle": "Odottavat pyynnöt",
   "requestsPlaceholder": "Ei pyyntöjä",
@@ -438,8 +449,8 @@
   "accept": "Hyväksy",
   "decline": "Kieltäydy",
   "endCall": "Lopeta puhelu",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Käyttöoikeudet",
+  "helpSettingsTitle": "Tuki",
   "cameraPermissionNeededTitle": "Tarvitaan ääni-/videopuheluiden käyttöoikeus",
   "cameraPermissionNeeded": "Voit aktivoida 'Ääni- ja videopuhelut' -käyttöoikeuden yksityisyysasetuksista.",
   "unableToCall": "Lopeta nykyinen puhelusi ensin",
@@ -449,12 +460,12 @@
   "noCameraFound": "Kameraa ei löytynyt",
   "noAudioInputFound": "Äänituloa ei löytynyt",
   "noAudioOutputFound": "Äänilähtöä ei löytynyt",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Ääni- ja videopuhelut (beta)",
   "callMissedCausePermission": "Puhelu käyttäjältä '$name$' jäi vastaamatta, koska puheluita varten yksityisyysasetuksista on myönnettävä 'Ääni- ja videopuhelut' -käyttöoikeus.",
   "callMissedNotApproved": "Puhelu käyttäjältä '$name$' jäi vastaamatta, koska et ole vielä hyväksynyt tätä keskustelua. Lähetä heille ensin viesti.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Mahdollistaa ääni- ja videopuheluiden soiton ja vastaanoton.",
+  "callMediaPermissionsDialogContent": "IP-osoitteesi paljastuu beta-puheluita käytettäessä puhelukumppanillesi ja Oxen Säätiön palvelimelle. Haluatko varmasti ottaa ääni- ja videopuhelut käyttöön?",
+  "callMediaPermissionsDialogTitle": "Ääni- ja videopuhelut (beta)",
   "startedACall": "Soitit käyttäjälle $name$",
   "answeredACall": "Puhelu käyttäjälle $name$",
   "trimDatabase": "Tiivistä tietokanta",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Haluatko varmasti kieltäytyä viestipyynnöstä?",
   "respondingToRequestWarning": "Viestin lähetys tälle käyttäjälle hyväksyy heidän viestipyyntönsä automaattisesti ja paljastaa Session ID:si.",
   "hideRequestBanner": "Piilota viestipyyntöpalkki",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Viestipyynnöt",
   "noMessageRequestsPending": "Ei odottavia viestipyyntöjä",
   "noMediaUntilApproved": "Liitteiden lähetys edellyttää keskustelun on hyväksyntää",
   "mustBeApproved": "Ominaisuuden käyttö edellyttää keskustelun hyväksyntää",
   "youHaveANewFriendRequest": "Sinulla on uusi kaveripyyntö",
   "clearAllConfirmationTitle": "Tyhjennä kaikki viestipyynnöt",
   "clearAllConfirmationBody": "Haluatko varmasti tyhjentää kaikki viestipyynnöt?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Piilota",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Näytä saapuneet viestipyyntösi",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Haluatko varmasti tyhjentää kaikki $emoji$?",
+  "expandedReactionsText": "Näytä vähemmän",
+  "reactionNotification": "Reagoi viestiin: $emoji$",
+  "rateLimitReactMessage": "Hidasta! Olet lähettänyt liian monta emojireaktiota. Yritä hetken kuluttua uudelleen",
+  "otherSingular": "$number$ muu",
+  "otherPlural": "$number$ muuta",
+  "reactionPopup": "reagoi emojilla",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ ja $name2$",
+  "reactionPopupThree": "$name$, $name2$ ja $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ ja",
+  "reactionListCountSingular": "Ja $otherSingular$ on reagoinut viestiin emojilla <span>$emoji$</span>",
+  "reactionListCountPlural": "Ja $otherPlural$ on reagoinut viestiin emojilla <span>$emoji$</span>"
 }
diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json
index 892a44a07..2e25b776b 100644
--- a/_locales/fil/messages.json
+++ b/_locales/fil/messages.json
@@ -1,9 +1,9 @@
 {
   "copyErrorAndQuit": "Kopyahin ang pagkakamali at umalis",
-  "unknown": "Unknown",
+  "unknown": "Hindi kilala",
   "databaseError": "Database error",
   "mainMenuFile": "&File",
-  "mainMenuEdit": "&Edit",
+  "mainMenuEdit": "&I-edit",
   "mainMenuView": "&View",
   "mainMenuWindow": "&Window",
   "mainMenuHelp": "&Help",
@@ -13,38 +13,38 @@
   "appMenuQuit": "Umalis sa Session",
   "editMenuUndo": "Ibalik sa dati",
   "editMenuRedo": "Ulitin",
-  "editMenuCut": "Cut",
+  "editMenuCut": "I-cut",
   "editMenuCopy": "Kopyahin",
   "editMenuPaste": "Idikit",
   "editMenuDeleteContact": "Alisin ang Kontak",
   "editMenuDeleteGroup": "Alisin ang Grupo",
   "editMenuSelectAll": "Piliin lahat",
-  "windowMenuClose": "Close Window",
+  "windowMenuClose": "Isara ang Window",
   "windowMenuMinimize": "Paliitin",
-  "windowMenuZoom": "Zoom",
+  "windowMenuZoom": "I-zoom",
   "viewMenuResetZoom": "Totoong Laki",
-  "viewMenuZoomIn": "Zoom In",
-  "viewMenuZoomOut": "Zoom Out",
-  "viewMenuToggleFullScreen": "Toggle Full Screen",
-  "viewMenuToggleDevTools": "Toggle Developer Tools",
+  "viewMenuZoomIn": "I-zoom In",
+  "viewMenuZoomOut": "I-zoom Out",
+  "viewMenuToggleFullScreen": "I-toggle ng Full Screen",
+  "viewMenuToggleDevTools": "I-toggle ang Mga Tool ng Developer",
   "contextMenuNoSuggestions": "Walang mga mungkahi",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Imbitasyon sa komunidad",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Sumali sa $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
-  "enterSessionIDOrONSName": "Enter Session ID or ONS name",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Sigurado ka bang nais mong sumali sa komunidad ng $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "Ilagay ang Session ID o pangalan ng ONS",
+  "startNewConversationBy...": "Magsimula ng bagong pag-uusap sa pamamagitan ng paglalagay ng Session ID ng isang tao o pagbabahagi ng Session ID mo sa kanila.",
   "loading": "Loading...",
   "done": "Tapos na",
   "youLeftTheGroup": "\"Ikaw ay umalis sa grupo\".",
   "youGotKickedFromGroup": "Ikaw ay inalis sa grupong ito.",
   "unreadMessages": "Hindi nabasang mensahe",
   "debugLogExplanation": "\"Ang log na ito ay isi-save sa iyong desktop\".",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Mag-ulat ng Bug",
   "markAllAsRead": "Markahan lahat bilang nabasa na",
-  "incomingError": "Error handling incoming message",
+  "incomingError": "Error sa paghawak ng papasok na mensahe",
   "media": "Media",
-  "mediaEmptyState": "No media",
+  "mediaEmptyState": "Walang media",
   "documents": "Dokumento",
   "documentsEmptyState": "Walang mga dokumento",
   "today": "Ngayon",
@@ -52,18 +52,18 @@
   "thisWeek": "Ngayong linggo",
   "thisMonth": "Ngayong buwan",
   "voiceMessage": "Boses na Mensahe",
-  "stagedPreviewThumbnail": "Draft thumbnail link preview for $domain$",
-  "previewThumbnail": "Thumbnail link preview for $domain$",
-  "stagedImageAttachment": "Draft image attachment: $path$",
+  "stagedPreviewThumbnail": "I-draft ang preview ng link ng thumbnail para sa $domain$",
+  "previewThumbnail": "Preview ng link ng thumbnail para sa $domain$",
+  "stagedImageAttachment": "I-draft ang attachment na imahe: $path$",
   "oneNonImageAtATimeToast": "\"Sorry, limitado lang sa isang non-image attachment sa bawat mensahe\"",
   "cannotMixImageAndNonImageAttachments": "Paumanhin, hindi pwedeng ihalo ang mga imahen sa iba pang file types sa isang mensahe",
   "maximumAttachments": "Naabot na ang maximun attachments. Pakisuyong ipadala ang natitirang attachments sa hiwalay na mensahe.",
   "fileSizeWarning": "Lampas ang laki ng attachment para sa uri ng mensahe na ipapadala mo.",
   "unableToLoadAttachment": "Paumanhin, nagkaroon ng error sa setting ng iyong attachment.",
   "offline": "Offline",
-  "debugLog": "Debug Log",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "debugLog": "I-debug ang Log",
+  "showDebugLog": "I-export ang mga Log",
+  "shareBugDetails": "I-export ang iyong mga log, pagkatapos ay i-upload ang file sa Help Desk ng Session.",
   "goToReleaseNotes": "Pumunta sa Release Notes",
   "goToSupportPage": "Pumunta sa Support Page",
   "about": "Tungkol sa",
@@ -72,13 +72,13 @@
   "noSearchResults": "Walang nakita para sa \"$searchTerm$\"",
   "conversationsHeader": "Mga Grupo ng Kontak",
   "contactsHeader": "Kontak",
-  "messagesHeader": "Mga mensahe",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Mga Settings",
-  "typingAlt": "Typing animation for this conversation",
-  "contactAvatarAlt": "Avatar for contact $name$",
+  "typingAlt": "Pag-type ng animation para sa usapan na ito",
+  "contactAvatarAlt": "Avatar para sa contact na si $name$",
   "downloadAttachment": "I-download ang attachment",
   "replyToMessage": "Sagot sa mensahe",
-  "replyingToMessage": "Replying to:",
+  "replyingToMessage": "Sinasagot si:",
   "originalMessageNotFound": "Hindi makita ang orihinal na mensahe",
   "you": "Ikaw",
   "audioPermissionNeededTitle": "Microphone access required",
@@ -97,89 +97,91 @@
   "messageDeletionForbidden": "Wala kang pahintulot para tangalin ang mensahe ng iba",
   "deleteJustForMe": "Burahin para sa akin lang",
   "deleteForEveryone": "Burahin para sa lahat",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
+  "deleteMessagesQuestion": "Burahin ang $count$ (na) mensahe?",
   "deleteMessageQuestion": "Burahin ang mensaheng ito?",
   "deleteMessages": "Burahin ang mga mensahe",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "Nabura ang $count$",
   "messageDeletedPlaceholder": "Ang mensaheng ito ay nabura na",
   "from": "Mula kay:",
   "to": "Galing kay:",
   "sent": "Ipinadala",
   "received": "Natanggap",
   "sendMessage": "Mensahe",
-  "groupMembers": "Mga Miyembro ng Grupo",
+  "groupMembers": "Mga Miyembro",
   "moreInformation": "Higit pang impormasyon",
   "resend": "Ipadala muli",
   "deleteConversationConfirmation": "Burahin ng tuluyan ang mga mensahe sa usapang ito?",
-  "clear": "Clear",
+  "clear": "Burahin",
   "clearAllData": "Alisin lahat ng Data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Permanente nitong buburahin ang iyong mga mensahe at contact.",
+  "deleteAccountFromLogin": "Sigurado ka bang gusto mong i-clear ang iyong device?",
   "deleteContactConfirmation": "Sigurado k ba sa pagtanggal ng usaping ito?",
-  "quoteThumbnailAlt": "Thumbnail of image from quoted message",
-  "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "quoteThumbnailAlt": "Thumbnail ng larawan mula sa na-quote na mensahe",
+  "imageAttachmentAlt": "Naka-attach ang larawan sa mensahe",
+  "videoAttachmentAlt": "Screenshot ng video sa mensahe",
   "lightboxImageAlt": "Naipadala na ang imahe sa paguusap",
-  "imageCaptionIconAlt": "Icon showing that this image has a caption",
+  "imageCaptionIconAlt": "Icon na nagpapakita na ang larawang ito ay may caption",
   "addACaption": "Maglagay ng kapsyon...",
   "copySessionID": "Kopyahin ang Session ID",
   "copyOpenGroupURL": "Kopyahin ang URL ng Grupo",
   "save": "I-save",
-  "saveLogToDesktop": "Save log to desktop",
-  "saved": "Saved",
+  "saveLogToDesktop": "I-save ang log sa desktop",
+  "saved": "Na-save",
   "tookAScreenshot": "Kumuha ng screenshot si $name$",
-  "savedTheFile": "Media saved by $name$",
+  "savedTheFile": "Na-save ni $name$ ang media",
   "linkPreviewsTitle": "Ipadala ang Preview ng Link",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Bumuo ng mga preview ng link para sa mga suportadong URL.",
   "linkPreviewsConfirmMessage": "Hindi ka magkakaroon lubos na proteksiyon ng metadata kung magpapadala ng link previews.",
   "mediaPermissionsTitle": "Mikropono",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Payagan ang access sa microphone.",
   "spellCheckTitle": "Suri sa baybayin",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
+  "spellCheckDescription": "I-enable ang pagsuri sa spell kapag nagta-type ng mga mensahe.",
+  "spellCheckDirty": "Dapat mong i-restart ang Session para ilapat ang iyong bagong settings",
+  "readReceiptSettingDescription": "Magpadala ng mga resibo ng pagbasa sa one-to-one na mga chat.",
+  "readReceiptSettingTitle": "Mga Resibo ng Pagbasa",
+  "typingIndicatorsSettingDescription": "Tingnan at ibahagi ang mga indikasyon sa pagta-type sa one-to-one na chat.",
+  "typingIndicatorsSettingTitle": "Mga Indikasyon sa Pag-type",
   "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Pangalan at nilalaman",
+  "themesSettingTitle": "Mga tema",
+  "primaryColor": "Pangunahing Kulay",
+  "primaryColorGreen": "Pangunahing kulay na berde",
+  "primaryColorBlue": "Pangunahing kulay na asul",
+  "primaryColorYellow": "Pangunahing kulay na dilaw",
+  "primaryColorPink": "Pangunahing kulay na rosas",
+  "primaryColorPurple": "Pangunahing kulay na lila",
+  "primaryColorOrange": "Pangunahing kulay na kahel",
+  "primaryColorRed": "Pangunahing kulay na pula",
+  "classicDarkThemeTitle": "Klasikong Madilim",
+  "classicLightThemeTitle": "Klasikong Maliwanag",
+  "oceanDarkThemeTitle": "Madilim na Karagatan",
+  "oceanLightThemeTitle": "Maliwanag na Karagatan",
+  "pruneSettingTitle": "Burahin ang Mga Mensaheng Nagtagal ng Higit sa 6 (na) Buwan",
+  "pruneSettingDescription": "I-delete ang mga mensaheng mas matagal sa 6 na buwan mula sa mga komunidad na may mahigit 2,000 mensahe.",
+  "enable": "I-enable",
+  "keepDisabled": "Panatlihing naka-disable",
+  "notificationSettingsDialog": "Ang impormasyong ipinapakita sa mga notipikasyon.",
+  "nameAndMessage": "Pangalan & Content",
   "noNameOrMessage": "Walang pangalan at nilalaman",
   "nameOnly": "Pangalan lang",
   "newMessage": "Bagong mensahe",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Lumikha ng usapan kasama ang bagong contact",
+  "createConversationNewGroup": "Lumikha ng isang grupo kasama ang mga kasalukuyang contact",
+  "joinACommunity": "Sumali sa isang grupo",
+  "chooseAnAction": "Pumili ng aksyon para magsimula ng usapan",
   "newMessages": "Mga bagong mensahe",
   "notificationMostRecentFrom": "Pinakabago mula kay: $name$",
   "notificationFrom": "Mula kay:",
   "notificationMostRecent": "Pinakabago:",
   "sendFailed": "Nabigo ang pagpapadala",
-  "mediaMessage": "Media message",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
-  "unblockToSend": "Unblock this contact to send a message.",
-  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
-  "youChangedTheTimer": "You set the disappearing message timer to $time$",
-  "timerSetOnSync": "Updated disappearing message timer to $time$",
-  "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
+  "mediaMessage": "Mensaheng media",
+  "messageBodyMissing": "Mangyaring maglagay ng laman ng mensahe.",
+  "messageBody": "Laman ng mensahe",
+  "unblockToSend": "I-unblock ang contact na ito para magpadala ng mensahe.",
+  "unblockGroupToSend": "Naka-block ang grupong ito. I-unblock ito kung gusto mong magmensahe.",
+  "youChangedTheTimer": "Itinakda mo ang timer ng naglalahong mensahe sa $time$",
+  "timerSetOnSync": "Na-update ang timer ng naglalahong mensahe sa $time$",
+  "theyChangedTheTimer": "Itinakda ni $name$ ang timer ng naglalahong mensahe sa $time$",
   "timerOption_0_seconds": "Off",
   "timerOption_5_seconds": "5 segundo",
   "timerOption_10_seconds": "10 segundo",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 oras",
   "timerOption_1_day": "1 araw",
   "timerOption_1_week": "1 linggo",
+  "timerOption_2_weeks": "2 linggo",
   "disappearingMessages": "Nawawalang mensahe",
   "changeNickname": "Palitan ang Palayaw",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 oras",
   "timerOption_1_day_abbreviated": "1 araw",
   "timerOption_1_week_abbreviated": "1 linggo",
-  "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
-  "youDisabledDisappearingMessages": "You disabled disappearing messages.",
+  "timerOption_2_weeks_abbreviated": "2linggo",
+  "disappearingMessagesDisabled": "Na-disable ang naglalahong mensahe",
+  "disabledDisappearingMessages": "In-off ni $name$ ang mga naglalahong mensahe.",
+  "youDisabledDisappearingMessages": "In-off mo ang mga naglalahong mensahe.",
   "timerSetTo": "Nawawalang mensahe ay nakaset sa oras na $time$",
   "noteToSelf": "Paalala sa akin",
   "hideMenuBarTitle": "Itago ang Menu Bar",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "I-toggle ang pagkakakita ng menu bar ng system.",
   "startConversation": "Mag umpisa ng bagong usapan",
-  "invalidNumberError": "Maling Session ID o DNS Name",
+  "invalidNumberError": "Pakitingnan ang Session ID o pangalan ng ONS at subukang muli",
   "failedResolveOns": "Hindi tagumpay na i-resolve ang ONS name",
   "autoUpdateSettingTitle": "Awtomatikong mag-uupdate",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Awtomatikong tingnan ang mga update sa startup.",
   "autoUpdateNewVersionTitle": "Available na mga updates ng Session",
   "autoUpdateNewVersionMessage": "Available na ang bagong bersiyon ng Session.",
   "autoUpdateNewVersionInstructions": "Pindutin ang Magsimula ulit sa Session para mai-apply ang updates.",
@@ -237,57 +241,57 @@
   "multipleJoinedTheGroup": "Sumali si $name$ sa grupo.",
   "kickedFromTheGroup": "Tinanggal si $name$ sa grupo.",
   "multipleKickedFromTheGroup": "Tinanggal sina $name$ sa grupo.",
-  "blockUser": "Harangin",
-  "unblockUser": "Unblock",
-  "unblocked": "Unblocked",
-  "blocked": "Blocked",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Unban User",
-  "userUnbanned": "User unbanned successfully",
-  "userUnbanFailed": "Unban failed!",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Na-unblock",
+  "blocked": "Na-block",
+  "blockedSettingsTitle": "Mga Naka-block na Contact",
+  "conversationsSettingsTitle": "Mga usapan",
+  "unbanUser": "I-unban ang User",
+  "userUnbanned": "Matagumpay na na-unban ang user",
+  "userUnbanFailed": "Nabigo ang pag-unban!",
   "banUser": "Ipagbawal ang taong ito",
   "banUserAndDeleteAll": "Ipagbawal at tanggalin lahat",
   "userBanned": "User banned successfully",
   "userBanFailed": "Nabigo ang pagbawal!",
   "leaveGroup": "Iwanan ang grupo",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Umalis sa Grupo at Alisin para sa Lahat",
   "leaveGroupConfirmation": "Sigurado ka ba na nais mong umalis sa grupo?",
-  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
+  "leaveGroupConfirmationAdmin": "Dahil ikaw ang admin ng grupong ito, kung aalis ka dito ay maaalis na rin ito para sa bawat kasalukuyang miyembro. Sigurado ka bang gusto mong umalis sa grupong ito?",
   "cannotRemoveCreatorFromGroup": "Hindi matanggal ang taong ito",
   "cannotRemoveCreatorFromGroupDesc": "Hindi mo pwedeng tanggalin ang taong ito dahil sila ang gumawa sa grupong ito.",
   "noContactsForGroup": "Wala ka pang mga kontak",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Nabigong maidagdag ang user bilang admin",
+  "failedToRemoveFromModerator": "Nabigong alisin ang user sa listahan ng admin",
   "copyMessage": "Kopyahin ang mensahe",
   "selectMessage": "Piliin ang mensahe",
-  "editGroup": "Edit group",
-  "editGroupName": "Edit group name",
-  "updateGroupDialogTitle": "Updating $name$...",
+  "editGroup": "I-edit ang grupo",
+  "editGroupName": "I-edit ang pangalan ng grupo",
+  "updateGroupDialogTitle": "Ina-update si $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Ang iyong Session ID",
-  "setAccountPasswordTitle": "Maglagay ng password sa Account",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Baguhin Ang Password Ng Account",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Tanggalin ang Account Password",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Password",
+  "setAccountPasswordDescription": "Nangangailangan ng password para i-unlock ang Session.",
+  "changeAccountPasswordTitle": "Palitan ang Password",
+  "changeAccountPasswordDescription": "Palitan ang password na kinakailangan para i-unlock ang Session.",
+  "removeAccountPasswordTitle": "Alisin ang Password",
+  "removeAccountPasswordDescription": "Alisin ang password na kinakailangan para i-unlock ang Session.",
   "enterPassword": "Pakisuyong ilagay ang iyong password",
   "confirmPassword": "Kumpirmahin ang iyong password",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Pakilagay ang iyong bagong password",
+  "confirmNewPassword": "Kumpirmahin ang bagong password",
   "showRecoveryPhrasePasswordRequest": "Pakisuyong ilagay ang iyong password",
-  "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
+  "recoveryPhraseSavePromptMain": "Ang recovery phrase mo ay ang master key sa iyong Session ID — magagamit mo ito para i-restore ang iyong Session ID kung mawalan ka ng access sa device mo. Itago ang recovery phrase mo sa isang ligtas na lugar, at huwag itong ibigay sa sinuman.",
   "invalidOpenGroupUrl": "Hindi tama ang URL",
-  "copiedToClipboard": "Copied to clipboard",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Nakopya na",
+  "passwordViewTitle": "Ilagay ang Password",
   "password": "Password",
   "setPassword": "Maglagay ng password",
   "changePassword": "Palitan ang Password",
-  "createPassword": "Create your password",
+  "createPassword": "Lumikha ng password mo",
   "removePassword": "Alisin ang Password",
   "maxPasswordAttempts": "Hindi wasto ang Password. Nais mo bang i-reset ang database?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Pakilagay ang iyong kasalukuyang password",
   "invalidOldPassword": "Hindi na valid ang lumang password",
   "invalidPassword": "Mali ang password",
   "noGivenPassword": "Pakisuyong ilagay ang iyong password",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Hindi nagtugma ang mga password",
   "changePasswordInvalid": "Ang lumang password na iyong nailagay ay hindi tama",
   "removePasswordInvalid": "Maling password",
-  "setPasswordTitle": "Maglagay ng password",
-  "changePasswordTitle": "Palitan ang Password",
-  "removePasswordTitle": "Alisin ang Password",
+  "setPasswordTitle": "Pagtakda ng Password",
+  "changePasswordTitle": "Napalitan ang Password",
+  "removePasswordTitle": "Inalis ang Password",
   "setPasswordToastDescription": "Nabago na ang iyong password. Pakisuyong itago ito.",
   "changePasswordToastDescription": "Nabago na ang iyong password. Pakisuyong itago ito.",
-  "removePasswordToastDescription": "Tinangal mo ang iyong password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Ang iyong password ay naalis na.",
+  "publicChatExists": "Nakakonekta ka na sa grupong ito",
+  "connectToServerFail": "Hindi makasali sa grupo",
   "connectingToServer": "Nagkokonek...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Matagumpay na nakakonekta sa grupo",
   "setPasswordFail": "Bigong na-reset ang password",
   "passwordLengthError": "Dapat may haba na 6 hanggang 20 titik ang 'yong password",
   "passwordTypeError": "Ang password ay dapat string",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profile",
   "groupNamePlaceholder": "Pangalan ng Grupo",
   "inviteContacts": "Imbitahin ang Kontak",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Magdagdag ng Mga Admin",
+  "removeModerators": "Alisin ang Mga Admin",
+  "addAsModerator": "Idagdag bilang Admin",
+  "removeFromModerators": "Alisin Mula sa Mga Admin",
   "add": "Idagdag",
   "addingContacts": "Dinadagdagan si $name$ sa mga contacts",
   "noContactsToAdd": "Walang kontak na idadagdag",
   "noMembersInThisGroup": "Walang ibang miyembro sa grupong ito",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "walang mga admin na maaalis",
   "onlyAdminCanRemoveMembers": "Hindi ikaw ang creator",
   "onlyAdminCanRemoveMembersDesc": "Tanging creator lamang ng grupo ang magtatangal ng users",
   "createAccount": "Create Account",
   "startInTrayTitle": "Ilagay sa System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Panatilihing gumagana ang Session sa background kapag isinara mo ang window.",
   "yourUniqueSessionID": "Kumustahin ang iyong Session ID",
   "allUsersAreRandomly...": "Ang iyong Session ID ay kakaibang address na pwedeng gamitin ng ibang tao para makipagugnayan sa iyo dahil ito ay lihim sa pagkakakilanlan mo at pribado sa anyo.",
   "getStarted": "Magsimula",
@@ -344,40 +348,43 @@
   "linkDevice": "I-link ang Device",
   "restoreUsingRecoveryPhrase": "Ibalik ang iyong account",
   "or": "o",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Sa paggamit ng serbisyong ito, sumasang-ayon ka sa aming <a href=\"https://getsession.org/terms-of-service \">Mga Tuntunin ng Serbisyo</a> at <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Patakaran sa Privacy</a>",
   "beginYourSession": "Magsimula sa Session.",
   "welcomeToYourSession": "Maligayang pagdating sa iyong Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Mag-search ng mga usapan at contact",
+  "searchForContactsOnly": "Mag-search ng mga contact",
   "enterSessionID": "Ilagay ang Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Ilagay ang Session ID o ONS ng iyong contact",
   "message": "Mensahe",
   "appearanceSettingsTitle": "Hitsura",
   "privacySettingsTitle": "Pribado",
   "notificationsSettingsTitle": "Paalaala",
-  "notificationsSettingsContent": "Notification Content",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Content ng Notipikasyon",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Ilagay ang iyong recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ mga miyembro",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Sumali",
+  "joinOpenGroup": "Sumali sa Grupo",
+  "createGroup": "Lumikha ng Grupo",
+  "create": "Lumikha",
   "createClosedGroupNamePrompt": "Pangalan ng Grupo",
   "createClosedGroupPlaceholder": "Ilagay ang pangalan ng grupo",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL ng Grupo",
+  "enterAnOpenGroupURL": "Ilagay ang URL ng Grupo",
   "next": "Susunod",
   "invalidGroupNameTooShort": "Pakisuyong ilagay ang pangalan ng grupo",
   "invalidGroupNameTooLong": "Pakisuyong maglagay ng pinaikling pangalan ng grupo",
   "pickClosedGroupMember": "Pumili ng 1 miyembro ng grupo",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Ang isang grupo ay hindi maaaring magkaroon ng higit sa 100 miyembro",
+  "noBlockedContacts": "Wala kang mga naka-block na contact.",
+  "userAddedToModerators": "Idinagdag ang user sa listahan ng admin",
+  "userRemovedFromModerators": "Inalis ang user sa listahan ng admin",
   "orJoinOneOfThese": "O sumali sa isa sa mga ito...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Isalin ang Session",
   "closedGroupInviteFailTitle": "Ang imbitasyon sa grupo ay hindi nagtagumpay",
   "closedGroupInviteFailTitlePlural": "Ang mga imitasyon sa grupo ay hindi nagtagumpay",
   "closedGroupInviteFailMessage": "Bigo ang pag-imbita sa isang miyembro ng grupo",
@@ -385,12 +392,12 @@
   "closedGroupInviteOkText": "Subukan ulit magimbita",
   "closedGroupInviteSuccessTitlePlural": "Ang imbitasyon sa grupo ay nakumpleto",
   "closedGroupInviteSuccessTitle": "Ang imbitasyon sa grupo ay tagumpay",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Matagumpay na naimbitahan ang mga miyembro ng grupo",
   "notificationForConvo": "Mga paalaala",
   "notificationForConvo_all": "Lahat",
-  "notificationForConvo_disabled": "Disabled",
+  "notificationForConvo_disabled": "Na-disable",
   "notificationForConvo_mentions_only": "Mentions lang",
-  "onionPathIndicatorTitle": "Path",
+  "onionPathIndicatorTitle": "Daan",
   "onionPathIndicatorDescription": "Tinatago ng Session ang iyong IP sa pamamagitan ng pagtalbog ng mga mensahe mo papasok ng maraming Service Nodes gamit ang decentralized network nito. Eto ang mga bansa kung saan pinatalbog ang koneksyon mo:",
   "unknownCountry": "Hindi kilalang bansa",
   "device": "Device",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Buksan ang link sa iyong browser?",
   "linkVisitWarningMessage": "Sigurado ka ba na gusto mong buksan ang $url$ sa iyong browser?",
   "open": "Buksan",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "I-autoplay ang Mga Mensaheng Audio",
+  "audioMessageAutoplayDescription": "I-autoplay ang magkakasunod na mensaheng audio.",
   "clickToTrustContact": "I-click para i-download ang media",
   "trustThisContactDialogTitle": "Pagkatiwaalan si $name$?",
   "trustThisContactDialogDescription": "Sigurado ka bang nais mong i-download ang media mula kay $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
+  "pinConversation": "I-pin ang Usapan",
+  "unpinConversation": "I-unpin ang Usapan",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Ipakita ang Detalye ng User",
   "sendRecoveryPhraseTitle": "Ipapadala ang Recovery Phrase",
   "sendRecoveryPhraseMessage": "Sinusubukan mong ipadala ang iyong recovery phrase na pwedeng gamitin para mapasok ang iyong account. Gusto mo bang ipadala ito?",
@@ -413,33 +421,36 @@
   "dialogClearAllDataDeletionFailedDesc": "Hindi nabura ang data dahil sa hindi matukoy na kadahilanan. Nais mo bang burahin ang data sa device lang na ito?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Nais mo bang tanggalin ang data mula sa device na ito?",
   "dialogClearAllDataDeletionFailedMultiple": "Hindi nabura ang Data mula sa mga Service Nodes:$snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Gusto mo bang burahin sa device na ito lamang, o alisin din ang iyong data mula sa network?",
+  "clearDevice": "Burahin sa Device",
+  "tryAgain": "Subukang Muli",
+  "areYouSureClearDevice": "Sigurado ka bang gusto mong i-clear ang iyong device?",
+  "deviceOnly": "I-clear ang Device Lamang",
+  "entireAccount": "I-clear ang Device at Network",
   "areYouSureDeleteDeviceOnly": "Sigurado ka bang tatangalin mo na ang iyong device data?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Sigurado ka bang gusto mong alisin ang iyong data mula sa network? Kung magpapatuloy ka, hindi mo na maibabalik ang iyong mga mensahe o contact.",
   "iAmSure": "Sigurado ako",
   "recoveryPhraseSecureTitle": "Halos tapos ka na!",
   "recoveryPhraseRevealMessage": "Tiyaking ligtas ang iyong account sa pamamagitan ng pagtago ng iyong recovery phrase sa isang ligtas na lugar.",
   "recoveryPhraseRevealButtonText": "Ipakita ang recovery phrase",
   "notificationSubtitle": "Paalala - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
+  "surveyTitle": "Nais namin ang Iyong Puna",
   "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
+  "support": "Suporta",
+  "clearAll": "Burahin Lahat",
+  "clearDataSettingsTitle": "Burahin ang Data",
   "messageRequests": "Kahilingang mensahe",
   "requestsSubtitle": "Nakabinbin na mga Kahilingan",
   "requestsPlaceholder": "Walang mga request",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "hideRequestBannerDescription": "Itago ang banner na Kahilingan sa Pagmemensahe hangga't makatanggap ka muli ng bago.",
   "incomingCallFrom": "Papasok na tawag mula kay '$name$'",
   "ringing": "Nagriring...",
   "establishingConnection": "Kumukonekta...",
   "accept": "Tangapin",
   "decline": "Tanggihan",
   "endCall": "Tapusin ang tawag",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Mga Pahintulot",
+  "helpSettingsTitle": "Tulong",
   "cameraPermissionNeededTitle": "Pahintulot sa voice/video call ay kailangan",
   "cameraPermissionNeeded": "Pwedeng mong paganahin ang pahintulot ukol sa 'Voice and video calls' sa Privacy Settings.",
   "unableToCall": "Kanselahin ang kasalukuyang tawag",
@@ -449,44 +460,49 @@
   "noCameraFound": "Hindi mahanap ang kamera",
   "noAudioInputFound": "Walang audio input ang natagpuan",
   "noAudioOutputFound": "Walang audio output ang natagpuan",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Mga Voice at Video Call (Beta)",
   "callMissedCausePermission": "Nakaligtaang tawag mula kay $name$ dahil kailangang i-enable ang 'Voice at video calls' permission sa Privacy Settings.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMissedNotApproved": "Hindi nasagot ang tawag mula kay '$name$' dahil hindi mo pa na-aprubahan ang usapang ito. Magpadala muna ng mensahe sa kanila.",
+  "callMediaPermissionsDescription": "Ini-enable ang mga voice at video call papunta at mula sa iba pang mga user.",
+  "callMediaPermissionsDialogContent": "Ang IP address mo ay nakikita ng iyong katawag at isang server ng Oxen Foundation habang gumagamit ng mga beta na pagtawag. Sigurado ka bang gusto mong i-enable ang Mga Voice at Video Call?",
+  "callMediaPermissionsDialogTitle": "Mga Voice at Video Call (Beta)",
   "startedACall": "Tinawag mo si $name$",
   "answeredACall": "Tawag kasama si $name$",
   "trimDatabase": "Bawasan ang Database",
   "trimDatabaseDescription": "Bawasan ang laki ng mga mensahe hanggang sa pinakahuling 10,000 na mga mensahe.",
   "trimDatabaseConfirmationBody": "Sigurado ka ba na gusto mong tanggalin ang $deleteAmount$ mga pinakalumang mensahe?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "pleaseWaitOpenAndOptimizeDb": "Pakihintay habang ang iyong database ay binuksan at ino-optimize...",
+  "messageRequestPending": "Kasalukuyang nakabinbin ang iyong kahilingan sa pagmemensahe",
+  "messageRequestAccepted": "Ang iyong kahilingan sa pagmemensahe ay natanggap",
+  "messageRequestAcceptedOurs": "Tinanggap mo ang kahilingan sa pagmemensahe ni $name$",
+  "messageRequestAcceptedOursNoName": "Tinanggap mo ang kahilingan sa pagmemensahe",
+  "declineRequestMessage": "Sigurado ka bang gusto mong tanggihan ang kahilingan sa pagmemensaheng ito?",
+  "respondingToRequestWarning": "Ang pagmemensahe sa user na ito ay awtomatikong tatanggapin ang kanilang kahilingan sa pagmemensahe at ipapakita ang Session ID mo.",
+  "hideRequestBanner": "Itago ang Banner ng Kahilingan sa Pagmemensahe",
+  "openMessageRequestInbox": "Mga Kahilingan sa Pagmemensahe",
+  "noMessageRequestsPending": "Walang nakabinbing kahilingan sa pagmemensahe",
+  "noMediaUntilApproved": "Hindi ka maaaring magpadala ng mga attachment hanggang sa maaprubahan ang pag-uusap",
+  "mustBeApproved": "Dapat tanggapin ang usapan na ito para magamit ang feature na ito",
+  "youHaveANewFriendRequest": "May bago kang friend request",
+  "clearAllConfirmationTitle": "I-clear ang Lahat ng Kahilingan sa Pagmemensahe",
+  "clearAllConfirmationBody": "Sigurado ka bang gusto mong i-clear ang lahat ng kahilingan sa pagmemensahe?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Itago",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Tingnan ang iyong inbox ng Kahilingan sa Pagmemensahe",
+  "clearAllReactions": "Sigurado ka bang gusto mong i-clear ang lahat ng $emoji$ ?",
+  "expandedReactionsText": "Magpakita ng Mas Kaunti",
+  "reactionNotification": "Ay nag-react sa isang mensahe ng $emoji$",
+  "rateLimitReactMessage": "Bagalan! Nagpadala ka ng masyadong maraming emoji react. Subukan muli sa susunod",
+  "otherSingular": "$number$ (na) iba pa",
+  "otherPlural": "$number$ (na) iba pa",
+  "reactionPopup": "nag-react ng",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ at $name2$",
+  "reactionPopupThree": "$name$, $name2$ at $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ at",
+  "reactionListCountSingular": "At nag-react si $otherSingular$ ng <span>$emoji$</span> sa mensaheng ito",
+  "reactionListCountPlural": "At ang $otherPlural$ ay nag-react ng <span>$emoji$</span> sa mensaheng ito"
 }
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index a5db7b42e..03ff4e430 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Activer/désactiver le plein écran",
   "viewMenuToggleDevTools": "Afficher/cacher les outils pour développeurs",
   "contextMenuNoSuggestions": "Pas de suggestions",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Invitation à un groupe",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Rejoindre $roomName$ ?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Impossible de trouver le groupe public",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Êtes-vous sûr de vouloir rejoindre le groupe $roomName$ ?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Entrer un Session ID ou un nom ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Commencez une nouvelle conversation en entrant l'ID de session de quelqu'un ou en partageant votre ID de session avec lui.",
   "loading": "Chargement…",
   "done": "Terminé",
   "youLeftTheGroup": "Vous avez quitté le groupe.",
   "youGotKickedFromGroup": "Vous avez été retiré du groupe.",
   "unreadMessages": "Messages non lus",
   "debugLogExplanation": "Ce journal sera sauvegardé sur votre bureau.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Signaler un bug",
   "markAllAsRead": "Tout marquer comme lu",
   "incomingError": "Erreur de traitement du message entrant",
   "media": "Médias",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Une erreur est survenue lors du chargement de la pièce jointe.",
   "offline": "Hors ligne",
   "debugLog": "Journal de débogage",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exporter les journaux",
+  "shareBugDetails": "Exportez vos logs, puis téléversez le fichier par le service d'aide de Session.",
   "goToReleaseNotes": "Accéder aux notes de mise à jour",
   "goToSupportPage": "Accéder à la page d’assistance",
   "about": "À propos de Session",
@@ -72,7 +72,7 @@
   "noSearchResults": "Aucun résultat n’a été trouvé pour « %s »",
   "conversationsHeader": "Contacts et Groupes",
   "contactsHeader": "Contacts",
-  "messagesHeader": "Messages",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Paramètres",
   "typingAlt": "Animation de saisie pour cette conversation",
   "contactAvatarAlt": "Avatar pour le contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Supprimer $count$ messages ?",
   "deleteMessageQuestion": "Êtes-vous sûr de vouloir supprimer ce message?",
   "deleteMessages": "Supprimer les messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ supprimé(s)",
   "messageDeletedPlaceholder": "Ce message a été supprimé",
   "from": "De :",
@@ -107,17 +108,18 @@
   "sent": "Envoyé",
   "received": "Reçu",
   "sendMessage": "Envoyer un message",
-  "groupMembers": "Membres du groupe",
+  "groupMembers": "Membres",
   "moreInformation": "Plus d’informations",
   "resend": "Renvoyer",
   "deleteConversationConfirmation": "Supprimer définitivement cette conversation ?",
-  "clear": "Clear",
+  "clear": "Effacer",
   "clearAllData": "Effacer toutes les données",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Cela supprimera définitivement vos messages et contacts.",
+  "deleteAccountFromLogin": "Voulez-vous vraiment effacer votre appareil ?",
   "deleteContactConfirmation": "Voulez-vous vraiment supprimer cette conversation ?",
   "quoteThumbnailAlt": "Imagette du message cité",
   "imageAttachmentAlt": "Image jointe au message",
-  "videoAttachmentAlt": "Capture d'écran de la vidéo jointe au message",
+  "videoAttachmentAlt": "Capture d'écran de la vidéo dans le message",
   "lightboxImageAlt": "Image envoyée dans la conversation",
   "imageCaptionIconAlt": "Icône qui indique que cette image a une légende",
   "addACaption": "Ajouter un légende…",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$ a pris une capture d’écran",
   "savedTheFile": "$name$ a enregistré le média",
   "linkPreviewsTitle": "Envoyer des aperçus de liens",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Générer des aperçus de liens pour les URL supportées.",
   "linkPreviewsConfirmMessage": "Vous n'aurez pas une protection complète des métadonnées en envoyant des aperçu de liens.",
   "mediaPermissionsTitle": "Microphone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Autoriser l'accès au micro.",
   "spellCheckTitle": "Vérification orthographique",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Activer le correcteur orthographique lors de la saisie des messages.",
   "spellCheckDirty": "Vous devez redémarrer Session pour appliquer ces changements.",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Envoyer les accusés de lecture dans les conversations un à un.",
   "readReceiptSettingTitle": "Accusés de lecture",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Voir et envoyer les indicateurs de saisie dans les conversations un à un.",
   "typingIndicatorsSettingTitle": "Indicateurs de saisie",
   "zoomFactorSettingTitle": "Facteur de zoom",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
+  "themesSettingTitle": "Styles",
+  "primaryColor": "Couleur principale",
+  "primaryColorGreen": "Couleur de base verte",
+  "primaryColorBlue": "Couleur de base bleue",
+  "primaryColorYellow": "Couleur de base jaune",
+  "primaryColorPink": "Couleur de base rose",
+  "primaryColorPurple": "Couleur de base mauve",
+  "primaryColorOrange": "Couleur de base orange",
+  "primaryColorRed": "Couleur de base rouge",
+  "classicDarkThemeTitle": "Sombre classique",
+  "classicLightThemeTitle": "Clair classique",
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Supprimez les messages de plus de 6 mois des Communautés qui ont plus de 2 000 messages.",
   "enable": "Activer",
   "keepDisabled": "Garder désactivé",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "À la fois le nom de l’expéditeur et son message",
+  "notificationSettingsDialog": "Informations affichées dans les notifications.",
+  "nameAndMessage": "Nom et contenu",
   "noNameOrMessage": "Ni le nom ni le message",
   "nameOnly": "Seulement le nom de l’expéditeur",
   "newMessage": "Nouveau message",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Créer une conversation avec un nouveau contact",
+  "createConversationNewGroup": "Créer un groupe avec des contacts existants",
+  "joinACommunity": "Rejoindre un groupe",
+  "chooseAnAction": "Choisissez une action pour démarrer une conversation",
   "newMessages": "Nouveaux messages",
   "notificationMostRecentFrom": "Le plus récent de : $name$",
   "notificationFrom": "De :",
@@ -174,7 +176,7 @@
   "sendFailed": "Échec d’envoi",
   "mediaMessage": "Message multimédia",
   "messageBodyMissing": "Entrez un corps de message.",
-  "messageBody": "Message body",
+  "messageBody": "Corps du message",
   "unblockToSend": "Débloquez ce contact pour envoyer un message.",
   "unblockGroupToSend": "Débloquer ce groupe pour envoyer un message.",
   "youChangedTheTimer": "Vous avez défini l’expiration des messages éphémères à $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 heures",
   "timerOption_1_day": "1 jour",
   "timerOption_1_week": "1 semaine",
+  "timerOption_2_weeks": "2 semaines",
   "disappearingMessages": "Messages éphémères",
   "changeNickname": "Modifier le surnom",
   "clearNickname": "Supprimer le surnom",
@@ -208,19 +211,20 @@
   "timerOption_6_hours_abbreviated": "6 h",
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 j",
-  "timerOption_1_week_abbreviated": "1 sem.",
+  "timerOption_1_week_abbreviated": "1 sem",
+  "timerOption_2_weeks_abbreviated": "2 sem",
   "disappearingMessagesDisabled": "Les messages éphémères sont désactivés",
   "disabledDisappearingMessages": "$name$ a désactivé les messages éphémères.",
   "youDisabledDisappearingMessages": "Vous avez désactivé les messages éphémères.",
   "timerSetTo": "L’expiration des messages éphémères a été définie à $time$",
   "noteToSelf": "Note à mon intention",
   "hideMenuBarTitle": "Cacher la barre de menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Activer/désactiver la visibilité de la barre de menu système.",
   "startConversation": "Lancer une nouvelle conversation…",
-  "invalidNumberError": "Le numéro est invalide",
+  "invalidNumberError": "Veuillez vérifier l'ID de Session ou le nom ONS et réessayer",
   "failedResolveOns": "Échec de résolution du nom ONS",
   "autoUpdateSettingTitle": "Mise à jour automatique",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Vérifier automatiquement les mises à jour au démarrage.",
   "autoUpdateNewVersionTitle": "Une mise à jour de Session est proposée",
   "autoUpdateNewVersionMessage": "Une nouvelle version de Session est proposée.",
   "autoUpdateNewVersionInstructions": "Appuyez sur « Redémarrer Session » pour appliquer les mises à jour.",
@@ -237,11 +241,11 @@
   "multipleJoinedTheGroup": "$name$ se sont joints au groupe.",
   "kickedFromTheGroup": "$name$ a été retiré du groupe.",
   "multipleKickedFromTheGroup": "$name$ ont été retirés du groupe.",
-  "blockUser": "Bloquer",
-  "unblockUser": "Débloquer",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Débloqué",
   "blocked": "Bloqué",
-  "blockedSettingsTitle": "Blocked Contacts",
+  "blockedSettingsTitle": "Contacts bloqués",
   "conversationsSettingsTitle": "Conversations",
   "unbanUser": "Débannir l'utilisateur",
   "userUnbanned": "Utilisateur débanni avec succès",
@@ -251,14 +255,14 @@
   "userBanned": "Utilisateur banni",
   "userBanFailed": "Le bannissement a échoué",
   "leaveGroup": "Quitter le groupe",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Quitter le groupe et le supprimer pour tout le monde",
   "leaveGroupConfirmation": "Voulez-vous vraiment quitter ce groupe ?",
   "leaveGroupConfirmationAdmin": "Comme vous êtes l'administrateur de ce groupe, si vous le quittez, il sera supprimé pour tous les membres actuels. Êtes-vous sûr de vouloir quitter ce groupe ?",
   "cannotRemoveCreatorFromGroup": "Impossible de supprimer cet utilisateur",
   "cannotRemoveCreatorFromGroupDesc": "Vous ne pouvez pas supprimer cet utilisateur car il est le créateur du groupe.",
   "noContactsForGroup": "Vous n'avez pas encore de contacts",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Impossible d'ajouter l'utilisateur en tant qu'admin",
+  "failedToRemoveFromModerator": "Échec de la suppression de l'utilisateur de la liste des administrateurs",
   "copyMessage": "Copier le texte du message",
   "selectMessage": "Sélectionner le message",
   "editGroup": "Modifier le groupe",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Mise à jour de $name$…",
   "showRecoveryPhrase": "Phrase de récupération",
   "yourSessionID": "Votre Session ID",
-  "setAccountPasswordTitle": "Définir un mot de passe",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Changement de mot de passe",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
+  "setAccountPasswordTitle": "Mot de passe",
+  "setAccountPasswordDescription": "Mot de passe requis pour déverrouiller Session.",
+  "changeAccountPasswordTitle": "Modifier le mot de passe",
+  "changeAccountPasswordDescription": "Modifier le mot de passe requis pour déverrouiller Session.",
   "removeAccountPasswordTitle": "Supprimer le mot de passe",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "removeAccountPasswordDescription": "Retirer le mot de passe requis pour déverrouiller Session.",
   "enterPassword": "Veuillez saisir votre mot de passe",
   "confirmPassword": "Confirmez le mot de passe",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Veuillez entrer votre nouveau mot de passe",
+  "confirmNewPassword": "Confirmer le nouveau mot de passe",
   "showRecoveryPhrasePasswordRequest": "Veuillez saisir votre mot de passe",
   "recoveryPhraseSavePromptMain": "Votre phrase de récupération est la clé principale de votre Session ID — vous pouvez l'utiliser pour restaurer votre Session ID si vous perdez l'accès à votre appareil. Conservez la dans un endroit sûr et ne la donnez à personne.",
   "invalidOpenGroupUrl": "URL non valide",
-  "copiedToClipboard": "Copié dans le presse-papier",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Copie effectuée",
+  "passwordViewTitle": "Entrez le mot de passe",
   "password": "Mot de passe",
   "setPassword": "Définir un mot de passe",
   "changePassword": "Changer le mot de passe",
-  "createPassword": "Create your password",
+  "createPassword": "Créez votre mot de passe",
   "removePassword": "Supprimer le mot de passe",
   "maxPasswordAttempts": "Mot de passe invalide. Voulez-vous effacer la base de données?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Veuillez entrer votre mot de passe actuel",
   "invalidOldPassword": "Ancien mot de passe invalide",
   "invalidPassword": "Mot de passe invalide",
   "noGivenPassword": "Merci de saisir votre mot de passe",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Les mots de passe ne correspondent pas.",
   "changePasswordInvalid": "L'ancien mot de passe entré est incorrect",
   "removePasswordInvalid": "Mot de passe incorrect",
-  "setPasswordTitle": "Définir un mot de passe",
-  "changePasswordTitle": "Mot de passe changé",
+  "setPasswordTitle": "Mot de passe défini",
+  "changePasswordTitle": "Mot de passe modifié",
   "removePasswordTitle": "Mot de passe supprimé",
   "setPasswordToastDescription": "Votre mot de passe a été défini. Veuillez le conserver en sécurité.",
   "changePasswordToastDescription": "Votre mot de passe a été changé. Veuillez le conserver en sécurité.",
-  "removePasswordToastDescription": "Vous avez supprimé votre mot de passe.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Votre mot de passe a été supprimé.",
+  "publicChatExists": "Vous êtes déjà connecté à cette communauté",
+  "connectToServerFail": "Impossible de rejoindre la communauté",
   "connectingToServer": "Connexion…",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Connexion réussie à la communauté",
   "setPasswordFail": "Échec de la définition du mot de passe",
   "passwordLengthError": "Le mot de passe doit avoir une longueur comprise entre 6 et 64 caractères",
   "passwordTypeError": "Le mot de passe doit être une chaîne de caractères",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Nom du groupe",
   "inviteContacts": "Inviter des amis",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Ajouter des administrateurs",
+  "removeModerators": "Retirer des administrateurs",
+  "addAsModerator": "Ajouter en tant qu'administrateur",
+  "removeFromModerators": "Retirer des administrateurs",
   "add": "Ajouter",
   "addingContacts": "Ajouter des contacts à $name$",
   "noContactsToAdd": "Aucun contact à ajouter",
   "noMembersInThisGroup": "Aucun autre membre dans ce groupe",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "aucun administrateur à retirer",
   "onlyAdminCanRemoveMembers": "Vous n'êtes pas le créateur",
   "onlyAdminCanRemoveMembersDesc": "Seul le créateur du groupe peut supprimer des utilisateurs",
   "createAccount": "Créer un compte",
   "startInTrayTitle": "Garder dans la barre d'état du système",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Laisser Session continuer à fonctionner en arrière-plan lorsque vous fermez la fenêtre.",
   "yourUniqueSessionID": "Dites bonjour à votre Session ID",
   "allUsersAreRandomly...": "Votre Session ID est l'identifiant unique que les gens utilisent pour vous contacter dans Session. Sans lien avec votre identité réelle, votre Session ID est complètement anonyme et privé.",
   "getStarted": "Commencer",
@@ -344,40 +348,43 @@
   "linkDevice": "Relier un appareil",
   "restoreUsingRecoveryPhrase": "Restaurez votre compte",
   "or": "ou",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "En utilisant ce service, vous acceptez nos <a href=\"https://getsession.org/terms-of-service \">Conditions d'utilisation</a> et notre <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Politique de confidentialité</a>",
   "beginYourSession": "Commencez votre Session.",
   "welcomeToYourSession": "Bienvenue sur Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Rechercher dans conversations ou les contacts",
+  "searchForContactsOnly": "Rechercher des contacts",
   "enterSessionID": "Saisir un Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Entrez l'ID de Session ou l'ONS de votre contact",
   "message": "Message",
   "appearanceSettingsTitle": "Apparence",
   "privacySettingsTitle": "Confidentialité",
   "notificationsSettingsTitle": "Notifications",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Contenu de la notification",
+  "notificationPreview": "Aperçu",
   "recoveryPhraseEmpty": "Saisissez votre phrase de récupération",
   "displayNameEmpty": "Veuillez choisir un nom d'utilisateur",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ membres",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Rejoindre",
+  "joinOpenGroup": "Rejoindre la communauté",
+  "createGroup": "Créer un Groupe",
+  "create": "Créer",
   "createClosedGroupNamePrompt": "Nom du groupe",
   "createClosedGroupPlaceholder": "Saisissez un nom de groupe",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL de la Communauté",
+  "enterAnOpenGroupURL": "Entrez l'URL de la communauté",
   "next": "Suivant",
   "invalidGroupNameTooShort": "Veuillez saisir un nom de groupe",
   "invalidGroupNameTooLong": "Veuillez saisir un nom de groupe plus court",
   "pickClosedGroupMember": "Veuillez sélectionner au moins 2 membres",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Aucun contact n’est bloqué",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Un groupe privé ne peut avoir plus de 100 membres",
+  "noBlockedContacts": "Vous n'avez aucun contact bloqué.",
+  "userAddedToModerators": "Utilisateur ajouté à la liste des administrateurs",
+  "userRemovedFromModerators": "Utilisateur retiré de la liste des administrateurs",
   "orJoinOneOfThese": "Ou rejoignez un de ceux-ci...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Traduire Session",
   "closedGroupInviteFailTitle": "Échec de l'invitation",
   "closedGroupInviteFailTitlePlural": "Échec des invitations",
   "closedGroupInviteFailMessage": "Impossible d'inviter avec succès un membre du groupe",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Réessayer les invitations",
   "closedGroupInviteSuccessTitlePlural": "Invitations de groupes terminées",
   "closedGroupInviteSuccessTitle": "Invitation de groupe réussie",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Membres du groupe privé invités avec succès",
   "notificationForConvo": "Notifications",
   "notificationForConvo_all": "Toutes",
   "notificationForConvo_disabled": "Désactivées",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Ouvrir cette page dans votre navigateur ?",
   "linkVisitWarningMessage": "Êtes-vous sûr de vouloir ouvrir $url$ dans votre navigateur ?",
   "open": "Ouvrir",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Lire automatiquement les messages audio",
+  "audioMessageAutoplayDescription": "Lire automatiquement les messages audio consécutifs.",
   "clickToTrustContact": "Cliquez pour télécharger cette pièce-jointe",
   "trustThisContactDialogTitle": "Faire confiance à $name$ ?",
   "trustThisContactDialogDescription": "Êtes-vous sûr de vouloir télécharger les médias envoyés par $name$ ?",
   "pinConversation": "Épingler la conversation",
   "unpinConversation": "Désépingler la conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Afficher les détails de l'utilisateur",
   "sendRecoveryPhraseTitle": "Envoyer la phrase de récupération",
   "sendRecoveryPhraseMessage": "Vous essayer actuellement d’envoyer votre phrase de récupération, qui peut être utilisée pour accéder a votre compte. Êtes-vous sûre de vouloir envoyer ce message ?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Données non supprimées à cause d'une erreur inconnue. Voulez-vous supprimer les données de cet appareil seulement ?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Voulez-vous supprimer les données de cet appareil?",
   "dialogClearAllDataDeletionFailedMultiple": "Données non détectées par ces nœuds de services : $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Voulez-vous effacer seulement cet appareil ou aussi supprimer vos données du réseau ?",
+  "clearDevice": "Effacer l'appareil",
+  "tryAgain": "Réessayer",
+  "areYouSureClearDevice": "Voulez-vous vraiment effacer votre appareil ?",
+  "deviceOnly": "Effacer l'appareil uniquement",
+  "entireAccount": "Effacer l'appareil et le réseau",
   "areYouSureDeleteDeviceOnly": "Êtes-vous sûr de vouloir supprimer uniquement les données de votre appareil ?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Êtes-vous sûr de vouloir supprimer vos données du réseau ? Si vous continuez, vous ne pourrez pas restaurer vos messages ou vos contacts.",
   "iAmSure": "Je suis sûr(e)",
   "recoveryPhraseSecureTitle": "Vous avez presque terminé !",
   "recoveryPhraseRevealMessage": "Sécurisez votre compte en enregistrant votre phrase de récupération. Afficher votre phrase de récupération puis stockez-la en toute sécurité pour la sécuriser.",
   "recoveryPhraseRevealButtonText": "Afficher la phrase de récupération",
   "notificationSubtitle": "Paramètres des notifications",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "Nous apprécierions vos commentaires",
+  "faq": "Foire aux questions",
+  "support": "Assistance",
   "clearAll": "Effacer tout",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Effacer les données",
   "messageRequests": "Requêtes de messages",
   "requestsSubtitle": "Demandes en fils d'attente",
   "requestsPlaceholder": "Aucune demande",
@@ -438,8 +449,8 @@
   "accept": "Accepter",
   "decline": "Refuser",
   "endCall": "Terminer l'appel",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Autorisations",
+  "helpSettingsTitle": "Aide",
   "cameraPermissionNeededTitle": "Autorisations pour les appels vocaux/vidéo requises",
   "cameraPermissionNeeded": "Vous pouvez activer la permission \"Appels vocaux et vidéo\" dans les paramètres de confidentialité.",
   "unableToCall": "Annulez d'abord votre appel en cours",
@@ -449,12 +460,12 @@
   "noCameraFound": "Aucune caméra trouvée",
   "noAudioInputFound": "Aucune entrée audio trouvée",
   "noAudioOutputFound": "Aucune sortie audio trouvée",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Appels vocaux et vidéo (Beta)",
   "callMissedCausePermission": "Appel manqué de '$name$' car vous devez activer la permission 'Appels vocaux et vidéo' dans les paramètres de confidentialité.",
   "callMissedNotApproved": "Appel manqué de '$name$' car vous n'avez pas encore approuvé cette conversation. Envoyez-leur un message d'abord.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Active les appels vocaux et vidéo vers et depuis d'autres utilisateurs.",
+  "callMediaPermissionsDialogContent": "Votre adresse IP est visible par votre interlocuteur et un serveur d'Oxen Foundation lorsque que vous utilisez les appels beta. Voulez-vous vraiment activer les appels vocaux et vidéo ?",
+  "callMediaPermissionsDialogTitle": "Appels vocaux et vidéo (Beta)",
   "startedACall": "Vous avez appelé $name$",
   "answeredACall": "Appel avec $name$",
   "trimDatabase": "Réduire la base de données",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Êtes-vous sûr de vouloir refuser cette demande de message ?",
   "respondingToRequestWarning": "Envoyer un message à cet utilisateur acceptera automatiquement sa demande de message et révélera votre ID de session.",
   "hideRequestBanner": "Masquer la bannière de demande de message",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Demandes de message",
   "noMessageRequestsPending": "Aucune demande de message en attente",
   "noMediaUntilApproved": "Vous ne pouvez pas envoyer de pièces jointes tant que la conversation n'est pas approuvée",
   "mustBeApproved": "Cette conversation doit être acceptée pour utiliser cette fonctionnalité",
   "youHaveANewFriendRequest": "Vous avez une nouvelle demande d’ami",
   "clearAllConfirmationTitle": "Effacer toutes les demandes de message",
   "clearAllConfirmationBody": "Êtes-vous sûr de vouloir supprimer toutes les demandes de message ?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Masquer",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Voir la boîte de réception des demandes de message",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Êtes-vous certain de vouloir effacer tous les $emoji$ ?",
+  "expandedReactionsText": "Afficher moins",
+  "reactionNotification": "Réagit à un message avec $emoji$",
+  "rateLimitReactMessage": "Ralentissez ! Vous avez envoyé trop d'émoticônes. Réessayez bientôt.",
+  "otherSingular": "$number$ autre",
+  "otherPlural": "$number$ autres",
+  "reactionPopup": "a réagit avec",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "Et $otherSingular$ a réagi à ce message avec <span>$emoji$</span>",
+  "reactionListCountPlural": "Et $otherPlural$ ont réagi à ce message avec <span>$emoji$</span>"
 }
diff --git a/_locales/he/messages.json b/_locales/he/messages.json
index c8950b14d..03d89b59b 100644
--- a/_locales/he/messages.json
+++ b/_locales/he/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "להצטרף ל $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "הזן את מזהה הסשן שלך או שם ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "טוען...",
@@ -72,7 +72,7 @@
   "noSearchResults": "אין תוצאות עבור \"$searchTerm$\"",
   "conversationsHeader": "אנשי קשר וקבוצות",
   "contactsHeader": "אנשי קשר",
-  "messagesHeader": "הודעות",
+  "messagesHeader": "Conversations",
   "settingsHeader": "הגדרות",
   "typingAlt": "הנפשת הקלדה עבור שיחה זו",
   "contactAvatarAlt": "יצגן עבור איש קשר $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "למחוק $count$ הודעות?",
   "deleteMessageQuestion": "למחוק הודעה זו?",
   "deleteMessages": "מחק הודעות",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "הודעה זו נמחקה",
   "from": "מאת",
@@ -107,29 +108,30 @@
   "sent": "נשלח",
   "received": "התקבל",
   "sendMessage": "שלח הודעה",
-  "groupMembers": "חברי קבוצה",
+  "groupMembers": "Members",
   "moreInformation": "מידע נוסף",
   "resend": "שלח שוב",
   "deleteConversationConfirmation": "האם למחוק לצמיתות שיחה זו?",
   "clear": "Clear",
   "clearAllData": "ניקוי כל הנתונים",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "אתה בטוח שברצונך למחוק את השיחה הזאת?",
   "quoteThumbnailAlt": "תמונה ממוזערת מהודעה מצוטטת",
   "imageAttachmentAlt": "תמונה צורפה אל הודעה",
-  "videoAttachmentAlt": "צילום מסך של וידיאו צורף אל הודעה",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "תמונה נשלחה בשיחה",
   "imageCaptionIconAlt": "ראות צלמית שיש לתמונה זו כיתוב",
   "addACaption": "הוסף כיתוב...",
   "copySessionID": "העתק מזהה",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "שמור",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "שם השולח והודעה",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "לא שם ולא הודעה",
   "nameOnly": "רק את שם השולח",
   "newMessage": "הודעה חדשה",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 שעות",
   "timerOption_1_day": "יום 1",
   "timerOption_1_week": "שבוע 1",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "הודעות נעלמות",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 שע'",
   "timerOption_1_day_abbreviated": "1 י'",
   "timerOption_1_week_abbreviated": "1 שב'",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "הודעות נעלמות מושבתות",
-  "disabledDisappearingMessages": "$name$ השבית הודעות נעלמות",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "הִשְׁבַּת הודעות נעלמות",
   "timerSetTo": "קוצב הזמן הוגדר אל $time$",
   "noteToSelf": "הערה לעצמי",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "התחל שיחה חדשה...",
-  "invalidNumberError": "מספר בלתי תקף",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ הצטרפו אל הקבוצה",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "יש לך בקשת חברות חדשה",
   "clearAllConfirmationTitle": "ניקוי כל בקשות ההודעות",
   "clearAllConfirmationBody": "האם את/ה בטוח/ה שברצונך למחוק את כל בקשות ההודעות?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "הסתר/י",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "צפיה בתיבה נכנסת לבקשות שיחה",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json
index d3fb1ad88..ce0967a25 100644
--- a/_locales/hi/messages.json
+++ b/_locales/hi/messages.json
@@ -16,8 +16,8 @@
   "editMenuCut": "कट",
   "editMenuCopy": "कॉपी करें",
   "editMenuPaste": "पेस्ट करें",
-  "editMenuDeleteContact": "Delete Contact",
-  "editMenuDeleteGroup": "Delete Group",
+  "editMenuDeleteContact": "संपर्क हटाएँ",
+  "editMenuDeleteGroup": "ग्रुप डिलीट करें",
   "editMenuSelectAll": "Select All",
   "windowMenuClose": "विंडो बंद करें",
   "windowMenuMinimize": "छोटा करें",
@@ -28,21 +28,21 @@
   "viewMenuToggleFullScreen": "पूर्णस्क्रीन में जाएं",
   "viewMenuToggleDevTools": "डेवलपर टूल टॉगल करें",
   "contextMenuNoSuggestions": "कोई सुझाव नहीं हैं",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "समुदाय आमंत्रण",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$ से जुड़ें?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "क्या आप $roomName$ open ग्रुप से जुड़ना चाहते हैं?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session आईडी या ओएनएस नाम दर्ज करें",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "किसी की सेशन आईडी दर्ज करके एक नई बातचीत शुरू करें या उनके साथ अपनी सेशन आईडी साझा करें।",
   "loading": "लोड हो रहा है",
   "done": "पूरा हुआ",
   "youLeftTheGroup": "आपने समूह छोड़ दिया",
   "youGotKickedFromGroup": "इस समूह से आप हटा दिए गए",
   "unreadMessages": "अपठित मेसेजस",
-  "debugLogExplanation": "This log will be saved to your desktop.",
-  "reportIssue": "Report a Bug",
+  "debugLogExplanation": "यह लॉग आपके डेस्कटॉप पर सहेजा जाएगा।",
+  "reportIssue": "बग सूचित करें",
   "markAllAsRead": "सभी को पढ़ा हुआ मार्क करें",
-  "incomingError": "Error handling incoming message",
+  "incomingError": "आने वाले संदेश को संभालने में त्रुटि",
   "media": "मीडिया",
   "mediaEmptyState": "You don’t have any media in this conversation",
   "documents": "दस्तावेज़",
@@ -52,9 +52,9 @@
   "thisWeek": "This Week",
   "thisMonth": "इस महीने",
   "voiceMessage": "ध्वनि संदेश",
-  "stagedPreviewThumbnail": "Draft thumbnail link preview for $domain$",
-  "previewThumbnail": "Thumbnail link preview for $domain$",
-  "stagedImageAttachment": "Draft image attachment: $path$",
+  "stagedPreviewThumbnail": "$domain$ के लिए ड्राफ़्ट थंबनेल लिंक पूर्वावलोकन",
+  "previewThumbnail": "$domain$ के लिए थंबनेल लिंक पूर्वावलोकन",
+  "stagedImageAttachment": "ड्राफ़्ट इमेज अटैचमेंट: $path$",
   "oneNonImageAtATimeToast": "When including a non-image attachment, the limit is one attachment per message.",
   "cannotMixImageAndNonImageAttachments": "You cannot mix non-image and image attachments in one message.",
   "maximumAttachments": "You cannot add any more attachments to this message.",
@@ -62,17 +62,17 @@
   "unableToLoadAttachment": "Unable to load selected attachment.",
   "offline": "ऑफ़लाइन",
   "debugLog": "लॉग को डीबग करें",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "निर्यात लॉग",
+  "shareBugDetails": "अपने लॉग निर्यात करें, फिर सेशन के हेल्प डेस्क के माध्यम से फ़ाइल अपलोड करें।",
   "goToReleaseNotes": "रिलीज़ नोट्स पे जाइए",
   "goToSupportPage": "सहायता पेज पर जाएँ",
   "about": "हमारे बारे में",
   "show": "दिखाना",
   "sessionMessenger": "सैशन",
   "noSearchResults": "No results for \"$searchTerm$\"",
-  "conversationsHeader": "Contacts and Groups",
+  "conversationsHeader": "संपर्क और समूहों",
   "contactsHeader": "संपर्क",
-  "messagesHeader": "संदेश",
+  "messagesHeader": "Conversations",
   "settingsHeader": "सेटिंग्स",
   "typingAlt": "इस कन्वर्सेशन के लिए टाइपिंग एनीमेशन",
   "contactAvatarAlt": "$name$ कांटेक्ट का अवतार",
@@ -94,90 +94,92 @@
   "continue": "जारी रखें",
   "error": " गलती",
   "delete": "हटाना",
-  "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
-  "deleteJustForMe": "Delete just for me",
-  "deleteForEveryone": "Delete for everyone",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
-  "deleteMessageQuestion": "Delete this message?",
+  "messageDeletionForbidden": "आपको दूसरों के संदेशों को हटाने की अनुमति नहीं है",
+  "deleteJustForMe": "सिर्फ मेरे लिए मिटाएं",
+  "deleteForEveryone": "सभी के लिए हटाएं",
+  "deleteMessagesQuestion": "$count$ संदेश हटाएं?",
+  "deleteMessageQuestion": "यह संदेश हटाएं?",
   "deleteMessages": "संदेश हटाएँ",
-  "deleted": "$count$ deleted",
-  "messageDeletedPlaceholder": "This message has been deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ हटाई गई",
+  "messageDeletedPlaceholder": "यह संदेश हटा दिया गया है",
   "from": "किस से",
   "to": "to",
   "sent": "भेज दिया",
   "received": "प्राप्त किया",
   "sendMessage": "एक संदेश भेजें",
-  "groupMembers": "समूह के सदस्य",
+  "groupMembers": "Members",
   "moreInformation": "अधिक जानकारी",
   "resend": "फिर से भेजें",
   "deleteConversationConfirmation": "इस वार्तालाप को स्थायी रूप से हटाएं?",
-  "clear": "Clear",
+  "clear": "साफ़",
   "clearAllData": "सभी डेटा हटाएं",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
-  "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
-  "quoteThumbnailAlt": "Thumbnail of image from quoted message",
-  "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
-  "lightboxImageAlt": "Image sent in conversation",
-  "imageCaptionIconAlt": "Icon showing that this image has a caption",
-  "addACaption": "Add a caption...",
-  "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "deleteAccountWarning": "यह आपके मैसेजस, सेशन और कॉन्टैक्टस को स्थायी रूप से हटा देगा।",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
+  "deleteContactConfirmation": "क्या वाकई आप इस वार्तालाप को हटाना चाहते हैं?",
+  "quoteThumbnailAlt": "उद्धृत संदेश से छवि का थंबनेल",
+  "imageAttachmentAlt": "संदेश से जुड़ी छवि",
+  "videoAttachmentAlt": "Screenshot of video in message",
+  "lightboxImageAlt": "बातचीत में भेजा गया चित्र",
+  "imageCaptionIconAlt": "आइकन दिखा रहा है कि इस छवि में एक कैप्शन है",
+  "addACaption": "शीर्षक जोड़ें...",
+  "copySessionID": "कापी सेशन आईडी",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "संरक्षित करें",
-  "saveLogToDesktop": "Save log to desktop",
-  "saved": "Saved",
-  "tookAScreenshot": "$name$ took a screenshot",
-  "savedTheFile": "Media saved by $name$",
-  "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
-  "mediaPermissionsTitle": "Microphone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
-  "spellCheckTitle": "Spell Check",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "प्रेषक का नाम और संदेश दोनों",
+  "saveLogToDesktop": "लॉग को डेस्कटॉप पर सहेजें",
+  "saved": "सेव किया",
+  "tookAScreenshot": "$name$ ने स्क्रीनशॉट लिया",
+  "savedTheFile": "$name$ द्वारा मीडिया सहेजा गया",
+  "linkPreviewsTitle": "लिंक प्रिव्यू भेजें",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
+  "linkPreviewsConfirmMessage": "लिंक प्रीव्यू भेजते समय आपके पास पूर्ण मेटाडेटा सुरक्षा नहीं होगी।",
+  "mediaPermissionsTitle": "माइक्रोफ़ोन",
+  "mediaPermissionsDescription": "माइक्रोफ़ोन तक पहुंच की अनुमति दें।",
+  "spellCheckTitle": "वर्तनी की जाँच",
+  "spellCheckDescription": "संदेश टाइप करते समय वर्तनी जांच सक्षम करें।",
+  "spellCheckDirty": "अपनी नई सेटिंग लागू करने के लिए आपको सेशन पुनः प्रारंभ करना होगा",
+  "readReceiptSettingDescription": "एक-से-एक चैट में पठन रसीदें भेजें।",
+  "readReceiptSettingTitle": "पढ़ने की रसीदें",
+  "typingIndicatorsSettingDescription": "एक-से-एक चैट में टाइपिंग संकेतक देखें और साझा करें।",
+  "typingIndicatorsSettingTitle": "टाइपिंग सूचक",
+  "zoomFactorSettingTitle": "ज़ूम फैक्टर",
+  "themesSettingTitle": "थीम्स",
+  "primaryColor": "Primary Colour",
+  "primaryColorGreen": "प्राथमिक रंग हरा",
+  "primaryColorBlue": "प्राथमिक रंग नीला",
+  "primaryColorYellow": "प्राथमिक रंग पीला",
+  "primaryColorPink": "प्राथमिक रंग गुलाबी",
+  "primaryColorPurple": "प्राथमिक रंग बैंगनी",
+  "primaryColorOrange": "प्राथमिक रंग नारंगी",
+  "primaryColorRed": "प्राथमिक रंग लाल",
+  "classicDarkThemeTitle": "क्लासिक डार्क",
+  "classicLightThemeTitle": "क्लासिक लाइट",
+  "oceanDarkThemeTitle": "सागर अंधेरा",
+  "oceanLightThemeTitle": "सागर प्रकाश",
+  "pruneSettingTitle": "समुदाय काट-छांट कीजिये",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
+  "enable": "सक्षम",
+  "keepDisabled": "अक्षम रखें",
+  "notificationSettingsDialog": "सूचनाओं में दिखाई गई जानकारी।",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "न तो नाम और न ही संदेश",
   "nameOnly": "केवल प्रेषक का नाम",
   "newMessage": "नया संदेश",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "नए संपर्क के साथ बातचीत बनाएं",
+  "createConversationNewGroup": "मौजूदा संपर्कों के साथ एक समूह बनाएं",
+  "joinACommunity": "एक समुदाय में शामिल हों",
+  "chooseAnAction": "बातचीत शुरू करने के लिए एक क्रिया चुनें",
   "newMessages": "नए संदेश",
   "notificationMostRecentFrom": "Most recent from:",
-  "notificationFrom": "From:",
-  "notificationMostRecent": "Most recent:",
+  "notificationFrom": "तरफ से:",
+  "notificationMostRecent": "सबसे हाल का:",
   "sendFailed": "Send failed",
   "mediaMessage": "मीडिया संदेश",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
+  "messageBodyMissing": "कृपया संदेश का मुख्य भाग दर्ज करें।",
+  "messageBody": "संदेश का मुख्य हिस्सा",
   "unblockToSend": "कोई संदेश भेजने के लिए इस संपर्क को अनवरोधित करें",
   "unblockGroupToSend": "Unblock this group to send a message.",
-  "youChangedTheTimer": "You set the disappearing message timer to $time$",
+  "youChangedTheTimer": "आपने गायब होने वाले संदेश टाइमर को $time$ पर सेट किया है",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
   "timerOption_0_seconds": "बंद",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 घंटे",
   "timerOption_1_day": "1 दिन",
   "timerOption_1_week": "1 सप्ताह",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "गायब होने वाले संदेश",
   "changeNickname": "उपनाम बदलें",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 घंटे",
   "timerOption_1_day_abbreviated": "1 डी",
   "timerOption_1_week_abbreviated": "1 सप्ताह",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "गायब होने वाले संदेश अक्षम",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "टाइमर पर सेट $time$",
   "noteToSelf": "खुद पर ध्यान दें",
   "hideMenuBarTitle": "मेनू बार छुपाएं",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "अमान्य संख्या",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "स्वयमेव अद्यतन हो जाना",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "$name$ को समूह से हटा दिया गया था।",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "खंड",
-  "unblockUser": "अनब्लॉक",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "अनब्लॉक किया",
   "blocked": "अवरोधित",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,62 +283,62 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
   "changePassword": "Change Password",
-  "createPassword": "Create your password",
-  "removePassword": "Remove Password",
-  "maxPasswordAttempts": "Invalid Password. Would you like to reset the database?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Old password is invalid",
-  "invalidPassword": "Invalid password",
-  "noGivenPassword": "Please enter your password",
-  "passwordsDoNotMatch": "Passwords do not match",
-  "setPasswordInvalid": "Passwords do not match",
-  "changePasswordInvalid": "The old password you entered is incorrect",
-  "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Connecting...",
-  "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
-  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
-  "remove": "Remove",
-  "invalidSessionId": "Invalid Session ID",
-  "invalidPubkeyFormat": "Invalid Pubkey Format",
-  "emptyGroupNameError": "Please enter a group name",
-  "editProfileModalTitle": "Profile",
-  "groupNamePlaceholder": "Group Name",
-  "inviteContacts": "Invite Contacts",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
-  "add": "Add",
-  "addingContacts": "Adding contacts to $name$",
-  "noContactsToAdd": "No contacts to add",
-  "noMembersInThisGroup": "No other members in this group",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
-  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "createPassword": "अपना पासवर्ड बनाएं",
+  "removePassword": "पासवर्ड हटाएं",
+  "maxPasswordAttempts": "अवैध पासवर्ड। क्या आप डेटाबेस को रीसेट करना चाहेंगे?",
+  "typeInOldPassword": "कृपया अपना वर्तमान पासवर्ड दर्ज करें",
+  "invalidOldPassword": "पुराना पासवर्ड अमान्य है",
+  "invalidPassword": "अमान्य पासवर्ड",
+  "noGivenPassword": "कृपया अपना पासवर्ड दर्ज करें",
+  "passwordsDoNotMatch": "पासवर्ड्स मेल नहीं खाते",
+  "setPasswordInvalid": "पासवर्ड्स मेल नहीं खाते",
+  "changePasswordInvalid": "आपके द्वारा दर्ज किया गया पुराना पासवर्ड गलत है",
+  "removePasswordInvalid": "गलत पासवर्ड",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
+  "setPasswordToastDescription": "आपका पासवर्ड सेट कर दिया गया है। कृपया इसे सुरक्षित रखें।",
+  "changePasswordToastDescription": "आपका पासवर्ड बदल दिया गया है। कृपया इसे सुरक्षित रखें।",
+  "removePasswordToastDescription": "Your password has been removed.",
+  "publicChatExists": "आप पहले से ही इस समुदाय से जुड़े हुए हैं",
+  "connectToServerFail": "समुदाय में शामिल नहीं हो सका",
+  "connectingToServer": "कनेक्ट हो रहा है...",
+  "connectToServerSuccess": "समुदाय से सफलतापूर्वक जुड़ा",
+  "setPasswordFail": "पासवर्ड सेट करने में विफल",
+  "passwordLengthError": "पासवर्ड 6 से 64 वर्णों के बीच होना चाहिए",
+  "passwordTypeError": "पासवर्ड एक स्ट्रिंग होना चाहिए",
+  "passwordCharacterError": "पासवर्ड में केवल अक्षर, संख्याएं और प्रतीक होने चाहिए",
+  "remove": "हटा दें",
+  "invalidSessionId": "अमान्य सेशन आईडी",
+  "invalidPubkeyFormat": "अमान्य पबकी प्रारूप",
+  "emptyGroupNameError": "कृपया ग्रुप नाम डालें",
+  "editProfileModalTitle": "प्रोफ़ाइल",
+  "groupNamePlaceholder": "ग्रुप का नाम",
+  "inviteContacts": "मित्रों को आमंत्रित करें",
+  "addModerators": "एडमिन जोड़ें",
+  "removeModerators": "एडमिन को हटाएं",
+  "addAsModerator": "एडमिन के रूप में जोड़ें",
+  "removeFromModerators": "व्यवस्थापकों से निकालें",
+  "add": "जोड़ें",
+  "addingContacts": "$name$ में संपर्क जोड़ना",
+  "noContactsToAdd": "जोड़ने के लिए कोई संपर्क नहीं",
+  "noMembersInThisGroup": "इस समूह में कोई अन्य सदस्य नहीं है",
+  "noModeratorsToRemove": "हटाने के लिए कोई एडमिन नहीं",
+  "onlyAdminCanRemoveMembers": "आप निर्माता नहीं हैं",
+  "onlyAdminCanRemoveMembersDesc": "केवल समूह का निर्माता ही एडमिन को हटा सकता है",
   "createAccount": "Create Account",
-  "startInTrayTitle": "Keep in System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
-  "yourUniqueSessionID": "Say hello to your Session ID",
-  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
-  "getStarted": "Get started",
-  "createSessionID": "Create Session ID",
-  "recoveryPhrase": "Recovery Phrase",
+  "startInTrayTitle": "सिस्टम ट्रे में रखें",
+  "startInTrayDescription": "जब आप विंडो बंद करते हैं तो सेशन को पृष्ठभूमि में चालू रखें।",
+  "yourUniqueSessionID": "अपने सेशन आईडी को नमस्ते कहें",
+  "allUsersAreRandomly...": "आपकी सेशन आईडी एक ऐसा अनोखा पता है जिसका उपयोग करके लोग आपसे सेशन पर संपर्क कर सकते हैं। आपकी वास्तविक पहचान से कोई संबंध नहीं होने के कारण, आपका सेशन आईडी डिज़ाइन द्वारा पूरी तरह से गुमनाम और निजी है |",
+  "getStarted": "प्रारंभ करें",
+  "createSessionID": "सेशन आईडी बनाएं",
+  "recoveryPhrase": "रिकवरी वाक्यांश",
   "enterRecoveryPhrase": "Enter your recovery phrase",
   "displayName": "Display Name",
   "anonymous": "Anonymous",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -386,52 +393,56 @@
   "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
   "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
   "closedGroupInviteSuccessMessage": "Successfully invited group members",
-  "notificationForConvo": "Notifications",
-  "notificationForConvo_all": "All",
-  "notificationForConvo_disabled": "Disabled",
-  "notificationForConvo_mentions_only": "Mentions only",
-  "onionPathIndicatorTitle": "Path",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
-  "linkVisitWarningTitle": "Open this link in your browser?",
-  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
-  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
-  "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
-  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
-  "notificationSubtitle": "Notifications - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Message Requests",
-  "requestsSubtitle": "Pending Requests",
-  "requestsPlaceholder": "No requests",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "notificationForConvo": "सूचनाएं",
+  "notificationForConvo_all": "सभी",
+  "notificationForConvo_disabled": "अक्षम",
+  "notificationForConvo_mentions_only": "केवल उल्लेख",
+  "onionPathIndicatorTitle": "पथ",
+  "onionPathIndicatorDescription": "सेशन आपके मैसेज को सेशन के डेंटरलिज़्ड नेटवर्क की बहुत साडी सर्विस नोड्स में भेज देता है जो आपकी IP को छुपाती है.",
+  "unknownCountry": "अज्ञात देश",
+  "device": "डिवाइस",
+  "destination": "गंतव्य",
+  "learnMore": "और जानें",
+  "linkVisitWarningTitle": "इस लिंक को अपने ब्राउज़र में खोलें?",
+  "linkVisitWarningMessage": "क्या आप वाकई अपने ब्राउज़र में $url$ खोलना चाहते हैं?",
+  "open": "खोलें",
+  "audioMessageAutoplayTitle": "ऑटोप्ले ऑडियो संदेश",
+  "audioMessageAutoplayDescription": "लगातार ऑडियो संदेशों को ऑटोप्ले करें।",
+  "clickToTrustContact": "मीडिया डाउनलोड करने के लिए क्लिक करें",
+  "trustThisContactDialogTitle": "$name$ पर भरोसा करें?",
+  "trustThisContactDialogDescription": "क्या आप वाकई $name$ द्वारा भेजे गए मीडिया को डाउनलोड करना चाहते हैं?",
+  "pinConversation": "पिन वार्तालाप",
+  "unpinConversation": "वार्तालाप अनपिन करें",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "उपयोगकर्ता विवरण दिखाएं",
+  "sendRecoveryPhraseTitle": "रिकवरी फ्रेज भेजा जा रहा है",
+  "sendRecoveryPhraseMessage": "आप अपना रिकवरी फ्रेज भेजने का प्रयास कर रहे हैं जिसका उपयोग आपके खाते तक पहुंचने के लिए किया जा सकता है। क्या आप वाकई यह संदेश भेजना चाहते हैं?",
+  "dialogClearAllDataDeletionFailedTitle": "डेटा हटाया नहीं गया",
+  "dialogClearAllDataDeletionFailedDesc": "अज्ञात त्रुटि के साथ डेटा हटाया नहीं गया। क्या आप केवल इस उपकरण से डेटा हटाना चाहते हैं?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "क्या आप केवल इस डिवाइस से डेटा हटाना चाहते हैं?",
+  "dialogClearAllDataDeletionFailedMultiple": "डेटा उन सेवा नोड्स द्वारा नहीं हटाया गया: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "क्या आप केवल इस डिवाइस को साफ़ करना चाहते हैं, या नेटवर्क से भी अपना डेटा हटाना चाहते हैं?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
+  "deviceOnly": "केवल डिवाइस साफ़ करें",
+  "entireAccount": "डिवाइस और नेटवर्क साफ़ करें",
+  "areYouSureDeleteDeviceOnly": "क्या आप वाकई केवल अपने डिवाइस डेटा को हटाना चाहते हैं?",
+  "areYouSureDeleteEntireAccount": "क्या आप वाकई नेटवर्क से अपना डेटा हटाना चाहते हैं? यदि आप जारी रखते हैं, तो आप अपने संदेशों या संपर्कों को पुनर्स्थापित नहीं कर पाएंगे।",
+  "iAmSure": "मुझे यकीन है",
+  "recoveryPhraseSecureTitle": "आप लगभग समाप्त कर चुके हैं!",
+  "recoveryPhraseRevealMessage": "अपना रिकवरी फ्रेज सहेज कर अपना खाता सुरक्षित करें. अपना रिकवरी फ्रेज प्रकट करें और फिर इसे सुरक्षित करने के लिए सुरक्षित रूप से संग्रहीत करें।",
+  "recoveryPhraseRevealButtonText": "रिकवरी फ्रेज प्रकट करें",
+  "notificationSubtitle": "सूचनाएं - $setting$",
+  "surveyTitle": "हमें आपकी प्रतिक्रिया पसंद आएगी",
+  "faq": "अकसर किये गए सवाल",
+  "support": "सहायता",
+  "clearAll": "सभ साफ करें",
+  "clearDataSettingsTitle": "डेटा हटाएं",
+  "messageRequests": "संदेश अनुरोध",
+  "requestsSubtitle": "अनुरोध लंबित",
+  "requestsPlaceholder": "कोई अनुरोध नहीं",
+  "hideRequestBannerDescription": "संदेश अनुरोध बैनर को तब तक छिपाएं जब तक कि आपको कोई नया संदेश अनुरोध प्राप्त न हो जाए।",
   "incomingCallFrom": "Incoming call from '$name$'",
   "ringing": "Ringing...",
   "establishingConnection": "Establishing connection...",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json
index 44126c33e..f3d0b48f9 100644
--- a/_locales/hr/messages.json
+++ b/_locales/hr/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Učitavanje...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Kontakti",
-  "messagesHeader": "Poruke",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Izbriši poruku",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "Od",
@@ -107,29 +108,30 @@
   "sent": "Poslano",
   "received": "Primljeno",
   "sendMessage": "Pošalji poruku",
-  "groupMembers": "Članovi grupe",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Trajno obrisati ovaj razgovor?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Spremi",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "I pošiljateljevo ime i poruka",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Ni ime ni poruka",
   "nameOnly": "Samo pošiljateljevo ime",
   "newMessage": "Nova poruka",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 dan",
   "timerOption_1_week": "1 tjedan",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Nestajuće poruke",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1t",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Brojač postavljen na $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Neispravni broj",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json
index 759abf591..f5d269fee 100644
--- a/_locales/hu/messages.json
+++ b/_locales/hu/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Teljes képernyő bekapcsolása/kikapcsolása",
   "viewMenuToggleDevTools": "Fejlesztői eszközök megjelenítése/elrejtése",
   "contextMenuNoSuggestions": "Nincsenek javaslatok",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Meghívás közösségbe",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Csatlakozni a $roomName$ nevű szobához?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Biztosan csatlakozni szeretne a(z) $roomName$ nyilvános csoporthoz?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Írja be Session azonosítóját vagy ONS nevét",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Beszélgetés kezdeményezéséhez addj meg egy Session ID-t vagy oszd meg a tiédet másokkal.",
   "loading": "Betöltés...",
   "done": "Kész",
   "youLeftTheGroup": "Kiléptél a csoportból",
   "youGotKickedFromGroup": "Ön ki lett dobva ebből a csoportból.",
   "unreadMessages": "Olvasatlan Üzenetek",
   "debugLogExplanation": "Ez a napló az asztalra lesz mentve.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Hiba jelentése",
   "markAllAsRead": "Összes megjelölése olvasottként",
   "incomingError": "Nem sikerült kezelni a bejövő üzenetet.",
   "media": "Média",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Nem sikerült betölteni a kiválasztott csatolmányt.",
   "offline": "Nincs csatlakozva",
   "debugLog": "Fejlesztői napló",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Naplók exportálása",
+  "shareBugDetails": "Hibanaplók exportálása és feltöltése a Session ügyfélszolgálatán keresztül.",
   "goToReleaseNotes": "Release notes megnyitása",
   "goToSupportPage": "Támogatás megnyitása",
   "about": "Névjegy",
@@ -72,7 +72,7 @@
   "noSearchResults": "Nincs találat a \"$searchTerm$\" keresőkifejezése",
   "conversationsHeader": "Partnerek és csoportok",
   "contactsHeader": "Névjegyek",
-  "messagesHeader": "Üzenetek",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Beállítások",
   "typingAlt": "Gépelési animáció ehhez a beszélgetéshez",
   "contactAvatarAlt": "$name$ profilképe",
@@ -100,36 +100,38 @@
   "deleteMessagesQuestion": "Biztos törölni szerente $count$ üzenetet?",
   "deleteMessageQuestion": "Törli ezt az üzenetet?",
   "deleteMessages": "Üzenetek törlése",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ törölve",
   "messageDeletedPlaceholder": "Az üzenete törölve",
   "from": "Feladó",
   "to": "címzett",
   "sent": "Elküldve",
   "received": "Beérkezett",
   "sendMessage": "Küldj egy üzenetet",
-  "groupMembers": "Csoport tagjai",
+  "groupMembers": "Tagok",
   "moreInformation": "További információ",
   "resend": "Újraküldés",
   "deleteConversationConfirmation": "Véglegesen törlöd ezt a beszélgetést?",
-  "clear": "Clear",
+  "clear": "Törlés",
   "clearAllData": "Az összes adat törlése",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Ez végleg törölni fogja üzeneteit, beszélgetéseit és ismerőseit.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Biztosan törölni szeretné ezt a beszélgetést?",
   "quoteThumbnailAlt": "Az idézett üzenetben megjelenített fotó előnézeti képe",
   "imageAttachmentAlt": "Üzenethez csatolt kép",
-  "videoAttachmentAlt": "Az üzenethez csatolt videó előnézeti képe",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Beszélgetés során küldött fotó",
   "imageCaptionIconAlt": "Ikon, amely azt jelzi, hogy a kép feliratot tartalmaz",
   "addACaption": "Felirat hozzáadása...",
   "copySessionID": "Az ön Session azonosítójának kimásolása",
-  "copyOpenGroupURL": "Csoport URL-jének másolása",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Mentés",
   "saveLogToDesktop": "Napló mentése asztalra",
   "saved": "Elmentve",
   "tookAScreenshot": "$name$ készített egy képernyőképet",
   "savedTheFile": "$name$ lementett egy médiaelemet",
   "linkPreviewsTitle": "Hivatkozások előnézeti képének küldése",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -141,31 +143,31 @@
   "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
   "typingIndicatorsSettingTitle": "Gépelésindikátorok",
   "zoomFactorSettingTitle": "Nagyítás mértéke",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Feladó neve és az üzenet",
+  "themesSettingTitle": "Témák",
+  "primaryColor": "Elsődleges szín",
+  "primaryColorGreen": "Elsődleges szín zöld",
+  "primaryColorBlue": "Elsődleges szín kék",
+  "primaryColorYellow": "Elsődleges szín sárga",
+  "primaryColorPink": "Elsődleges szín rózsaszín",
+  "primaryColorPurple": "Elsődleges szín lila",
+  "primaryColorOrange": "Elsődleges szín narancssárga",
+  "primaryColorRed": "Elsődleges szín piros",
+  "classicDarkThemeTitle": "Klasszikus Sötét",
+  "classicLightThemeTitle": "Klasszikus Világos",
+  "oceanDarkThemeTitle": "Sötét Óceán",
+  "oceanLightThemeTitle": "Világos Óceán",
+  "pruneSettingTitle": "Közösségek Csonkítása",
+  "pruneSettingDescription": "6 hónapnál idősebb közösségi üzenetek törlése ahol több mint 2000 üzenet van.",
+  "enable": "Engedélyezés",
+  "keepDisabled": "Maradjon letiltva",
+  "notificationSettingsDialog": "Az értesítésekben megjelenő információ.",
+  "nameAndMessage": "Név és Tartalom",
   "noNameOrMessage": "Se név, se üzenet",
   "nameOnly": "Csak a feladó neve",
   "newMessage": "Új üzenet",
   "createConversationNewContact": "Create a conversation with a new contact",
   "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
+  "joinACommunity": "Csatlakozás egy közösséghez",
   "chooseAnAction": "Choose an action to start a conversation",
   "newMessages": "Új üzenetek",
   "notificationMostRecentFrom": "Legfrissebb tőle:",
@@ -174,7 +176,7 @@
   "sendFailed": "Küldés sikertelen",
   "mediaMessage": "Médiaüzenet",
   "messageBodyMissing": "Kérlek írd be az üzenetet.",
-  "messageBody": "Message body",
+  "messageBody": "Üzenet szövege",
   "unblockToSend": "Üzenet küldéséhez oldd fel ismerősöd blokkolását!",
   "unblockGroupToSend": "Üzenet küldéséhez oldd fel a csoportot a blokk alól!",
   "youChangedTheTimer": "Az időzítő értékét a következőre módosítottad: $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 óra",
   "timerOption_1_day": "1 nap",
   "timerOption_1_week": "1 hét",
+  "timerOption_2_weeks": "két hét",
   "disappearingMessages": "Eltűnő üzenetek",
   "changeNickname": "Becenév módosítása",
   "clearNickname": "Becenév törlése",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12ó",
   "timerOption_1_day_abbreviated": "1n",
   "timerOption_1_week_abbreviated": "1h",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Eltűnő üzenetek letiltva",
-  "disabledDisappearingMessages": "$name$ letiltotta az eltűnő üzeneteket",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Letiltottad az eltűnő üzeneteket",
   "timerSetTo": "Időzítő állapota: $time$",
   "noteToSelf": "Privát feljegyzés",
   "hideMenuBarTitle": "Menüsor elrejtése",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Új beszélgetés megkezdése…",
-  "invalidNumberError": "Érvénytelen telefonszám",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Automatikus frissítés",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ belépett a csoportba.",
   "kickedFromTheGroup": "$name$ eltávolításra került a csoportból.",
   "multipleKickedFromTheGroup": "$name$ eltávolításra került a csoportból.",
-  "blockUser": "Letiltás",
-  "unblockUser": "Blokkolás feloldása",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Blokkolás feloldva",
   "blocked": "Blokkolt",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "$name$ frissítése...",
   "showRecoveryPhrase": "Helyreállítási kód",
   "yourSessionID": "A Session azonosítód",
-  "setAccountPasswordTitle": "Fiók jelszó beállítása",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Fiók jelszavának megváltoztatása",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Fiók jelszavának eltávolítása",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Kérlek add meg a jelszavad",
   "confirmPassword": "Jelszó megerősítése",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Kérlek add meg a jelszavad",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Érvénytelen URL",
-  "copiedToClipboard": "Vágólapra másolva",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Jelszó",
   "setPassword": "Jelszó beállítása",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "A megadott jelszavak nem egyeznek",
   "changePasswordInvalid": "A megadott régi jelszó helytelen",
   "removePasswordInvalid": "Hibás jelszó",
-  "setPasswordTitle": "Jelszó beállítása",
-  "changePasswordTitle": "A jelszó módosult",
-  "removePasswordTitle": "A jelszó eltávolításra került",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "A jelszó megváltozott. Tartsd biztonságos helyen!",
   "changePasswordToastDescription": "A jelszó megváltozott. Tartsd biztonságos helyen!",
-  "removePasswordToastDescription": "Eltávolítottad a jelszavadat.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Csatlakozás...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Megjelenés",
   "privacySettingsTitle": "Adatvédelem",
   "notificationsSettingsTitle": "Értesítések",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Írd be a helyreállítási szavakat",
   "displayNameEmpty": "Add meg a megjelenítendő nevedet",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ tag",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Nincsenek titltott kontaktok",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Vagy csatlakozz az egyikhez az alábbiakból...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Biztosan le szeretnéd tölteni a(z) $name$ által küldött tartalmat?",
   "pinConversation": "Beszélgetés feltűzése",
   "unpinConversation": "Feltűzött beszélgetés eltávolítása",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Helyreállító kódmondat küldése",
   "sendRecoveryPhraseMessage": "A helyreállító kódmondatod készülsz elküldeni, amellyel hozzá lehet férni fiókodhoz. Biztosan el akarod küldeni?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Biztosan törlöd az adatokat csak erről az eszközről?",
   "dialogClearAllDataDeletionFailedMultiple": "Az adatokat a következő szolgáltatási csomópontok nem törölték: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Nem fogadott hívás '$name$' -től, mert előbb engedélyezned kell a 'Hang és videó hívásokat' a Biztonsági beállításokban.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Felhívtad $name$",
   "answeredACall": "Hívás $name$ -al",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/hy-AM/messages.json b/_locales/hy-AM/messages.json
index bd7e2f439..fc52404a5 100644
--- a/_locales/hy-AM/messages.json
+++ b/_locales/hy-AM/messages.json
@@ -1,492 +1,508 @@
 {
-  "copyErrorAndQuit": "Copy error and quit",
-  "unknown": "Unknown",
-  "databaseError": "Database Error",
-  "mainMenuFile": "&File",
-  "mainMenuEdit": "&Edit",
-  "mainMenuView": "&View",
-  "mainMenuWindow": "&Window",
-  "mainMenuHelp": "&Help",
-  "appMenuHide": "Hide",
-  "appMenuHideOthers": "Hide Others",
-  "appMenuUnhide": "Show All",
-  "appMenuQuit": "Quit Session",
-  "editMenuUndo": "Undo",
-  "editMenuRedo": "Redo",
-  "editMenuCut": "Cut",
-  "editMenuCopy": "Copy",
-  "editMenuPaste": "Paste",
-  "editMenuDeleteContact": "Delete Contact",
-  "editMenuDeleteGroup": "Delete Group",
-  "editMenuSelectAll": "Select all",
-  "windowMenuClose": "Close Window",
-  "windowMenuMinimize": "Minimize",
-  "windowMenuZoom": "Zoom",
-  "viewMenuResetZoom": "Actual Size",
-  "viewMenuZoomIn": "Zoom In",
-  "viewMenuZoomOut": "Zoom Out",
-  "viewMenuToggleFullScreen": "Toggle Full Screen",
-  "viewMenuToggleDevTools": "Toggle Developer Tools",
-  "contextMenuNoSuggestions": "No Suggestions",
-  "openGroupInvitation": "Community invitation",
-  "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
-  "enterSessionIDOrONSName": "Enter Session ID or ONS name",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
-  "loading": "Loading...",
-  "done": "Done",
-  "youLeftTheGroup": "You have left the group.",
-  "youGotKickedFromGroup": "You were removed from the group.",
-  "unreadMessages": "Unread Messages",
-  "debugLogExplanation": "This log will be saved to your desktop.",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "Mark All as Read",
-  "incomingError": "Error handling incoming message",
-  "media": "Media",
-  "mediaEmptyState": "No media",
-  "documents": "Documents",
-  "documentsEmptyState": "No documents",
-  "today": "Today",
-  "yesterday": "Yesterday",
-  "thisWeek": "This week",
-  "thisMonth": "This Month",
-  "voiceMessage": "Voice Message",
-  "stagedPreviewThumbnail": "Draft thumbnail link preview for $domain$",
-  "previewThumbnail": "Thumbnail link preview for $domain$",
-  "stagedImageAttachment": "Draft image attachment: $path$",
-  "oneNonImageAtATimeToast": "Sorry, there is a limit of one non-image attachment per message",
-  "cannotMixImageAndNonImageAttachments": "Sorry, you cannot mix images with other file types in one message",
-  "maximumAttachments": "Maximum number of attachments reached. Please send remaining attachments in a separate message.",
-  "fileSizeWarning": "Attachment exceeds size limits for the type of message you're sending.",
-  "unableToLoadAttachment": "Sorry, there was an error setting your attachment.",
-  "offline": "Offline",
-  "debugLog": "Debug Log",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
-  "goToReleaseNotes": "Go to Release Notes",
-  "goToSupportPage": "Go to Support Page",
-  "about": "About",
-  "show": "Show",
+  "copyErrorAndQuit": "Պատճենել սխալը և դուրս գալ",
+  "unknown": "Անհայտ",
+  "databaseError": "Տվյալների բազայի սխալ",
+  "mainMenuFile": "&Ֆայլ",
+  "mainMenuEdit": "&Խմբագրում",
+  "mainMenuView": "&Դիտում",
+  "mainMenuWindow": "&Պատուհան",
+  "mainMenuHelp": "&Օգնություն",
+  "appMenuHide": "Թաքցնել",
+  "appMenuHideOthers": "Թաքցնել մյուսները",
+  "appMenuUnhide": "Ցուցադրել բոլորը",
+  "appMenuQuit": "Դուրս գալ Session-ից",
+  "editMenuUndo": "Չեղարկել",
+  "editMenuRedo": "Կրկնել",
+  "editMenuCut": "Կտրել",
+  "editMenuCopy": "Պատճենել",
+  "editMenuPaste": "Տեղադրել",
+  "editMenuDeleteContact": "Ջնջել կոնտակտը",
+  "editMenuDeleteGroup": "Ջնջել խումբը",
+  "editMenuSelectAll": "Ընտրել բոլորը",
+  "windowMenuClose": "Փակել պատուհանը",
+  "windowMenuMinimize": "Փոքրացնել",
+  "windowMenuZoom": "Խոշորացում",
+  "viewMenuResetZoom": "Իրական չափս",
+  "viewMenuZoomIn": "Խոշորացնել",
+  "viewMenuZoomOut": "Մանրացնել",
+  "viewMenuToggleFullScreen": "Միացնել ամբողջ էկրանը",
+  "viewMenuToggleDevTools": "Միացնել ծրագրավորողի գործիքները",
+  "contextMenuNoSuggestions": "Առաջարկներ չկան",
+  "openGroupInvitation": "Համայնքի հրավեր",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Միանա՞լ $roomName$֊ին։",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Համոզվա՞ծ եք, որ ուզում եք միանալ $roomName$ համայնքին։",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "Գրեք Session ID-ն կամ ONS անունը",
+  "startNewConversationBy...": "Սկսեք նոր խոսակցություն՝ մուտքագրելով ինչ-որ մեկի Session ID-ն կամ կիսվեք ձեր Session ID-ով նրանց հետ:",
+  "loading": "Բեռնվում է...",
+  "done": "Վերջ",
+  "youLeftTheGroup": "Դուք լքել եք խումբը։",
+  "youGotKickedFromGroup": "Դուք հեռացվել եք խմբից:",
+  "unreadMessages": "Չընթերցված հաղորդագրություն",
+  "debugLogExplanation": "Այս գրանցամատյանը կպահվի ձեր աշխատասեղանին:",
+  "reportIssue": "Հաղորդել սխալի մասին",
+  "markAllAsRead": "Նշել բոլորը, որպես տեսնված",
+  "incomingError": "Մշակվում է մուտքային հաղորդագրության սխալը",
+  "media": "Մեդիա",
+  "mediaEmptyState": "Մեդիաֆայլեր չկան",
+  "documents": "Փաստաթղթեր",
+  "documentsEmptyState": "Փաստաթղթեր չկան",
+  "today": "Այսօր",
+  "yesterday": "Երեկ",
+  "thisWeek": "Այս շաբաթ",
+  "thisMonth": "Այս ամիս",
+  "voiceMessage": "Ձայնային հաղորդագրություն",
+  "stagedPreviewThumbnail": "$domain$ հղման նախադիտման մանրապատկերի նախագիծ",
+  "previewThumbnail": "$domain$ հղման նախադիտման մանրապատկեր",
+  "stagedImageAttachment": "Նկարի նախագծի կցորդ՝ $path$",
+  "oneNonImageAtATimeToast": "Ներողություն, յուրաքանչյուր հաղորդագրության համար կա մեկ ոչ պատկերային կցորդի սահմանափակում",
+  "cannotMixImageAndNonImageAttachments": "Ներեցեք, դուք չեք կարող պատկերները խառնել այլ ֆայլերի տեսակների հետ մեկ հաղորդագրության մեջ",
+  "maximumAttachments": "Հավելվածների առավելագույն քանակը չափազանցվել է։ Խնդրում ենք մնացած կցորդներն ուղարկել առանձին հաղորդագրությամբ։",
+  "fileSizeWarning": "Կցորդը գերազանցում է ձեր ուղարկած հաղորդագրության տեսակի սահմանաչափը:",
+  "unableToLoadAttachment": "Ներողություն, չհաջողվեց կցել Ձեր ընտրած կցորդը։",
+  "offline": "Ցանցից դուրս",
+  "debugLog": "Վրիպազերծման մատյան",
+  "showDebugLog": "Արտահանել տեղեկամատյանները",
+  "shareBugDetails": "Արտահանեք ձեր տեղեկամատյանները, այնուհետև վերբեռնեք ֆայլը Sessions Help Desk-ի միջոցով:",
+  "goToReleaseNotes": "Կարդացեք թողարկման նշումները",
+  "goToSupportPage": "Բացեք աջակցության էջը",
+  "about": "Մեր մասին",
+  "show": "Ցուցադրել",
   "sessionMessenger": "Session",
-  "noSearchResults": "No results found for \"$searchTerm$\"",
-  "conversationsHeader": "Contacts and Groups",
-  "contactsHeader": "Contacts",
-  "messagesHeader": "Messages",
-  "settingsHeader": "Settings",
-  "typingAlt": "Typing animation for this conversation",
-  "contactAvatarAlt": "Avatar for contact $name$",
-  "downloadAttachment": "Download Attachment",
-  "replyToMessage": "Reply to message",
-  "replyingToMessage": "Replying to:",
-  "originalMessageNotFound": "Original message not found",
-  "you": "You",
-  "audioPermissionNeededTitle": "Microphone Access Required",
-  "audioPermissionNeeded": "You can enable microphone access under: Settings (Gear icon) => Privacy",
-  "audio": "Audio",
-  "video": "Video",
-  "photo": "Photo",
-  "cannotUpdate": "Cannot Update",
-  "cannotUpdateDetail": "Session Desktop failed to update, but there is a new version available. Please go to https://getsession.org/ and install the new version manually, then either contact support or file a bug about this problem.",
-  "ok": "OK",
-  "cancel": "Cancel",
-  "close": "Close",
-  "continue": "Continue",
-  "error": "Error",
-  "delete": "Delete",
-  "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
-  "deleteJustForMe": "Delete just for me",
-  "deleteForEveryone": "Delete for everyone",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
-  "deleteMessageQuestion": "Delete this message?",
-  "deleteMessages": "Delete Messages",
-  "deleted": "$count$ deleted",
-  "messageDeletedPlaceholder": "This message has been deleted",
-  "from": "From:",
-  "to": "To:",
-  "sent": "Sent",
-  "received": "Received",
-  "sendMessage": "Message",
-  "groupMembers": "Group members",
-  "moreInformation": "More information",
-  "resend": "Resend",
-  "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
-  "clear": "Clear",
-  "clearAllData": "Clear All Data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
-  "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
-  "quoteThumbnailAlt": "Thumbnail of image from quoted message",
-  "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
-  "lightboxImageAlt": "Image sent in conversation",
-  "imageCaptionIconAlt": "Icon showing that this image has a caption",
-  "addACaption": "Add a caption...",
-  "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
-  "save": "Save",
-  "saveLogToDesktop": "Save log to desktop",
-  "saved": "Saved",
-  "tookAScreenshot": "$name$ took a screenshot",
-  "savedTheFile": "Media saved by $name$",
-  "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
-  "mediaPermissionsTitle": "Microphone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
-  "spellCheckTitle": "Spell Check",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
-  "noNameOrMessage": "No name or content",
-  "nameOnly": "Name Only",
-  "newMessage": "New Message",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
-  "newMessages": "New Messages",
-  "notificationMostRecentFrom": "Most recent from: $name$",
-  "notificationFrom": "From:",
-  "notificationMostRecent": "Most recent:",
-  "sendFailed": "Send Failed",
-  "mediaMessage": "Media message",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
-  "unblockToSend": "Unblock this contact to send a message.",
-  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
-  "youChangedTheTimer": "You set the disappearing message timer to $time$",
-  "timerSetOnSync": "Updated disappearing message timer to $time$",
-  "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
-  "timerOption_0_seconds": "Off",
-  "timerOption_5_seconds": "5 seconds",
-  "timerOption_10_seconds": "10 seconds",
-  "timerOption_30_seconds": "30 seconds",
-  "timerOption_1_minute": "1 minute",
-  "timerOption_5_minutes": "5 minutes",
-  "timerOption_30_minutes": "30 minutes",
-  "timerOption_1_hour": "1 hour",
-  "timerOption_6_hours": "6 hours",
-  "timerOption_12_hours": "12 hours",
-  "timerOption_1_day": "1 day",
-  "timerOption_1_week": "1 week",
-  "disappearingMessages": "Disappearing messages",
-  "changeNickname": "Change Nickname",
-  "clearNickname": "Clear Nickname",
-  "nicknamePlaceholder": "New Nickname",
-  "changeNicknameMessage": "Enter a nickname for this user",
-  "timerOption_0_seconds_abbreviated": "off",
-  "timerOption_5_seconds_abbreviated": "5s",
-  "timerOption_10_seconds_abbreviated": "10s",
-  "timerOption_30_seconds_abbreviated": "30s",
-  "timerOption_1_minute_abbreviated": "1m",
-  "timerOption_5_minutes_abbreviated": "5m",
-  "timerOption_30_minutes_abbreviated": "30m",
-  "timerOption_1_hour_abbreviated": "1h",
-  "timerOption_6_hours_abbreviated": "6h",
-  "timerOption_12_hours_abbreviated": "12h",
-  "timerOption_1_day_abbreviated": "1d",
-  "timerOption_1_week_abbreviated": "1w",
-  "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
-  "youDisabledDisappearingMessages": "You disabled disappearing messages.",
-  "timerSetTo": "Disappearing message time set to $time$",
-  "noteToSelf": "Note to Self",
-  "hideMenuBarTitle": "Hide Menu Bar",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
-  "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
-  "failedResolveOns": "Failed to resolve ONS name",
-  "autoUpdateSettingTitle": "Auto Update",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
-  "autoUpdateNewVersionTitle": "Session update available",
-  "autoUpdateNewVersionMessage": "There is a new version of Session available.",
-  "autoUpdateNewVersionInstructions": "Press Restart Session to apply the updates.",
-  "autoUpdateRestartButtonLabel": "Restart Session",
-  "autoUpdateLaterButtonLabel": "Later",
-  "autoUpdateDownloadButtonLabel": "Download",
-  "autoUpdateDownloadedMessage": "Update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Would you like to download the update?",
-  "leftTheGroup": "$name$ has left the group.",
-  "multipleLeftTheGroup": "$name$ left the group",
-  "updatedTheGroup": "Group updated",
-  "titleIsNow": "Group name is now '$name$'.",
-  "joinedTheGroup": "$name$ joined the group.",
-  "multipleJoinedTheGroup": "$name$ joined the group.",
-  "kickedFromTheGroup": "$name$ was removed from the group.",
-  "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
-  "unblocked": "Unblocked",
-  "blocked": "Blocked",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Unban User",
-  "userUnbanned": "User unbanned successfully",
-  "userUnbanFailed": "Unban failed!",
-  "banUser": "Ban User",
-  "banUserAndDeleteAll": "Ban and Delete All",
-  "userBanned": "Banned successfully",
-  "userBanFailed": "Ban failed!",
-  "leaveGroup": "Leave Group",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Are you sure you want to leave this group?",
-  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
-  "cannotRemoveCreatorFromGroup": "Cannot remove this user",
-  "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
-  "noContactsForGroup": "You don't have any contacts yet",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
-  "copyMessage": "Copy message text",
-  "selectMessage": "Select message",
-  "editGroup": "Edit group",
-  "editGroupName": "Edit group name",
-  "updateGroupDialogTitle": "Updating $name$...",
-  "showRecoveryPhrase": "Recovery Phrase",
-  "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
-  "enterPassword": "Please enter your password",
-  "confirmPassword": "Confirm password",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
-  "showRecoveryPhrasePasswordRequest": "Please enter your password",
-  "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
-  "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
-  "passwordViewTitle": "Enter Password",
-  "password": "Password",
-  "setPassword": "Set Password",
-  "changePassword": "Change Password",
-  "createPassword": "Create your password",
-  "removePassword": "Remove Password",
-  "maxPasswordAttempts": "Invalid Password. Would you like to reset the database?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Old password is invalid",
-  "invalidPassword": "Invalid password",
-  "noGivenPassword": "Please enter your password",
-  "passwordsDoNotMatch": "Passwords do not match",
-  "setPasswordInvalid": "Passwords do not match",
-  "changePasswordInvalid": "The old password you entered is incorrect",
-  "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Connecting...",
-  "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
-  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
-  "remove": "Remove",
-  "invalidSessionId": "Invalid Session ID",
-  "invalidPubkeyFormat": "Invalid Pubkey Format",
-  "emptyGroupNameError": "Please enter a group name",
-  "editProfileModalTitle": "Profile",
-  "groupNamePlaceholder": "Group Name",
-  "inviteContacts": "Invite Contacts",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
-  "add": "Add",
-  "addingContacts": "Adding contacts to $name$",
-  "noContactsToAdd": "No contacts to add",
-  "noMembersInThisGroup": "No other members in this group",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
-  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
-  "createAccount": "Create account",
-  "startInTrayTitle": "Keep in System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
-  "yourUniqueSessionID": "Say hello to your Session ID",
-  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
-  "getStarted": "Get started",
-  "createSessionID": "Create Session ID",
-  "recoveryPhrase": "Recovery Phrase",
-  "enterRecoveryPhrase": "Enter your recovery phrase",
-  "displayName": "Display Name",
-  "anonymous": "Anonymous",
-  "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
-  "enterDisplayName": "Enter a display name",
-  "continueYourSession": "Continue Your Session",
-  "linkDevice": "Link Device",
-  "restoreUsingRecoveryPhrase": "Restore your account",
-  "or": "or",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
-  "beginYourSession": "Begin your Session.",
-  "welcomeToYourSession": "Welcome to your Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
-  "enterSessionID": "Enter Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
-  "message": "Message",
-  "appearanceSettingsTitle": "Appearance",
-  "privacySettingsTitle": "Privacy",
-  "notificationsSettingsTitle": "Notifications",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
-  "recoveryPhraseEmpty": "Enter your recovery phrase",
-  "displayNameEmpty": "Please enter a display name",
-  "members": "$count$ members",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
-  "createClosedGroupNamePrompt": "Group Name",
-  "createClosedGroupPlaceholder": "Enter a group name",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
-  "next": "Next",
-  "invalidGroupNameTooShort": "Please enter a group name",
-  "invalidGroupNameTooLong": "Please enter a shorter group name",
-  "pickClosedGroupMember": "Please pick at least 1 group member",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
-  "orJoinOneOfThese": "Or join one of these...",
-  "helpUsTranslateSession": "Translate Session",
-  "closedGroupInviteFailTitle": "Group Invitation Failed",
-  "closedGroupInviteFailTitlePlural": "Group Invitations Failed",
-  "closedGroupInviteFailMessage": "Unable to successfully invite a group member",
-  "closedGroupInviteFailMessagePlural": "Unable to successfully invite all group members",
-  "closedGroupInviteOkText": "Retry invitations",
-  "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
+  "noSearchResults": "Արդյունք չգտնվեց «$searchTerm$»-ի համար։",
+  "conversationsHeader": "Կոնտակտներ և խմբեր",
+  "contactsHeader": "Կոնտակտներ",
+  "messagesHeader": "Conversations",
+  "settingsHeader": "Կարգավորումներ",
+  "typingAlt": "Մուտքագրման անիմացիա այս զրույցի համար",
+  "contactAvatarAlt": "Անձնանշան $name$ կոնտակտի համար",
+  "downloadAttachment": "Ներբեռնել կցորդը",
+  "replyToMessage": "Պատասխանել հաղորդագրությանը",
+  "replyingToMessage": "Ի պատասխան․",
+  "originalMessageNotFound": "Մեջբերված հաղորդագրությունը չի գտնվել",
+  "you": "Դուք",
+  "audioPermissionNeededTitle": "Պահանջվում է խոսափողի թույլատվություն",
+  "audioPermissionNeeded": "Դուք կարող եք միացնել խոսափողի թույլատվությունը հետևյալ հասցեյով ՝ Կարգավորումներ (փոխանցման պատկերակ) => Գաղտնիություն",
+  "audio": "Ձայնագրություն",
+  "video": "Տեսանյութ",
+  "photo": "Նկար",
+  "cannotUpdate": "Հնարավոր չէ թարմացնել",
+  "cannotUpdateDetail": "Session Desktop-ը չհաջողվեց թարմացնել, բայց կա նոր տարբերակ: Խնդրում ենք այցելեք https://getsession.org/ և ինքնուրույն տեղադրեք նոր տարբերակը, այնուհետև կամ կապվեք աջակցման ծառայության հետ կամ այս խնդրի վերաբերյալ վրիպակ ներկայացրեք:",
+  "ok": "Լավ",
+  "cancel": "Չեղարկել",
+  "close": "Փակել",
+  "continue": "Շարունակել",
+  "error": "Սխալ",
+  "delete": "Ջնջել",
+  "messageDeletionForbidden": "Դուք ուրիշների հաղորդագրությունները ջնջելու թույլտվություն չունեք",
+  "deleteJustForMe": "Ջնջել միայն իմ համար",
+  "deleteForEveryone": "Ջնջել բոլորի համար",
+  "deleteMessagesQuestion": "Ջնջե՞լ $count$ հաղորդագրություն:",
+  "deleteMessageQuestion": "Ջնջե՞լ այս հաղորդագրությունը:",
+  "deleteMessages": "Ջնջել հաղորդագրությունները",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ ջնջված է",
+  "messageDeletedPlaceholder": "Այս հաղորդագրությունը ջնջվել է",
+  "from": "Ուղարկող:",
+  "to": "Ստացող:",
+  "sent": "Ուղարկված է",
+  "received": "Ստացված է",
+  "sendMessage": "Հաղորդագրություն",
+  "groupMembers": "Անդամներ",
+  "moreInformation": "Լրացուցիչ տեղեկություններ",
+  "resend": "Կրկին ուղարկել",
+  "deleteConversationConfirmation": "Ընդմիշտ ջնջե՞լ այս խոսակցության հաղորդագրությունները:",
+  "clear": "Ջնջել",
+  "clearAllData": "Ջնջել բոլոր տվյալները",
+  "deleteAccountWarning": "Սա ընդմիշտ կջնջի ձեր հաղորդագրությունները և կոնտակտները:",
+  "deleteAccountFromLogin": "Իսկապե՞ս ուզում եք ջնջել ձեր սարքի տվյալները:",
+  "deleteContactConfirmation": "Վստա՞հ եք, որ ուզում եք ջնջել այս խոսակցությունը:",
+  "quoteThumbnailAlt": "Պատկերի մանրապատկերը մեջբերված հաղորդագրությունից",
+  "imageAttachmentAlt": "Պատկեր՝ կցված հաղորդագրությանը",
+  "videoAttachmentAlt": "Տեսանյութի սքրինշոթը հաղորդագրության մեջ",
+  "lightboxImageAlt": "Նկար՝ ուղարկված զրույում",
+  "imageCaptionIconAlt": "Պատկերակ՝ ցուցադրող, որ այս պատկերն ունի մակագրություն",
+  "addACaption": "Ավելացնել վերնագիր...",
+  "copySessionID": "Պատճենել Session ID֊ն",
+  "copyOpenGroupURL": "Բաց Խմբի URL հասցե",
+  "save": "Պահպանել",
+  "saveLogToDesktop": "Պահել գրանցամատյանը աշխատասեղանին",
+  "saved": "Պահպանված է",
+  "tookAScreenshot": "$name$֊ը նկարել է էկրանը",
+  "savedTheFile": "$name$ պահպանել է մեդիա ֆայլը:",
+  "linkPreviewsTitle": "Ուղարկել հղման նախադիտումներ",
+  "linkPreviewDescription": "Ստեղծեք հղման նախադիտումներ աջակցվող URL-ների համար:",
+  "linkPreviewsConfirmMessage": "Հղումների նախադիտում ուղարկելիս դուք չեք ունենա մետատվյալների ամբողջական պաշտպանություն:",
+  "mediaPermissionsTitle": "Խոսափող",
+  "mediaPermissionsDescription": "Թույլատրել խոսափողի մուտքը:",
+  "spellCheckTitle": "Ուղղագրության ստուգում",
+  "spellCheckDescription": "Միացնել ուղղագրության ստուգումը հաղորդագրություններ մուտքագրելիս:",
+  "spellCheckDirty": "Ձեր նոր կարգավորումները կիրառելու համար դուք պետք է վերագործարկեք Session-ը",
+  "readReceiptSettingDescription": "Ուղարկեք ընթերցման անդորրագրերը մեկ առ մեկ զրույցներում:",
+  "readReceiptSettingTitle": "Ընթերցման անդորրագրեր",
+  "typingIndicatorsSettingDescription": "Տեսեք և տարածեք մուտքագրման ցուցիչները մեկ առ մեկ զրույցներում:",
+  "typingIndicatorsSettingTitle": "Մուտքագրման ցուցիչներ",
+  "zoomFactorSettingTitle": "Խոշորացման ֆակտոր",
+  "themesSettingTitle": "Ոճեր",
+  "primaryColor": "Առաջնային գույն",
+  "primaryColorGreen": "Առաջնային գույն կանաչ",
+  "primaryColorBlue": "Առաջնային գույն կապույտ",
+  "primaryColorYellow": "Առաջնային գույն դեղին",
+  "primaryColorPink": "Առաջնային գույն վարդագույն",
+  "primaryColorPurple": "Առաջնային գույն մանուշակագույն",
+  "primaryColorOrange": "Առաջնային գույն նարնջագույն",
+  "primaryColorRed": "Առաջնային գույն կարմիր",
+  "classicDarkThemeTitle": "Դասական մութ",
+  "classicLightThemeTitle": "Դասական լույս",
+  "oceanDarkThemeTitle": "Օվկիանոսի մութ",
+  "oceanLightThemeTitle": "Օվկիանոսի լույս",
+  "pruneSettingTitle": "Կարճեցնել համայնքները",
+  "pruneSettingDescription": "Ջնջել 6 ամսից ավելի հին հաղորդագրությունները այն համայնքներից, որոնք ունեն ավելի քան 2000 հաղորդագրություն:",
+  "enable": "Միացնել",
+  "keepDisabled": "Անջատված պահել",
+  "notificationSettingsDialog": "Ծանուցումներում ցուցադրված տեղեկատվությունը:",
+  "nameAndMessage": "Անուն և բովանդակություն",
+  "noNameOrMessage": "Առանց անվան կամ բովանդակության",
+  "nameOnly": "Միայն անունը",
+  "newMessage": "Նոր հաղորդագրություն",
+  "createConversationNewContact": "Ստեղծեք զրույց նոր կոնտակտի հետ",
+  "createConversationNewGroup": "Ստեղծեք խումբ գոյություն ունեցող կոնտակտներով",
+  "joinACommunity": "Միացեք համայնքին",
+  "chooseAnAction": "Խոսակցություն սկսելու համար ընտրեք գործողություն",
+  "newMessages": "Նոր հաղորդագրություններ",
+  "notificationMostRecentFrom": "Վերջինը $name$֊ից",
+  "notificationFrom": "Ուղարկող:",
+  "notificationMostRecent": "Վերջինը:",
+  "sendFailed": "Ուղարկումը ձախողվեց",
+  "mediaMessage": "Մեդիաով հաղորդագրություն",
+  "messageBodyMissing": "Խնդրում ենք մուտքագրել հաղորդագրությունը:",
+  "messageBody": "Հաղորդագրության տեքստ",
+  "unblockToSend": "Արգելաբացել այս կոնտակտը հաղորդագրություն ուղարկելու համար:",
+  "unblockGroupToSend": "Այս խումբն արգելափակված է։ Արգելաբացեք այն, եթե ցանկանում եք հաղորդագրություն ուղարկել:",
+  "youChangedTheTimer": "Դուք անհետացող հաղորդագրության ժամաչափը դրեցիք $time$",
+  "timerSetOnSync": "Հաղորդագրության անհետացման ժամանակը սահմանվել է $time$",
+  "theyChangedTheTimer": "$name$֊ը անհետացող հաղորդագրության ժամաչափը դրեց $time$",
+  "timerOption_0_seconds": "Անջատված",
+  "timerOption_5_seconds": "5 վայրկյան",
+  "timerOption_10_seconds": "10 վայրկյան",
+  "timerOption_30_seconds": "30 վայրկյան",
+  "timerOption_1_minute": "1 րոպե",
+  "timerOption_5_minutes": "5 րոպե",
+  "timerOption_30_minutes": "30 րոպե",
+  "timerOption_1_hour": "1 ժամ",
+  "timerOption_6_hours": "6 ժամ",
+  "timerOption_12_hours": "12 ժամ",
+  "timerOption_1_day": "1 օր",
+  "timerOption_1_week": "1 շաբաթ",
+  "timerOption_2_weeks": "2 շաբաթ",
+  "disappearingMessages": "Անհետացող հաղորդագրություններ",
+  "changeNickname": "Փոխել մականունը",
+  "clearNickname": "Մաքրել մականունը",
+  "nicknamePlaceholder": "Նոր մականուն",
+  "changeNicknameMessage": "Մուտքագրեք այս օգտատիրոջ մականունը",
+  "timerOption_0_seconds_abbreviated": "անջատված",
+  "timerOption_5_seconds_abbreviated": "5 վայրկյան",
+  "timerOption_10_seconds_abbreviated": "10 վայրկյան",
+  "timerOption_30_seconds_abbreviated": "30 վայրկյան",
+  "timerOption_1_minute_abbreviated": "1 րոպե",
+  "timerOption_5_minutes_abbreviated": "5 րոպե",
+  "timerOption_30_minutes_abbreviated": "30 րոպե",
+  "timerOption_1_hour_abbreviated": "1 ժամ",
+  "timerOption_6_hours_abbreviated": "6 ժամ",
+  "timerOption_12_hours_abbreviated": "12 ժամ",
+  "timerOption_1_day_abbreviated": "1 օր",
+  "timerOption_1_week_abbreviated": "1 շաբաթ",
+  "timerOption_2_weeks_abbreviated": "2 շաբաթ",
+  "disappearingMessagesDisabled": "Անհետացող հաղորդագրություններն անջատված են",
+  "disabledDisappearingMessages": "$name$ անջատել է անհետացող հաղորդագրությունները:",
+  "youDisabledDisappearingMessages": "Դուք անջատել եք անհետացող հաղորդագրությունները:",
+  "timerSetTo": "Հաղորդագրության անհետացման ժամանակը սահմանվել է $time$",
+  "noteToSelf": "Նշում ինքս ինձ",
+  "hideMenuBarTitle": "Թաքցնել ընտրացանկը",
+  "hideMenuBarDescription": "Միացնել համակարգի ընտրացանկի տեսանելիությունը:",
+  "startConversation": "Սկսել նոր զրույց",
+  "invalidNumberError": "Խնդրում ենք ստուգել Session ID-ն կամ ONS անունը և նորից փորձել",
+  "failedResolveOns": "Չհաջողվեց պարզել ONS անունը",
+  "autoUpdateSettingTitle": "Ավտոմատ թարմացում",
+  "autoUpdateSettingDescription": "Ինքնաբար ստուգել թարմացումները գործարկման ժամանակ:",
+  "autoUpdateNewVersionTitle": "Session֊ի թարմացումը հասանելի է",
+  "autoUpdateNewVersionMessage": "Հասանելի է Session-ի նոր տարբերակը:",
+  "autoUpdateNewVersionInstructions": "Թարմացումները կիրառելու համար սեղմեք Restart Session-ը:",
+  "autoUpdateRestartButtonLabel": "Վերագործարկեք Session-ը",
+  "autoUpdateLaterButtonLabel": "Ավելի ուշ",
+  "autoUpdateDownloadButtonLabel": "Ներբեռնել",
+  "autoUpdateDownloadedMessage": "Թարմացումը ներբեռնվել է:",
+  "autoUpdateDownloadInstructions": "Ցանկանու՞մ եք ներբեռնել թարմացումը:",
+  "leftTheGroup": "$name$-ը լքել է խումբը:",
+  "multipleLeftTheGroup": "$name$-ը լքել է խումբը:",
+  "updatedTheGroup": "Խումբը թարմացվել է",
+  "titleIsNow": "Խմբի անունը այժմ «$name$» է:",
+  "joinedTheGroup": "$name$ միացավ խմբին:",
+  "multipleJoinedTheGroup": "$name$ միացավ խմբին:",
+  "kickedFromTheGroup": "$name$ հեռացվել է խմբից:",
+  "multipleKickedFromTheGroup": "$name$ հեռացվել են խմբից:",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Արգելաբացվել է",
+  "blocked": "Արգելափակվել է",
+  "blockedSettingsTitle": "Արգելափակված կոնտակտներ",
+  "conversationsSettingsTitle": "Զրույցներ",
+  "unbanUser": "Արգելահանել օգտատիրոջը",
+  "userUnbanned": "Օգտատերը հաջողությամբ արգելահանվեց",
+  "userUnbanFailed": "Արգելահանումը չհաջողվեց:",
+  "banUser": "Արգելել օգտատիրոջը",
+  "banUserAndDeleteAll": "Արգելել և ջնջել ամբողջը",
+  "userBanned": "Հաջողությամբ արգելված է",
+  "userBanFailed": "Արգելքը ձախողվեց:",
+  "leaveGroup": "Լքել խումբը",
+  "leaveAndRemoveForEveryone": "Դուրս գալ խմբից և հեռացնել բոլորի համար",
+  "leaveGroupConfirmation": "Իսկապե՞ս ուզում եք լքել այս խումբը:",
+  "leaveGroupConfirmationAdmin": "Քանի որ դուք այս խմբի ադմին եք, եթե այն լքեք, այն կհեռացվի բոլոր ներկա անդամների համար: Իսկապե՞ս ուզում եք լքել այս խումբը:",
+  "cannotRemoveCreatorFromGroup": "Հնարավոր չէ հեռացնել այս օգտատիրոջը",
+  "cannotRemoveCreatorFromGroupDesc": "Դուք չեք կարող հեռացնել այս օգտվողին, քանի որ նա խմբի ստեղծողն է:",
+  "noContactsForGroup": "Դուք դեռ որևէ կոնտակտ չունեք",
+  "failedToAddAsModerator": "Չհաջողվեց ավելացնել օգտվողին որպես ադմին",
+  "failedToRemoveFromModerator": "Չհաջողվեց հեռացնել օգտվողին ադմինների ցանկից",
+  "copyMessage": "Պատճենել հաղորդագրության տեքստը",
+  "selectMessage": "Ընտրել հաղորդագրությունը",
+  "editGroup": "Խմբագրել խումբը",
+  "editGroupName": "Խմբագրել խմբի անունը",
+  "updateGroupDialogTitle": "Թարմացվում է $name$...",
+  "showRecoveryPhrase": "Վերականգնման արտահայտություն",
+  "yourSessionID": "Ձեր Session ID֊ն",
+  "setAccountPasswordTitle": "Գաղտնաբառ",
+  "setAccountPasswordDescription": "Պահանջվում է գաղտնաբառ՝ Session-ը ապակողպելու համար:",
+  "changeAccountPasswordTitle": "Փոխել Գաղտնաբառը",
+  "changeAccountPasswordDescription": "Փոխեք Session-ն ապակողպելու համար պահանջվող գաղտնաբառը:",
+  "removeAccountPasswordTitle": "Հեռացնել գաղտնաբառը",
+  "removeAccountPasswordDescription": "Փոխեք Session-ն ապակողպելու համար պահանջվող գաղտնաբառը:",
+  "enterPassword": "Խնդրում ենք մուտքագրել ձեր գաղտնաբառը։",
+  "confirmPassword": "Հաստատել գաղտնաբառը",
+  "enterNewPassword": "Խնդրում ենք մուտքագրել ձեր նոր գաղտնաբառը",
+  "confirmNewPassword": "Հաստատեք նոր գաղտնաբառը",
+  "showRecoveryPhrasePasswordRequest": "Խնդրում ենք մուտքագրել ձեր գաղտնաբառը։",
+  "recoveryPhraseSavePromptMain": "Ձեր վերականգնման արտահայտությունը ձեր Session ID-ի հիմնական բանալին է. դուք կարող եք այն օգտագործել ձեր Session ID-ն վերականգնելու համար, եթե կորցնեք մուտքը ձեր սարք: Պահպանեք ձեր վերականգնման արտահայտությունը ապահով տեղում և մի տվեք այն որևէ մեկին:",
+  "invalidOpenGroupUrl": "Անվավեր URL",
+  "copiedToClipboard": "Պատճենվել է",
+  "passwordViewTitle": "Մուտքագրել գաղտնաբառը",
+  "password": "Գաղտնաբառ",
+  "setPassword": "Սահմանել գաղտնաբառը",
+  "changePassword": "Փոխել գաղտնաբառը",
+  "createPassword": "Ստեղծել գաղտնաբառ",
+  "removePassword": "Հեռացնել գաղտնաբառը",
+  "maxPasswordAttempts": "Անվավեր գաղտնաբառ: Ցանկանու՞մ եք վերականգնել տվյալների բազան:",
+  "typeInOldPassword": "Մուտքագրեք Ձեր ներկա գաղտնաբառը.",
+  "invalidOldPassword": "Հին գաղտնաբառը անվավեր է",
+  "invalidPassword": "Անվավեր գաղտնաբառ",
+  "noGivenPassword": "Խնդրում ենք մուտքագրել ձեր գաղտնաբառը։",
+  "passwordsDoNotMatch": "Գաղտնաբառերը չեն համընկնում",
+  "setPasswordInvalid": "Գաղտնաբառերը չեն համընկնում",
+  "changePasswordInvalid": "Ձեր մուտքագրած հին գաղտնաբառը սխալ է",
+  "removePasswordInvalid": "Սխալ գաղտնաբառ",
+  "setPasswordTitle": "Գաղտնաբառը սահմանված է",
+  "changePasswordTitle": "Գաղտնաբառը փոխվեց",
+  "removePasswordTitle": "Գաղտնաբառը հեռացվեց",
+  "setPasswordToastDescription": "Ձեր գաղտնաբառը սահմանվել է: Խնդրում ենք անվտանգ պահել:",
+  "changePasswordToastDescription": "Ձեր գաղտնաբառը սահմանվել է: Խնդրում ենք անվտանգ պահել:",
+  "removePasswordToastDescription": "Ձեր գաղտնաբառը հեռացվել է:",
+  "publicChatExists": "Դուք արդեն կապված եք այս համայնքի հետ",
+  "connectToServerFail": "Չհաջողվեց միանալ համայնքին",
+  "connectingToServer": "Միացում…",
+  "connectToServerSuccess": "Հաջողությամբ միացվեց համայնքին",
+  "setPasswordFail": "Չհաջողվեց սահմանել գաղտնաբառը",
+  "passwordLengthError": "Գաղտնաբառը պետք է լինի 6-ից 64 նիշ",
+  "passwordTypeError": "Գաղտնաբառը պետք է լինի տող",
+  "passwordCharacterError": "Գաղտնաբառը պետք է պարունակի միայն տառեր, թվեր և նշաններ",
+  "remove": "Ջնջել",
+  "invalidSessionId": "Անվավեր Session ID",
+  "invalidPubkeyFormat": "Pubkey-ի անվավեր ձևաչափ",
+  "emptyGroupNameError": "Խնդրում ենք մուտքագրել խմբի անունը",
+  "editProfileModalTitle": "Հաշիվ",
+  "groupNamePlaceholder": "Խմբի անուն",
+  "inviteContacts": "Հրավիրել կոնտակներին",
+  "addModerators": "Ավելացնել ադմիններ",
+  "removeModerators": "Հեռացնել ադմիններին",
+  "addAsModerator": "Ավելացնել որպես ադմին",
+  "removeFromModerators": "Հեռացնել ադմիններից",
+  "add": "Ավելացնել",
+  "addingContacts": "Կոնտակտների ավելացում $name$-ում",
+  "noContactsToAdd": "Ավելացնելու կոնտակտներ չկան",
+  "noMembersInThisGroup": "Այս խմբում այլ անդամներ չկան",
+  "noModeratorsToRemove": "ադմիններ չկան հեռացնելու համար",
+  "onlyAdminCanRemoveMembers": "Դուք չեք ստեղծողը",
+  "onlyAdminCanRemoveMembersDesc": "Միայն խմբի ստեղծողը կարող է հեռացնել օգտատերերին",
+  "createAccount": "Գրանցվել",
+  "startInTrayTitle": "Պահել System Tray-ում",
+  "startInTrayDescription": "Պատուհանը փակելիս Session-ը գործարկեք ֆոնային ռեժիմում:",
+  "yourUniqueSessionID": "Ողջունեք ձեր Session ID-ին",
+  "allUsersAreRandomly...": "Ձեր Session ID-ն այն եզակի հասցեն է, որը մարդիկ կարող են օգտագործել Session-ում ձեզ հետ կապվելու համար: Առանց ձեր իրական ինքնության հետ կապի, ձեր Session ID-ն բացարձակապես անանուն է և գաղտնի:",
+  "getStarted": "Սկսել",
+  "createSessionID": "Ստեղծել Session ID",
+  "recoveryPhrase": "Վերականգնման արտահայտություն",
+  "enterRecoveryPhrase": "Գրեք ձեր վերականգնման արտահայտությունը",
+  "displayName": "Ցուցադրվող անուն",
+  "anonymous": "Անանուն",
+  "removeResidueMembers": "Լավ սեղմելով՝ այդ անդամները նույնպես կհեռացվեն խմբից դուրս գալուց:",
+  "enterDisplayName": "Մուտքագրեք ցուցադրվող անուն",
+  "continueYourSession": "Շարունակեք ձեր Session֊ի նիստը",
+  "linkDevice": "Ավելացնել սարք",
+  "restoreUsingRecoveryPhrase": "Վերականգնել ձեր հաշիվը",
+  "or": "կամ",
+  "ByUsingThisService...": "Օգտագործելով այս ծառայությունը՝ դուք համաձայնում եք մեր <a href=\"https://getsession.org/terms-of-service \"> Ծառայությունների մատուցման պայմաններին </a> և <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\"> Գաղտնիության քաղաքականությանը </a>",
+  "beginYourSession": "Սկսեք ձեր Session-ի նստաշրջանը։",
+  "welcomeToYourSession": "Բարի գալուստ Ձեր Session-ի նստաշրջան",
+  "searchFor...": "Որոնեք խոսակցություններ և կոնտակտներ",
+  "searchForContactsOnly": "Որոնել կոնտակտներ",
+  "enterSessionID": "Մուտքագրեք Session ID-ն",
+  "enterSessionIDOfRecipient": "Մուտքագրեք ձեր կոնտակտի Session ID-ն կամ ONS-ը",
+  "message": "Հաղորդագրություն",
+  "appearanceSettingsTitle": "Արտաքին տեսք",
+  "privacySettingsTitle": "Գաղտնիություն",
+  "notificationsSettingsTitle": "Ծանուցումներ",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Ծանուցման բովանդակություն",
+  "notificationPreview": "Նախադիտում",
+  "recoveryPhraseEmpty": "Գրեք ձեր վերականգնման արտահայտությունը",
+  "displayNameEmpty": "Խնդրում ենք մուտքագրել ցուցադրվող անուն",
+  "displayNameTooLong": "Display name is too long",
+  "members": "$count$ անդամաներ",
+  "activeMembers": "$count$ active members",
+  "join": "Միանալ",
+  "joinOpenGroup": "Միանալ համայնքին",
+  "createGroup": "Ստեղծել խումբ",
+  "create": "Ստեղծել",
+  "createClosedGroupNamePrompt": "Խմբի անուն",
+  "createClosedGroupPlaceholder": "Մուտքագրեք խմբի անուն",
+  "openGroupURL": "Համայնքի URL",
+  "enterAnOpenGroupURL": "Մուտքագրեք համայնքի URL-ը",
+  "next": "Հաջորդը",
+  "invalidGroupNameTooShort": "Խնդրում ենք մուտքագրել խմբի անունը",
+  "invalidGroupNameTooLong": "Խնդրում ենք մուտքագրել ավելի կարճ խմբի անուն",
+  "pickClosedGroupMember": "Խնդրում ենք ընտրել խմբի առնվազն 1 անդամ",
+  "closedGroupMaxSize": "Խումբը չի կարող ունենալ 100-ից ավելի անդամ",
+  "noBlockedContacts": "Դուք արգելափակված կոնտակտներ չունեք.",
+  "userAddedToModerators": "Օգտատերը ավելացվել է ադմինների ցանկում",
+  "userRemovedFromModerators": "Օգտատերը հեռացվել է ադմինիստրատորի ցուցակից",
+  "orJoinOneOfThese": "Կամ միացե՛ք սրանցից մեկին…",
+  "helpUsTranslateSession": "Թարգմանել Session-ը",
+  "closedGroupInviteFailTitle": "Խմբի հրավերը ձախողվեց",
+  "closedGroupInviteFailTitlePlural": "Խմբի հրավերները ձախողվեցին",
+  "closedGroupInviteFailMessage": "Չաջողվեց հրավիրել խմբի անդամ",
+  "closedGroupInviteFailMessagePlural": "Չաջողվեց հրավիրել բոլոր խմբի անդամներին",
+  "closedGroupInviteOkText": "Կրկին փորձեք հրավերները",
+  "closedGroupInviteSuccessTitlePlural": "Խմբային հրավերներն ավարտված են",
   "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
-  "notificationForConvo": "Notifications",
-  "notificationForConvo_all": "All",
-  "notificationForConvo_disabled": "Disabled",
-  "notificationForConvo_mentions_only": "Mentions only",
-  "onionPathIndicatorTitle": "Path",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
-  "linkVisitWarningTitle": "Open this link in your browser?",
-  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
-  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
-  "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
-  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
-  "notificationSubtitle": "Notifications - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Message Requests",
-  "requestsSubtitle": "Pending Requests",
-  "requestsPlaceholder": "No requests",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
-  "incomingCallFrom": "Incoming call from '$name$'",
-  "ringing": "Ringing...",
-  "establishingConnection": "Establishing connection...",
-  "accept": "Accept",
-  "decline": "Decline",
-  "endCall": "End call",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
-  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "unableToCall": "Cancel your ongoing call first",
-  "unableToCallTitle": "Cannot start new call",
-  "callMissed": "Missed call from $name$",
-  "callMissedTitle": "Call missed",
-  "noCameraFound": "No camera found",
-  "noAudioInputFound": "No audio input found",
-  "noAudioOutputFound": "No audio output found",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
-  "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
-  "startedACall": "You called $name$",
-  "answeredACall": "Call with $name$",
-  "trimDatabase": "Trim Database",
-  "trimDatabaseDescription": "Reduces your message database size to your last 10,000 messages.",
-  "trimDatabaseConfirmationBody": "Are you sure you want to delete your $deleteAmount$ oldest received messages?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "closedGroupInviteSuccessMessage": "Խմբի անդամները հաջողությամբ հրավիրվեցին",
+  "notificationForConvo": "Ծանուցումներ",
+  "notificationForConvo_all": "Բոլորը",
+  "notificationForConvo_disabled": "Անջատված",
+  "notificationForConvo_mentions_only": "Միայն հիշատակումներ",
+  "onionPathIndicatorTitle": "Ուղի",
+  "onionPathIndicatorDescription": "Session-ը թաքցնում է Ձեր IP հասցեն Ձեր հաղորդագրությունները տանելով Session-ի ապահով ցանցերի Ծառայողական Հանգույցներով։ Սրանք այն երկրներն են, որոնցով Ձեր հաղորդագրություններն անցնում են․",
+  "unknownCountry": "Անհայտ երկիր",
+  "device": "Սարք",
+  "destination": "Նպատակակետ",
+  "learnMore": "Իմանալ ավելին",
+  "linkVisitWarningTitle": "Բացե՞լ այս հղումը ձեր դիտարկիչում:",
+  "linkVisitWarningMessage": "Իսկապե՞ս ուզում եք բացել $url$ ձեր դիտարկիչում:",
+  "open": "Բացել",
+  "audioMessageAutoplayTitle": "Աուդիո հաղորդագրությունների ավտոմատ նվագարկում",
+  "audioMessageAutoplayDescription": "Ավտոմատ նվագարկել հաջորդական աուդիո հաղորդագրությունները:",
+  "clickToTrustContact": "Սեղմեք՝ մեդիան ներբեռնելու համար",
+  "trustThisContactDialogTitle": "Վստահե՞լ $name$-ին:",
+  "trustThisContactDialogDescription": "Իսկապե՞ս ուզում եք ներբեռնել $name$-ից ուղարկված մեդիան:",
+  "pinConversation": "Ամրացնել զրույցը",
+  "unpinConversation": "Ապամրացնել զրույցը",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Ցուցադրել օգտատիրոջ տվյալները",
+  "sendRecoveryPhraseTitle": "Վերականգնման արտահայտություն ուղարկում",
+  "sendRecoveryPhraseMessage": "Դուք փորձում եք ուղարկել ձեր վերականգնման արտահայտությունը, որը կարող է օգտագործվել ձեր հաշիվ մուտք գործելու համար: Իսկապե՞ս ուզում եք ուղարկել այս հաղորդագրությունը:",
+  "dialogClearAllDataDeletionFailedTitle": "Տվյալները չեն ջնջվել",
+  "dialogClearAllDataDeletionFailedDesc": "Տվյալները չեն ջնջվել անհայտ սխալով: Ցանկանու՞մ եք ջնջել տվյալները միայն այս սարքից:",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Ցանկանու՞մ եք ջնջել տվյալները միայն այս սարքից:",
+  "dialogClearAllDataDeletionFailedMultiple": "Տվյալները չեն ջնջվել այս ծառայողական հանգույցների կողմից՝ $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Ցանկանու՞մ եք մաքրել միայն այս սարքը, թե ջնջե՞լ ձեր տվյալները ցանցից:",
+  "clearDevice": "Մաքրել սարքը",
+  "tryAgain": "Կրկին փորձեք",
+  "areYouSureClearDevice": "Իսկապե՞ս ուզում եք ջնջել ձեր սարքի տվյալները:",
+  "deviceOnly": "Մաքրել միայն սարքը",
+  "entireAccount": "Մաքրել սարքը և ցանցը",
+  "areYouSureDeleteDeviceOnly": "Իսկապե՞ս ուզում եք ջնջել միայն ձեր սարքի տվյալները:",
+  "areYouSureDeleteEntireAccount": "Իսկապե՞ս ուզում եք ջնջել ձեր տվյալները ցանցից: Եթե շարունակեք, չեք կարողանա վերականգնել ձեր հաղորդագրությունները կամ կոնտակտները:",
+  "iAmSure": "Վստահ եմ",
+  "recoveryPhraseSecureTitle": "Դուք գրեթե ավարտեցիք:",
+  "recoveryPhraseRevealMessage": "Ապահովեք ձեր հաշիվը՝ պահպանելով ձեր վերականգնման արտահայտությունը: Բացահայտեք ձեր վերականգնման արտահայտությունը, այնուհետև ապահով պահեք այն՝ այն ապահովելու համար:",
+  "recoveryPhraseRevealButtonText": "Բացահայտել վերականգնման արտահայտությունը",
+  "notificationSubtitle": "Ծանուցումներ - $setting$",
+  "surveyTitle": "Մենք կցանկանայինք ձեր կարծիքը",
+  "faq": "ՀՏՀ",
+  "support": "Աջակցում",
+  "clearAll": "Մաքրել բոլորը",
+  "clearDataSettingsTitle": "Զրոյացնել",
+  "messageRequests": "Հաղորդագրության հարցումներ",
+  "requestsSubtitle": "Սպասվող հարցումներ",
+  "requestsPlaceholder": "Հարցումներ չկան",
+  "hideRequestBannerDescription": "Թաքցրեք Հաղորդագրության հարցման դրոշակը, մինչև ստանաք նոր հաղորդագրության հարցում:",
+  "incomingCallFrom": "Մուտքային զանգ «$name$»-ից",
+  "ringing": "Զանգահարում է...",
+  "establishingConnection": "Կապի հաստատում...",
+  "accept": "Ընդունել",
+  "decline": "Մերժել",
+  "endCall": "Ավարտել զանգը",
+  "permissionsSettingsTitle": "Թույլտվություններ",
+  "helpSettingsTitle": "Օգնություն",
+  "cameraPermissionNeededTitle": "Պահանջվում են ձայնային/տեսազանգերի թույլտվություններ",
+  "cameraPermissionNeeded": "Դուք կարող եք միացնել «Ձայնային և տեսազանգերի» թույլտվությունը Գաղտնիության կարգավորումներում:",
+  "unableToCall": "Նախ չեղարկեք ձեր ընթացիկ զանգը",
+  "unableToCallTitle": "Հնարավոր չէ նոր զանգ սկսել",
+  "callMissed": "Բաց թողնված զանգ $name$-ից",
+  "callMissedTitle": "Զանգը բաց է թողնվել",
+  "noCameraFound": "Տեսախցիկ չի գտնվել",
+  "noAudioInputFound": "Ձայնային մուտքագրում չի գտնվել",
+  "noAudioOutputFound": "Ձայնային ելք չի գտնվել",
+  "callMediaPermissionsTitle": "Ձայնային և տեսազանգեր (Beta)",
+  "callMissedCausePermission": "Դուք բաց եք թողել զանգ «$name$»-ից, քանի որ Գաղտնիության կարգավորումներում պետք է միացնեք «Ձայնային և տեսազանգերի» թույլտվությունը:",
+  "callMissedNotApproved": "Զանգը բաց է թողնվել «$name$»-ից, քանի որ դուք դեռ չեք հաստատել այս խոսակցությունը: Սկզբում հաղորդագրություն ուղարկեք նրանց:",
+  "callMediaPermissionsDescription": "Միացնում է ձայնային և տեսազանգերը դեպի և այլ օգտվողների հետ:",
+  "callMediaPermissionsDialogContent": "Ձեր IP հասցեն տեսանելի է ձեր զանգի գործընկերոջը և Oxen Foundation սերվերին Beta զանգեր օգտագործելիս: Իսկապե՞ս ուզում եք միացնել ձայնային և տեսազանգերը:",
+  "callMediaPermissionsDialogTitle": "Ձայնային և տեսազանգեր (Beta)",
+  "startedACall": "Դուք զանգահարել եք $name$",
+  "answeredACall": "Զանգ $name$-ի հետ",
+  "trimDatabase": "Կրճատել տվյալների բազան",
+  "trimDatabaseDescription": "Կրճատում է ձեր հաղորդագրությունների տվյալների բազայի չափը մինչև ձեր վերջին 10000 հաղորդագրությունը:",
+  "trimDatabaseConfirmationBody": "Իսկապե՞ս ուզում եք ջնջել ձեր $deleteAmount$ ամենահին ստացված հաղորդագրությունները:",
+  "pleaseWaitOpenAndOptimizeDb": "Խնդրում ենք սպասել, մինչև ձեր տվյալների բազան բացվի և օպտիմիզացվի...",
+  "messageRequestPending": "Ձեր հաղորդագրության հարցումն այժմ առկախ է",
+  "messageRequestAccepted": "Ձեր հաղորդագրության հարցումն ընդունվել է",
+  "messageRequestAcceptedOurs": "Դուք ընդունել եք $name$-ի հաղորդագրության հարցումը",
+  "messageRequestAcceptedOursNoName": "Դուք ընդունել եք հաղորդագրության հարցումը",
+  "declineRequestMessage": "Իսկապե՞ս ուզում եք մերժել այս հաղորդագրության հարցումը:",
+  "respondingToRequestWarning": "Այս օգտատիրոջը հաղորդագրություն ուղարկելը ինքնաբերաբար կընդունի նրա հաղորդագրության հարցումը և կբացահայտի ձեր Session ID-ն:",
+  "hideRequestBanner": "Թաքցնել hաղորդագրության հարցումների բաժինը",
+  "openMessageRequestInbox": "Հաղորդագրության հարցումներ",
+  "noMessageRequestsPending": "Սպասող հաղորդագրությունների հարցումներ չկան",
+  "noMediaUntilApproved": "Դուք չեք կարող ուղարկել կցորդներ, քանի դեռ զրույցը չի հաստատվել",
+  "mustBeApproved": "Այս խոսակցությունը պետք է ընդունվի՝ այս գործառույթն օգտագործելու համար",
+  "youHaveANewFriendRequest": "Դուք ունեք նոր հաղորդագրության հարցում",
+  "clearAllConfirmationTitle": "Մաքրել բոլոր հաղորդագրությունների հարցումները",
+  "clearAllConfirmationBody": "Իսկապե՞ս ուզում եք ջնջել հաղորդագրությունների բոլոր հարցումները:",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Թաքցնել",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Դիտեք ձեր հաղորդագրությունների հարցումների մուտքի արկղը",
+  "clearAllReactions": "Իսկապե՞ս ուզում եք ջնջել բոլոր $emoji$-ը:",
+  "expandedReactionsText": "Ավելի քիչ ցույց տալ",
+  "reactionNotification": "Արձագանքում է $emoji$-ով հաղորդագրությանը",
+  "rateLimitReactMessage": "Դանդաղեցրե՛ք։ Դուք չափազանց շատ էմոջիների արձագանքներ եք ուղարկել: Շուտով նորից փորձեք:",
+  "otherSingular": "$number$ այլ",
+  "otherPlural": "$number$ այլ",
+  "reactionPopup": "արձագանքել է",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ և $name2$",
+  "reactionPopupThree": "$name$, $name2$ և $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ և",
+  "reactionListCountSingular": "Եվ ևս $otherSingular$ արձագանքել է <span>$emoji$</span> այս հաղորդագրությանը",
+  "reactionListCountPlural": "Եվ ևս $otherPlural$ արձագանքել է <span>$emoji$</span> այս հաղորդագրությանը"
 }
diff --git a/_locales/id/messages.json b/_locales/id/messages.json
index ea4104486..67176059b 100644
--- a/_locales/id/messages.json
+++ b/_locales/id/messages.json
@@ -16,7 +16,7 @@
   "editMenuCut": "Potong",
   "editMenuCopy": "Salin",
   "editMenuPaste": "Tempel",
-  "editMenuDeleteContact": "Hapus kontak",
+  "editMenuDeleteContact": "Hapus Kontak",
   "editMenuDeleteGroup": "Hapus Grup",
   "editMenuSelectAll": "Pilih semua",
   "windowMenuClose": "Tutup Jendela",
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Toggle layar penuh",
   "viewMenuToggleDevTools": "Toggle perangkat pengembangan",
   "contextMenuNoSuggestions": "Tidak ada sugesti",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Undangan komunitas",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Bergabung ke $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Apakah Anda yakin ingin bergabung dengan komunitas $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Masukkan Session ID atau nama ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Mulai percakapan baru dengan memasukkan ID Session seseorang atau bagikan ID Session Anda dengan mereka.",
   "loading": "Memuat...",
   "done": "Selesai",
   "youLeftTheGroup": "Anda telah keluar dari grup.",
   "youGotKickedFromGroup": "Anda dikeluarkan dari grup.",
   "unreadMessages": "Pesan Belum Terbaca",
   "debugLogExplanation": "Log ini akan disimpan ke desktop anda.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Laporkan Bug",
   "markAllAsRead": "Tandai semuanya telah dibaca",
   "incomingError": "Gagal dalam menangani pesan masuk",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Maaf, terjadi kesalahan pada pengaturan lampiran anda.",
   "offline": "Luring",
   "debugLog": "Catatan Awakutu",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Ekspor Log",
+  "shareBugDetails": "Ekspor log Anda, lalu unggah berkas melalui Layanan Bantuan Session.",
   "goToReleaseNotes": "Lihat Catatan Rilis",
   "goToSupportPage": "Cek halaman bantuan",
   "about": "Tentang",
@@ -72,7 +72,7 @@
   "noSearchResults": "Tidak ditemukan hasil untuk \"$searchTerm$\"",
   "conversationsHeader": "Grup dan Kontak",
   "contactsHeader": "Kontak",
-  "messagesHeader": "Pesan",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Pengaturan",
   "typingAlt": "Animasi pengetikan untuk percakapan ini",
   "contactAvatarAlt": "Avatar untuk kontak $name$",
@@ -100,73 +100,75 @@
   "deleteMessagesQuestion": "Hapus $count$ Pesan?",
   "deleteMessageQuestion": "Hapus pesan ini?",
   "deleteMessages": "Hapus pesan",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ dihapus",
   "messageDeletedPlaceholder": "Pesan ini telah dihapus",
   "from": "Dari:",
   "to": "Kepada:",
   "sent": "Terkirim",
   "received": "Diterima",
   "sendMessage": "Mengirim pesan",
-  "groupMembers": "Anggota grup",
+  "groupMembers": "Anggota",
   "moreInformation": "Informasi lebih lanjut",
   "resend": "Kirim ulang",
   "deleteConversationConfirmation": "Hapus obrolan ini selamanya?",
-  "clear": "Clear",
+  "clear": "Hapus",
   "clearAllData": "Hapus semua data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Tindakan ini akan menghapus pesan dan kontak Anda secara permanen.",
+  "deleteAccountFromLogin": "Apakah Anda yakin ingin menghapus perangkat Anda?",
   "deleteContactConfirmation": "Apakah anda yakin ingin menghapus percakapan ini?",
   "quoteThumbnailAlt": "Cuplikan gambar dari pesan yang dikutip",
   "imageAttachmentAlt": "Gambar dilampirkan kedalam pesan",
-  "videoAttachmentAlt": "Hasil tangkapan layar dari video dilampirkan dalam pesan",
+  "videoAttachmentAlt": "Tangkapan layar video dalam pesan",
   "lightboxImageAlt": "Gambar telah terkirim dalam percakapan",
   "imageCaptionIconAlt": "Ikon mengindikasikan jika gambar ini memiliki takarir",
   "addACaption": "Tambah keterangan...",
   "copySessionID": "Salin Session ID",
-  "copyOpenGroupURL": "Salin URL grup",
+  "copyOpenGroupURL": "Salin URL Grup",
   "save": "Simpan",
   "saveLogToDesktop": "Simpan log ke dekstop",
   "saved": "Tersimpan",
   "tookAScreenshot": "$name$ mengambil tangkapan layar",
   "savedTheFile": "Media disimpan oleh $name$",
   "linkPreviewsTitle": "Kirim pratinjau tautan",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Buat pratinjau tautan untuk URL yang didukung.",
   "linkPreviewsConfirmMessage": "Anda tidak mendapatkan perlindungan metadata penuh ketika mengirim atau menerima tautan pratinjau.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Izinkan akses ke mikrofon.",
   "spellCheckTitle": "Pemeriksa Ejaan",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Aktifkan pemeriksaan ejaan saat mengetik pesan.",
   "spellCheckDirty": "Anda harus muat ulang Session untuk terima pengaturan baru anda",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Kirim tanda baca dalam obrolan pribadi.",
   "readReceiptSettingTitle": "Pesan terbaca",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Lihat dan bagikan indikator mengetik dalam obrolan pribadi.",
   "typingIndicatorsSettingTitle": "Indikator penulisan",
   "zoomFactorSettingTitle": "Zoom faktor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "nama pengirim dan pesannya",
+  "themesSettingTitle": "Tema",
+  "primaryColor": "Warna Utama",
+  "primaryColorGreen": "Warna primer hijau",
+  "primaryColorBlue": "Warna primer biru",
+  "primaryColorYellow": "Warna primer kuning",
+  "primaryColorPink": "Warna primer merah jambu",
+  "primaryColorPurple": "Warna primer ungu",
+  "primaryColorOrange": "Warna primer jingga",
+  "primaryColorRed": "Warna primer merah",
+  "classicDarkThemeTitle": "Gelap Klasik",
+  "classicLightThemeTitle": "Terang Klasik",
+  "oceanDarkThemeTitle": "Lautan Gelap",
+  "oceanLightThemeTitle": "Lautan Cerah",
+  "pruneSettingTitle": "Pangkas Komunitas",
+  "pruneSettingDescription": "Hapus pesan yang lebih lama dari 6 bulan dalam komunitas yang memiliki lebih dari 2.000 pesan.",
+  "enable": "Aktifkan",
+  "keepDisabled": "Tetap nonaktifkan",
+  "notificationSettingsDialog": "Informasi yang ditampilkan dalam notifikasi.",
+  "nameAndMessage": "Nama & Isi",
   "noNameOrMessage": "Nama atau pesan saja",
   "nameOnly": "Nama pengirim saja",
   "newMessage": "Pesan Baru",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Buat percakapan dengan kontak baru",
+  "createConversationNewGroup": "Buat grup dengan kontak yang ada",
+  "joinACommunity": "Gabung komunitas",
+  "chooseAnAction": "Ketuk kontak untuk memulai percakapan",
   "newMessages": "Pesan Baru",
   "notificationMostRecentFrom": "Paling baru dari: $name$",
   "notificationFrom": "Dari:",
@@ -174,7 +176,7 @@
   "sendFailed": "Gagal Mengirim",
   "mediaMessage": "Pesan media",
   "messageBodyMissing": "Masukkan pesan.",
-  "messageBody": "Message body",
+  "messageBody": "Isi pesan",
   "unblockToSend": "Lepaskan blokir kontak ini untuk mengirim pesan",
   "unblockGroupToSend": "Lepaskan blokir grup ini untuk mengirim pesan.",
   "youChangedTheTimer": "Anda mengatur pesan menghilang dalam $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 jam",
   "timerOption_1_day": "1 hari",
   "timerOption_1_week": "1 minggu",
+  "timerOption_2_weeks": "2 minggu",
   "disappearingMessages": "Pesan hilang",
   "changeNickname": "Ubah Nama Panggilan",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12j",
   "timerOption_1_day_abbreviated": "1h",
   "timerOption_1_week_abbreviated": "1mg",
+  "timerOption_2_weeks_abbreviated": "2mg",
   "disappearingMessagesDisabled": "Pesan menghilang dinonaktifkan",
-  "disabledDisappearingMessages": "$name$ menonaktifkan pesan menghilang.",
+  "disabledDisappearingMessages": "$name$ telah menonaktifkan pesan menghilang.",
   "youDisabledDisappearingMessages": "Anda menonaktifkan pesan menghilang.",
   "timerSetTo": "Waktu pesan hilang diatur ke $time$",
   "noteToSelf": "Catatan Pribadi",
   "hideMenuBarTitle": "Sembunyikan Meny Bar",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Alihkan visibilitas bilah menu sistem.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Nomor salah",
+  "invalidNumberError": "Harap periksa ID Session atau nama ONS dan coba lagi",
   "failedResolveOns": "Gagal menyelesaikan jalan ONS",
   "autoUpdateSettingTitle": "Pembaruan Otomatis",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Secara otomatis cek pembaruan saat startup.",
   "autoUpdateNewVersionTitle": "Tersedia Session versi terbaru",
   "autoUpdateNewVersionMessage": "Tersedia versi terbaru Session.",
   "autoUpdateNewVersionInstructions": "Tekan memulai awal Session untuk mendapatkan versi terbaru.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ bergabung dengan grup",
   "kickedFromTheGroup": "$name$ telah dikeluarkan dari grup.",
   "multipleKickedFromTheGroup": "$name$ telah dikeluarkan dari grup.",
-  "blockUser": "Blokir",
-  "unblockUser": "Buka blokir",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Buka blokir",
   "blocked": "Terblokir",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Kontak Diblokir",
+  "conversationsSettingsTitle": "Percakapan",
   "unbanUser": "Hapus cekal pengguna",
   "userUnbanned": "Pemblokiran pengguna berhasil dibatalkan",
   "userUnbanFailed": "Hapus cekal gagal!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Larang gagal!",
   "leaveGroup": "Keluar grup",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Keluar dari grup dan hapus untuk semua orang",
   "leaveGroupConfirmation": "Apakah anda yakin ingin meninggalkan grup ini?",
   "leaveGroupConfirmationAdmin": "Karena anda adalah admin grup ini, jika anda keluar, grup ini akan dihapus untuk setiap anggota saat ini. Anda yakin ingin keluar dari grup ini?",
   "cannotRemoveCreatorFromGroup": "Tidak dapat mengeluarkan pengguna ini",
   "cannotRemoveCreatorFromGroupDesc": "Anda tidak dapat mengeluarkan pengguna ini karena pengguna merupakan pembuat grup.",
   "noContactsForGroup": "anda belum memiliki kontak",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Gagal menambahkan pengguna sebagai admin",
+  "failedToRemoveFromModerator": "Gagal menghapus pengguna dari daftar admin",
   "copyMessage": "Salin pesan",
   "selectMessage": "Pilih pesan",
   "editGroup": "Ubah grup",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Memperbarui $name$...",
   "showRecoveryPhrase": "Kata pemulihan",
   "yourSessionID": "Session ID anda",
-  "setAccountPasswordTitle": "Atur Kata Sandi Akun",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Ubah Kata Sandi Akun",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Hapus Kata Sandi Akun",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Kata sandi",
+  "setAccountPasswordDescription": "Memerlukan kata sandi untuk membuka kunci Session.",
+  "changeAccountPasswordTitle": "Ubah Kata Sandi",
+  "changeAccountPasswordDescription": "Ubah kata sandi yang diperlukan untuk membuka kunci Session.",
+  "removeAccountPasswordTitle": "Hapus Kata Sandi",
+  "removeAccountPasswordDescription": "Hapus kata sandi yang diperlukan untuk membuka kunci Session.",
   "enterPassword": "Masukkan kata sandi Anda",
   "confirmPassword": "Konfirmasi kata sandi",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Mohon masukkan kata sandi Anda yang baru",
+  "confirmNewPassword": "Konfirmasi kata sandi baru",
   "showRecoveryPhrasePasswordRequest": "Silahkan masukan kata sandi Anda",
   "recoveryPhraseSavePromptMain": "Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun",
   "invalidOpenGroupUrl": "URL tidak valid",
-  "copiedToClipboard": "Salin ke clipboard",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Disalin",
+  "passwordViewTitle": "Masukkan Kata Sandi",
   "password": "Kata sandi",
   "setPassword": "Atur Kata Sandi",
   "changePassword": "Ubah Kata Sandi",
-  "createPassword": "Create your password",
+  "createPassword": "Buat kata sandi Anda",
   "removePassword": "Hapus Kata Sandi",
   "maxPasswordAttempts": "Kata sandi tidak valid. Apakah anda ingin mengatur ulang database?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Harap masukkan kata sandi Anda saat ini",
   "invalidOldPassword": "Kata sandi lama tidak valid",
   "invalidPassword": "Kata sandi tidak valid",
   "noGivenPassword": "Masukkan kata sandi anda",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Kata sandi tidak cocok",
   "changePasswordInvalid": "Kata sandi lama yang anda masukkan salah",
   "removePasswordInvalid": "Kata sandi salah",
-  "setPasswordTitle": "Atur Kata Sandi",
-  "changePasswordTitle": "Kata Sandi yang Telah Diubah",
-  "removePasswordTitle": "Kata Sandi yang Telah Dihapus",
+  "setPasswordTitle": "Kata sandi dipasang",
+  "changePasswordTitle": "Kata Sandi Diubah",
+  "removePasswordTitle": "Kata Sandi Dihapus",
   "setPasswordToastDescription": "Kata sandi anda telah disetel. Harap untuk menjaganya.",
   "changePasswordToastDescription": "Kata sandi anda telah disetel. Harap untuk menjaganya.",
-  "removePasswordToastDescription": "Anda telah menghapus kata sandi anda.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Kata sandi Anda telah dihapus.",
+  "publicChatExists": "Anda sudah terhubung ke komunitas ini",
+  "connectToServerFail": "Tidak dapat bergabung ke komunitas",
   "connectingToServer": "Menghubungkan...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Berhasil terhubung ke komunitas",
   "setPasswordFail": "Gagal memperbarui kata sandi",
   "passwordLengthError": "Panjang kata sandi anda harus diantara 6 dan 64 karakter",
   "passwordTypeError": "Kata sandi harus berupa rangkaian kata",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Nama grup",
   "inviteContacts": "Undang teman",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Tambah Admin",
+  "removeModerators": "Hapus Admin",
+  "addAsModerator": "Tambah sebagai Admin",
+  "removeFromModerators": "Hapus dari Admin",
   "add": "Tambahkan",
   "addingContacts": "Tambahkan kontak ke $name$",
   "noContactsToAdd": "Tidak ada kontak untuk ditambah",
   "noMembersInThisGroup": "Tidak ada anggota lain di dalam grup ini",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "tidak ada admin yang dihapus",
   "onlyAdminCanRemoveMembers": "Anda bukan kreator",
   "onlyAdminCanRemoveMembersDesc": "Hanya kreator grup yang bisa mengeluarkan pengguna",
   "createAccount": "Create Account",
   "startInTrayTitle": "Simpan di System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Biarkan Session bekerja di latar belakang ketika anda menutup jendela.",
   "yourUniqueSessionID": "Ucapkan halo pada Session ID anda",
   "allUsersAreRandomly...": "Session ID adalah alamat unik yang bisa digunakan untuk mengontak anda. Tanpa koneksi dengan identitas asli, Session ID anda didesain bersifat anonim dan rahasia.",
   "getStarted": "Memulai",
@@ -344,149 +348,161 @@
   "linkDevice": "Tautkan perangkat",
   "restoreUsingRecoveryPhrase": "Kembalikan akun",
   "or": "atau",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Dengan menggunakan layanan ini, Anda menyetujui <a href=\"https://getsession.org/terms-of-service \">Persyaratan Layanan</a> dan <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Kebijakan Privasi</a> kami",
   "beginYourSession": "Mulai Session anda.",
   "welcomeToYourSession": "Selamat Datang di Session anda",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Cari percakapan dan kontak",
+  "searchForContactsOnly": "Cari kontak",
   "enterSessionID": "Masuk ke Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Masukkan ID Session atau ONS kontak Anda",
   "message": "Pesan",
   "appearanceSettingsTitle": "Penampilan",
   "privacySettingsTitle": "Privasi",
   "notificationsSettingsTitle": "Pemberitahuan",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Isi Notifikasi",
+  "notificationPreview": "Pratinjau",
   "recoveryPhraseEmpty": "masukan kata pemulihan",
   "displayNameEmpty": "Pilih nama yang ditampilkan",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ anggota",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Gabung",
+  "joinOpenGroup": "Gabung ke Komunitas",
+  "createGroup": "Buat Grup",
+  "create": "Buat",
   "createClosedGroupNamePrompt": "Nama grup",
   "createClosedGroupPlaceholder": "Masukkan nama grup",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Tautan Komunitas",
+  "enterAnOpenGroupURL": "Masukkan Tautan Komunitas",
   "next": "Berikutnya",
   "invalidGroupNameTooShort": "Masukkan nama grup",
   "invalidGroupNameTooLong": "Masukkan nama grup yang lebih pendek",
   "pickClosedGroupMember": "Pilih setidaknya 2 anggota grup",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Tidak ada kontak yang diblokir",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Grup maksimal berisikan 100 anggota",
+  "noBlockedContacts": "Anda tidak memiliki kontak yang diblokir.",
+  "userAddedToModerators": "Pengguna ditambahkan ke daftar admin",
+  "userRemovedFromModerators": "Pengguna dihapus dari daftar admin",
   "orJoinOneOfThese": "Atau gabung salah satu dari ini...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Terjemahkan Session",
   "closedGroupInviteFailTitle": "Undangan grup gagal",
   "closedGroupInviteFailTitlePlural": "Undangan Grup Gagal",
   "closedGroupInviteFailMessage": "Gagal mengundang anggota grup",
   "closedGroupInviteFailMessagePlural": "Gagal mengundang semua anggota grup",
-  "closedGroupInviteOkText": "Retry invitations",
-  "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
-  "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
-  "notificationForConvo": "Notifications",
-  "notificationForConvo_all": "All",
-  "notificationForConvo_disabled": "Disabled",
-  "notificationForConvo_mentions_only": "Mentions only",
-  "onionPathIndicatorTitle": "Path",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
+  "closedGroupInviteOkText": "Ulangi undangan",
+  "closedGroupInviteSuccessTitlePlural": "Undangan Grup Berhasil",
+  "closedGroupInviteSuccessTitle": "Undangan Grup Berhasil",
+  "closedGroupInviteSuccessMessage": "Berhasil mengundang anggota grup",
+  "notificationForConvo": "Notifikasi",
+  "notificationForConvo_all": "Semua",
+  "notificationForConvo_disabled": "Nonaktif",
+  "notificationForConvo_mentions_only": "Sebutan saja",
+  "onionPathIndicatorTitle": "Jalur",
+  "onionPathIndicatorDescription": "Session menyembunyikan IP dengan memantulkan pesan melalui berbagai Node di jaringan Session yang terdesentralisasi. Ini adalah negara yang menjadi lokasi pesan anda dipantulkan:",
+  "unknownCountry": "Negara tak diketahui",
+  "device": "Perangkat",
+  "destination": "Tujuan",
+  "learnMore": "Selengkapnya",
   "linkVisitWarningTitle": "Buka tautan ini di peramban Anda?",
-  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
-  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
-  "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
-  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
-  "notificationSubtitle": "Notifications - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
+  "linkVisitWarningMessage": "Anda yakin ingin membuka $url$ di peramban Anda?",
+  "open": "Buka",
+  "audioMessageAutoplayTitle": "Putar Otomatis Pesan Suara",
+  "audioMessageAutoplayDescription": "Putar otomatis pesan suara secara berurutan.",
+  "clickToTrustContact": "Klik untuk mengunduh media",
+  "trustThisContactDialogTitle": "Percayai $name$?",
+  "trustThisContactDialogDescription": "Apakah Anda yakin ingin mengunduh media yang dikirim oleh $name$?",
+  "pinConversation": "Sematkan Percakapan",
+  "unpinConversation": "Lepas Semat Percakapan",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Tampilkan Rincian Pengguna",
+  "sendRecoveryPhraseTitle": "Mengirim Frasa Pemulihan",
+  "sendRecoveryPhraseMessage": "Anda mencoba mengirim frase pemulihan yang dapat digunakan untuk mengakses akun Anda. Apakah Anda yakin ingin mengirim pesan ini?",
+  "dialogClearAllDataDeletionFailedTitle": "Data tidak dihapus",
+  "dialogClearAllDataDeletionFailedDesc": "Data tidak dihapus dengan kesalahan yang tidak diketahui. Apakah Anda ingin menghapus data hanya dari perangkat ini?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Apakah Anda ingin menghapus data hanya dari perangkat ini?",
+  "dialogClearAllDataDeletionFailedMultiple": "Data tidak dihapus oleh Service Node: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Apakah Anda ingin menghapus perangkat ini saja, atau juga menghapus data Anda dari jaringan?",
+  "clearDevice": "Hapus Perangkat",
+  "tryAgain": "Coba Lagi",
+  "areYouSureClearDevice": "Apakah Anda yakin ingin menghapus perangkat Anda?",
+  "deviceOnly": "Hapus di Perangkat Saja",
+  "entireAccount": "Hapus di Perangkat dan Jaringan",
+  "areYouSureDeleteDeviceOnly": "Apakah Anda yakin ingin menghapus data di perangkat saja?",
+  "areYouSureDeleteEntireAccount": "Apakah Anda yakin ingin menghapus data Anda dari jaringan? Jika Anda melanjutkan, Anda tidak akan dapat memulihkan pesan atau kontak Anda.",
+  "iAmSure": "Saya yakin",
+  "recoveryPhraseSecureTitle": "Hampir selesai!",
+  "recoveryPhraseRevealMessage": "Amankan akun Anda dengan menyimpan frase pemulihan Anda. Ungkapkan frase pemulihan Anda lalu simpan dengan aman untuk mengamankannya.",
+  "recoveryPhraseRevealButtonText": "Perlihatkan Frasa Pemulihan",
+  "notificationSubtitle": "Notifikasi - $setting$",
+  "surveyTitle": "Kami Ingin Masukan Anda",
   "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Message Requests",
-  "requestsSubtitle": "Pending Requests",
-  "requestsPlaceholder": "No requests",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
-  "incomingCallFrom": "Incoming call from '$name$'",
-  "ringing": "Ringing...",
-  "establishingConnection": "Establishing connection...",
-  "accept": "Accept",
-  "decline": "Decline",
-  "endCall": "End call",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
-  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "unableToCall": "Cancel your ongoing call first",
-  "unableToCallTitle": "Cannot start new call",
-  "callMissed": "Missed call from $name$",
-  "callMissedTitle": "Call missed",
-  "noCameraFound": "No camera found",
-  "noAudioInputFound": "No audio input found",
-  "noAudioOutputFound": "No audio output found",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
-  "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
-  "startedACall": "You called $name$",
-  "answeredACall": "Call with $name$",
-  "trimDatabase": "Trim Database",
-  "trimDatabaseDescription": "Reduces your message database size to your last 10,000 messages.",
-  "trimDatabaseConfirmationBody": "Are you sure you want to delete your $deleteAmount$ oldest received messages?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "support": "Dukungan",
+  "clearAll": "Hapus Semua",
+  "clearDataSettingsTitle": "Hapus Data",
+  "messageRequests": "Permintaan Pesan",
+  "requestsSubtitle": "Permintaan Tertunda",
+  "requestsPlaceholder": "Tidak ada permintaan",
+  "hideRequestBannerDescription": "Sembunyikan spanduk Permintaan Pesan hingga Anda menerima permintaan pesan baru.",
+  "incomingCallFrom": "Panggilan masuk dari '$name$'",
+  "ringing": "Berdering...",
+  "establishingConnection": "Membangun koneksi...",
+  "accept": "Terima",
+  "decline": "Tolak",
+  "endCall": "Akhiri",
+  "permissionsSettingsTitle": "Izin",
+  "helpSettingsTitle": "Bantuan",
+  "cameraPermissionNeededTitle": "Izin Panggilan Suara/Video Diperlukan",
+  "cameraPermissionNeeded": "Anda dapat mengaktifkan izin 'Panggilan suara dan video' di Pengaturan Privasi.",
+  "unableToCall": "Batalkan panggilan yang sedang berlangsung",
+  "unableToCallTitle": "Tidak dapat memulai panggilan baru",
+  "callMissed": "Panggilan tak terjawab dari $name$",
+  "callMissedTitle": "Panggilan tak terjawab",
+  "noCameraFound": "Kamera tidak ditemukan",
+  "noAudioInputFound": "Input audio tidak ditemukan",
+  "noAudioOutputFound": "Output audio tidak ditemukan",
+  "callMediaPermissionsTitle": "Panggilan Suara dan Video (Beta)",
+  "callMissedCausePermission": "Panggilan tidak terjawab dari '$name$' karena Anda perlu mengaktifkan izin 'Panggilan suara dan video' di Pengaturan Privasi.",
+  "callMissedNotApproved": "Panggilan tidak terjawab dari '$name$' karena Anda belum menyetujui percakapan ini. Kirim pesan ke mereka terlebih dahulu.",
+  "callMediaPermissionsDescription": "Aktifkan panggilan suara dan video ke atau dari pengguna lain.",
+  "callMediaPermissionsDialogContent": "Alamat IP Anda dapat dilihat oleh mitra panggilan Anda dan server Oxen Foundation saat menggunakan panggilan versi beta. Anda yakin ingin mengaktifkan Panggilan Suara dan Video?",
+  "callMediaPermissionsDialogTitle": "Panggilan Suara dan Video (Beta)",
+  "startedACall": "Anda memanggil $name$",
+  "answeredACall": "Memanggil $name$",
+  "trimDatabase": "Pangkas Basis Data",
+  "trimDatabaseDescription": "Mengurangi ukuran basis data pesan Anda menjadi 10.000 pesan terakhir.",
+  "trimDatabaseConfirmationBody": "Anda yakin ingin menghapus $deleteAmount$ pesan terlama yang diterima?",
+  "pleaseWaitOpenAndOptimizeDb": "Harap tunggu sementara basis data Anda dibuka dan dioptimalkan...",
+  "messageRequestPending": "Permintaan pesan Anda sedang menunggu keputusan",
+  "messageRequestAccepted": "Permintaan pesan Anda telah diterima",
+  "messageRequestAcceptedOurs": "Anda telah menerima permintaan pesan $name$",
+  "messageRequestAcceptedOursNoName": "Anda telah menerima permintaan pesan",
+  "declineRequestMessage": "Yakin ingin menolak permintaan pesan ini?",
+  "respondingToRequestWarning": "Mengirim pesan ke pengguna ini akan secara otomatis menerima permintaan pesan mereka dan mengungkapkan ID Session Anda.",
+  "hideRequestBanner": "Sembunyikan Bilah Permintaan Pesan",
+  "openMessageRequestInbox": "Permintaan Pesan",
+  "noMessageRequestsPending": "Tidak ada permintaan pesan tertunda",
+  "noMediaUntilApproved": "Anda tidak dapat mengirim lampiran hingga percakapan disetujui",
+  "mustBeApproved": "Percakapan ini harus diterima untuk menggunakan fitur ini",
+  "youHaveANewFriendRequest": "Anda memiliki permintaan pertemanan baru",
+  "clearAllConfirmationTitle": "Hapus Semua Permintaan Pesan",
+  "clearAllConfirmationBody": "Yakin ingin menghapus semua permintaan pesan?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Tutup",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Lihat kotak masuk Permintaan Pesan Anda",
+  "clearAllReactions": "Anda yakin ingin menghapus semua $emoji$?",
+  "expandedReactionsText": "Lihat Sedikit",
+  "reactionNotification": "Menanggapi pesan dengan $emoji$",
+  "rateLimitReactMessage": "Pelan - pelan! Anda telah mengirim terlalu banyak reaksi emoji. Coba lagi nanti",
+  "otherSingular": "$number$ lainnya",
+  "otherPlural": "$number$ lainnya",
+  "reactionPopup": "bereaksi dengan",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "Dan $otherSingular$ telah bereaksi <span>$emoji$</span> ke pesan ini",
+  "reactionListCountPlural": "Dan $otherPlural$ telah bereaksi <span>$emoji$</span> ke pesan ini"
 }
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 878283e2e..e0d3de349 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -30,17 +30,17 @@
   "contextMenuNoSuggestions": "Nessun suggerimento",
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Unirsi a $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Impossibile trovare il server opengroup corrispondente",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Sei sicuro di voler unirti al gruppo aperto $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Inserisci Session ID o nome ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Inizia una nuova conversazione inserendo il Session ID di qualcuno o condividendo il tuo Session ID.",
   "loading": "Caricamento...",
   "done": "Fatto",
   "youLeftTheGroup": "Hai lasciato il gruppo.",
   "youGotKickedFromGroup": "Sei stato rimosso da questo gruppo.",
   "unreadMessages": "Messaggi non letti",
   "debugLogExplanation": "Questo log verrà salvato sul desktop.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Segnala un bug",
   "markAllAsRead": "Segna tutto come letto",
   "incomingError": "Errore messaggio in arrivo",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Attenzione, c'è stato un errore nell'inviare il tuo allegato.",
   "offline": "Disconnesso",
   "debugLog": "Log di debug",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Esporta i log",
+  "shareBugDetails": "Esporta i tuoi log, poi carica il file attraverso l'Help Desk di Session.",
   "goToReleaseNotes": "Vai alle note di rilascio",
   "goToSupportPage": "Vai alla pagina di supporto",
   "about": "A riguardo",
@@ -72,7 +72,7 @@
   "noSearchResults": "Nessun risultato trovato per \"$searchTerm$\"",
   "conversationsHeader": "Contatti e Gruppi",
   "contactsHeader": "Contatti",
-  "messagesHeader": "Messaggi",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Impostazioni",
   "typingAlt": "Animazione per battitura per questa conversazione",
   "contactAvatarAlt": "Avatar del contatto $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Eliminare $count$ messaggi?",
   "deleteMessageQuestion": "Cancellare questo messaggio?",
   "deleteMessages": "Elimina messaggi",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ cancellato",
   "messageDeletedPlaceholder": "Questo messaggio è stato eliminato",
   "from": "Da:",
@@ -107,65 +108,66 @@
   "sent": "Inviato",
   "received": "Ricevuto",
   "sendMessage": "Invia messaggio",
-  "groupMembers": "Membri del gruppo",
+  "groupMembers": "Membri",
   "moreInformation": "Maggiori informazioni",
   "resend": "Reinvia",
   "deleteConversationConfirmation": "Rimuovere definitivamente la conversazione?",
-  "clear": "Clear",
+  "clear": "Cancella",
   "clearAllData": "Elimina tutti i dati",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Ciò eliminerà permanentemente i tuoi messaggi, sessioni e contatti.",
+  "deleteAccountFromLogin": "Sei sicuro di voler cancellare il tuo dispositivo?",
   "deleteContactConfirmation": "Sei sicuro di voler eliminare questa conversazione?",
   "quoteThumbnailAlt": "Anteprima dell'immagine dal messaggio citato",
   "imageAttachmentAlt": "Immagine allegata a un messaggio",
-  "videoAttachmentAlt": "Schermata del video allegato al messaggio ",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Immagine inviata nella conversazione",
   "imageCaptionIconAlt": "Icona che mostra che questa immagine ha una didascalia",
   "addACaption": "Aggiungi una didascalia...",
   "copySessionID": "Copia Session ID",
-  "copyOpenGroupURL": "Copia L'Url Del Gruppo",
+  "copyOpenGroupURL": "Copia l'URL del gruppo",
   "save": "Salva",
   "saveLogToDesktop": "Salva log sul desktop",
   "saved": "Salvato",
   "tookAScreenshot": "$name$ ha fatto uno screenshot",
   "savedTheFile": "Media salvati da $name$",
   "linkPreviewsTitle": "Invia Anteprime Dei Link",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Genera le anteprime dei link per gli URL supportati.",
   "linkPreviewsConfirmMessage": "Non avrai la protezione completa dei metadati quando invierai le anteprime dei link.",
   "mediaPermissionsTitle": "Microfono",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Autorizza l'accesso al microfono.",
   "spellCheckTitle": "Controllo ortografico",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Abilita il controllo ortografico quando digiti i messaggi.",
   "spellCheckDirty": "È necessario riavviare Session per applicare le modifiche",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Invia conferma di lettura nelle chat uno a uno.",
   "readReceiptSettingTitle": "Conferme Di Lettura",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Visualizza e condividi gli indicatori di digitazione nelle chat uno a uno.",
   "typingIndicatorsSettingTitle": "Indicatori Di Scrittura",
   "zoomFactorSettingTitle": "Fattore Ingrandimento",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Temi",
+  "primaryColor": "Colore primario",
+  "primaryColorGreen": "Colore primario verde",
+  "primaryColorBlue": "Colore primario blu",
+  "primaryColorYellow": "Colore primario giallo",
+  "primaryColorPink": "Colore primario rosa",
+  "primaryColorPurple": "Colore primario viola",
+  "primaryColorOrange": "Colore primario arancione",
+  "primaryColorRed": "Colore primario rosso",
+  "classicDarkThemeTitle": "Scuro Classico",
+  "classicLightThemeTitle": "Classico Chiaro",
+  "oceanDarkThemeTitle": "Oceano Scuro",
+  "oceanLightThemeTitle": "Oceano Chiaro",
+  "pruneSettingTitle": "Cancellazione dei gruppi",
+  "pruneSettingDescription": "Elimina i messaggi più vecchi di 6 mesi nei gruppi che hanno più di 2.000 messaggi.",
   "enable": "Abilita",
   "keepDisabled": "Mantieni disabilitato",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Sia il mittente che il messaggio",
+  "notificationSettingsDialog": "L'informazione mostrata nelle notifiche.",
+  "nameAndMessage": "Nome e contenuto",
   "noNameOrMessage": "Né il mittente, né il messaggio",
   "nameOnly": "Solo il mittente",
   "newMessage": "Nuovo messaggio",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
+  "createConversationNewContact": "Crea una conversazione con un nuovo contatto",
+  "createConversationNewGroup": "Crea un gruppo con contatti esistenti",
+  "joinACommunity": "Unisciti a una comunità",
   "chooseAnAction": "Choose an action to start a conversation",
   "newMessages": "Nuovi messaggi",
   "notificationMostRecentFrom": "Il più recente da: $name$",
@@ -174,7 +176,7 @@
   "sendFailed": "Invio Non Riuscito",
   "mediaMessage": "Messaggio multimediale",
   "messageBodyMissing": "Inserisci un corpo di messaggio.",
-  "messageBody": "Message body",
+  "messageBody": "Corpo del messaggio",
   "unblockToSend": "Per inviare un messaggio sblocca questo contatto.",
   "unblockGroupToSend": "Sblocca questo gruppo per inviare un messaggio.",
   "youChangedTheTimer": "Hai settato i messaggi a scomparsa a $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 ore",
   "timerOption_1_day": "1 giorno",
   "timerOption_1_week": "1 settimana",
+  "timerOption_2_weeks": "2 settimane",
   "disappearingMessages": "Messaggi a scomparsa",
   "changeNickname": "Cambia Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 ore",
   "timerOption_1_day_abbreviated": "1 giorno",
   "timerOption_1_week_abbreviated": "1 set",
+  "timerOption_2_weeks_abbreviated": "2 sett.",
   "disappearingMessagesDisabled": "Messaggi a scomparsa disabilitati",
   "disabledDisappearingMessages": "$name$ ha disabilitato i messaggi a scomparsa.",
   "youDisabledDisappearingMessages": "Hai disabilitato i messaggi a scomparsa.",
   "timerSetTo": "La scomparsa dei messaggi è settata a $time$",
   "noteToSelf": "Note personali",
   "hideMenuBarTitle": "Nascondi Barra Dei Menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Attiva/disattiva la visibilità della barra dei menu.",
   "startConversation": "Inizia una nuova conversazione...",
-  "invalidNumberError": "Numero non valido",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Impossibile risolvere il nome ONS",
   "autoUpdateSettingTitle": "Aggiornamento automatico",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ fanno ora parte del gruppo.",
   "kickedFromTheGroup": "$name$ è stato rimosso dal gruppo.",
   "multipleKickedFromTheGroup": "$name$ sono stati rimossi dal gruppo.",
-  "blockUser": "Blocca",
-  "unblockUser": "Sblocca",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Sbloccato",
   "blocked": "Bloccato",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Contatti bloccati",
+  "conversationsSettingsTitle": "Conversazioni",
   "unbanUser": "Sblocca Utente",
   "userUnbanned": "Utente sbloccato con successo",
   "userUnbanFailed": "Sblocco fallito!",
@@ -257,7 +261,7 @@
   "cannotRemoveCreatorFromGroup": "Impossibile rimuovere questo utente",
   "cannotRemoveCreatorFromGroupDesc": "Non puoi rimuovere questo utente in quanto è il creatore del gruppo.",
   "noContactsForGroup": "Non hai ancora nessun contatto",
-  "failedToAddAsModerator": "Failed to add user as admin",
+  "failedToAddAsModerator": "Impossibile aggiungere l'utente come amministratore",
   "failedToRemoveFromModerator": "Failed to remove user from the admin list",
   "copyMessage": "Copia testo del messaggio",
   "selectMessage": "Seleziona il messaggio",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Aggiornamento $name$...",
   "showRecoveryPhrase": "Frase di recupero",
   "yourSessionID": "La tua Sessione ID",
-  "setAccountPasswordTitle": "Imposta Password Account",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Cambia la password dell'account",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Rimuovi Password Account",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Password",
+  "setAccountPasswordDescription": "Richiedi la password per sbloccare Session.",
+  "changeAccountPasswordTitle": "Cambia Password",
+  "changeAccountPasswordDescription": "Cambia la password richiesta per sbloccare Session.",
+  "removeAccountPasswordTitle": "Rimuovi password",
+  "removeAccountPasswordDescription": "Rimuovi la password richiesta per sbloccare Session.",
   "enterPassword": "Per favore inserisci la tua password",
   "confirmPassword": "Conferna password",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Si prega d'inserire la tua nuova password",
+  "confirmNewPassword": "Conferma la nuova password",
   "showRecoveryPhrasePasswordRequest": "Per favore inserisci la tua password",
   "recoveryPhraseSavePromptMain": "La frase di recupero è la chiave principale per la Sessione ID: puoi usarla per ripristinare la Sessione ID se perdi l'accesso al dispositivo. Conserva la frase di recupero in un luogo sicuro e non rivelarla a nessuno.",
   "invalidOpenGroupUrl": "URL non valido",
-  "copiedToClipboard": "Copiato negli appunti",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Copiato",
+  "passwordViewTitle": "Inserisci Password",
   "password": "Password",
   "setPassword": "Imposta password",
   "changePassword": "Cambia password",
-  "createPassword": "Create your password",
+  "createPassword": "Crea la tua password",
   "removePassword": "Rimuovi password",
   "maxPasswordAttempts": "Password non valida. Vuoi resettare il database?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Per favore inserisci la tua password",
   "invalidOldPassword": "Vecchia password non valida",
   "invalidPassword": "Password non valida",
   "noGivenPassword": "Per favore inserisci la tua password",
@@ -295,14 +299,14 @@
   "setPasswordInvalid": "Le password non coincidono",
   "changePasswordInvalid": "La vecchia password inserita non è corretta",
   "removePasswordInvalid": "Password non corretta",
-  "setPasswordTitle": "Imposta password",
-  "changePasswordTitle": "Cambia Password",
-  "removePasswordTitle": "Password rimossa",
+  "setPasswordTitle": "Password Impostata",
+  "changePasswordTitle": "Password Cambiata",
+  "removePasswordTitle": "Password Rimosssa",
   "setPasswordToastDescription": "La password è stata impostata. Si prega di tenerla al sicuro.",
   "changePasswordToastDescription": "La tua password è stata modificata. Per favore tienila al sicuro.",
-  "removePasswordToastDescription": "Hai rimosso la tua password.",
+  "removePasswordToastDescription": "La tua password è stata rimossa.",
   "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "connectToServerFail": "Impossibile entrare nel gruppo",
   "connectingToServer": "Connessione in corso...",
   "connectToServerSuccess": "Successfully connected to community",
   "setPasswordFail": "Impossibile impostare la password",
@@ -316,15 +320,15 @@
   "editProfileModalTitle": "Profilo",
   "groupNamePlaceholder": "Nome Del Gruppo",
   "inviteContacts": "Invita Amici",
-  "addModerators": "Add Admins",
+  "addModerators": "Aggiungi Admin",
   "removeModerators": "Remove Admins",
   "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "removeFromModerators": "Rimuovi Da Admin",
   "add": "Aggiungi",
   "addingContacts": "Aggiungi contatti a",
   "noContactsToAdd": "Nessun contatto da aggiungere",
   "noMembersInThisGroup": "Nessun altro membro di questo gruppo",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "nessun amministratore da rimuovere",
   "onlyAdminCanRemoveMembers": "Non sei il creatore",
   "onlyAdminCanRemoveMembersDesc": "Solo il creatore del gruppo può rimuovere gli utenti",
   "createAccount": "Create Account",
@@ -344,40 +348,43 @@
   "linkDevice": "Collega dispositivo",
   "restoreUsingRecoveryPhrase": "Ripristina il tuo account",
   "or": "o",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Utilizzando questo servizio, accetti i nostri <a href=\"https://getsession.org/terms-of-service \">Termini di Servizio</a> e <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Informativa sulla privacy</a>",
   "beginYourSession": "Inizia la tua Session.",
   "welcomeToYourSession": "Benvenuto su Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Cerca conversazioni e contatti",
+  "searchForContactsOnly": "Cerca contatti",
   "enterSessionID": "Inserisci la Sessione ID",
   "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
   "message": "Messaggio",
   "appearanceSettingsTitle": "Aspetto",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifiche",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Contenuto della notifica",
+  "notificationPreview": "Anteprima",
   "recoveryPhraseEmpty": "Inserisci la frase di recupero",
   "displayNameEmpty": "Scegli il nome da visualizzare",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ membri",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Unisciti",
+  "joinOpenGroup": "Unisciti Alla Comunità",
+  "createGroup": "Crea Gruppo",
+  "create": "Crea",
   "createClosedGroupNamePrompt": "Nome Del Gruppo",
   "createClosedGroupPlaceholder": "Inserisci un nome per il gruppo",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL della Community",
+  "enterAnOpenGroupURL": "Inserisci URL della Community",
   "next": "Avanti",
   "invalidGroupNameTooShort": "Inserisci un nome per il gruppo",
   "invalidGroupNameTooLong": "Inserisci un nome gruppo più breve",
   "pickClosedGroupMember": "Scegli almeno 2 membri del gruppo",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Nessun contatto bloccato",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Un gruppo chiuso non può avere più di 100 membri",
+  "noBlockedContacts": "Non hai contatti bloccati.",
+  "userAddedToModerators": "Utente aggiunto alla lista moderatori",
+  "userRemovedFromModerators": "Utente rimosso dalla lista moderatori",
   "orJoinOneOfThese": "Oppure unisciti a uno di questi...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Traduci Session",
   "closedGroupInviteFailTitle": "Invito Di Gruppo Non Riuscito",
   "closedGroupInviteFailTitlePlural": "Inviti Di Gruppo Non Riusciti",
   "closedGroupInviteFailMessage": "Impossibile invitare con successo un membro del gruppo",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Riprova gli inviti",
   "closedGroupInviteSuccessTitlePlural": "Inviti Di Gruppo Completati",
   "closedGroupInviteSuccessTitle": "Invito Di Gruppo Riuscito",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Membri del gruppo invitati con successo",
   "notificationForConvo": "Notifiche",
   "notificationForConvo_all": "Tutte",
   "notificationForConvo_disabled": "Non attivo",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Aprire questo collegamento sul tuo browser?",
   "linkVisitWarningMessage": "Sei sicuro di voler aprire $url$ nel tuo browser?",
   "open": "Apri",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Riproduzione automatica dei messaggi vocali",
+  "audioMessageAutoplayDescription": "Riproduzione automatica di messaggi vocali consecutivi.",
   "clickToTrustContact": "Clicca per scaricare i media",
   "trustThisContactDialogTitle": "Ti fidi di $name$?",
   "trustThisContactDialogDescription": "Sei sicuro di voler scaricare i media inviati da $name$?",
   "pinConversation": "Fissa conversazione",
   "unpinConversation": "Rimuovi conversazione",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Mostra Dettagli Utente",
   "sendRecoveryPhraseTitle": "Invio Frase Di Recupero",
   "sendRecoveryPhraseMessage": "Stai tentando di inviare la frase di recupero che può essere utilizzata per accedere al tuo account. Sei sicuro di voler inviare questo messaggio?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Dati non eliminati a causa di un errore sconosciuto. Vuoi eliminare i dati solo da questo dispositivo?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Vuoi eliminare i dati solo da questo dispositivo?",
   "dialogClearAllDataDeletionFailedMultiple": "Dati non eliminati da questi nodi di servizio: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Vuoi solo cancellare questo dispositivo o anche eliminare i tuoi dati dalla rete?",
+  "clearDevice": "Cancella solo il dispositivo",
+  "tryAgain": "Riprova",
+  "areYouSureClearDevice": "Sei sicuro di voler cancellare il tuo dispositivo?",
+  "deviceOnly": "Cancella solo il dispositivo",
+  "entireAccount": "Cancellare il dispositivo e la rete",
   "areYouSureDeleteDeviceOnly": "Sei sicuro di voler cancellare i dati solo sul tuo dispositivo?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Sei sicuro di voler cancellare i tuoi dati dalla rete? Se continui non potrai più recuperare i tuoi messaggi o contatti.",
   "iAmSure": "Sono sicuro",
   "recoveryPhraseSecureTitle": "Hai quasi finito!",
   "recoveryPhraseRevealMessage": "Proteggi il tuo account salvando la tua frase di recupero. Mostra la tua frase di recupero, quindi salvala in modo sicuro per proteggerla.",
   "recoveryPhraseRevealButtonText": "Mostra Frase di Recupero",
   "notificationSubtitle": "Notifiche - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
+  "surveyTitle": "Ci piacerebbe avere un tuo feedback",
   "faq": "FAQ",
-  "support": "Support",
+  "support": "Assistenza",
   "clearAll": "Cancella tutto",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Elimina dati",
   "messageRequests": "Richieste Di Messaggio",
   "requestsSubtitle": "Richieste in Attesa",
   "requestsPlaceholder": "Nessuna richiesta",
@@ -438,8 +449,8 @@
   "accept": "Accetta",
   "decline": "Rifiuta",
   "endCall": "Termina chiamata",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Permessi",
+  "helpSettingsTitle": "Aiuto",
   "cameraPermissionNeededTitle": "Autorizzazioni di chiamata vocale/video richieste",
   "cameraPermissionNeeded": "È possibile abilitare l'autorizzazione 'Voce e videochiamate' nelle Impostazioni Privacy.",
   "unableToCall": "Annulla prima la tua chiamata in corso",
@@ -449,12 +460,12 @@
   "noCameraFound": "Nessuna fotocamera è stata trovata",
   "noAudioInputFound": "Nessun ingresso audio trovato",
   "noAudioOutputFound": "Nessuna uscita audio trovata",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Chiamate vocali e video (Beta)",
   "callMissedCausePermission": "Chiamata persa da '$name$' perché è necessario abilitare l'autorizzazione 'Voce e videochiamate' nelle Impostazioni Privacy.",
   "callMissedNotApproved": "Chiamata persa da '$name$' poiché non hai ancora approvato questa conversazione. Invia prima un messaggio.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Abilita chiamate vocali e video da e verso altri utenti.",
+  "callMediaPermissionsDialogContent": "Il tuo indirizzo IP è visibile al tuo partner di chiamata e a un server della Oxen Foundation durante l'utilizzo delle chiamate beta. Sei sicuro di voler abilitare le chiamate vocali e video?",
+  "callMediaPermissionsDialogTitle": "Chiamate vocali e video (Beta)",
   "startedACall": "Hai chiamato $name$",
   "answeredACall": "Chiamata con $name$",
   "trimDatabase": "Pulisci Database",
@@ -466,27 +477,32 @@
   "messageRequestAcceptedOurs": "Hai accettato la richiesta di messaggio di $name$",
   "messageRequestAcceptedOursNoName": "Hai accettato la richiesta di messaggio",
   "declineRequestMessage": "Sei sicuro di voler rifiutare questa richiesta di messaggio?",
-  "respondingToRequestWarning": "L'invio di un messaggio a questo utente approverà automaticamente la sua richiesta di messaggio e rivelerà l'ID della sessione.",
+  "respondingToRequestWarning": "L'invio di un messaggio a questo utente approverà automaticamente la sua richiesta di messaggio e rivelerà l'ID di Session.",
   "hideRequestBanner": "Nascondi Banner Di Richiesta Messaggio",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Richieste Di Messaggio",
   "noMessageRequestsPending": "Nessuna richiesta di messaggi in sospeso",
   "noMediaUntilApproved": "Non è possibile inviare allegati finché la conversazione non sarà approvata",
   "mustBeApproved": "Questa conversazione deve essere accettata per usare questa funzione",
   "youHaveANewFriendRequest": "Hai una nuova richiesta d'amicizia",
   "clearAllConfirmationTitle": "Elimina Tutte Le Richieste Di Messaggio",
   "clearAllConfirmationBody": "Sei sicuro di voler eliminare tutte le richieste di messaggio?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Nascondi",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Casella di richieste messaggio",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Sei sicuro di voler cancellare tutte le $emoji$?",
+  "expandedReactionsText": "Mostra meno",
+  "reactionNotification": "Ha reagito al messaggio con $emoji$",
+  "rateLimitReactMessage": "Rallenta! Hai inviato troppe reazioni emoji. Riprova più tardi",
+  "otherSingular": "$number$ altro",
+  "otherPlural": "$number$ altri",
+  "reactionPopup": "ha reagito con",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
+  "reactionListCountSingular": "E $otherSingular$ ha reagito con <span>$emoji$</span> a questo messaggio",
   "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
 }
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index ad2e6fb72..83d0ae578 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "フルスクリーンを切り替える",
   "viewMenuToggleDevTools": "開発者ツールを切り替える",
   "contextMenuNoSuggestions": "候補はありません",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "コミュニティへの招待",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$に参加しますか？",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "対応する公開グループのサーバが見つかりませんでした",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "$roomName$の公開グループに参加しますか？",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session ID か ONS 名を入力してください",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "新しい会話を始めるには、セッションIDを入力するか、セッションIDを共有します。",
   "loading": "読込中...",
   "done": "完了",
   "youLeftTheGroup": "グループを抜けました",
   "youGotKickedFromGroup": "あなたはこのグループから削除されました",
   "unreadMessages": "未読",
   "debugLogExplanation": "このログはデスクトップに保存されます。",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "バグを報告",
   "markAllAsRead": "すべて既読にする",
   "incomingError": "受信中にエラー",
   "media": "メディア",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "添付中にエラーが発生しました。",
   "offline": "オフライン",
   "debugLog": "デバッグログ",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "ログのエクスポート",
+  "shareBugDetails": "ログをエクスポートし、Sessionのヘルプデスクにてファイルをアップロードします。",
   "goToReleaseNotes": "リリースノートを閲覧",
   "goToSupportPage": "サポートページへ",
   "about": "Sessionについて",
@@ -72,7 +72,7 @@
   "noSearchResults": "「%s」に一致する情報は見つかりませんでした。",
   "conversationsHeader": "連絡先とグループ",
   "contactsHeader": "連絡先",
-  "messagesHeader": "メッセージ",
+  "messagesHeader": "Conversations",
   "settingsHeader": "設定",
   "typingAlt": "この会話のためのタイピングアニメーション",
   "contactAvatarAlt": "$name$のアイコン",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "$count$個のメッセージを削除しますか？",
   "deleteMessageQuestion": "このメッセージを削除しますか？",
   "deleteMessages": "メッセージを削除",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ が削除されました",
   "messageDeletedPlaceholder": "このメッセージは削除されました",
   "from": "差出人:",
@@ -107,13 +108,14 @@
   "sent": "送信",
   "received": "受信",
   "sendMessage": "メッセージ",
-  "groupMembers": "グループメンバー",
+  "groupMembers": "メンバー",
   "moreInformation": "詳細",
   "resend": "再送",
   "deleteConversationConfirmation": "この会話を完全に消去しますが，よろしいですか？",
-  "clear": "Clear",
+  "clear": "消去",
   "clearAllData": "すべてのデータを消去する",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "メッセージと連絡先が完全に削除されます",
+  "deleteAccountFromLogin": "本当に端末から消去してもよろしいですか？",
   "deleteContactConfirmation": "この会話を削除してもよろしいですか？",
   "quoteThumbnailAlt": "引用されたメッセージから画像のサムネール",
   "imageAttachmentAlt": "メッセージにイメージを添付する",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$はスクリーンショットを撮りました。",
   "savedTheFile": "$name$ でメディアを保存しました",
   "linkPreviewsTitle": "リンクプレビューを送る",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "サポートされている URL のリンクプレビューを表示します。",
   "linkPreviewsConfirmMessage": "リンクのプレビューを送信するとき、完全なメタデータ保護はありません。",
   "mediaPermissionsTitle": "マイク",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "マイクへのアクセスを許可する.",
   "spellCheckTitle": "スペルチェック",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "メッセージを入力するときにスペルチェックを有効にします。",
   "spellCheckDirty": "新しい設定を適用するために Session を再起動する必要があります",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "1対1のチャットで既読通知を送信します。",
   "readReceiptSettingTitle": "既読通知",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "入力中の表示を1対1のチャットで相手に表示します。",
   "typingIndicatorsSettingTitle": "入力中アイコン",
   "zoomFactorSettingTitle": "ズーム",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "テーマ",
+  "primaryColor": "プライマリーカラー",
+  "primaryColorGreen": "プライマリーカラー 緑",
+  "primaryColorBlue": "プライマリーカラー 青",
+  "primaryColorYellow": "プライマリーカラー 黄色",
+  "primaryColorPink": "プライマリーカラー ピンク",
+  "primaryColorPurple": "プライマリーカラー 紫",
+  "primaryColorOrange": "プライマリーカラー オレンジ",
+  "primaryColorRed": "プライマリーカラー 赤",
+  "classicDarkThemeTitle": "クラシック ダーク",
+  "classicLightThemeTitle": "クラシック ライト",
+  "oceanDarkThemeTitle": "オーシャンダーク",
+  "oceanLightThemeTitle": "オーシャンライト",
+  "pruneSettingTitle": "コミュニティをトリムする",
+  "pruneSettingDescription": "2,000件以上のメッセージを持つコミュニティから6ヶ月以上のメッセージを削除します。",
   "enable": "有効にする",
   "keepDisabled": "無効のままにする",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "差出人名とメッセージ",
+  "notificationSettingsDialog": "通知に表示される情報",
+  "nameAndMessage": "名前とメッセージ",
   "noNameOrMessage": "なし",
   "nameOnly": "差出人名のみ",
   "newMessage": "新着メッセージ",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "新しい連絡先と会話を作成する",
+  "createConversationNewGroup": "既存の連絡先でグループを作成",
+  "joinACommunity": "コミュニティに参加する",
+  "chooseAnAction": "会話を開始するアクションを選択してください",
   "newMessages": "新着メッセージ",
   "notificationMostRecentFrom": "最新の受信: $name$",
   "notificationFrom": "差出人:",
@@ -174,7 +176,7 @@
   "sendFailed": "送信失敗",
   "mediaMessage": "メディアでのメッセージ",
   "messageBodyMissing": "メッセージを入力してください",
-  "messageBody": "Message body",
+  "messageBody": "メッセージ本文",
   "unblockToSend": "この連絡先にメッセージを送るためにブロックを解除する。",
   "unblockGroupToSend": "このグループにメッセージを送信するには、ブロックを解除してください。",
   "youChangedTheTimer": "消えるメッセージの消去時間を$time$に設定しました",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12時間",
   "timerOption_1_day": "1日",
   "timerOption_1_week": "1週間",
+  "timerOption_2_weeks": "2 週間",
   "disappearingMessages": "消えるメッセージ",
   "changeNickname": "ニックネームを変更",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12時間",
   "timerOption_1_day_abbreviated": "1日",
   "timerOption_1_week_abbreviated": "1週間",
+  "timerOption_2_weeks_abbreviated": "2週目",
   "disappearingMessagesDisabled": "消えるメッセージが無効にされました",
-  "disabledDisappearingMessages": "$name$ が消えるメッセージを無効にしました。",
+  "disabledDisappearingMessages": "$name$ は消えているメッセージをオフにしました.",
   "youDisabledDisappearingMessages": "消えるメッセージを無効にしました。",
   "timerSetTo": "消えるメッセージの消去時間が$time$に設定されました",
   "noteToSelf": "自分用メモ",
   "hideMenuBarTitle": "メニューバーを隠す",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "メニューバーの表示を切り替える.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "不正な番号です",
+  "invalidNumberError": "セッションIDまたはONS名を確認して再度お試しください。",
   "failedResolveOns": "ONS名の解決に失敗しました",
   "autoUpdateSettingTitle": "自動更新",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "起動時に自動的に更新の有無を確認する.",
   "autoUpdateNewVersionTitle": "Sessionの新しい更新があります",
   "autoUpdateNewVersionMessage": "新しく生まれ変わったSessionがあります",
   "autoUpdateNewVersionInstructions": "更新を適用するにはSessionを再起動してください。",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$がグループに加わりました",
   "kickedFromTheGroup": "$name$ はグループから削除されました。",
   "multipleKickedFromTheGroup": "$name$ はグループから削除されました。",
-  "blockUser": "ブロック",
-  "unblockUser": "ブロック解除",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "ブロック解除",
   "blocked": "ブロック済み",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "ブロックされた連絡先",
+  "conversationsSettingsTitle": "会話",
   "unbanUser": "ユーザーの禁止解除",
   "userUnbanned": "ユーザーの禁止解除に成功しました",
   "userUnbanFailed": "禁止解除に失敗しました！",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "禁止に失敗しました！",
   "leaveGroup": "グループを抜ける",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "グループから脱退し、全員を削除",
   "leaveGroupConfirmation": "このグループを退会しますか？",
   "leaveGroupConfirmationAdmin": "あなたがこのグループの管理者であるため、退会すると現在のすべてのメンバーが削除されます。 本当にこのグループから脱退しますか？",
   "cannotRemoveCreatorFromGroup": "このユーザーを削除できません",
   "cannotRemoveCreatorFromGroupDesc": "グループの作成者であるため、このユーザーを削除できません。",
   "noContactsForGroup": "まだ連絡先がありません",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "ユーザーを管理者として追加できませんでした",
+  "failedToRemoveFromModerator": "管理者リストからユーザーを削除できませんでした",
   "copyMessage": "メッセージをコピー",
   "selectMessage": "メッセージを選択",
   "editGroup": "グループを編集する",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "$name$を更新中...",
   "showRecoveryPhrase": "リカバリーフレーズ",
   "yourSessionID": "あなたの Session ID",
-  "setAccountPasswordTitle": "アカウントのパスワード設定",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "パスワードの変更",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "パスワードの削除",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "パスワード",
+  "setAccountPasswordDescription": "セッションのロック解除にはパスワードが必要です。",
+  "changeAccountPasswordTitle": "パスワードを変更",
+  "changeAccountPasswordDescription": "セッションのロック解除に必要なパスワードを変更します。",
+  "removeAccountPasswordTitle": "パスワードを削除",
+  "removeAccountPasswordDescription": "セッションのロック解除に必要なパスワードを削除します。",
   "enterPassword": "パスワードを入力してください",
   "confirmPassword": "パスワードを再確認",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "新しいパスワードを入力してください",
+  "confirmNewPassword": "新しいパスワードを確認",
   "showRecoveryPhrasePasswordRequest": "パスワードを入力してください",
   "recoveryPhraseSavePromptMain": "リカバリーフレーズは、Session ID のマスターキーです。端末にアクセスできなくなった場合、これを使用して Session ID を復元できます。リカバリーフレーズを安全な場所に保管し、誰にも教えないでください。",
   "invalidOpenGroupUrl": "URL が無効です",
-  "copiedToClipboard": "クリップボードにコピーされました",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "コピーしました",
+  "passwordViewTitle": "パスワードを入力してください",
   "password": "パスワード",
   "setPassword": "パスワードを設定",
   "changePassword": "パスワードを変更",
-  "createPassword": "Create your password",
+  "createPassword": "パスワードを作成してください",
   "removePassword": "パスワードを削除",
   "maxPasswordAttempts": "パスワードが無効です。データベースをリセットしますか？",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "現在のパスワードを入力してください",
   "invalidOldPassword": "古いパスワードが無効です。",
   "invalidPassword": "無効なパスワード",
   "noGivenPassword": "パスワードを入力してください",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "パスワードが一致しません",
   "changePasswordInvalid": "入力した古いパスワードが間違っています",
   "removePasswordInvalid": "パスワードが正しくありません",
-  "setPasswordTitle": "パスワードを設定",
-  "changePasswordTitle": "パスワードを変更",
-  "removePasswordTitle": "パスワードを削除",
+  "setPasswordTitle": "パスワードの設定",
+  "changePasswordTitle": "パスワードを変更しました",
+  "removePasswordTitle": "パスワードを削除しました",
   "setPasswordToastDescription": "パスワードが設定されました。安全に保管してください。",
   "changePasswordToastDescription": "パスワードが変更されました。安全に保管してください。",
   "removePasswordToastDescription": "パスワードを削除しました。",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "publicChatExists": "既にこのコミュニティに接続されています",
+  "connectToServerFail": "コミュニティに参加できませんでした",
   "connectingToServer": "接続中...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "コミュニティに正常に接続しました",
   "setPasswordFail": "パスワードの設定に失敗しました",
   "passwordLengthError": "パスワードの長さを6文字から64文字にしてください",
   "passwordTypeError": "パスワードは文字列でなければいけません",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "プロフィール",
   "groupNamePlaceholder": "グループ名",
   "inviteContacts": "友達にオススメする",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "管理者を追加する",
+  "removeModerators": "管理者権限を削除",
+  "addAsModerator": "管理人を追加する",
+  "removeFromModerators": "管理者権限を削除",
   "add": "追加",
   "addingContacts": "連絡先を追加",
   "noContactsToAdd": "追加できる連絡先がありません",
   "noMembersInThisGroup": "このグループには他のメンバーがいません。",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "削除する管理者がいません",
   "onlyAdminCanRemoveMembers": "あなたは作成者ではありません",
   "onlyAdminCanRemoveMembersDesc": "グループの作成者のみがユーザーを削除できます",
   "createAccount": "アカウントを作成",
   "startInTrayTitle": "システムトレイに常駐",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "ウィンドウを閉じても、バックグラウンドでSessionを実行し続ける。",
   "yourUniqueSessionID": "Session ID をご紹介します",
   "allUsersAreRandomly...": "Session ID は、Session で連絡を取るために使用できる一意のアドレスです。本当のアイデンティティに関係なく、あなたの Session ID は設計上完全に匿名でプライベートです。",
   "getStarted": "はじめましょう",
@@ -344,40 +348,43 @@
   "linkDevice": "端末をリンクする",
   "restoreUsingRecoveryPhrase": "アカウントを復元する",
   "or": "または",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "本サービスを利用する場合、<a href=\"https://getsession.org/terms-of-service \">利用規約</a>および<a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">プライバシーポリシー</a>に同意するものとします",
   "beginYourSession": "セッションを始めましょう",
   "welcomeToYourSession": "Sessionにようこそ",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "会話や連絡先を検索",
+  "searchForContactsOnly": "連絡先を検索",
   "enterSessionID": "Session ID を入力してください",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "連絡先のセッションIDまたはONSを入力してください",
   "message": "メッセージ",
   "appearanceSettingsTitle": "デザイン設定",
   "privacySettingsTitle": "プライバシー",
   "notificationsSettingsTitle": "通知",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "通知内容",
+  "notificationPreview": "プレビュー",
   "recoveryPhraseEmpty": "リカバリーフレーズを入力してください",
   "displayNameEmpty": "表示名を選択してください",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ 人のメンバー",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "参加",
+  "joinOpenGroup": "コミュニティに参加する",
+  "createGroup": "グループを作成",
+  "create": "作成する",
   "createClosedGroupNamePrompt": "グループ名",
   "createClosedGroupPlaceholder": "グループ名を入力してください",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "コミュニティ URL",
+  "enterAnOpenGroupURL": "コミュニティ URL を入力してください",
   "next": "進む",
   "invalidGroupNameTooShort": "グループ名を入力してください",
   "invalidGroupNameTooLong": "短いグループ名を入力してください",
   "pickClosedGroupMember": "グループメンバーを少なくとも 2 人選択してください",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "ブロックしている連絡先はありません",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "非公開グループは１００人以上は入れません",
+  "noBlockedContacts": "ブロックされた連絡先がありません。",
+  "userAddedToModerators": "管理者リストに追加されたユーザー",
+  "userRemovedFromModerators": "ユーザーを管理者リストから削除しました",
   "orJoinOneOfThese": "または、以下のグループに参加する…",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "セッションを翻訳",
   "closedGroupInviteFailTitle": "グループ招待に失敗しました",
   "closedGroupInviteFailTitlePlural": "グループ招待に失敗",
   "closedGroupInviteFailMessage": "グループメンバーの招待に成功することができません",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "招待を再試行する",
   "closedGroupInviteSuccessTitlePlural": "グループ招待が完了しました",
   "closedGroupInviteSuccessTitle": "グループ招待に成功しました",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "正常にグループメンバーを招待しました",
   "notificationForConvo": "通知",
   "notificationForConvo_all": "すべて",
   "notificationForConvo_disabled": "無効",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "このリンクをブラウザで開きますか？",
   "linkVisitWarningMessage": "ブラウザーで $url$ を開いてもよろしいですか？",
   "open": "開く",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "音声メッセージの自動再生",
+  "audioMessageAutoplayDescription": "音声メッセージを自動再生します",
   "clickToTrustContact": "クリックしてダウンロード",
   "trustThisContactDialogTitle": "$name$ を信頼しますか？",
   "trustThisContactDialogDescription": "$name$ が送信したメディアをダウンロードしてもよろしいですか？",
   "pinConversation": "会話をピン留めする",
   "unpinConversation": "会話のピン留めを外す",
+  "markUnread": "Mark Unread",
   "showUserDetails": "ユーザーの詳細を表示",
   "sendRecoveryPhraseTitle": "復元フレーズを送信中",
   "sendRecoveryPhraseMessage": "あなたのアカウントにアクセスするため復元フレーズを送信しようとしています。このメッセージを送信してもよろしいですか？",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "データは不明なエラーにより削除されませんでした。このデバイスからデータを削除しますか？",
   "dialogClearAllDataDeletionFailedTitleQuestion": "このデバイスからデータを削除しますか？",
   "dialogClearAllDataDeletionFailedMultiple": "これらのサービスノードによって削除されなかったデータ: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "このデバイスのみを消去するか、ネットワークからデータを削除しますか？",
+  "clearDevice": "デバイスを消去",
+  "tryAgain": "再試行",
+  "areYouSureClearDevice": "本当に端末から消去してもよろしいですか？",
+  "deviceOnly": "端末のみ消去",
+  "entireAccount": "端末とネットワークを消去",
   "areYouSureDeleteDeviceOnly": "本当にデバイスデータのみを削除しますか？",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "ネットワークからデータを削除してもよろしいですか？ 続行すると、メッセージや連絡先を復元することはできません。",
   "iAmSure": "私は確信している",
   "recoveryPhraseSecureTitle": "もう少しで完了です",
   "recoveryPhraseRevealMessage": "復元フレーズを保存してアカウントを保護します。復元フレーズを確認し、安全に保存してください",
   "recoveryPhraseRevealButtonText": "復元フレーズを表示",
   "notificationSubtitle": "通知設定 $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "ご意見をお聞かせください。",
+  "faq": "よくある質問",
+  "support": "サポート",
   "clearAll": "すべて消去する",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "データを消去する",
   "messageRequests": "メッセージリクエスト",
   "requestsSubtitle": "保留中のリクエスト",
   "requestsPlaceholder": "リクエストなし",
@@ -438,8 +449,8 @@
   "accept": "同意",
   "decline": "拒否",
   "endCall": "通話を終了",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "権限",
+  "helpSettingsTitle": "ヘルプ",
   "cameraPermissionNeededTitle": "音声/ビデオ通話の権限が必要です",
   "cameraPermissionNeeded": "プライバシー設定で「音声とビデオ通話」の許可を有効にできます。",
   "unableToCall": "進行中の通話を先にキャンセルする",
@@ -449,12 +460,12 @@
   "noCameraFound": "カメラが見つかりません",
   "noAudioInputFound": "オーディオ入力が見つかりません",
   "noAudioOutputFound": "オーディオ出力が見つかりません",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "音声通話とビデオ通話 (ベータ版)",
   "callMissedCausePermission": "プライバシー設定で「音声通話とビデオ通話」権限を有効にする必要があるため、「$name$」からの通話が失敗しました。",
   "callMissedNotApproved": "この会話を承認していないため、'$name$' からの通話が失敗しました。最初にメッセージを送信してください。",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "他のユーザーとの音声通話やビデオ通話を有効にします。",
+  "callMediaPermissionsDialogContent": "音声通話とビデオ通話を使用している間、あなたのIPはあなたの通話相手とOxen Foundationサーバーに表示されます。 音声通話とビデオ通話を有効にしてもよろしいですか？",
+  "callMediaPermissionsDialogTitle": "音声通話とビデオ通話 (ベータ版)",
   "startedACall": "$name$ と通話しました",
   "answeredACall": "$name$ と通話",
   "trimDatabase": "データベースの切り取り",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "こちらの友達リクエストを本当に拒否しますか？",
   "respondingToRequestWarning": "このユーザーにメッセージを送信すると、自動的にメッセージのリクエストが受け付けられ、あなたのセッションIDが公開されます。",
   "hideRequestBanner": "メッセージリクエストバナーを非表示にする",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "メッセージリクエスト",
   "noMessageRequestsPending": "保留中のメッセージ・リクエストはありません",
   "noMediaUntilApproved": "承認されるまで添付ファイルを送信できません",
   "mustBeApproved": "この機能を使うには承認する必要があります。",
   "youHaveANewFriendRequest": "友達申請が来ています。",
   "clearAllConfirmationTitle": "すべてのメッセージリクエストを削除",
   "clearAllConfirmationBody": "本当に全てのメッセージリクエストを消去しますか？",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "非表示",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "メッセージリクエストの受信トレイを表示",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "すべての項目の $emoji$ を削除してもよろしいですか？",
+  "expandedReactionsText": "最小化",
+  "reactionNotification": "$emoji$でメッセージに反応します",
+  "rateLimitReactMessage": "スローダウンしました。絵文字リアクターが多すぎます。しばらくしてからもう一度試してください。",
+  "otherSingular": "$number$ 他",
+  "otherPlural": "$number$ 他",
+  "reactionPopup": "との反応",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupMany": "$name$, $name2$ & $name3$ &",
+  "reactionListCountSingular": "$otherSingular$ が <span>$emoji$</span> をこのメッセージに反応しました",
+  "reactionListCountPlural": "$otherPlural$ が <span>$emoji$</span> をこのメッセージに反応しました"
 }
diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json
index 89cf82033..b94bf3ad8 100644
--- a/_locales/ka/messages.json
+++ b/_locales/ka/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "შევიდეთ $roomName$-ში?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "მიუთითეთ Session ID ან ONS სახელი",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "იტვირთება...",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"$searchTerm$\" -ზე არაფერი მოიძებნა",
   "conversationsHeader": "კონტაქტები და ჯგუფები",
   "contactsHeader": "კონტაქტები",
-  "messagesHeader": "შეტყობინებები",
+  "messagesHeader": "Conversations",
   "settingsHeader": "პარამეტრები",
   "typingAlt": "ამ საუბრისთვის ბეჭდვის ანიმაციის აკრეფა",
   "contactAvatarAlt": "ავატარი კონტაქტისთვის $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "წაშლით $count$ შეტყობინებებს?",
   "deleteMessageQuestion": "გსურთ ამ შეტყობინების წაშლა?",
   "deleteMessages": "შეტყობინებების წაშლა",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "ეს შეტყობინება წაშლილია",
   "from": "სგან:\nდან:",
@@ -107,29 +108,30 @@
   "sent": "გაგზავნილი",
   "received": "მიღებული",
   "sendMessage": "შეტყობინება",
-  "groupMembers": "ჯგუფის წევრები",
+  "groupMembers": "Members",
   "moreInformation": "მეტი ინფორმაცია",
   "resend": "თავიდან გაგზავნა",
   "deleteConversationConfirmation": "გსურთ რომ სამუდამოდ წაშალოთ შეტყობინებები ამ სასაუბროში?",
   "clear": "Clear",
   "clearAllData": "ყველა მონაცემის გასუფთავება",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "დარწმუნებული ხართ, რომ გსურთ ამ მიმოწერის წაშლა?",
   "quoteThumbnailAlt": "სურათის მინიატურა ციტირებული გზავნილიდან",
   "imageAttachmentAlt": "შეტყობინებას მიმაგრებული სურათი",
-  "videoAttachmentAlt": "შეტყობინებას მიმაგრებული ვიდეოს ეკრანის ასლი",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "სურათი გაგზავნილია სასაუბროში",
   "imageCaptionIconAlt": "სიმბოლო, რომელიც აჩვენებს, რომ ამ სურათს აქვს წარწერა",
   "addACaption": "დაამატეთ წარწერა...",
   "copySessionID": "დააკოპირეთ სესიის ID",
-  "copyOpenGroupURL": "კონტექსტის მენიუს მოქმედება გრუპის ლინკის დაკოპირებისთვის",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear Nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/km/messages.json b/_locales/km/messages.json
index c5828caeb..8d65edf6b 100644
--- a/_locales/km/messages.json
+++ b/_locales/km/messages.json
@@ -28,20 +28,20 @@
   "viewMenuToggleFullScreen": "បិទបើកការបង្ហាញពេញអេក្រង់",
   "viewMenuToggleDevTools": "បិទបើកមុខងារអ្នកអភិវឌ្ឍន៍",
   "contextMenuNoSuggestions": "មិនមានយោបល់កែប្រែទេ",
-  "openGroupInvitation": "Community invitation",
-  "joinOpenGroupAfterInvitationConfirmationTitle": "ចូល $roomName$",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "មានបញ្ហា ដាច់ទំនាក់ទំនងទៅកាន់ Server",
-  "enterSessionIDOrONSName": "បញ្ចូលអត្តលេខ Session ឬ ឈ្មោះ ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "openGroupInvitation": "ការអញ្ជើញពីសហគមន៍",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "ចូលរួម $roomName$?",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "តើអ្នកប្រាកដថា ពិតជាចង់ចូលរួមជាមួយសហគមន៍ $roomName$ ដែរឬទេ?​​",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "បញ្ចូល Session ID ឬឈ្មោះ ONS",
+  "startNewConversationBy...": "ការចាប់ផ្តើមការសន្ទនាថ្មីដោយបញ្ចូល Session ID របស់នរណាម្នាក់ ឬចែករំលែក Session ID របស់អ្នកជាមួយពួកនឹងពួកគេ។",
   "loading": "កំពុងផ្ទុក...",
   "done": "រួចរាល់",
   "youLeftTheGroup": "អ្នកបានចាកចេញពីក្រុម",
-  "youGotKickedFromGroup": "អ្នកត្រូវបានដកចេញពីក្រុម",
+  "youGotKickedFromGroup": "អ្នកត្រូវបានដកចេញពីកិច្ចប្រជុំនេះ។",
   "unreadMessages": "សារមិនទាន់អាន",
-  "debugLogExplanation": "ទិន្នន័យនេះនឹងរក្សារទុកនៅក្នុង Desktop របស់អ្នក",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "សម្គាល់ទាំងអស់ថាបានអាន",
+  "debugLogExplanation": "កំណត់ត្រានេះនឹងរក្សាទុកនៅក្នុងកុំព្យូទ័ររបស់អ្នក។",
+  "reportIssue": "រាយការណ៍ពីកំហុសមួយ",
+  "markAllAsRead": "ដាក់សម្គាល់ទាំងអស់ថាបានអាន",
   "incomingError": "បញ្ហាទទួលសារផ្ញើចូល",
   "media": "ឯកសារមេឌា",
   "mediaEmptyState": "អ្នកមិនមានឯកសារមេឌា ក្នុងការសន្ទនានេះទេ",
@@ -62,18 +62,18 @@
   "unableToLoadAttachment": "មិនអាចផ្ទុកឯកសារភ្ជាប់ដែលបានជ្រើសរើស។",
   "offline": "អហ្វឡាញ",
   "debugLog": "កំណត់ត្រាបញ្ហា",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "ការនាំចេញកំណត់ត្រា",
+  "shareBugDetails": "ការនាំចេញកំណត់ត្រារបស់អ្នក បន្ទាប់មកបង្ហោះឯកសារនេះឬៅកាន់ Session របស់ Help Desk។",
   "goToReleaseNotes": "ចូលទៅកាន់កំណត់ចេញថ្មី",
   "goToSupportPage": "ចូលទៅកាន់ទំព័រគាំទ្រ",
-  "about": "អំពីយើង",
+  "about": "អំពី",
   "show": "បង្ហាញ",
   "sessionMessenger": "Session",
   "noSearchResults": "គ្មានលទ្ធផលសម្រាប់ \"$searchTerm$\"",
-  "conversationsHeader": "ក្រុម និងមិត្ត",
+  "conversationsHeader": "ទំនាក់ទំនង និង ក្រុម",
   "contactsHeader": "បញ្ជីទំនាក់ទំនង",
-  "messagesHeader": "សារ",
-  "settingsHeader": "កំណត់មុខងារ",
+  "messagesHeader": "Conversations",
+  "settingsHeader": "ការកំណត់",
   "typingAlt": "ការវាយចលនាសម្រាប់ការសន្ទនានេះ",
   "contactAvatarAlt": "រូបតំណាងសម្រាប់លេខទំនាក់ទំនង $name$",
   "downloadAttachment": "ទាញយកឯកសារភ្ជាប់",
@@ -86,95 +86,97 @@
   "audio": "សំឡេង",
   "video": "វីដេអូ",
   "photo": "រូបភាព",
-  "cannotUpdate": "មិនអានធ្វើបច្ចុប្បន្នភាពកម្មវិធី",
-  "cannotUpdateDetail": "មានកំណែប្រែថ្មី ក៏ប៉ុន្ថែបរាជ័យក្នុងការធ្វើបច្ចុប្បន្នភាពកម្មវិធី",
+  "cannotUpdate": "មិនអានធ្វើបច្ចុប្បន្នភាព",
+  "cannotUpdateDetail": "Session Desktop បានបរាជ័យក្នុងការធ្វើបច្ចុប្បន្នភាព ប៉ុន្តែមានកំណែថ្មីដែលអាចប្រើប្រាស់បាន។ សូមចូលទៅកាន់ https://getsession.org/ ហើយដំឡើងកំណែថ្មីដោយដៃ បន្ទាប់មកទាក់ទងទៅផ្នែកជំនួយ ឬរៀបចំឯកសារកំហុសអំពីបញ្ហានេះ។",
   "ok": "យល់ព្រម",
   "cancel": "លះបង់",
   "close": "បិទ",
   "continue": "បន្តរ",
   "error": "បញ្ហា",
   "delete": "លុប",
-  "messageDeletionForbidden": "អ្នកមិនមានសិទ្ធសំរាប់លុបសារអ្នកផ្សេងៗនោះទេ",
-  "deleteJustForMe": "លុបសំរាប់ខ្លួនឯង",
-  "deleteForEveryone": "លុបសំរាប់ទាំងអស់គ្នា",
+  "messageDeletionForbidden": "អ្នកគ្មានសិទ្ធដើម្បីលុបសារអ្នកផ្សេងៗទេ",
+  "deleteJustForMe": "លុបសម្រាប់ខ្ញុំ",
+  "deleteForEveryone": "លុបចេញពីទាំងអស់គ្នា",
   "deleteMessagesQuestion": "លុបសារចំនួន $count$?",
   "deleteMessageQuestion": "តើចង់លុបសារនេះមែនទេ?",
   "deleteMessages": "លុបសារ",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ ត្រូវបានលុប",
-  "messageDeletedPlaceholder": "សារនេះត្រូវបានលុបចោល",
+  "messageDeletedPlaceholder": "សារនេះត្រូវបានលុបចេញ",
   "from": "ពី",
   "to": "ទៅ",
   "sent": "បានផ្ញើ",
   "received": "បានទទួល",
   "sendMessage": "ផ្ញើសារមួយ",
-  "groupMembers": "សមាជិកក្រុម",
+  "groupMembers": "សមាជិក",
   "moreInformation": "ព័ត៌មាន​បន្ថែម",
   "resend": "ផ្ញើ​ម្តងទៀត",
   "deleteConversationConfirmation": "លុបការសន្ទនានេះចោលរហូត?",
-  "clear": "Clear",
-  "clearAllData": "លុបទិន្នន័យទាំងអស់​",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "clear": "ជម្រះ",
+  "clearAllData": "ជម្រះទិន្នន័យទាំងអស់",
+  "deleteAccountWarning": "វានឹងលុបសារ និងទំនាក់ទំនងរបស់អ្នកចេញជាអចិន្ត្រៃយ៍។",
+  "deleteAccountFromLogin": "តើអ្នកប្រាកដទេថា អ្នកចង់ជម្រះឧបករណ៍របស់អ្នកចេញ?",
   "deleteContactConfirmation": "តើអ្នកចង់លុបការសន្ទនានេះមែនទេ?",
   "quoteThumbnailAlt": "រូបភាពតូចៗនៃរូបភាពពីសារដែលបានដកស្រង់",
   "imageAttachmentAlt": "រូបភាពបានភ្ជាប់ទៅសារ",
-  "videoAttachmentAlt": "រូបថតអេក្រង់នៃវីដេអូភ្ជាប់ទៅកាន់សារ",
+  "videoAttachmentAlt": "ការថតនៅលើអេក្រង់ទៅលើសារវីដេអូ",
   "lightboxImageAlt": "រូបភាពបានផ្ញើ ក្នុងការសន្ទនា",
   "imageCaptionIconAlt": "រូបតំណាងបង្ហាញថារូបភាពនេះមានចំណងជើង",
   "addACaption": "ដាក់ចំណងជើង...",
-  "copySessionID": "ចម្លង ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copySessionID": "ចម្លង Session ID",
+  "copyOpenGroupURL": "ចម្លង URL ពីក្រុម",
   "save": "រក្សាទុក",
-  "saveLogToDesktop": "Save log to desktop",
+  "saveLogToDesktop": "រក្សាទុកកំណត់ត្រាទៅក្នុងកុំព្យូទ័រ",
   "saved": "បានរក្សារទុក",
-  "tookAScreenshot": "$name$ took a screenshot",
-  "savedTheFile": "Media saved by $name$",
-  "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
+  "tookAScreenshot": "$name$ ដើម្បីថតលើអេក្រង់",
+  "savedTheFile": "មេឌៀបានរក្សាទុកដោយ $name$​",
+  "linkPreviewsTitle": "ផ្ញើតំណឲ្យមើលជាមុន",
+  "linkPreviewDescription": "បង្កើតតំណឲ្យមើលជាមុនសម្រាប់ URLs ដែលអាចប្រើប្រាស់បាន។",
+  "linkPreviewsConfirmMessage": "អ្នកមិនមានការការពារទិន្នន័យមេតាពេញលេញនៅពេលផ្ញើការមើលតំណជាមុននោះទេ។",
   "mediaPermissionsTitle": "មីក្រូ​ហ្វូន",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "ការអនុញ្ញាតឱ្យចូលប្រើមីក្រូហ្វូន។",
   "spellCheckTitle": "ពិនិត្យ​អក្ខរាវិរុទ្ធ",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "ទាំងឈ្មោះអ្នកផ្ញើ និងសារ",
+  "spellCheckDescription": "ការពិនិត្យអក្ខរាវិរុទ្ធនៅពេលវាយសារ។",
+  "spellCheckDirty": "អ្នកត្រូវចាប់ផ្តើម Session ឡើងវិញ ដើម្បីអនុវត្តការកំណត់ថ្មីណាមួយរបស់អ្នក",
+  "readReceiptSettingDescription": "ផ្ញើសារអ្នកទទួលដែលបានអានរួចក្នុងការជជែកមួយទល់មួយ។",
+  "readReceiptSettingTitle": "​អ្នកទទួលដែលបានអានសាររួច",
+  "typingIndicatorsSettingDescription": "មើល និងចែករំលែកសញ្ញាបង្ហាញពេលកំពុងវាយក្នុងការជជែកមួយទល់មួយ។",
+  "typingIndicatorsSettingTitle": "សូចនាករវាយអក្សរ",
+  "zoomFactorSettingTitle": "កត្តាពង្រីក​បង្រួម",
+  "themesSettingTitle": "ទម្រង់រចនា",
+  "primaryColor": "ពណ៌ចម្បង",
+  "primaryColorGreen": "ពណ៌ចម្បងពណ៌បៃតង",
+  "primaryColorBlue": "ពណ៌ចម្បងពណ៌ខៀវ",
+  "primaryColorYellow": "ពណ៌ចម្បងពណ៌លឿង",
+  "primaryColorPink": "ពណ៌ចម្បងពណ៌ផ្កាឈូក",
+  "primaryColorPurple": "ពណ៌ចម្បងពណ៌ស្វាយ",
+  "primaryColorOrange": "ពណ៌ចម្បងពណ៌ទឹកក្រូច",
+  "primaryColorRed": "ពណ៌ចម្បងពណ៌ក្រហម",
+  "classicDarkThemeTitle": "ផ្ទៃចាស់ស្រអាប់",
+  "classicLightThemeTitle": "ពន្លឺក្លាស៊ិក",
+  "oceanDarkThemeTitle": "សមុទ្រស្រអាប់",
+  "oceanLightThemeTitle": "សមុទ្រភ្លឺថ្លា",
+  "pruneSettingTitle": "បង្រួមសហគមន៍",
+  "pruneSettingDescription": "លុបសារណាដែលមានអាយុលើសពី 6 ខែពីសហគមន៍ ដែលមានសារលើសពី 2,000។",
+  "enable": "បើក",
+  "keepDisabled": "បន្តបិទ",
+  "notificationSettingsDialog": "ព័ត៌មានដែលបានបង្ហាញនៅក្នុងការជូនដំណឹង។",
+  "nameAndMessage": "ឈ្មោះ និងមាតិកា",
   "noNameOrMessage": "គ្មានឈ្មោះ ឬ សារ",
   "nameOnly": "មានតែឈ្មោះអ្នកផ្ញើ",
   "newMessage": "សារថ្មី",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "បង្កើតការសន្ទនាជាមួយទំនាក់ទំនងថ្មីមួយ",
+  "createConversationNewGroup": "បង្កើតក្រុមមួយចេញពីទំនាក់ទំនងដែលមានស្រាប់",
+  "joinACommunity": "ចូលរួមសហគមន៍មួយ",
+  "chooseAnAction": "ជ្រើសរើសសកម្មភាពមួយដើម្បីចាប់ផ្តើមការសន្ទនា",
   "newMessages": "សារថ្មី",
   "notificationMostRecentFrom": "ថ្មីៗបំផុតពី៖",
   "notificationFrom": "ពី៖",
   "notificationMostRecent": "ថ្មីៗបំផុត៖",
   "sendFailed": "ផ្ញើបរាជ័យ",
   "mediaMessage": "សារមេឌា",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
+  "messageBodyMissing": "សូមបញ្ចូលតួសារ។",
+  "messageBody": "តួសារ",
   "unblockToSend": "ដោះការហាមឃាត់លេខទំនាក់ទំនងនេះ ដើម្បីផ្ញើសារ។",
   "unblockGroupToSend": "មិនការទប់ស្កាត់ក្រុមនេះ ដើម្បីផ្ញើសារ។",
   "youChangedTheTimer": "អ្នកបានកំណត់រយៈពេលសារបាត់ទៅវិញជា $time$",
@@ -192,11 +194,12 @@
   "timerOption_12_hours": "12 ម៉ោង",
   "timerOption_1_day": "1 ថ្ងៃ",
   "timerOption_1_week": "1 សប្តាហ៍",
+  "timerOption_2_weeks": "2 សប្តាហ៍",
   "disappearingMessages": "សារបាត់ទៅវិញ",
-  "changeNickname": "Change Nickname",
+  "changeNickname": "ប្តូរឈ្មោះហៅក្រៅ",
   "clearNickname": "Clear nickname",
-  "nicknamePlaceholder": "New Nickname",
-  "changeNicknameMessage": "Enter a nickname for this user",
+  "nicknamePlaceholder": "ឈ្មោះហៅក្រៅថ្មី",
+  "changeNicknameMessage": "បញ្ចូលឈ្មោះហៅក្រៅមួយសម្រាប់អ្នកប្រើនេះ",
   "timerOption_0_seconds_abbreviated": "បិទ",
   "timerOption_5_seconds_abbreviated": "5វិ",
   "timerOption_10_seconds_abbreviated": "10វិ",
@@ -209,284 +212,297 @@
   "timerOption_12_hours_abbreviated": "12ម",
   "timerOption_1_day_abbreviated": "1ថ",
   "timerOption_1_week_abbreviated": "1ស",
+  "timerOption_2_weeks_abbreviated": "2ស",
   "disappearingMessagesDisabled": "សារបាត់ទៅវិញបានបិទ",
-  "disabledDisappearingMessages": "$name$ បានបិទសារបាត់ទៅវិញ",
+  "disabledDisappearingMessages": "$name$ ត្រូវបានបិទមុខងារសារបាត់ទៅវិញ។",
   "youDisabledDisappearingMessages": "អ្នកបានបិទសារបាត់ទៅវិញ",
   "timerSetTo": "រយៈពេលបានកំណត់$time$",
   "noteToSelf": "កំណត់ចំណាំ",
-  "hideMenuBarTitle": "Hide Menu Bar",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarTitle": "លាក់របារម៉ឺនុយ",
+  "hideMenuBarDescription": "បិទបើកប្រព័ន្ធរបារម៉ឺនុយដែលអាចមើលឃើញ។",
   "startConversation": "ចាប់ផ្តើមការសន្ទនាថ្មី...",
-  "invalidNumberError": "លេខមិនត្រឹមត្រូវ",
-  "failedResolveOns": "Failed to resolve ONS name",
-  "autoUpdateSettingTitle": "Auto Update",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "invalidNumberError": "សូមពិនិត្យមើល Session ID ឬឈ្មោះ ONS ហើយព្យាយាមម្តងទៀត",
+  "failedResolveOns": "បានបរាជ័យក្នុងការដោះស្រាយឈ្មោះ ONS",
+  "autoUpdateSettingTitle": "ធ្វើបច្ចុប្បន្នភាពដោយស្វ័យប្រវត្តិ",
+  "autoUpdateSettingDescription": "ពិនិត្យដោយស្វ័យប្រវត្តិសម្រាប់ការធ្វើបច្ចុប្បន្នភាពនៅពេលចាប់ផ្តើម។",
   "autoUpdateNewVersionTitle": "មានបច្ចុប្បន្នភាព Session",
   "autoUpdateNewVersionMessage": "មានSessionជំនាន់ថ្មី",
   "autoUpdateNewVersionInstructions": "ចុច បើក Sessionឡើងវិញ ដើម្បីដំណើការបច្ចុប្បន្នភាព។",
   "autoUpdateRestartButtonLabel": "បើកSession ឡើងវិញ",
   "autoUpdateLaterButtonLabel": "លើកក្រោយ",
-  "autoUpdateDownloadButtonLabel": "Download",
+  "autoUpdateDownloadButtonLabel": "ទាញយក",
   "autoUpdateDownloadedMessage": "The new update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Would you like to download the update?",
+  "autoUpdateDownloadInstructions": "តើអ្នកចង់ទាញយកបច្ចុប្បន្នភាពទេ?",
   "leftTheGroup": "$name$ បានចេញពីក្រុម",
   "multipleLeftTheGroup": "$name$ បានចេញពីក្រុម",
   "updatedTheGroup": "ក្រុមបានធ្វើបច្ចុប្បន្នភាព",
   "titleIsNow": "ចំណងជើងឥឡូវគឺ '$name$'",
   "joinedTheGroup": "$name$ បានចូលក្រុម",
   "multipleJoinedTheGroup": "$names$ បានចូលក្រុម",
-  "kickedFromTheGroup": "$name$ was removed from the group.",
-  "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
-  "unblocked": "Unblocked",
-  "blocked": "Blocked",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Unban User",
-  "userUnbanned": "User unbanned successfully",
-  "userUnbanFailed": "Unban failed!",
-  "banUser": "Ban User",
-  "banUserAndDeleteAll": "Ban and Delete All",
+  "kickedFromTheGroup": "$name$ ត្រូវបានដកចេញពីក្រុមនេះ។",
+  "multipleKickedFromTheGroup": "$name$ ត្រូវបានដកចេញពីក្រុមនេះ។",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "បានឈប់ទប់ស្កាត់",
+  "blocked": "បានទប់ស្កាត់",
+  "blockedSettingsTitle": "ទំនាក់ទំនងដែលបានទប់ស្កាត់",
+  "conversationsSettingsTitle": "ការសន្ទនា",
+  "unbanUser": "ឈប់ហាមឃាត់អ្នកប្រើ",
+  "userUnbanned": "អ្នកប្រើបានឈប់ហាមឃាត់ដោយជោគជ័យ",
+  "userUnbanFailed": "ហាមឃាត់តមិនបានសម្រេច!",
+  "banUser": "ហាមឃាត់អ្នកប្រើ",
+  "banUserAndDeleteAll": "ហាមឃាត់ និងលុបទាំងអស់",
   "userBanned": "User banned successfully",
-  "userBanFailed": "Ban failed!",
-  "leaveGroup": "Leave Group",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Are you sure you want to leave this group?",
-  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
-  "cannotRemoveCreatorFromGroup": "Cannot remove this user",
-  "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
-  "noContactsForGroup": "You don't have any contacts yet",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
-  "copyMessage": "Copy message text",
-  "selectMessage": "Select message",
-  "editGroup": "Edit group",
-  "editGroupName": "Edit group name",
-  "updateGroupDialogTitle": "Updating $name$...",
-  "showRecoveryPhrase": "Recovery Phrase",
-  "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
-  "enterPassword": "Please enter your password",
-  "confirmPassword": "Confirm password",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
-  "showRecoveryPhrasePasswordRequest": "Please enter your password",
-  "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
-  "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
-  "passwordViewTitle": "Enter Password",
-  "password": "Password",
-  "setPassword": "Set Password",
-  "changePassword": "Change Password",
-  "createPassword": "Create your password",
-  "removePassword": "Remove Password",
-  "maxPasswordAttempts": "Invalid Password. Would you like to reset the database?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Old password is invalid",
-  "invalidPassword": "Invalid password",
-  "noGivenPassword": "Please enter your password",
-  "passwordsDoNotMatch": "Passwords do not match",
-  "setPasswordInvalid": "Passwords do not match",
-  "changePasswordInvalid": "The old password you entered is incorrect",
-  "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
-  "connectingToServer": "Connecting...",
-  "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
-  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
-  "remove": "Remove",
-  "invalidSessionId": "Invalid Session ID",
-  "invalidPubkeyFormat": "Invalid Pubkey Format",
-  "emptyGroupNameError": "Please enter a group name",
-  "editProfileModalTitle": "Profile",
-  "groupNamePlaceholder": "Group Name",
-  "inviteContacts": "Invite Contacts",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
-  "add": "Add",
-  "addingContacts": "Adding contacts to $name$",
-  "noContactsToAdd": "No contacts to add",
-  "noMembersInThisGroup": "No other members in this group",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
-  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "userBanFailed": "ហាមឃាត់មិនបានសម្រេច!",
+  "leaveGroup": "ចាកចេញពីក្រុម",
+  "leaveAndRemoveForEveryone": "ចាកចេញពីក្រុម ហើយលុបអ្នកទាំងអស់គ្នាចេញ",
+  "leaveGroupConfirmation": "តើអ្នកពិតជាចង់ចាកចេញពីក្រុមនេះឬទេ?",
+  "leaveGroupConfirmationAdmin": "ក្នុង​នាម​អ្នក​ជា​អ្នក​គ្រប់គ្រង​ក្រុម​នេះ ប្រសិន​បើ​អ្នក​ចាកចេញ​វា វា​នឹង​ត្រូវ​បាន​ដក​ចេញ​សម្រាប់រាល់​សមាជិក​បច្ចុប្បន្ន​ទាំងអស់។ តើអ្នកប្រាកដទេថាអ្នកចង់ចាកចេញពីក្រុមនេះទេ?",
+  "cannotRemoveCreatorFromGroup": "មិនអាចលុបអ្នកប្រើប្រាស់នេះចេញបានទេ",
+  "cannotRemoveCreatorFromGroupDesc": "អ្នកមិនអាចលុបអ្នកប្រើប្រាស់នេះចេញបាន ដោយសារពួកគេជាអ្នកបង្កើតក្រុម។",
+  "noContactsForGroup": "អ្នកមិនទាន់មានទំនាក់ទំនងណាមួយនៅឡើយទេ",
+  "failedToAddAsModerator": "បរាជ័យក្នុងការបន្ថែមអ្នកប្រើជាអ្នកគ្រប់គ្រង",
+  "failedToRemoveFromModerator": "បរាជ័យក្នុងការលុបអ្នកប្រើចេញពីបញ្ជីអ្នកគ្រប់គ្រង",
+  "copyMessage": "ចម្លងអត្ថបទសារ",
+  "selectMessage": "ជ្រើសរើសសារ",
+  "editGroup": "កែក្រុម",
+  "editGroupName": "កែឈ្មោះក្រុម",
+  "updateGroupDialogTitle": "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព $name$...",
+  "showRecoveryPhrase": "ឃ្លាស្តារឡើងវិញ",
+  "yourSessionID": "Session ID របស់អ្នក",
+  "setAccountPasswordTitle": "ពាក្យសម្ងាត់",
+  "setAccountPasswordDescription": "តម្រូវឲ្យមានពាក្យសម្ងាត់ដើម្បីឈប់ទប់ស្កាត់ Session។",
+  "changeAccountPasswordTitle": "ប្តូរពាក្យសម្ងាត់",
+  "changeAccountPasswordDescription": "ប្ដូរពាក្យសម្ងាត់ដែលបានតម្រូវឲ្យមានដើម្បីឈប់ទប់ស្កាត់ Session។",
+  "removeAccountPasswordTitle": "លុបពាក្យសម្ងាត់",
+  "removeAccountPasswordDescription": "ប្ដូរពាក្យសម្ងាត់ដែលបានតម្រូវឲ្យមានដើម្បីឈប់ទប់ស្កាត់ Session។",
+  "enterPassword": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក",
+  "confirmPassword": "បញ្ជាក់ពាក្យសម្ងាត់",
+  "enterNewPassword": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់ថ្មី​របស់​អ្នក",
+  "confirmNewPassword": "បញ្ជាក់ពាក្យសម្ងាត់ថ្មី",
+  "showRecoveryPhrasePasswordRequest": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក",
+  "recoveryPhraseSavePromptMain": "ឃ្លាស្តារឡើងវិញរបស់អ្នកគឺជាកូដចម្បងដើម្បីចូលទៅ Session ID របស់អ្នក ហើយអ្នកអាចប្រើវាដើម្បីស្តារឡើងវិញនូវ Session ID របស់អ្នក ប្រសិនបើអ្នកបាត់បង់សិទ្ធិចូលប្រើឧបករណ៍របស់អ្នក។ រក្សាឃ្លាស្តារឡើងវិញរបស់អ្នកទុកក្នុងកន្លែងដែលមានសុវត្ថិភាព និងមិនត្រូវផ្តល់វាឱ្យនរណាម្នាក់ឡើយ។",
+  "invalidOpenGroupUrl": "URL មិនត្រឹមត្រូវ",
+  "copiedToClipboard": "បានចម្លង",
+  "passwordViewTitle": "បញ្ចូលពាក្យសម្ងាត់",
+  "password": "ពាក្យសម្ងាត់",
+  "setPassword": "កំណត់ពាក្យសម្ងាត់",
+  "changePassword": "ប្តូរពាក្យសម្ងាត់",
+  "createPassword": "បង្កើតពាក្យសម្ងាត់របស់អ្នក",
+  "removePassword": "លុបពាក្យសម្ងាត់",
+  "maxPasswordAttempts": "ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។ តើអ្នកចង់កំណត់មូលដ្ឋានទិន្នន័យឡើងវិញទេ?",
+  "typeInOldPassword": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់ថ្មី​របស់​អ្នក",
+  "invalidOldPassword": "ពាក្យសម្ងាត់ចាស់មិនត្រឹមត្រូវទេ",
+  "invalidPassword": "ពាក្យសម្ងាត់មិនត្រឹមត្រូវ",
+  "noGivenPassword": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក",
+  "passwordsDoNotMatch": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ",
+  "setPasswordInvalid": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ",
+  "changePasswordInvalid": "ពាក្យសម្ងាត់ចាស់ដែលអ្នកបានបញ្ចូលគឺមិនត្រឹមត្រូវទេ",
+  "removePasswordInvalid": "ពាក្យសម្ងាត់មិនត្រឹមត្រូវ",
+  "setPasswordTitle": "កំណត់ពាក្យសម្ងាត់",
+  "changePasswordTitle": "ពាក្យសម្ងាត់ត្រូវបានប្តូរ",
+  "removePasswordTitle": "ពាក្យសម្ងាត់ត្រូវបានលុបចេញ",
+  "setPasswordToastDescription": "ពាក្យសម្ងាត់របស់អ្នកត្រូវបានកំណត់។ សូមរក្សាវាឲ្យមានសុវត្ថិភាព។",
+  "changePasswordToastDescription": "ពាក្យសម្ងាត់របស់អ្នកត្រូវបានប្តូរ។ សូមរក្សាវាឲ្យមានសុវត្ថិភាព។",
+  "removePasswordToastDescription": "ពាក្យសម្ងាត់របស់អ្នកត្រូវបានលុបចេញ។",
+  "publicChatExists": "អ្នកបានភ្ជាប់ជាមួយសហគមន៍នេះរួចហើយ",
+  "connectToServerFail": "មិនអាចចូលរួមសហគមន៍បានទេ",
+  "connectingToServer": "កំពុងភ្ជាប់...",
+  "connectToServerSuccess": "បានភ្ជាប់ជាមួយសហគមន៍ដោយជោគជ័យ",
+  "setPasswordFail": "ការកំណត់ពាក្យសម្ងាត់មិនបានសម្រេច",
+  "passwordLengthError": "ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​ចន្លោះ​ពី 6 ទៅ 64 តួអក្សរ",
+  "passwordTypeError": "ពាក្យសម្ងាត់ត្រូវតែជាសំនុំអក្សរ",
+  "passwordCharacterError": "ពាក្យសម្ងាត់ត្រូវតែមានអក្សរ លេខ និងនិមិត្តសញ្ញាប៉ុណ្ណោះ",
+  "remove": "ដកចេញ",
+  "invalidSessionId": "Session ID មិនត្រឹមត្រូវ",
+  "invalidPubkeyFormat": "ទម្រង់ Pubkey មិនត្រឹមត្រូវ",
+  "emptyGroupNameError": "សូមបញ្ចូលឈ្មោះក្រុម",
+  "editProfileModalTitle": "ប្រវត្តិរូប",
+  "groupNamePlaceholder": "ឈ្មោះក្រុម",
+  "inviteContacts": "អញ្ជើញទំនាក់ទំនង",
+  "addModerators": "បន្ថែមអ្នកគ្រប់គ្រង",
+  "removeModerators": "ដកអ្នកគ្រប់គ្រងចេញ",
+  "addAsModerator": "បន្ថែមជាអ្នកគ្រប់គ្រង",
+  "removeFromModerators": "ដកចេញពីអ្នកគ្រប់គ្រង",
+  "add": "បន្ថែម",
+  "addingContacts": "ការបន្ថែមទំនាក់ទំនងទៅ $name$",
+  "noContactsToAdd": "គ្មានទំនាក់ទំនងដែលត្រូវបន្ថែមទេ",
+  "noMembersInThisGroup": "គ្មានសមាជិកផ្សេងទៀតនៅក្នុងក្រុមនេះទេ",
+  "noModeratorsToRemove": "មិនមានអ្នកគ្រប់គ្រងដើម្បីដកចេញទេ",
+  "onlyAdminCanRemoveMembers": "អ្នកមិនមែនជាអ្នកបង្កើតទេ",
+  "onlyAdminCanRemoveMembersDesc": "មានតែអ្នកបង្កើតក្រុមដែលអាចដកអ្នកប្រើចេញបាន",
   "createAccount": "Create Account",
-  "startInTrayTitle": "Keep in System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
-  "yourUniqueSessionID": "Say hello to your Session ID",
-  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
-  "getStarted": "Get started",
-  "createSessionID": "Create Session ID",
-  "recoveryPhrase": "Recovery Phrase",
-  "enterRecoveryPhrase": "Enter your recovery phrase",
-  "displayName": "Display Name",
-  "anonymous": "Anonymous",
-  "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
-  "enterDisplayName": "Enter a display name",
-  "continueYourSession": "Continue Your Session",
-  "linkDevice": "Link Device",
-  "restoreUsingRecoveryPhrase": "Restore your account",
-  "or": "or",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
-  "beginYourSession": "Begin your Session.",
-  "welcomeToYourSession": "Welcome to your Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
-  "enterSessionID": "Enter Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
-  "message": "Message",
-  "appearanceSettingsTitle": "Appearance",
-  "privacySettingsTitle": "Privacy",
-  "notificationsSettingsTitle": "Notifications",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
-  "recoveryPhraseEmpty": "Enter your recovery phrase",
+  "startInTrayTitle": "រក្សាទុកក្នុងថាសប្រព័ន្ធ",
+  "startInTrayDescription": "បន្តដំណើរការកម្មវិធី Session ក្នុងផ្ទៃខាងក្រោយ នៅពេលអ្នកបិទវីនដូ។",
+  "yourUniqueSessionID": "និយាយថា សួស្តីទៅកាន់ Session ID របស់អ្នក",
+  "allUsersAreRandomly...": "Session ID របស់អ្នកជាអាសយដ្ឋានតែមួយគត់ដែលមនុស្សអាចប្រើ ដើម្បីទាក់ទងអ្នកនៅលើ Session។ Session ID របស់អ្នកត្រូវបានរចនាឡើងដោយអនាមិក និងឯកជនទាំងស្រុង ដោយមិនមានពាក់ព័ន្ធជាមួយអត្តសញ្ញាណពិតប្រាកដរបស់អ្នក។",
+  "getStarted": "បានចាប់ផ្តើម",
+  "createSessionID": "បង្កើត Session ID",
+  "recoveryPhrase": "ឃ្លាស្តារឡើងវិញ",
+  "enterRecoveryPhrase": "បញ្ចូលឃ្លាស្តារឡើងវិញរបស់អ្នក",
+  "displayName": "បង្ហាញឈ្មោះ",
+  "anonymous": "អនាមិក",
+  "removeResidueMembers": "ការចុច យល់ព្រម នោះនឹងដកសមាជិកទាំងអស់នោះចេញដោយសារពួកគេចាកចេញពីក្រុមនេះ។",
+  "enterDisplayName": "បញ្ចូលឈ្មោះបង្ហាញ",
+  "continueYourSession": "បន្ត Session របស់អ្នក",
+  "linkDevice": "ភ្ជាប់ឧបករណ៍",
+  "restoreUsingRecoveryPhrase": "ស្តារគណនីរបស់អ្នកឡើងវិញ",
+  "or": "ឬ",
+  "ByUsingThisService...": "តាមរយៈការប្រើប្រាស់សេវានេះ អ្នកយល់ព្រមនឹង <a href=\"https://getsession.org/terms-of-service \">លក្ខខណ្ឌឌ​ប្រើប្រាស់</a> និង <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">គោលការណ៍ឯកជនភាព</a> របស់យើង",
+  "beginYourSession": "ចាប់ផ្តើម​​ Session របស់អ្នក។",
+  "welcomeToYourSession": "សូមស្វាគមន៍មកកាន់ Session របស់អ្នក",
+  "searchFor...": "ស្វែងរកការសន្ទនា និងទំនាក់ទំនង",
+  "searchForContactsOnly": "ស្វែងរកទំនាក់ទំនង",
+  "enterSessionID": "បញ្ចូល Session ID",
+  "enterSessionIDOfRecipient": "បញ្ចូល Session ID ឬ ONS ទំនាក់ទំនងរបស់អ្នក",
+  "message": "សារ",
+  "appearanceSettingsTitle": "រូបរាង",
+  "privacySettingsTitle": "ឯកជនភាព",
+  "notificationsSettingsTitle": "ការជូនដំណឹង",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "ខ្លឹមសារនៃការជូនដំណឹង",
+  "notificationPreview": "មើលជាមុន",
+  "recoveryPhraseEmpty": "បញ្ចូលឃ្លាស្តារឡើងវិញរបស់អ្នក",
   "displayNameEmpty": "Please pick a display name",
-  "members": "$count$ members",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
-  "createClosedGroupNamePrompt": "Group Name",
-  "createClosedGroupPlaceholder": "Enter a group name",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
-  "next": "Next",
-  "invalidGroupNameTooShort": "Please enter a group name",
-  "invalidGroupNameTooLong": "Please enter a shorter group name",
-  "pickClosedGroupMember": "Please pick at least 1 group member",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
-  "orJoinOneOfThese": "Or join one of these...",
-  "helpUsTranslateSession": "Translate Session",
-  "closedGroupInviteFailTitle": "Group Invitation Failed",
-  "closedGroupInviteFailTitlePlural": "Group Invitations Failed",
-  "closedGroupInviteFailMessage": "Unable to successfully invite a group member",
-  "closedGroupInviteFailMessagePlural": "Unable to successfully invite all group members",
-  "closedGroupInviteOkText": "Retry invitations",
-  "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
-  "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
-  "notificationForConvo": "Notifications",
-  "notificationForConvo_all": "All",
-  "notificationForConvo_disabled": "Disabled",
-  "notificationForConvo_mentions_only": "Mentions only",
-  "onionPathIndicatorTitle": "Path",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
-  "unknownCountry": "Unknown Country",
-  "device": "Device",
-  "destination": "Destination",
-  "learnMore": "Learn more",
-  "linkVisitWarningTitle": "Open this link in your browser?",
-  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
-  "open": "Open",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Click to download media",
-  "trustThisContactDialogTitle": "Trust $name$?",
-  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
-  "pinConversation": "Pin Conversation",
-  "unpinConversation": "Unpin Conversation",
-  "showUserDetails": "Show User Details",
-  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
-  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
-  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
-  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
-  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "I am sure",
-  "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
-  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
-  "notificationSubtitle": "Notifications - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Message Requests",
-  "requestsSubtitle": "Pending Requests",
-  "requestsPlaceholder": "No requests",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
-  "incomingCallFrom": "Incoming call from '$name$'",
-  "ringing": "Ringing...",
-  "establishingConnection": "Establishing connection...",
-  "accept": "Accept",
-  "decline": "Decline",
-  "endCall": "End call",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
-  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "unableToCall": "Cancel your ongoing call first",
-  "unableToCallTitle": "Cannot start new call",
-  "callMissed": "Missed call from $name$",
-  "callMissedTitle": "Call missed",
-  "noCameraFound": "No camera found",
-  "noAudioInputFound": "No audio input found",
-  "noAudioOutputFound": "No audio output found",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
-  "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
-  "startedACall": "You called $name$",
-  "answeredACall": "Call with $name$",
-  "trimDatabase": "Trim Database",
-  "trimDatabaseDescription": "Reduces your message database size to your last 10,000 messages.",
-  "trimDatabaseConfirmationBody": "Are you sure you want to delete your $deleteAmount$ oldest received messages?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "displayNameTooLong": "Display name is too long",
+  "members": "សមាជិក $count$",
+  "activeMembers": "$count$ active members",
+  "join": "ចូលរួម",
+  "joinOpenGroup": "ចូលរួមសហគមន៍",
+  "createGroup": "បង្កើតក្រុម",
+  "create": "បង្កើត",
+  "createClosedGroupNamePrompt": "ឈ្មោះក្រុម",
+  "createClosedGroupPlaceholder": "បញ្ចូលឈ្មោះក្រុម",
+  "openGroupURL": "URL សហគមន៍",
+  "enterAnOpenGroupURL": "បញ្ចូល URL សហគមន៍",
+  "next": "បន្ទាប់",
+  "invalidGroupNameTooShort": "សូមបញ្ចូលឈ្មោះក្រុម",
+  "invalidGroupNameTooLong": "សូមបញ្ចូលឈ្មោះក្រុមឲ្យខ្លីជាងនេះ",
+  "pickClosedGroupMember": "សូមជ្រើសរើសសមាជិកក្រុមយ៉ាងតិចបំផុត 1 នាក់",
+  "closedGroupMaxSize": "​ក្រុមមួយមិនអាចមានសមាជិកលើសពី 100 បានឡើយ",
+  "noBlockedContacts": "អ្នកមិនមានទំនាក់ទំនងដែលត្រូវបានទប់ស្កាត់ទេ។",
+  "userAddedToModerators": "អ្នកប្រើបានបន្ថែមទៅបញ្ជីអ្នកគ្រប់គ្រង",
+  "userRemovedFromModerators": "អ្នកប្រើបានដកចេញពីបញ្ជីអ្នកគ្រប់គ្រង",
+  "orJoinOneOfThese": "ឬចូលរួមក្នុងចំណោមណាមួយនេះ…",
+  "helpUsTranslateSession": "បកប្រែ Session",
+  "closedGroupInviteFailTitle": "ការអញ្ជើញជាក្រុមមិនបានសម្រេច",
+  "closedGroupInviteFailTitlePlural": "ការអញ្ជើញជាក្រុមមិនបានសម្រេច",
+  "closedGroupInviteFailMessage": "មិនអាចអញ្ជើញសមាជិកក្រុមបានដោយជោគជ័យទេ",
+  "closedGroupInviteFailMessagePlural": "មិនអាចអញ្ជើញសមាជិកក្រុមទាំងអស់បានដោយជោគជ័យទេ",
+  "closedGroupInviteOkText": "សាកល្បងអញ្ជើញម្តងទៀត",
+  "closedGroupInviteSuccessTitlePlural": "ការអញ្ជើញជាក្រុមបានបញ្ចប់",
+  "closedGroupInviteSuccessTitle": "ការអញ្ជើញក្រុមបានជោគជ័យ",
+  "closedGroupInviteSuccessMessage": "សមាជិកក្រុមបានអញ្ជើញដោយជោគជ័យ",
+  "notificationForConvo": "ការជូនដំណឹង",
+  "notificationForConvo_all": "ទាំងអស់",
+  "notificationForConvo_disabled": "បានបិទ",
+  "notificationForConvo_mentions_only": "ការលើកឡើងតែប៉ុណ្ណោះ",
+  "onionPathIndicatorTitle": "ផ្លូវ",
+  "onionPathIndicatorDescription": "កម្មវិធី Session លាក់ IP របស់អ្នកដោយបញ្ជូនសាររបស់អ្នកតាមរយៈមុខងារ Service Nodes ជាច្រើននៅក្នុងបណ្តាញវិមជ្ឈការរបស់កម្មវិធី Session។ នេះគឺជាបណ្តាប្រទេសដែលចរាចរណ៍អ៊ីនធឺណិតរបស់អ្នកពេលថ្មីៗនេះកំពុងត្រូវបានបញ្ជូននាតាមរយៈ៖",
+  "unknownCountry": "ប្រទេសដែលមិនស្គាល់",
+  "device": "ឧបករណ៍",
+  "destination": "គោលដៅ",
+  "learnMore": "ស្វែង​យល់​បន្ថែម",
+  "linkVisitWarningTitle": "បើកតំណនេះនៅក្នុងកម្មវិធីរុករកអ៊ីនធឺណិតរបស់អ្នកមែនទេ?",
+  "linkVisitWarningMessage": "តើអ្នកប្រាកដថាចង់បើក $url$ នៅក្នុង browser របស់អ្នកទេ?",
+  "open": "បើក",
+  "audioMessageAutoplayTitle": "ចាក់សារជាសំឡេងដោយស្វ័យប្រវត្តិ",
+  "audioMessageAutoplayDescription": "ចាក់សារជាសំឡេងបន្តបន្ទាប់គ្នាដោយស្វ័យប្រវត្តិ។",
+  "clickToTrustContact": "ចុចទាញយកមេឌៀ",
+  "trustThisContactDialogTitle": "ជឿទុកចិត្តចំពោះ $name$ មែនទេ?",
+  "trustThisContactDialogDescription": "តើ​អ្នក​ពិត​ជា​ចង់​ទាញ​យក​មេឌៀ​ដែល​ផ្ញើ​ដោយ $name$ មែនទេ?",
+  "pinConversation": "ខ្ទាស់ការសន្ទនា",
+  "unpinConversation": "បិតខ្ទាស់ការសន្ទនា",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "បង្ហាញព័ត៌មានលម្អិតអ្នកប្រើ",
+  "sendRecoveryPhraseTitle": "កំពុងផ្ញើឃ្លាស្តារឡើងវិញ",
+  "sendRecoveryPhraseMessage": "អ្នកកំពុងព្យាយាមផ្ញើឃ្លាស្តារឡើងវិញរបស់អ្នក ដែលអាចត្រូវប្រើប្រាស់ដើម្បីចូលប្រើគណនីរបស់អ្នក។ តើអ្នកប្រាកដទេថាអ្នកចង់ផ្ញើសារនេះ?",
+  "dialogClearAllDataDeletionFailedTitle": "ទិន្នន័យមិនត្រូវបានលុបទេ",
+  "dialogClearAllDataDeletionFailedDesc": "ទិន្នន័យមិនបានលុបចេញដោយបញ្ហាដែលមិនស្គាល់។ តើអ្នកចង់លុបទិន្នន័យចេញពីឧបករណ៍នេះដែរឬទេ?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "តើអ្នកចង់លុបទិន្នន័យចេញពីឧបករណ៍នេះមែនទេ?",
+  "dialogClearAllDataDeletionFailedMultiple": "ទិន្នន័យមិនបានលុបដោយមុខងារ Service Nodes ទាំងអស់នោះ៖ $snodes$",
+  "dialogClearAllDataDeletionQuestion": "តើអ្នកចង់ជម្រះតែឧបករណ៍នេះ ឬលុបទិន្នន័យរបស់អ្នកចេញពីបណ្តាញនេះមែនទេ?",
+  "clearDevice": "ជម្រះឧបករណ៍",
+  "tryAgain": "សូមព្យាយាម​ម្តង​ទៀត",
+  "areYouSureClearDevice": "តើអ្នកប្រាកដទេថា អ្នកចង់ជម្រះឧបករណ៍របស់អ្នកចេញ?",
+  "deviceOnly": "ជម្រះតែឧបករណ៍ប៉ុណ្ណោះ",
+  "entireAccount": "ជម្រះឧបករណ៍ និងបណ្តាញ",
+  "areYouSureDeleteDeviceOnly": "តើអ្នកប្រាកដទេថា អ្នកចង់លុបតែទិន្នន័យឧបករណ៍របស់អ្នកនេះ?",
+  "areYouSureDeleteEntireAccount": "តើអ្នកពិតជាចង់លុបទិន្នន័យរបស់អ្នកចេញពីបណ្តាញនេះមែនទេ? ប្រសិនបើអ្នកបន្ត អ្នកនឹងមិនអាចស្តារសារ ឬទំនាក់ទំនងរបស់អ្នកឡើងវិញបានទេ។",
+  "iAmSure": "ខ្ញុំ​ប្រាកដណាស់",
+  "recoveryPhraseSecureTitle": "អ្នកបានធ្វើជិតរួចរាល់ហើយ!",
+  "recoveryPhraseRevealMessage": "រក្សាទុកឃ្លាស្តារឡើងវិញរបស់អ្នកដើម្បីធានាថាគណនីរបស់អ្នកមានសុវត្ថិភាព។ បង្ហាញឃ្លាស្តារឡើងវិញរបស់អ្នក បន្ទាប់មករក្សាទុកវាឱ្យមានសុវត្ថិភាពល្អ។",
+  "recoveryPhraseRevealButtonText": "បង្ហាញឃ្លាស្តារឡើងវិញ",
+  "notificationSubtitle": "ការជូនដំណឹង - $setting$",
+  "surveyTitle": "យើងចូលចិត្តមតិយោបល់របស់អ្នក",
+  "faq": "សំណួរដែលសួរញឹកញាប់",
+  "support": "ជំនួយ",
+  "clearAll": "ជម្រះ​ទាំងអស់",
+  "clearDataSettingsTitle": "ជម្រះទិន្នន័យ",
+  "messageRequests": "ការស្នើសុំសារ",
+  "requestsSubtitle": "សំណើដែលមិនទាន់សម្រេច",
+  "requestsPlaceholder": "គ្មានសំណើ",
+  "hideRequestBannerDescription": "លាក់ផ្ទាំងបដាស្នើសុំសារ រហូតទាល់តែអ្នកទទួលបានការស្នើសុំសារថ្មីមួយ។",
+  "incomingCallFrom": "ការហៅចូលពី '$name$'",
+  "ringing": "កំពុងរោទ៍...",
+  "establishingConnection": "កំពុង​បង្កើត​ការ​តភ្ជាប់...",
+  "accept": "ទទួលយក",
+  "decline": "បដិសេធ",
+  "endCall": "បញ្ចប់ការហៅ",
+  "permissionsSettingsTitle": "ការអនុញ្ញាត",
+  "helpSettingsTitle": "ជំនួយ",
+  "cameraPermissionNeededTitle": "តម្រូវឱ្យមានការអនុញ្ញាតការហៅជាសំឡេង/ជាវីដេអូ",
+  "cameraPermissionNeeded": "អ្នកអាចបើកការអនុញ្ញាត 'ការហៅទូសព្ទជាសំឡេង និងជាវីដេអូ' នៅក្នុងការកំណត់ឯកជនភាព។",
+  "unableToCall": "បោះបង់ការហៅដែលកំពុងបន្តរបស់អ្នកជាមុនសិន",
+  "unableToCallTitle": "មិនអាចចាប់ផ្តើមការហៅទូរសព្ទថ្មីបានទេ",
+  "callMissed": "បាន​ខកខាន​ទទួល​ការ​ហៅ​ពី $name$",
+  "callMissedTitle": "ការហៅដែលបានខកខាន",
+  "noCameraFound": "រកមិនឃើញកាមេរ៉ា",
+  "noAudioInputFound": "រកមិនឃើញការបញ្ចូលអូឌីយ៉ូ",
+  "noAudioOutputFound": "រកមិនឃើញឧបករណ៍បញ្ចេញអូឌីយ៉ូ",
+  "callMediaPermissionsTitle": "ការហៅជាសំឡេង និងជា​វីដេអូ (បេតា)",
+  "callMissedCausePermission": "ការហៅដែលបានខកខានពី '$name$' ពីព្រោះអ្នកត្រូវការបើកការអនុញ្ញាត 'ការហៅជាសំឡេង និងជាវីដេអូ' នៅក្នុងការកំណត់ឯកជនភាព។",
+  "callMissedNotApproved": "ការហៅដែលបានខកខានពី '$name$' ពីព្រោះអ្នកមិនទទួលបានការអនុញ្ញាតលើការសន្ទនារនេះនៅឡើយទេ។ ផ្ញើសារមួយទៅកាន់ពួកគេជាមុនសិន។",
+  "callMediaPermissionsDescription": "បើកការហៅជាសំឡេង និងជាវីដេអូទៅកាន់ និងមកពីអ្នកប្រើផ្សេងទៀត។",
+  "callMediaPermissionsDialogContent": "ដៃគូហៅទូរសព្ទរបស់អ្នក និងម៉ាស៊ីនមេ Oxen Foundation អាចមើលឃើញអាសយដ្ឋាន IP របស់អ្នក នៅពេលកំពុងប្រើប្រាស់ការហៅបេតា។ តើអ្នកប្រាកដថា អ្នកចង់បើកការហៅជាសំឡេង និងជាវីដេអូមែនទេ?",
+  "callMediaPermissionsDialogTitle": "ការហៅជាសំឡេង និងជា​វីដេអូ (បេតា)",
+  "startedACall": "អ្នកបានហៅ $name$",
+  "answeredACall": "ហៅជាមួយ $name$",
+  "trimDatabase": "សម្អាតមូលដ្ឋានទិន្នន័យ",
+  "trimDatabaseDescription": "កាត់បន្ថយទំហំមូលដ្ឋានទិន្នន័យសាររបស់អ្នកទៅ 10,000 សារចុងក្រោយរបស់អ្នក។",
+  "trimDatabaseConfirmationBody": "តើអ្នកពិតជាចង់លុបសារដែលបានទទួលចំនួន $deleteAmount$ ដែលជាសារចាស់ជាងគេរបស់អ្នកមែនទេ?",
+  "pleaseWaitOpenAndOptimizeDb": "សូមរង់ចាំនៅខណៈពេលដែលមូលដ្ឋានទិន្នន័យរបស់អ្នកកំពុងតែបើក និងបង្កើនប្រសិទ្ធភាព...",
+  "messageRequestPending": "ការស្នើសុំសាររបស់អ្នកកំពុងរង់ចាំថ្មីៗនេះ",
+  "messageRequestAccepted": "បានទទួលយកការស្នើសុំសាររបស់អ្នករួចហើយ",
+  "messageRequestAcceptedOurs": "អ្នកបានទទួលយកការស្នើសុំសាររបស់ $name$",
+  "messageRequestAcceptedOursNoName": "អ្នកបានទទួលយកការស្នើសុំសារនេះ",
+  "declineRequestMessage": "តើអ្នកពិតជាអ្នកចង់លុបការស្នើសុំសារទាំងអស់ចេញមែនទេ?",
+  "respondingToRequestWarning": "ការផ្ញើសារទៅកាន់អ្នកប្រើរូបនេះនឹងទទួលយកសំណើសាររបស់ពួកគេដោយស្វ័យប្រវត្តិ ហើយបង្ហាញ Session ID របស់អ្នក។",
+  "hideRequestBanner": "លាក់ផ្ទាំងបដាស្នើសុំសារ",
+  "openMessageRequestInbox": "ការស្នើសុំសារ",
+  "noMessageRequestsPending": "គ្មានការស្នើសុំដែលកំពុងរង់ចាំ",
+  "noMediaUntilApproved": "អ្នកមិនអាចផ្ញើឯកសារភ្ជាប់បានទេ រហូតទាល់តែការសន្ទនាទទួលបានការយល់ព្រម",
+  "mustBeApproved": "ការសន្ទនានេះត្រូវតែទទួលយកដើម្បីប្រើប្រាស់មុខងារនេះ",
+  "youHaveANewFriendRequest": "អ្នក​មាន​ការស្នើសុំ​សារ​ថ្មីមួយ",
+  "clearAllConfirmationTitle": "ជម្រះការស្នើសុំសារទាំងអស់",
+  "clearAllConfirmationBody": "តើអ្នកប្រាកដទេថា អ្នកពិតចង់លុបសំណើសារទាំងអស់ចេញ?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "លាក់",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "សូមពិនិត្យមើលប្រអប់សំបុត្រស្នើសុំសាររបស់អ្នក",
+  "clearAllReactions": "តើអ្នកប្រាកដទេថាអ្នកចង់ជម្រះសញ្ញា $emoji$ ទាំងអស់ចេញ?",
+  "expandedReactionsText": "បង្ហាញតិចជាង",
+  "reactionNotification": "សូមប្រតិកម្មទៅនឹងសារណាដែលមានសញ្ញា$emoji$",
+  "rateLimitReactMessage": "កុំលឿនពេក ! អ្នកបានផ្ញើរូប Emoji ច្រើនពេក។ សូមព្យាយាមម្តងទៀតក្នុងពេលឆាប់ៗនេះ",
+  "otherSingular": "$number$ ផ្សេងទៀត",
+  "otherPlural": "$number$ ផ្សេងទៀត",
+  "reactionPopup": "បានប្រតិកម្មជាមួយ",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ និង $name2$",
+  "reactionPopupThree": "$name$, $name2$ និង $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ និង",
+  "reactionListCountSingular": "និង $otherSingular$ បាន​ប្រតិកម្ម <span>$emoji$</span> ទៅកាន់សារនេះ",
+  "reactionListCountPlural": "និង $otherPlural$ បានប្រតិកម្ម <span>$emoji$</span> ទៅកាន់សារនេះ"
 }
diff --git a/_locales/kmr/messages.json b/_locales/kmr/messages.json
new file mode 100644
index 000000000..f2a4e6f0a
--- /dev/null
+++ b/_locales/kmr/messages.json
@@ -0,0 +1,508 @@
+{
+  "copyErrorAndQuit": "Çewtiyê kopî bike û derkeve",
+  "unknown": "Nenas",
+  "databaseError": "Çewtiya danegehê",
+  "mainMenuFile": "&Dosye",
+  "mainMenuEdit": "&Biguhêre",
+  "mainMenuView": "&Bibîne",
+  "mainMenuWindow": "&Pencere",
+  "mainMenuHelp": "&Alîkarî",
+  "appMenuHide": "Biveşêre",
+  "appMenuHideOthers": "Yên din biveşêre",
+  "appMenuUnhide": "Temamê wan nîşan bide",
+  "appMenuQuit": "Ji Session-ê derkeve",
+  "editMenuUndo": "Vegerîne",
+  "editMenuRedo": "Dîsa bike",
+  "editMenuCut": "Biqusîne",
+  "editMenuCopy": "Kopî bike",
+  "editMenuPaste": "Pêve bike",
+  "editMenuDeleteContact": "Kontaktê jê bibe",
+  "editMenuDeleteGroup": "Komê jê bibe",
+  "editMenuSelectAll": "Temamê wan bibijêre",
+  "windowMenuClose": "Pancereyê bigire",
+  "windowMenuMinimize": "Biçûk bike",
+  "windowMenuZoom": "Nêzîk bike",
+  "viewMenuResetZoom": "Mezinahiya eslî",
+  "viewMenuZoomIn": "Nêzîk bike",
+  "viewMenuZoomOut": "Dûr bike",
+  "viewMenuToggleFullScreen": "Bike Ekrana Dagirtî/Jê Derkeve",
+  "viewMenuToggleDevTools": "Amûrên Pêşvebiran Veke/Bigire",
+  "contextMenuNoSuggestions": "Ti pêşniyarek nîne",
+  "openGroupInvitation": "Daweta civatê",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Tevlî $roomName$ dibî?",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Tu piştrast î ku tu dixwazî tevlî civata $roomName$ bibî?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "IDya Sessionê an navê ONSyê binivîse",
+  "startNewConversationBy...": "Dest bi sohbeteke nû bike bi têketina IDya Session-ê yê yekî an IDya xwe Session-ê bi wan re parve bike.",
+  "loading": "Bar dibe...",
+  "done": "Çêbû",
+  "youLeftTheGroup": "Tu ji komê terketî.",
+  "youGotKickedFromGroup": "Te ji komê hate avêtin.",
+  "unreadMessages": "Peyamên nexwendî",
+  "debugLogExplanation": "Ev log wê li sermaseya te qeyd bibe.",
+  "reportIssue": "Çewtiyekê ragihîne",
+  "markAllAsRead": "Temamê wan wek xwendî nîşan bike",
+  "incomingError": "Gava wergirtina peyama hatî çewtiyeke derket",
+  "media": "Medya",
+  "mediaEmptyState": "Medya tine",
+  "documents": "Dokument",
+  "documentsEmptyState": "Dokument tine",
+  "today": "Îro",
+  "yesterday": "Do",
+  "thisWeek": "Vê heftiyê",
+  "thisMonth": "Vê mehê",
+  "voiceMessage": "Peyama dengî",
+  "stagedPreviewThumbnail": "Wek rismê biçûk reşnivîsa pêşdîtina lînkê ji bo $domain$",
+  "previewThumbnail": "Wêneyê biçûk yê pêşdîtina lînkê ji bo $domain$",
+  "stagedImageAttachment": "Reşnivîsa ataşmana wêneyê: $path$",
+  "oneNonImageAtATimeToast": "Bibore, lîmîteke heye ku ji bo her peyamê tenê yek ataşmanên ne-wêneyî tevlî dibe",
+  "cannotMixImageAndNonImageAttachments": "Bibore, di yek peyamekê de tu nikarî wêneyan bi cureyên dosyeyê yên din re tevîhev bikî",
+  "maximumAttachments": "Gihîşte hejmara maksîmum ya zêdekan. Ji kerema xwe ataşmanên mayî di peyameke nû de bişîne.",
+  "fileSizeWarning": "Ataşman ji bo cureyê peyama tu dişînî, ji sînora mezinahiyê derbas bû.",
+  "unableToLoadAttachment": "Bibore, di sazkirina zêdekê de çewtiyekê rû da.",
+  "offline": "Offline",
+  "debugLog": "Loga pînekirina çewtiyan",
+  "showDebugLog": "Logan derxîne",
+  "shareBugDetails": "Logên xwe eksport bike, paşê bi wasiteya Maseya Alîkariyê ya Session-ê hilbar bike.",
+  "goToReleaseNotes": "Here Notên Versiyonê",
+  "goToSupportPage": "Her Rûpela Destekê",
+  "about": "Derbar",
+  "show": "Nîşan bide",
+  "sessionMessenger": "Session",
+  "noSearchResults": "Encam peyda nebû ji bo \"$searchTerm$\"",
+  "conversationsHeader": "Kontakt û Kom",
+  "contactsHeader": "Kontakt",
+  "messagesHeader": "Conversations",
+  "settingsHeader": "Mîheng",
+  "typingAlt": "Anîmasyona nivîsînê ji bo vê sohbetê",
+  "contactAvatarAlt": "Avatara ji bo $name$",
+  "downloadAttachment": "Ataşmanê daxîne",
+  "replyToMessage": "Cewab bide peyamê",
+  "replyingToMessage": "Cewab didî:",
+  "originalMessageNotFound": "Peyama orjînal peyda nebû",
+  "you": "Tu",
+  "audioPermissionNeededTitle": "Gihîna Mîkrofonê Hewce ye",
+  "audioPermissionNeeded": "Tu dikarî gihîna mîkrofonê aktîv bikî ji vir: Mîheng (îkona diranokê) => Nihênî",
+  "audio": "Audio",
+  "video": "Video",
+  "photo": "Wêne",
+  "cannotUpdate": "Nikare Rojane Bike",
+  "cannotUpdateDetail": "Bi ser neket ku Session Sermaseyê rojane bike, lê belê versiyoneke nû berdest e. Ji kerema xwe here https://getsession.org/ û versiyona nû bi destan saz bike, di peyî re xwe bigihîne destekê an derbarê vê problemê de bug-ekî çêke û bişîne.",
+  "ok": "Bila",
+  "cancel": "Na bê",
+  "close": "Girti",
+  "continue": "Berdewam",
+  "error": "Şaşî",
+  "delete": "Jêbirin",
+  "messageDeletionForbidden": "Îzna te tine ye ku mesajên kesên din jê bibî",
+  "deleteJustForMe": "Tenê ji bo min jê bibe",
+  "deleteForEveryone": "Ji bo tevan jê bibe",
+  "deleteMessagesQuestion": "Bila $count$ peyaman jê bibe?",
+  "deleteMessageQuestion": "Bila vê peyamê jê bibe?",
+  "deleteMessages": "Peyaman Jê Bibe",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ jêbirî ne",
+  "messageDeletedPlaceholder": "Ev peyam hatiye jêbirin",
+  "from": "Ji:",
+  "to": "Ji bo:",
+  "sent": "Hate şandin",
+  "received": "Hatiye wergirtin",
+  "sendMessage": "Not",
+  "groupMembers": "Endam",
+  "moreInformation": "Zêdetir agahî",
+  "resend": "Cardin bişîne",
+  "deleteConversationConfirmation": "Bila ev mesajên di vê sohbetê de daîmen were jêbirin?",
+  "clear": "Paqij",
+  "clearAllData": "Hemû daneyên paqij bikie",
+  "deleteAccountWarning": "Ev wê mesaj û kontaktên te daîmen jê bibe.",
+  "deleteAccountFromLogin": "Tu emîn î ku dixwazî cîhaza xwe paqij bikî?",
+  "deleteContactConfirmation": "Tu piştrast î ku tu dixwazî vê sohbetê jê bibî?",
+  "quoteThumbnailAlt": "Ji peyama jêgirtî pêşdîtina wêneyê wek rismê biçûk",
+  "imageAttachmentAlt": "Wêneyekê tevlî mesajê kiriye",
+  "videoAttachmentAlt": "Rismê ekranê ya vîdeoya di mesajê de",
+  "lightboxImageAlt": "Wêneyê di sohbetê de şandî",
+  "imageCaptionIconAlt": "Îkon nîşan dide ku ev wêne xwedî sernavekî ye",
+  "addACaption": "Sernavekî tevlî bike...",
+  "copySessionID": "IDya Sessionê Kopî Bike",
+  "copyOpenGroupURL": "URLya Komê Kopî Bike",
+  "save": "Qeyd bike",
+  "saveLogToDesktop": "Logê qeydê sermaseyê bike",
+  "saved": "Hate qeydkirin",
+  "tookAScreenshot": "$name$ wêneyekî ekranê kişand",
+  "savedTheFile": "Medya ji aliyê $name$ ve hate qeydkirin",
+  "linkPreviewsTitle": "Pêşdîtinên Lînkan Bişîne",
+  "linkPreviewDescription": "Pêşdîtinên lînkan çêke ji bo URLyên ku tên piştgirîkirin.",
+  "linkPreviewsConfirmMessage": "Gava pêşdîtinên lînkan dişînî tu yê xwedî muhafezeya full ya metadaneyê nebî.",
+  "mediaPermissionsTitle": "Mîkrofon",
+  "mediaPermissionsDescription": "Îzn bide ji bo gihîna mîkrofonê.",
+  "spellCheckTitle": "Rastnivîsê Kontrol Bike",
+  "spellCheckDescription": "Gava nivîsîna mesajan kontrola rastnivîsê aktîv bike.",
+  "spellCheckDirty": "Ji bo tetbîqkirina mîhengên xwe yên nû divê Session-ê ji nû ve bidî destpêkirin",
+  "readReceiptSettingDescription": "Di sohbetên yek-bi-yek de agahiya xwendinê bişîne.",
+  "readReceiptSettingTitle": "Agahiyên Xwendinê",
+  "typingIndicatorsSettingDescription": "Îndîkatorên nivîsînê bibîne û parve bike di sohbetên yek-bi-yek de.",
+  "typingIndicatorsSettingTitle": "Îndîkatorên nivîsînê",
+  "zoomFactorSettingTitle": "Faktora zoomê",
+  "themesSettingTitle": "Tema",
+  "primaryColor": "Rengê Sereke",
+  "primaryColorGreen": "Rengê seretayî kesk",
+  "primaryColorBlue": "Rengê seretayî şîn",
+  "primaryColorYellow": "Rengê seretayî zer",
+  "primaryColorPink": "Rengê seretayî helesor",
+  "primaryColorPurple": "Rengê seretayî binevşî",
+  "primaryColorOrange": "Rengê seretayî pirteqalî",
+  "primaryColorRed": "Rengê seretayî sor",
+  "classicDarkThemeTitle": "Tarîya Klasîk",
+  "classicLightThemeTitle": "Ronîya Klasîk",
+  "oceanDarkThemeTitle": "Tarîya Okyanûsê",
+  "oceanLightThemeTitle": "Ronîya Okyanûsê",
+  "pruneSettingTitle": "Civakan kêmtir bike",
+  "pruneSettingDescription": "Peyamên kevintirî 6 mehan jê dibe, ji Civatên ku xwediyê zêdetirî 2000 peyaman in.",
+  "enable": "Bikêrkirin",
+  "keepDisabled": "Girtî bihêle",
+  "notificationSettingsDialog": "Malûmatên di danezanan de tên nîşandan.",
+  "nameAndMessage": "Nav & Naverok",
+  "noNameOrMessage": "Nav an naverok tine",
+  "nameOnly": "Tenê Nav",
+  "newMessage": "Notiyê nû",
+  "createConversationNewContact": "Bi kontaktekî nû re sohbetekê çêke",
+  "createConversationNewGroup": "Bi kontaktên mewcûd re grûbekê çêke",
+  "joinACommunity": "Tevlî civatekî bibe",
+  "chooseAnAction": "Ji bo destpêkirina sohbetekê kiryarekê bibijêre",
+  "newMessages": "Notiyên nû",
+  "notificationMostRecentFrom": "Peyama nûtirîn ji: $name$",
+  "notificationFrom": "Ji:",
+  "notificationMostRecent": "Peyama nûtirîn:",
+  "sendFailed": "Şandin biser neket",
+  "mediaMessage": "Peyama medyayê",
+  "messageBodyMissing": "Ji kerema xwe mesajekî binivîse.",
+  "messageBody": "Metnê mesajê",
+  "unblockToSend": "Ji bo şandina peyamê vê bloka vî kontaktê rake.",
+  "unblockGroupToSend": "Ev kom blokkirî ye. Ger bixwazî mesaj bişînî, blokê rake.",
+  "youChangedTheTimer": "Te peyamên winda dibin ji $time$ re saz kir",
+  "timerSetOnSync": "Zemanê windabûna peyaman ji $time$ re saz kir",
+  "theyChangedTheTimer": "$name$ zemanê windabûna mesajan saz kir $time$",
+  "timerOption_0_seconds": "Bese",
+  "timerOption_5_seconds": "5 diduyan",
+  "timerOption_10_seconds": "10 diduyan",
+  "timerOption_30_seconds": "30 diduyan",
+  "timerOption_1_minute": "1 deqeke",
+  "timerOption_5_minutes": "5 deqeke",
+  "timerOption_30_minutes": "30 deqeke",
+  "timerOption_1_hour": "1 seet",
+  "timerOption_6_hours": "6 seet",
+  "timerOption_12_hours": "12 seet",
+  "timerOption_1_day": "1 roj",
+  "timerOption_1_week": "1 hefte",
+  "timerOption_2_weeks": "2 hefte",
+  "disappearingMessages": "Mesajên ku tine dibin",
+  "changeNickname": "Bernavkê Biguherîne",
+  "clearNickname": "Bernavkê Paqij Bike",
+  "nicknamePlaceholder": "Bernavka Nû",
+  "changeNicknameMessage": "Bernavkekê têkeve ji bo vî bikarhênerî",
+  "timerOption_0_seconds_abbreviated": "girtî",
+  "timerOption_5_seconds_abbreviated": "5sn",
+  "timerOption_10_seconds_abbreviated": "10sn",
+  "timerOption_30_seconds_abbreviated": "30sn",
+  "timerOption_1_minute_abbreviated": "1d",
+  "timerOption_5_minutes_abbreviated": "5d",
+  "timerOption_30_minutes_abbreviated": "30d",
+  "timerOption_1_hour_abbreviated": "1s",
+  "timerOption_6_hours_abbreviated": "6s",
+  "timerOption_12_hours_abbreviated": "12s",
+  "timerOption_1_day_abbreviated": "1r",
+  "timerOption_1_week_abbreviated": "1h",
+  "timerOption_2_weeks_abbreviated": "2h",
+  "disappearingMessagesDisabled": "Peyamên winda dibin girtî ye",
+  "disabledDisappearingMessages": "$name$ mesajên winda dibin girt.",
+  "youDisabledDisappearingMessages": "Te mesajên winda dibin girt.",
+  "timerSetTo": "Wextê windabûna mesajan kir $time$",
+  "noteToSelf": "Not ji bo xwe",
+  "hideMenuBarTitle": "Darikê Menuyê Biveşêre",
+  "hideMenuBarDescription": "Xuyabûna darikê menuyê ya sîstemê veke/bigire.",
+  "startConversation": "Sohbeteke Nû Bide Destpêkirin",
+  "invalidNumberError": "Ji kerema xwe IDya Sessionê an navê ONSyê kontrol bike û dîsa biceribîne",
+  "failedResolveOns": "Bi ser neket ku navê ONSyê peyda bike",
+  "autoUpdateSettingTitle": "Rojanekirina otomatîk",
+  "autoUpdateSettingDescription": "Di destpêkê de rojanekirina otomatîken kontrol dike.",
+  "autoUpdateNewVersionTitle": "Rojanekirina Sessionê hazir e",
+  "autoUpdateNewVersionMessage": "Versiyoneke nû ya Sessionê mewcûd e.",
+  "autoUpdateNewVersionInstructions": "Ji bo tetbîqkirina rojanekirinan pêl bike ser \"Sessionê Ji Nû Ve Bide Destpêkirin\".",
+  "autoUpdateRestartButtonLabel": "Sessionê ji nû ve bide destpêkirin",
+  "autoUpdateLaterButtonLabel": "Paşe",
+  "autoUpdateDownloadButtonLabel": "Daxîne",
+  "autoUpdateDownloadedMessage": "Rojanekirin hate daxistin.",
+  "autoUpdateDownloadInstructions": "Tu dixwazî rojanekirinê daxînî?",
+  "leftTheGroup": "$name$ ji komê veqetiya.",
+  "multipleLeftTheGroup": "$name$ ji komê veqetiya",
+  "updatedTheGroup": "Kom hat rojanekirin",
+  "titleIsNow": "Navê komê vêga '$name$' ye.",
+  "joinedTheGroup": "$name$ tevlî komê bû.",
+  "multipleJoinedTheGroup": "$name$ tevlî komê bû.",
+  "kickedFromTheGroup": "$name$ ji komê hatiye derxistin.",
+  "multipleKickedFromTheGroup": "$name$ ji komê hatine derxistin.",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Astengî hate rakirin",
+  "blocked": "Astengkirî",
+  "blockedSettingsTitle": "Kontaktên Astengkirî",
+  "conversationsSettingsTitle": "Sohbet",
+  "unbanUser": "Astengiya bikarhênerî rake",
+  "userUnbanned": "Astengiya bikarhênerî bi serkeftî hate rakirin",
+  "userUnbanFailed": "Rakirina astengiyê bi ser neket!",
+  "banUser": "Bikarhênerê Asteng bike",
+  "banUserAndDeleteAll": "Asteng Bike û Wan Tevan Jê Bibe",
+  "userBanned": "Bi serkeftî hate astengkirin",
+  "userBanFailed": "Blokkirin têk çû!",
+  "leaveGroup": "Komê Biterikîne",
+  "leaveAndRemoveForEveryone": "Ji Komê Derkeve û Komê Ji bo Her Kesî Rake",
+  "leaveGroupConfirmation": "Tu piştrast î ku tu dixwazî ji komê derkevî?",
+  "leaveGroupConfirmationAdmin": "Wek admînekî vê komê, eger tu biterikînî wê ew ji bo temamê endamên vê gavê were rakirin. Tu piştrast î ku tu dixwazî vê komê biterikînî?",
+  "cannotRemoveCreatorFromGroup": "Nebû ku vê bikarhênerî rake",
+  "cannotRemoveCreatorFromGroupDesc": "Tu nikarî vî bikarhênerî rakî, gava ew çêkerê vê grûpê bin.",
+  "noContactsForGroup": "Ti kontektekî te tine ye hêj",
+  "failedToAddAsModerator": "Bi ser neket ku bikarhênerê wek admîn tevlî bike",
+  "failedToRemoveFromModerator": "Bi ser neket ku bikarhênerê ji lîsta admînan rake",
+  "copyMessage": "Metna mesajê kopî bike",
+  "selectMessage": "Mesajê bibijêre",
+  "editGroup": "Komê biguherîne",
+  "editGroupName": "Navê komê biguherîne",
+  "updateGroupDialogTitle": "$name$ rojane dike...",
+  "showRecoveryPhrase": "Hevokên Xilaskirinê",
+  "yourSessionID": "IDya Sessiona Te",
+  "setAccountPasswordTitle": "Şîfre",
+  "setAccountPasswordDescription": "Ji bo vekirina qefilê şîfre lazim e.",
+  "changeAccountPasswordTitle": "Şîfreyê Biguherîne",
+  "changeAccountPasswordDescription": "Şîfreya ku ji bo vekirina qefila Sessionê lazim e biguherîne.",
+  "removeAccountPasswordTitle": "Şîfreyê Rake",
+  "removeAccountPasswordDescription": "Şîfreya ku ji bo vekirina qefila Sessionê lazim e rake.",
+  "enterPassword": "Ji kerema xwe şîfreyê binivîse",
+  "confirmPassword": "Şîfreyê tesdîq bike",
+  "enterNewPassword": "Ji kerema xwe şîfreya xwe ya nû têkeve",
+  "confirmNewPassword": "Şîfreya nû tesdîq bike",
+  "showRecoveryPhrasePasswordRequest": "Ji kerema xwe şîfreya xwe têkeve",
+  "recoveryPhraseSavePromptMain": "Peyvên xilaskirinê, mifteya esil ya IDya Sessiona te ye — tu dikarî wê ji bo restorekirina IDya xwe ya Sessionê biemilînî, ger gihîna cîhaza xwe winda bikî. Peyvên xilaskirinê li cihekî ewle muhafeze bike, û wê ji ti kesî re nede.",
+  "invalidOpenGroupUrl": "UDLya nederbasdar",
+  "copiedToClipboard": "Kopîkirî ye",
+  "passwordViewTitle": "Şîfreyê Têkeve",
+  "password": "Şîfre",
+  "setPassword": "Şîfre çêkirin",
+  "changePassword": "Şîfre juda dike",
+  "createPassword": "Şîfre çêkirin ji bo xwe",
+  "removePassword": "Şîfre paqij dike",
+  "maxPasswordAttempts": "Şîfreya Nederbasdar. Tu dixwazî danegehê reset bikî?",
+  "typeInOldPassword": "Ji kerema xwe şîfreya xwe ya berdest têkeve",
+  "invalidOldPassword": "Şîfreya berê nederbasdar e",
+  "invalidPassword": "Şîfreya nederbasdar",
+  "noGivenPassword": "Ji kerema xwe şîfreya xwe têkeve",
+  "passwordsDoNotMatch": "Şîfre li hev nayên",
+  "setPasswordInvalid": "Şîfre li hev nayên",
+  "changePasswordInvalid": "Şîfreya berê yê ku te têketiye xelet e",
+  "removePasswordInvalid": "Şîfreya nerast",
+  "setPasswordTitle": "Şîfre Hate Danîn",
+  "changePasswordTitle": "Şîfre Hate Guhertin",
+  "removePasswordTitle": "Şîfre Hat Rakirin",
+  "setPasswordToastDescription": "Şîfreya te hate danîn. Ji kerema xwe wê muhafeze bike.",
+  "changePasswordToastDescription": "Şîfreya te hate guherandin. Ji kerema xwe wê muhafeze bike.",
+  "removePasswordToastDescription": "Şîfreya te hat rakirin.",
+  "publicChatExists": "Tu jixwe girêdayî vê civatê yî",
+  "connectToServerFail": "Nikare tevlî civatê bibe",
+  "connectingToServer": "Tê girêdan...",
+  "connectToServerSuccess": "Bi awayekî serkeftî girê da civatê",
+  "setPasswordFail": "Bi ser neket ku şîfre deyne",
+  "passwordLengthError": "Divê şîfre di navbera dirêjiya 6 û 64 karakteran de be",
+  "passwordTypeError": "Şîfre divê rêzek karakteran be",
+  "passwordCharacterError": "Şîfre divê tenê herf, nimre û sembolan bihewîne",
+  "remove": "Rake",
+  "invalidSessionId": "IDya Sessionê ya Nederbasdar",
+  "invalidPubkeyFormat": "Formata Pubkeyê ya Nederbasdar",
+  "emptyGroupNameError": "Ji kerema xwe navekî grûpê têkeve",
+  "editProfileModalTitle": "Profîl",
+  "groupNamePlaceholder": "Navê grûpê",
+  "inviteContacts": "Kontaktan dawet bike",
+  "addModerators": "Admînan tevlî bike",
+  "removeModerators": "Admînan rake",
+  "addAsModerator": "Wek admîn tevlî bike",
+  "removeFromModerators": "Ji admînan rake",
+  "add": "Îlawe bike",
+  "addingContacts": "Kontaktan tevlî $name$ dike",
+  "noContactsToAdd": "Kontakt tine ji bo tevlîkirinê",
+  "noMembersInThisGroup": "No other members in this group",
+  "noModeratorsToRemove": "no admins to remove",
+  "onlyAdminCanRemoveMembers": "You are not the creator",
+  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "createAccount": "Create account",
+  "startInTrayTitle": "Keep in System Tray",
+  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "yourUniqueSessionID": "Say hello to your Session ID",
+  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
+  "getStarted": "Get started",
+  "createSessionID": "Create Session ID",
+  "recoveryPhrase": "Recovery Phrase",
+  "enterRecoveryPhrase": "Enter your recovery phrase",
+  "displayName": "Display Name",
+  "anonymous": "Anonymous",
+  "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
+  "enterDisplayName": "Enter a display name",
+  "continueYourSession": "Continue Your Session",
+  "linkDevice": "Link Device",
+  "restoreUsingRecoveryPhrase": "Restore your account",
+  "or": "or",
+  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "beginYourSession": "Begin your Session.",
+  "welcomeToYourSession": "Welcome to your Session",
+  "searchFor...": "Search conversations and contacts",
+  "searchForContactsOnly": "Search for contacts",
+  "enterSessionID": "Enter Session ID",
+  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "message": "Message",
+  "appearanceSettingsTitle": "Appearance",
+  "privacySettingsTitle": "Privacy",
+  "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Notification Content",
+  "notificationPreview": "Preview",
+  "recoveryPhraseEmpty": "Enter your recovery phrase",
+  "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
+  "members": "$count$ members",
+  "activeMembers": "$count$ active members",
+  "join": "Join",
+  "joinOpenGroup": "Join Community",
+  "createGroup": "Komê Çêke",
+  "create": "Çêke",
+  "createClosedGroupNamePrompt": "Navê Komê",
+  "createClosedGroupPlaceholder": "Navekî komê binivîse",
+  "openGroupURL": "URLya Civatê",
+  "enterAnOpenGroupURL": "URLya Civatê Têkeve",
+  "next": "Yê piştî",
+  "invalidGroupNameTooShort": "Ji kerema xwe navekî komê têkeve",
+  "invalidGroupNameTooLong": "Ji kerema xwe navekî komê yê kurttir têkeve",
+  "pickClosedGroupMember": "Ji kerema xwe bi kêmanî 1 endam bibijêre",
+  "closedGroupMaxSize": "A group cannot have more than 100 members",
+  "noBlockedContacts": "You have no blocked contacts.",
+  "userAddedToModerators": "User added to admin list",
+  "userRemovedFromModerators": "User removed from admin list",
+  "orJoinOneOfThese": "Or join one of these...",
+  "helpUsTranslateSession": "Translate Session",
+  "closedGroupInviteFailTitle": "Group Invitation Failed",
+  "closedGroupInviteFailTitlePlural": "Group Invitations Failed",
+  "closedGroupInviteFailMessage": "Unable to successfully invite a group member",
+  "closedGroupInviteFailMessagePlural": "Unable to successfully invite all group members",
+  "closedGroupInviteOkText": "Retry invitations",
+  "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
+  "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
+  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "notificationForConvo": "Notifications",
+  "notificationForConvo_all": "All",
+  "notificationForConvo_disabled": "Disabled",
+  "notificationForConvo_mentions_only": "Mentions only",
+  "onionPathIndicatorTitle": "Path",
+  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
+  "unknownCountry": "Unknown Country",
+  "device": "Device",
+  "destination": "Destination",
+  "learnMore": "Learn more",
+  "linkVisitWarningTitle": "Open this link in your browser?",
+  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
+  "open": "Open",
+  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
+  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "clickToTrustContact": "Click to download media",
+  "trustThisContactDialogTitle": "Trust $name$?",
+  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
+  "pinConversation": "Pin Conversation",
+  "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Show User Details",
+  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
+  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
+  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
+  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
+  "deviceOnly": "Clear Device Only",
+  "entireAccount": "Clear Device and Network",
+  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
+  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "iAmSure": "I am sure",
+  "recoveryPhraseSecureTitle": "You're almost finished!",
+  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
+  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
+  "notificationSubtitle": "Notifications - $setting$",
+  "surveyTitle": "We'd Love Your Feedback",
+  "faq": "FAQ",
+  "support": "Support",
+  "clearAll": "Clear All",
+  "clearDataSettingsTitle": "Clear Data",
+  "messageRequests": "Message Requests",
+  "requestsSubtitle": "Pending Requests",
+  "requestsPlaceholder": "No requests",
+  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "incomingCallFrom": "Incoming call from '$name$'",
+  "ringing": "Ringing...",
+  "establishingConnection": "Establishing connection...",
+  "accept": "Accept",
+  "decline": "Decline",
+  "endCall": "End call",
+  "permissionsSettingsTitle": "Permissions",
+  "helpSettingsTitle": "Help",
+  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
+  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
+  "unableToCall": "Cancel your ongoing call first",
+  "unableToCallTitle": "Cannot start new call",
+  "callMissed": "Missed call from $name$",
+  "callMissedTitle": "Call missed",
+  "noCameraFound": "No camera found",
+  "noAudioInputFound": "No audio input found",
+  "noAudioOutputFound": "No audio output found",
+  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
+  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
+  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "startedACall": "You called $name$",
+  "answeredACall": "Call with $name$",
+  "trimDatabase": "Trim Database",
+  "trimDatabaseDescription": "Reduces your message database size to your last 10,000 messages.",
+  "trimDatabaseConfirmationBody": "Are you sure you want to delete your $deleteAmount$ oldest received messages?",
+  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
+  "messageRequestPending": "Your message request is currently pending",
+  "messageRequestAccepted": "Your message request has been accepted",
+  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
+  "messageRequestAcceptedOursNoName": "You have accepted the message request",
+  "declineRequestMessage": "Are you sure you want to decline this message request?",
+  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
+  "hideRequestBanner": "Hide Message Request Banner",
+  "openMessageRequestInbox": "Message Requests",
+  "noMessageRequestsPending": "No pending message requests",
+  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
+  "mustBeApproved": "This conversation must be accepted to use this feature",
+  "youHaveANewFriendRequest": "You have a new friend request",
+  "clearAllConfirmationTitle": "Clear All Message Requests",
+  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "View your Message Request inbox",
+  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
+  "expandedReactionsText": "Show Less",
+  "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
+  "otherSingular": "$number$ other",
+  "otherPlural": "$number$ others",
+  "reactionPopup": "reacted with",
+  "reactionPopupOne": "$name$",
+  "reactionPopupTwo": "$name$ & $name2$",
+  "reactionPopupThree": "$name$, $name2$ & $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ &",
+  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
+  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+}
diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json
index 4d03fec32..5aeb24b39 100644
--- a/_locales/kn/messages.json
+++ b/_locales/kn/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results found for \"$searchTerm$\"",
   "conversationsHeader": "ಸಂಪರ್ಕಗಳು ಮತ್ತು ಗುಂಪುಗಳು",
   "contactsHeader": "ಸಂಪರ್ಕಗಳು",
-  "messagesHeader": "ಸಂದೇಶಗಳು",
+  "messagesHeader": "Conversations",
   "settingsHeader": "ಸಂಯೋಜನೆಗಳು",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸುವುದೇ?",
   "deleteMessages": "ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗಿದೆ",
   "from": "ಇಂದ:",
@@ -107,29 +108,30 @@
   "sent": "ಕಳುಹಿಸಲಾಗಿದೆ",
   "received": "ಸ್ವೀಕರಿಸಿದರು",
   "sendMessage": "ಸಂದೇಶ",
-  "groupMembers": "ಗುಂಪಿನ ಸದಸ್ಯರು",
+  "groupMembers": "Members",
   "moreInformation": "ಹೆಚ್ಚಿನ ಮಾಹಿತಿ",
   "resend": "Resend",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json
index 13b748206..8b5fd9fe1 100644
--- a/_locales/ko/messages.json
+++ b/_locales/ko/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$에 가입하시겠습니까?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "일치하는 오픈 그룹 서버를 찾지 못했습니다.",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session ID나 ONS name을 입력하세요.",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "불러오는 중",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "연락처와 그룹",
   "contactsHeader": "연락처",
-  "messagesHeader": "메시지",
+  "messagesHeader": "Conversations",
   "settingsHeader": "설정",
   "typingAlt": "이 대화에 타이핑 애니메이션 설정",
   "contactAvatarAlt": "연락처 $name$에 대한 아바타",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "$count$개의 메시지를 삭제할까요?",
   "deleteMessageQuestion": "이 메시지를 삭제하시겠습니까?",
   "deleteMessages": "Delete messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ 삭제됨",
   "messageDeletedPlaceholder": "메시지가 삭제되었습니다.",
   "from": "From",
@@ -107,29 +108,30 @@
   "sent": "전송됨",
   "received": "수신됨",
   "sendMessage": "메세지 보내기",
-  "groupMembers": "그룹 구성원",
+  "groupMembers": "Members",
   "moreInformation": "더 많은 정보",
   "resend": "재전송",
   "deleteConversationConfirmation": "대화에서 이 메세지를 영원히 지웁니까?",
   "clear": "Clear",
   "clearAllData": "모든 데이터 삭제",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "이 대화를 삭제하시겠습니까?",
   "quoteThumbnailAlt": "인용된 메시지의 축소된 이미지",
   "imageAttachmentAlt": "메시지에 첨부된 이미지",
-  "videoAttachmentAlt": "메시지에 첨부된 비디오 스크린샷",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "대화에서 보낸 이미지",
   "imageCaptionIconAlt": "이 이미지에 설명이 있는지 보여주는 아이콘",
   "addACaption": "설명을 적어주세요...",
   "copySessionID": "Session ID 복사",
-  "copyOpenGroupURL": "그룹 링크 복",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "저장",
   "saveLogToDesktop": "데스크탑에 저장",
   "saved": "저장 완료",
   "tookAScreenshot": "$name$님이 스크린샷을 찍었습니다.",
   "savedTheFile": "$name$님이 미디어를 저장하셨습니다.",
   "linkPreviewsTitle": "링크 미리보기 보내기",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "당신이 링크 미리보기를 보낼때 모든 메타데이터 보호가 이루어지지 않습니다.",
   "mediaPermissionsTitle": "마이크",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "입력 지시자 깜박임",
   "zoomFactorSettingTitle": "화면 비율 조정",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "활성화",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Both sender name and message",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Neither name nor message",
   "nameOnly": "Only sender name",
   "newMessage": "새 메세지",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12시간",
   "timerOption_1_day": "1일",
   "timerOption_1_week": "1주",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "메시지 사라지기 설정",
   "changeNickname": "닉네임 변경",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12시간",
   "timerOption_1_day_abbreviated": "1일",
   "timerOption_1_week_abbreviated": "1주",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "메세지 숨김 끄기",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Timer set to $time$",
   "noteToSelf": "개인용 메모",
   "hideMenuBarTitle": "메뉴 바 숨기기",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Invalid number",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "ONS 이름을 확인하지 못했습니다",
   "autoUpdateSettingTitle": "자동 업데이트",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "$name$ 님이 그룹에서 제거 되었습니다.",
   "multipleKickedFromTheGroup": "$name$ 님이 그룹에서 제거 되었습니다.",
-  "blockUser": "차단",
-  "unblockUser": "차단 해제",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "차단해제됨",
   "blocked": "차단됨",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "$name$ 을(를) 업데이트 중…",
   "showRecoveryPhrase": "복구 문구",
   "yourSessionID": "당신의 세션 ID",
-  "setAccountPasswordTitle": "계정 비밀번호 설정",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "계정 비밀번호 변경",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "계정 비밀번호를 지우기",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "비밀번호를 입력해주세요",
   "confirmPassword": "비밀번호 확인",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "비밀번호를 입력해주세요",
   "recoveryPhraseSavePromptMain": "복구 문구는 당신의 세션 ID 의 마스터 키 입니다. 만약 당신이 기기의 연결 권한을 잃어버렸다면, 당신의 세션 ID 를 복구하기 위해 복구 문구를 사용할수 있습니다. 복구 문구를 안전한 곳에 저장하고, 절대 남에게 알려주지 마세요.",
   "invalidOpenGroupUrl": "유효하지 않은 URL",
-  "copiedToClipboard": "클립보드에 복사됨",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "비밀번호",
   "setPassword": "비밀번호 설정",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "비밀번호가 일치하지 않습니다",
   "changePasswordInvalid": "입력한 이전 비밀번호가 올바르지 않습니다.",
   "removePasswordInvalid": "잘못된 비밀번호",
-  "setPasswordTitle": "비밀번호 설정",
-  "changePasswordTitle": "비밀번호가 변경되었습니다",
-  "removePasswordTitle": "비밀번호가 제거되었습니다",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "비밀번호 설정이 완료되었습니다. 안전히 관리하시기 바랍니다.",
   "changePasswordToastDescription": "비밀번호 변경이 완료되었습니다. 안전히 관리하시기 바랍니다.",
-  "removePasswordToastDescription": "비밀번호가 제거되었습니다.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "연결하는중...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "모양",
   "privacySettingsTitle": "보안",
   "notificationsSettingsTitle": "알림",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "복구 구문을 입력하세요.",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$명",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "짧은 그룹 이름을 입력해주세요.",
   "pickClosedGroupMember": "최소 1명의 멤버를 선택해주세요.",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "차단된 연락처가 없습니다.",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "또는 이 중에서 참여...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "$name$님이 전송한 미디어를 다운로드하시겠습니까?",
   "pinConversation": "대화 고정하기",
   "unpinConversation": "대화 고정 취소",
+  "markUnread": "Mark Unread",
   "showUserDetails": "사용자 정보 보기",
   "sendRecoveryPhraseTitle": "복구 문구 전송중",
   "sendRecoveryPhraseMessage": "복구 문구를 전송하면 다른 사람이 당신의 계정에 접근할 수 있게 됩니다. 정말 전송할까요?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "데이터를 이 장치에서만 삭제하시겠습니까?",
   "dialogClearAllDataDeletionFailedMultiple": "데이터가 이 서비스 노드에서 삭제되지 않았습니다: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "장치 내 데이터를 정말로 삭제 하시겠습니까?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "$name$ 님의 전화를 받지 못했습니다. 개인정보 설정에서 '음성 및 영상 통화' 항목을 활성화 시켜주십시오.",
   "callMissedNotApproved": "이 대화를 수락하지 않았기 때문에 $name$ 님과의 통화가 취소되었습니다. 메세지를 먼저 보내보세요.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "$name$님에게 전화함",
   "answeredACall": "$name$님과의 통화",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "친구 요청이 들어왔습니다.",
   "clearAllConfirmationTitle": "모든 메세지 요청 삭제",
   "clearAllConfirmationBody": "모든 메세지 요청을 삭제하시겠습니까?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "숨기기",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "메세지 요청함 보기",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json
index b658ead02..b57b2558d 100644
--- a/_locales/lt/messages.json
+++ b/_locales/lt/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Įkeliama...",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"$searchTerm$\" negrąžino jokių rezultatų",
   "conversationsHeader": "Adresatai ir grupės",
   "contactsHeader": "Kontaktai",
-  "messagesHeader": "Žinutės",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Nustatymai",
   "typingAlt": "Rašymo animacija šiam pokalbiui",
   "contactAvatarAlt": "Avataras, skirtas $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Ištrinti šią žinutę?",
   "deleteMessages": "Ištrinti žinutes",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "Nuo",
@@ -107,29 +108,30 @@
   "sent": "Išsiųsta",
   "received": "Gauta",
   "sendMessage": "Siųsti žinutę",
-  "groupMembers": "Grupės dalyviai",
+  "groupMembers": "Members",
   "moreInformation": "Daugiau informacijos",
   "resend": "Siųsti iš naujo",
   "deleteConversationConfirmation": "Ar ištrinti šį pokalbį visiems laikams?",
   "clear": "Clear",
   "clearAllData": "Išvalyti visus duomenis",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Paveikslo iš cituotos žinutės miniatiūra",
   "imageAttachmentAlt": "Prie žinutės pridėtas paveikslas",
-  "videoAttachmentAlt": "Prie žinutės pridėto vaizdo įrašo ekrano kopija",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Pokalbyje išsiųstas paveikslas",
   "imageCaptionIconAlt": "Piktograma, rodanti, kad šis paveikslas turi paaiškinimą",
   "addACaption": "Pridėti paaiškinimą...",
   "copySessionID": "Kopijuoti Session ID",
-  "copyOpenGroupURL": "Kopijuoti grupės URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Įrašyti",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Įrašyta",
   "tookAScreenshot": "$name$ padarė ekrano kopiją",
   "savedTheFile": "$name$ įsirašė mediją",
   "linkPreviewsTitle": "Siųsti nuorodų peržiūras",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Ir siuntėjo vardas, ir žinutė",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Nei vardas, nei žinutė",
   "nameOnly": "Tik siuntėjo vardas",
   "newMessage": "Nauja žinutės",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 valandų",
   "timerOption_1_day": "1 diena",
   "timerOption_1_week": "1 savaitė",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Išnykstančios žinutės",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 val.",
   "timerOption_1_day_abbreviated": "1 d.",
   "timerOption_1_week_abbreviated": "1 sav.",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Išnykstančios žinutės išjungtos",
-  "disabledDisappearingMessages": "$name$ išjungė išnykstančias žinutes",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Jūs išjungėte išnykstančias žinutes",
   "timerSetTo": "Laikmatis nustatytas į $time$",
   "noteToSelf": "Pastabos sau",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Pradėti naują pokalbį…",
-  "invalidNumberError": "Neteisingas numeris",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ prisijungė prie grupės",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Jūsų Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Šalinti paskyros slaptažodį",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Įveskite slaptažodį",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Įveskite slaptažodį",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Neteisingas URL",
-  "copiedToClipboard": "Nukopijuota į iškarpinę",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Slaptažodis",
   "setPassword": "Nustatyti slaptažodį",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Slaptažodžiai nesutampa",
   "changePasswordInvalid": "Jūsų įvestas senas slaptažodis yra neteisingas",
   "removePasswordInvalid": "Neteisingas slaptažodis",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Išvaizda",
   "privacySettingsTitle": "Privatumas",
   "notificationsSettingsTitle": "Pranešimai",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "Narių: $count$",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Įveskite trumpesnį grupės pavadinimą",
   "pickClosedGroupMember": "Pasirinkite bent 1 grupės narį",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Nėra užblokuotų adresatų",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Arba prisijunkite prie vienos iš šių...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Prisegti pokalbį",
   "unpinConversation": "Atsegti pokalbį",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/lv/messages.json b/_locales/lv/messages.json
index bd7e2f439..35e26b3f4 100644
--- a/_locales/lv/messages.json
+++ b/_locales/lv/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results found for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Contacts",
-  "messagesHeader": "Messages",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Delete Messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From:",
@@ -107,29 +108,30 @@
   "sent": "Sent",
   "received": "Received",
   "sendMessage": "Message",
-  "groupMembers": "Group members",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear Nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json
index 789aef695..219f1d1fc 100644
--- a/_locales/mk/messages.json
+++ b/_locales/mk/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Контакти",
-  "messagesHeader": "Messages",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Избриши пораки",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From",
@@ -107,29 +108,30 @@
   "sent": "Испратено",
   "received": "Примено",
   "sendMessage": "Испрати порака",
-  "groupMembers": "Group members",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Permanently delete this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Зачувај",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Both sender name and message",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Neither name nor message",
   "nameOnly": "Only sender name",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Timer set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Invalid number",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json
index 0c64518e0..e2d742360 100644
--- a/_locales/nb/messages.json
+++ b/_locales/nb/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Bli med i $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Klarte ikke finne den tilsvarende opengroup-serveren",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Angi Session-ID eller ONS-navn",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Laster...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Ingen resultater funnet for «$searchTerm$»",
   "conversationsHeader": "Kontakter og grupper",
   "contactsHeader": "Kontakter",
-  "messagesHeader": "Beskjeder",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Innstillinger",
   "typingAlt": "Inntastingsanimasjon for denne samtalen",
   "contactAvatarAlt": "Avatar for kontakt $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Slett $count$ meldinger?",
   "deleteMessageQuestion": "Slett denne meldingen?",
   "deleteMessages": "Slett beskjeder",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ slettet",
   "messageDeletedPlaceholder": "Denne beskjeden er slettet",
   "from": "Fra:",
@@ -107,29 +108,30 @@
   "sent": "Sendt",
   "received": "Mottatt",
   "sendMessage": "Beskjed",
-  "groupMembers": "Gruppemedlemmer",
+  "groupMembers": "Members",
   "moreInformation": "Mer informasjon",
   "resend": "Send på nytt",
   "deleteConversationConfirmation": "Slett beskjedene permanent i denne samtalen?",
   "clear": "Clear",
   "clearAllData": "Fjern alle data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Er du sikker på at du vil slette denne samtalen?",
   "quoteThumbnailAlt": "Miniatyrbilde av bilde i sitert beskjed",
   "imageAttachmentAlt": "Bilde vedlagt til beskjed",
-  "videoAttachmentAlt": "Skjermbilde av video vedlagt til beskjed",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Bilde sendt i samtale",
   "imageCaptionIconAlt": "Symbol som viser at dette bildet har en bildetekst",
   "addACaption": "Legg til bildetekst...",
   "copySessionID": "Kopier Session-ID",
-  "copyOpenGroupURL": "Kopier gruppens URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Lagre",
   "saveLogToDesktop": "Lagre loggfil til skrivebordet",
   "saved": "Lagret",
   "tookAScreenshot": "$name$ tok et skjermbilde",
   "savedTheFile": "Media lagret av $name$",
   "linkPreviewsTitle": "Send forhåndsvisning av lenker",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Du vil ikke ha full metadatabeskyttelse når du sender lenkeforhåndsvisninger.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Inntastingsindikatorer",
   "zoomFactorSettingTitle": "Zoomfaktor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Aktiver",
   "keepDisabled": "Hold deaktivert",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Navn og innhold",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Verken navn eller innhold",
   "nameOnly": "Kun navn",
   "newMessage": "Ny beskjed",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 timer",
   "timerOption_1_day": "1 dag",
   "timerOption_1_week": "1 uke",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Tidsbegrensede beskjeder",
   "changeNickname": "Forandre kallenavn",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12t",
   "timerOption_1_day_abbreviated": "1 d",
   "timerOption_1_week_abbreviated": "1u",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Tidsbegrensede beskjeder er deaktivert",
-  "disabledDisappearingMessages": "$name$ deaktiverte tidsbegrensede beskjeder.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Du deaktiverte tidsbegrensede beskjeder.",
   "timerSetTo": "Utløpstiden for beskjeder satt til $time$",
   "noteToSelf": "Notat til meg selv",
   "hideMenuBarTitle": "Skjul menylinjen",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start ny samtale",
-  "invalidNumberError": "Ugyldig Session-ID eller ONS-navn",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Fant ikke ONS-navnet",
   "autoUpdateSettingTitle": "Automatisk oppdatering",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ ble med i gruppen.",
   "kickedFromTheGroup": "$name$ ble fjernet fra gruppen.",
   "multipleKickedFromTheGroup": "$name$ ble fjernet fra gruppen.",
-  "blockUser": "Blokker",
-  "unblockUser": "Avblokker",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Blokkering opphevet",
   "blocked": "Blokkert",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Oppdaterer $name$...",
   "showRecoveryPhrase": "Gjenopprettelsesfrase",
   "yourSessionID": "Din Session-ID",
-  "setAccountPasswordTitle": "Still kontopassord",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Forandre kontopassord",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Fjern kontopassord",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Vennligst skriv inn passordet ditt",
   "confirmPassword": "Bekreft passordet",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Vennligst skriv inn passordet ditt",
   "recoveryPhraseSavePromptMain": "Gjenopprettelsesfrasen din er hovednøkkelen til Session-IDen din – du kan bruke den for å gjenopprette Session-IDen din dersom du mister tilgang til enheten din. Arkiver gjenopprettelsesfrasen din på et trygt sted, og ikke gi den til noen.",
   "invalidOpenGroupUrl": "Ugyldig URL",
-  "copiedToClipboard": "Kopiert til utklippstavlen",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Passord",
   "setPassword": "Still passord",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passordene stemmer ikke overens",
   "changePasswordInvalid": "Det gamle passordet du skrev inn, var galt",
   "removePasswordInvalid": "Galt passord",
-  "setPasswordTitle": "Stilte passordet",
-  "changePasswordTitle": "Forandret passordet",
-  "removePasswordTitle": "Fjernet passordet",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Passordet er blitt stilt. Vennligst oppbevar det trygt.",
   "changePasswordToastDescription": "Passordet ditt er endret. Vennligst oppbevar det trygt.",
-  "removePasswordToastDescription": "Du har fjernet passordet ditt.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Kobler til...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Utseende",
   "privacySettingsTitle": "Personvern",
   "notificationsSettingsTitle": "Varsler",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Skriv inn gjenopprettelsesfrasen",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ medlemmer",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Vennligst skriv inn et kortere gruppenavn",
   "pickClosedGroupMember": "Vennligst velg minst 1 gruppemedlem",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Ingen blokkerte kontakter",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Eller bli med i en av disse...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Er du sikker på at du vil laste ned medier sendt av $name$?",
   "pinConversation": "Fest samtale",
   "unpinConversation": "Løsne samtale",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Vis brukeropplysninger",
   "sendRecoveryPhraseTitle": "Sender gjenopprettelsesfrase",
   "sendRecoveryPhraseMessage": "Du forsøker å sende gjenopprettelsesfrasen din, som kan brukes til å få tilgang til kontoen din. Er du sikker på at du vil sende denne beskjeden?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Vil du slette opplysningene kun fra denne enheten?",
   "dialogClearAllDataDeletionFailedMultiple": "Opplysninger ikke slettet av disse tjenesteknutepunktene: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Er du sikker på at du kun vil slette opplysningene på enheten?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Oppringing fra '$name$ mislyktes fordi du trenger å aktivere 'Stemme- og videosamtaler' tillatelsen i personvernsinnstillingene.",
   "callMissedNotApproved": "Anrop fra '$name$' gikk tapt fordi du ikke har akseptert denne konversasjonen ennå. Du må sende dem en melding først.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Du ringte $name$",
   "answeredACall": "Oppringning med $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "Du har en ny venneforespørsel",
   "clearAllConfirmationTitle": "Fjern alle meldingsforespørsler",
   "clearAllConfirmationBody": "Er du sikker på at du ønsker å slette alle meldingsforespørsler?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Skjule",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Vis din innboks for meldingsforespørsler",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 58b1f48cd..39e890eff 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Volledigschermmodus",
   "viewMenuToggleDevTools": "Ontwikkelopties weergeven",
   "contextMenuNoSuggestions": "Geen suggesties",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Community uitnodiging",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Aansluiten bij $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Kon de overeenkomende opengroep-server niet vinden",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Weet je zeker dat je je bij de $roomName$ community wilt aansluiten?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Voer Session-ID of ONS naam in",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Begin een nieuw gesprek door iemands Sessie ID in te voeren of deel jouw Sessie ID met hen.",
   "loading": "Bezig met laden…",
   "done": "Klaar",
   "youLeftTheGroup": "Je hebt de groep verlaten",
   "youGotKickedFromGroup": "Je bent verwijderd van de groep.",
   "unreadMessages": "Ongelezen berichten",
   "debugLogExplanation": "Dit logboek wordt opgeslagen op uw bureaublad.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Meld een fout",
   "markAllAsRead": "Markeer alles als gelezen",
   "incomingError": "Fout bij het verwerken van een inkomend bericht",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Kan geselecteerde bijlage niet laden.",
   "offline": "Offline",
   "debugLog": "Foutopsporingslogboek",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exporteer logboek",
+  "shareBugDetails": "Exporteer je logboek en upload het bestand via de Sessie-helpdesk.",
   "goToReleaseNotes": "Ga naar uitgaveopmerkingen",
   "goToSupportPage": "Ga naar ondersteuningspagina",
   "about": "Over",
@@ -72,7 +72,7 @@
   "noSearchResults": "Geen resultaten voor ‘$searchTerm$’",
   "conversationsHeader": "Contactpersonen en groepen",
   "contactsHeader": "Contacten",
-  "messagesHeader": "Berichten",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Instellingen",
   "typingAlt": "Typ-animatie voor dit gesprek",
   "contactAvatarAlt": "Afbeelding voor contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "$count$ berichten verwijderen?",
   "deleteMessageQuestion": "Dit bericht verwijderen?",
   "deleteMessages": "Berichten wissen",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ verwijderd",
   "messageDeletedPlaceholder": "Dit bericht is verwijderd",
   "from": "Van",
@@ -107,66 +108,67 @@
   "sent": "Verzonden",
   "received": "Ontvangen",
   "sendMessage": "Verzend een bericht",
-  "groupMembers": "Groepsleden",
+  "groupMembers": "Members",
   "moreInformation": "Meer informatie",
   "resend": "Opnieuw verzenden",
   "deleteConversationConfirmation": "Dit gesprek voorgoed wissen?",
-  "clear": "Clear",
+  "clear": "Wis",
   "clearAllData": "Wis alle gegevens",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Hiermee worden je berichten en contacten permanent verwijderd.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Weet je zeker dat je deze conversatie wilt verwijderen?",
   "quoteThumbnailAlt": "Miniatuur van afbeelding uit aangehaald bericht",
   "imageAttachmentAlt": "Afbeelding toegevoegd aan bericht",
-  "videoAttachmentAlt": "Schermafdruk van video toegevoegd aan bericht",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Afbeelding verstuurd in gesprek",
   "imageCaptionIconAlt": "Pictogram dat laat zien dat deze afbeelding een bijschrift heeft",
   "addACaption": "Voeg een bijschrift toe…",
   "copySessionID": "Sessie-ID kopiëren",
-  "copyOpenGroupURL": "Kopiëer groep URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Opslaan",
   "saveLogToDesktop": "Logboek naar bureaublad opslaan",
   "saved": "Opgeslagen",
   "tookAScreenshot": "$name$ heeft een schermafdruk gemaakt",
   "savedTheFile": "Media opgeslagen door $name$",
   "linkPreviewsTitle": "Verstuur Link-voorbeelden",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Je hebt geen volledige bescherming van metadata bij het verzenden van link-voorbeelden.",
   "mediaPermissionsTitle": "Microfoon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Sta toegang tot microfoon toe.",
   "spellCheckTitle": "Spellingcontrole",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Spellingscontrole inschakelen tijdens het typen van berichten.",
   "spellCheckDirty": "Je moet Session opnieuw starten, om uw nieuwe instellingen toe te passen",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Verstuur leesbevestigingen in één-op-één chats.",
   "readReceiptSettingTitle": "Leesbevestigingen",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Bekijk en deel type-indicatoren in één-op-één chats.",
   "typingIndicatorsSettingTitle": "Typindicatoren",
   "zoomFactorSettingTitle": "Zoom factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Thema's",
+  "primaryColor": "Primary Colour",
+  "primaryColorGreen": "Hoofdkleur groen",
+  "primaryColorBlue": "Hoofdkleur blauw",
+  "primaryColorYellow": "Hoofdkleur geel",
+  "primaryColorPink": "Hoofdkleur roze",
+  "primaryColorPurple": "Hoofdkleur paars",
+  "primaryColorOrange": "Hoofdkleur oranje",
+  "primaryColorRed": "Hoofdkleur rood",
+  "classicDarkThemeTitle": "Klassiek donker",
+  "classicLightThemeTitle": "Klassiek licht",
+  "oceanDarkThemeTitle": "Oceaan donker",
+  "oceanLightThemeTitle": "Oceaan licht",
+  "pruneSettingTitle": "Reduceer communities",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Inschakelen",
   "keepDisabled": "Uitgeschakeld laten",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Naam van afzender en berichtinhoud",
+  "notificationSettingsDialog": "De informatie getoond in meldingen.",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Naam van afzender noch berichtinhoud",
   "nameOnly": "Enkel naam van afzender",
   "newMessage": "nieuw bericht",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Begin een gesprek met een nieuw contact",
+  "createConversationNewGroup": "Maak een groep aan met bestaande contacten",
+  "joinACommunity": "Sluit je aan bij een community",
+  "chooseAnAction": "Kies een actie om een gesprek te beginnen",
   "newMessages": "nieuwe berichten",
   "notificationMostRecentFrom": "Meest recent van:",
   "notificationFrom": "Van:",
@@ -174,7 +176,7 @@
   "sendFailed": "Verzenden mislukt",
   "mediaMessage": "Mediabericht",
   "messageBodyMissing": "Voeg a. u. b. een bericht toe.",
-  "messageBody": "Message body",
+  "messageBody": "Berichtinhoud",
   "unblockToSend": "Deblokkeer dit contact om een bericht te verzenden.",
   "unblockGroupToSend": "Deblokkeer deze groep om een bericht te verzenden.",
   "youChangedTheTimer": "Je hebt de timer voor zelf-wissende berichten op $time$gezet",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 uur",
   "timerOption_1_day": "1 dag",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Zelf-wissende berichten",
   "changeNickname": "Verander bijnaam",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12u",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Zelf-wissende berichten zijn uitgeschakeld",
-  "disabledDisappearingMessages": "$name$ heeft zelf-wissende berichten uitgeschakeld",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Je hebt zelf-wissende berichten uitgeschakeld",
   "timerSetTo": "Timer ingesteld op $time$",
   "noteToSelf": "Notitie aan mezelf",
   "hideMenuBarTitle": "Menubalk verbergen",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Zichtbaarheid systeemmenubalk in-/uitschakelen.",
   "startConversation": "Begin een nieuw gesprek…",
-  "invalidNumberError": "Ongeldig nummer",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Gefaald de ONS naam op te lossen",
   "autoUpdateSettingTitle": "Automatisch bijwerken",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Automatisch op updates controleren tijdens opstarten.",
   "autoUpdateNewVersionTitle": "Update voor Session beschikbaar",
   "autoUpdateNewVersionMessage": "Er is een nieuwe versie van Session beschikbaar.",
   "autoUpdateNewVersionInstructions": "Klik op Session herstarten’ om de updates toe te passen.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$ is lid geworden van de groep",
   "kickedFromTheGroup": "$name$ is verwijderd uit de groep.",
   "multipleKickedFromTheGroup": "$name$ is verwijderd uit de groep.",
-  "blockUser": "Blokkeren",
-  "unblockUser": "Blokkering opheffen",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Gedeblokkeerd",
   "blocked": "Geblokkeerd",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Geblokkeerde contacten",
+  "conversationsSettingsTitle": "Gesprekken",
   "unbanUser": "Gebruiker deblokkeren",
   "userUnbanned": "Gebruiker gedeblokkeerd",
   "userUnbanFailed": "Deblokkeren mislukt!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Blokkeren mislukt!",
   "leaveGroup": "Verlaat groep",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Groep verlaten en voor iedereen verwijderen",
   "leaveGroupConfirmation": "Weet je zeker dat je deze groep wilt verlaten?",
   "leaveGroupConfirmationAdmin": "Je bent de beheerder van deze groep, als je deze verlaat, wordt deze voor alle huidige leden verwijderd. Weet je zeker dat je deze groep wilt verlaten?",
   "cannotRemoveCreatorFromGroup": "Kan deze gebruiker niet verwijderen",
   "cannotRemoveCreatorFromGroupDesc": "Je kunt deze gebruiker niet verwijderen omdat hij/zij de maker van de groep is.",
   "noContactsForGroup": "Je hebt nog geen contacten",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Kan gebruiker niet toevoegen als beheerder",
+  "failedToRemoveFromModerator": "Kan gebruiker niet verwijderen uit de beheerderslijst",
   "copyMessage": "Kopieer tekst van bericht",
   "selectMessage": "Selecteer een bericht",
   "editGroup": "Groep bewerken",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "$name$ bijwerken...",
   "showRecoveryPhrase": "Herstel zin",
   "yourSessionID": "Je Session ID",
-  "setAccountPasswordTitle": "Account wachtwoord instellen",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Veranderd account wachtwoord",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Verwijder Account Wachtwoord",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Password",
+  "setAccountPasswordDescription": "Wachtwoord vereisen om Sessie te ontgrendelen.",
+  "changeAccountPasswordTitle": "Change Password",
+  "changeAccountPasswordDescription": "Wijzig het wachtwoord dat nodig is om Sessie te ontgrendelen.",
+  "removeAccountPasswordTitle": "Remove Password",
+  "removeAccountPasswordDescription": "Verwijder het wachtwoord dat nodig is om Sessie te ontgrendelen.",
   "enterPassword": "Voer a. u. b. je wachtwoord in",
   "confirmPassword": "Bevestig Wachtwoord",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Voer je nieuwe wachtwoord in",
+  "confirmNewPassword": "Bevestig je nieuwe wachtwoord",
   "showRecoveryPhrasePasswordRequest": "Voer a. u. b. je wachtwoord in",
   "recoveryPhraseSavePromptMain": "Jou herstel zin is de hoofdsleutel van jou Session ID - Je kunt deze gebruiken om je Session ID te herstellen als je de toegang tot jouw apparaat verliest. Sla jouw herstel zin veilig op en geef het aan niemand.",
   "invalidOpenGroupUrl": "Ongeldige URL",
-  "copiedToClipboard": "Gekopiëerd naar klembord",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Copied",
+  "passwordViewTitle": "Voer je wachtwoord in",
   "password": "Wachtwoord",
   "setPassword": "Instellen wachtwoord",
   "changePassword": "Wachtwoord wijzigen",
-  "createPassword": "Create your password",
+  "createPassword": "Maak je wachtwoord aan",
   "removePassword": "Verwijderd wachtwoord",
   "maxPasswordAttempts": "Ongeldig wachtwoord. Wilt u de database resetten?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Voer je huidige wachtwoord in",
   "invalidOldPassword": "Oude wachtwoord is ongeldig",
   "invalidPassword": "Ongeldig wachtwoord",
   "noGivenPassword": "Voer a. u. b. je wachtwoord in",
@@ -295,13 +299,13 @@
   "setPasswordInvalid": "Wachtwoorden zijn niet hetzelfde",
   "changePasswordInvalid": "Het ingevoerde oude wachtwoord is onjuist",
   "removePasswordInvalid": "Onjuist wachtwoord",
-  "setPasswordTitle": "Instellen wachtwoord",
-  "changePasswordTitle": "Gewijzigd wachtwoord",
-  "removePasswordTitle": "Verwijderd wachtwoord",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Je wachtwoord is ingesteld. Houd het veilig.",
   "changePasswordToastDescription": "Uw wachtwoord is gewijzigd. Hou het veilig.",
-  "removePasswordToastDescription": "Je hebt je wachtwoord verwijderd.",
-  "publicChatExists": "You are already connected to this community",
+  "removePasswordToastDescription": "Your password has been removed.",
+  "publicChatExists": "Je bent al bij deze community aangesloten",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Verbinding maken...",
   "connectToServerSuccess": "Successfully connected to community",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Weergave",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Meldingen",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Voer uw herstelzin in",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ leden",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Vul a. u. b een kortere groepsnaam in",
   "pickClosedGroupMember": "Kies ten minste één groepslid",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Geen geblokkeerde contactpersonen",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Of neem deel aan een van deze...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Weet je zeker dat je media van $name$ wilt downloaden?",
   "pinConversation": "Gesprek vastzetten",
   "unpinConversation": "Gesprek losmaken",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Toon gebruikers informatie",
   "sendRecoveryPhraseTitle": "Herstelzin verzenden",
   "sendRecoveryPhraseMessage": "Je probeert uw herstel zin te versturen welke kan worden gebruikt om toegang te krijgen tot jou account. Weet je zeker dat je dit bericht wilt versturen?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Wilt je gegevens verwijderen van alleen dit apparaat?",
   "dialogClearAllDataDeletionFailedMultiple": "Gegevens niet verwijderd door deze Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Weet je zeker dat je de gegevens van alleen uw apparaat wilt verwijderen?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Oproep gemist van '$name$' omdat je de 'Spraak- en video-oproep' permissie nodig hebt in de privacy-instellingen.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Je belde $name$",
   "answeredACall": "Bel met $name$",
@@ -467,26 +478,31 @@
   "messageRequestAcceptedOursNoName": "You have accepted the message request",
   "declineRequestMessage": "Are you sure you want to decline this message request?",
   "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
+  "hideRequestBanner": "Verberg banner met berichtverzoeken",
+  "openMessageRequestInbox": "Berichtverzoeken",
+  "noMessageRequestsPending": "Geen openstaande berichtverzoeken",
+  "noMediaUntilApproved": "Je kunt geen bijlagen versturen voordat het gesprek is goedgekeurd",
+  "mustBeApproved": "Dit gesprek moet worden geaccepteerd om deze functie te gebruiken",
   "youHaveANewFriendRequest": "U heeft een nieuw vriendverzoek",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "clearAllConfirmationTitle": "Wis alle berichtverzoeken",
+  "clearAllConfirmationBody": "Weet je zeker dat je alle berichtverzoeken wilt wissen?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Verbergen",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Bekijk je berichtverzoeken-inbox",
+  "clearAllReactions": "Weet je zeker dat je alle $emoji$ wilt wissen?",
+  "expandedReactionsText": "Minder tonen",
+  "reactionNotification": "Reageert op een bericht met $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
+  "otherSingular": "$number$ andere",
+  "otherPlural": "$number$ anderen",
+  "reactionPopup": "reageerde met",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupMany": "$name$, $name2$ & $name3$ &",
+  "reactionListCountSingular": "En $otherSingular$ heeft gereageerd <span>$emoji$</span> op dit bericht",
+  "reactionListCountPlural": "En $otherPlural$ hebben gereageerd <span>$emoji$</span> op dit bericht"
 }
diff --git a/_locales/no/messages.json b/_locales/no/messages.json
index 1f2831749..a8b017154 100644
--- a/_locales/no/messages.json
+++ b/_locales/no/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Bli med i $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Klarte ikke finne den tilsvarende opengroup-serveren",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Angi Session-ID eller ONS-navn",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Laster...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Ingen resultater funnet for «$searchTerm$»",
   "conversationsHeader": "Kontakter og grupper",
   "contactsHeader": "Kontakter",
-  "messagesHeader": "Beskjeder",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Innstillinger",
   "typingAlt": "Inntastingsanimasjon for denne samtalen",
   "contactAvatarAlt": "Avatar for kontakt $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Slett $count$ meldinger?",
   "deleteMessageQuestion": "Slett denne meldingen?",
   "deleteMessages": "Slett beskjeder",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ slettet",
   "messageDeletedPlaceholder": "Denne beskjeden er slettet",
   "from": "Fra:",
@@ -107,29 +108,30 @@
   "sent": "Sendt",
   "received": "Mottatt",
   "sendMessage": "Beskjed",
-  "groupMembers": "Gruppemedlemmer",
+  "groupMembers": "Members",
   "moreInformation": "Mer informasjon",
   "resend": "Send på nytt",
   "deleteConversationConfirmation": "Slett beskjedene permanent i denne samtalen?",
   "clear": "Clear",
   "clearAllData": "Fjern alle data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Er du sikker på at du vil slette denne samtalen?",
   "quoteThumbnailAlt": "Miniatyrbilde av bilde i sitert beskjed",
   "imageAttachmentAlt": "Bilde vedlagt til beskjed",
-  "videoAttachmentAlt": "Skjermbilde av video vedlagt til beskjed",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Bilde sendt i samtale",
   "imageCaptionIconAlt": "Symbol som viser at dette bildet har en bildetekst",
   "addACaption": "Legg til bildetekst...",
   "copySessionID": "Kopier Session-ID",
-  "copyOpenGroupURL": "Kopier gruppens URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Lagre",
   "saveLogToDesktop": "Lagre loggfil til skrivebordet",
   "saved": "Lagret",
   "tookAScreenshot": "$name$ tok et skjermbilde",
   "savedTheFile": "Media lagret av $name$",
   "linkPreviewsTitle": "Send forhåndsvisning av lenker",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Du vil ikke ha full metadatabeskyttelse når du sender lenkeforhåndsvisninger.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Inntastingsindikatorer",
   "zoomFactorSettingTitle": "Zoomfaktor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Aktiver",
   "keepDisabled": "Hold deaktivert",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Navn og innhold",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Verken navn eller innhold",
   "nameOnly": "Kun navn",
   "newMessage": "Ny beskjed",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 timer",
   "timerOption_1_day": "1 dag",
   "timerOption_1_week": "1 uke",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Tidsbegrensede beskjeder",
   "changeNickname": "Forandre kallenavn",
   "clearNickname": "Fjern kallenavn",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12t",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1u",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Tidsbegrensede beskjeder er deaktivert",
-  "disabledDisappearingMessages": "$name$ deaktiverte tidsbegrensede beskjeder.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Du deaktiverte tidsbegrensede beskjeder.",
   "timerSetTo": "Utløpstiden for beskjeder satt til $time$",
   "noteToSelf": "Notat til meg selv",
   "hideMenuBarTitle": "Skjul menylinjen",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start ny samtale",
-  "invalidNumberError": "Ugyldig Session-ID eller ONS-navn",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Fant ikke ONS-navnet",
   "autoUpdateSettingTitle": "Automatisk oppdatering",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ ble med i gruppen.",
   "kickedFromTheGroup": "$name$ ble fjernet fra gruppen.",
   "multipleKickedFromTheGroup": "$name$ ble fjernet fra gruppen.",
-  "blockUser": "Blokker",
-  "unblockUser": "Avblokker",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Blokkering opphevet",
   "blocked": "Blokkert",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Oppdaterer $name$...",
   "showRecoveryPhrase": "Gjenopprettelsesfrase",
   "yourSessionID": "Din Session-ID",
-  "setAccountPasswordTitle": "Still kontopassord",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Forandre kontopassord",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Fjern kontopassord",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Vennligst skriv inn passordet ditt",
   "confirmPassword": "Bekreft passordet",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Vennligst skriv inn passordet ditt",
   "recoveryPhraseSavePromptMain": "Gjenopprettelsesfrasen din er hovednøkkelen til Session-IDen din – du kan bruke den for å gjenopprette Session-IDen din dersom du mister tilgang til enheten din. Arkiver gjenopprettelsesfrasen din på et trygt sted, og ikke gi den til noen.",
   "invalidOpenGroupUrl": "Ugyldig URL",
-  "copiedToClipboard": "Kopiert til utklippstavlen",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Passord",
   "setPassword": "Still passord",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passordene stemmer ikke overens",
   "changePasswordInvalid": "Det gamle passordet du skrev inn, var galt",
   "removePasswordInvalid": "Galt passord",
-  "setPasswordTitle": "Stilte passordet",
-  "changePasswordTitle": "Forandret passordet",
-  "removePasswordTitle": "Fjernet passordet",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Passordet er blitt stilt. Vennligst oppbevar det trygt.",
   "changePasswordToastDescription": "Passordet ditt er endret. Vennligst oppbevar det trygt.",
-  "removePasswordToastDescription": "Du har fjernet passordet ditt.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Kobler til...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Utseende",
   "privacySettingsTitle": "Personvern",
   "notificationsSettingsTitle": "Varsler",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Skriv inn gjenopprettelsesfrasen",
   "displayNameEmpty": "Vennligst skriv inn navnet som skal vises",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ medlemmer",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Vennligst skriv inn et kortere gruppenavn",
   "pickClosedGroupMember": "Vennligst velg minst 1 gruppemedlem",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Ingen blokkerte kontakter",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Eller bli med i en av disse...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Er du sikker på at du vil laste ned medier sendt av $name$?",
   "pinConversation": "Fest samtale",
   "unpinConversation": "Løsne samtale",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Vis brukeropplysninger",
   "sendRecoveryPhraseTitle": "Sender gjenopprettelsesfrase",
   "sendRecoveryPhraseMessage": "Du forsøker å sende gjenopprettelsesfrasen din, som kan brukes til å få tilgang til kontoen din. Er du sikker på at du vil sende denne beskjeden?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Vil du slette opplysningene kun fra denne enheten?",
   "dialogClearAllDataDeletionFailedMultiple": "Opplysninger ikke slettet av disse tjenesteknutepunktene: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Er du sikker på at du kun vil slette opplysningene på enheten?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Oppringing fra '$name$ mislyktes fordi du trenger å aktivere 'Stemme- og videosamtaler' tillatelsen i personvernsinnstillingene.",
   "callMissedNotApproved": "Anrop fra '$name$' gikk tapt fordi du ikke har akseptert denne konversasjonen ennå. Du må sende dem en melding først.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Du ringte $name$",
   "answeredACall": "Oppringning med $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "Du har en ny venneforespørsel",
   "clearAllConfirmationTitle": "Fjern alle meldingsforespørsler",
   "clearAllConfirmationBody": "Er du sikker på at du ønsker å slette alle meldingsforespørsler?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Skjule",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Vis din innboks for meldingsforespørsler",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/pa/messages.json b/_locales/pa/messages.json
index 585ad3d2a..6c65a58cc 100644
--- a/_locales/pa/messages.json
+++ b/_locales/pa/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results found for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Contacts",
-  "messagesHeader": "Messages",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Delete Messages",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "From:",
@@ -107,29 +108,30 @@
   "sent": "Sent",
   "received": "Received",
   "sendMessage": "Message",
-  "groupMembers": "Group members",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "New Message",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
index e307e2b8a..36dc94890 100644
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Pełny ekran",
   "viewMenuToggleDevTools": "Narzędzia dla programistów",
   "contextMenuNoSuggestions": "Brak Sugestii",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Zaproszenie do społeczności",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Dołączyć do $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Nie mogliśmy znaleźć odpowiedniego serwera OpenGroup",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Czy na pewno chcesz dołączyć do społeczności $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Wprowadź Session ID lub nazwę ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Rozpocznij konwersację poprzez podanie ID kontaktu, lub udostępnij swój ID znajomemu.",
   "loading": "Ładowanie...",
   "done": "Gotowe",
   "youLeftTheGroup": "Opuściłeś(aś) grupę.",
   "youGotKickedFromGroup": "Usunięto cię z grupy.",
   "unreadMessages": "Nieprzeczytane wiadomości",
   "debugLogExplanation": "Ten dziennik zostanie zapisany na Twoim komputerze.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Zgłoś błąd",
   "markAllAsRead": "Oznacz wszystkie jako przeczytane",
   "incomingError": "Błąd przy obsłudze przychodzącej wiadomości.",
   "media": "Multimedia",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Przepraszamy, wystąpił błąd podczas dodawania załącznika.",
   "offline": "Rozłączony",
   "debugLog": "Dziennik Debugowania",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Eksport dzienników",
+  "shareBugDetails": "Wyeksportuj logi do pliku, następnie wyślij plik poprzez Help Desk Session.",
   "goToReleaseNotes": "Przejdź do informacji o wersji",
   "goToSupportPage": "Przejdź do strony wsparcia",
   "about": "O mnie",
@@ -72,7 +72,7 @@
   "noSearchResults": "Brak wyników dla \"$searchTerm$\"",
   "conversationsHeader": "Kontakty i grupy",
   "contactsHeader": "Kontakty",
-  "messagesHeader": "Wiadomości",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Ustawienia",
   "typingAlt": "Animacja wskaźnika pisania w tej rozmowie",
   "contactAvatarAlt": "Zdjęcie profilowe $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Usunąć $count$ wiadomość?",
   "deleteMessageQuestion": "Usunąć tę wiadomość?",
   "deleteMessages": "Usuń konwersację",
+  "deleteConversation": "Delete Conversation",
   "deleted": "Usunięto $count$",
   "messageDeletedPlaceholder": "Ta wiadomość została usunięta",
   "from": "Od:",
@@ -107,17 +108,18 @@
   "sent": "Wysłano",
   "received": "Otrzymano",
   "sendMessage": "Wyślij wiadomość",
-  "groupMembers": "Członkowie grupy",
+  "groupMembers": "Członkowie",
   "moreInformation": "Więcej informacji",
   "resend": "Wyślij ponownie",
   "deleteConversationConfirmation": "Usunąć trwale tę konwersację?",
-  "clear": "Clear",
+  "clear": "Wyczyść",
   "clearAllData": "Wyczyść wszystkie dane",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Spowoduje to trwałe usunięcie Twoich wiadomości i kontaktów.",
+  "deleteAccountFromLogin": "Czy jesteś pewien, że chcesz usunąć dane z urządzenia?",
   "deleteContactConfirmation": "Czy na pewno chcesz usunąć tę rozmowę?",
   "quoteThumbnailAlt": "Miniatura obrazu z cytowanej wiadomości",
   "imageAttachmentAlt": "Zdjęcie załączone do wiadomości",
-  "videoAttachmentAlt": "Zrzut ekranu z filmu dołączonego do wiadomości",
+  "videoAttachmentAlt": "Zrzut ekranu wideo w wiadomości",
   "lightboxImageAlt": "Obraz wysłany w rozmowie",
   "imageCaptionIconAlt": "Ikona informująca o tekście, który zawiera grafika",
   "addACaption": "Dodaj podpis...",
@@ -129,43 +131,43 @@
   "tookAScreenshot": "$name$ wykonał zrzut ekranu",
   "savedTheFile": "Media zapisane przez $name$",
   "linkPreviewsTitle": "Podgląd linków",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generuj podglądy linków dla wspieranych adresów URL.",
   "linkPreviewsConfirmMessage": "Pełna ochrona metadanych nie będzie dostępna podczas wysyłania podglądu.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Zezwól na dostęp do mikrofonu.",
   "spellCheckTitle": "Sprawdzanie pisowni",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Włącz sprawdzanie pisowni podczas pisania wiadomości.",
   "spellCheckDirty": "Musisz zrestartować Session, aby zastosować nowe ustawienia",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Wysyłaj potwierdzenia przeczytania w konwersacjach typu jeden do jednego.",
   "readReceiptSettingTitle": "Potwierdzenia przeczytania",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Włącz widoczność oraz wysyłanie wskaźnika pisania wiadomości w rozmowach jeden do jednego.",
   "typingIndicatorsSettingTitle": "Wskaźniki pisania",
   "zoomFactorSettingTitle": "Współczynnik powiększenia",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Motywy",
+  "primaryColor": "Kolor główny",
+  "primaryColorGreen": "Podstawowy kolor zielony",
+  "primaryColorBlue": "Podstawowy kolor niebieski",
+  "primaryColorYellow": "Podstawowy kolor żółty",
+  "primaryColorPink": "Podstawowy kolor różowy",
+  "primaryColorPurple": "Podstawowy kolor fioletowy",
+  "primaryColorOrange": "Podstawowy kolor pomarańczowy",
+  "primaryColorRed": "Podstawowy kolor czerwony",
+  "classicDarkThemeTitle": "Klasyczny ciemny",
+  "classicLightThemeTitle": "Klasyczny jasny",
+  "oceanDarkThemeTitle": "Ciemny Ocean",
+  "oceanLightThemeTitle": "Jasny Ocean",
+  "pruneSettingTitle": "Przytnij społeczności",
+  "pruneSettingDescription": "Usuń wiadomości starsze niż 6 miesięcy ze społeczności, które mają ponad 2000 wiadomości.",
   "enable": "Włącz",
   "keepDisabled": "Pozostaw wyłączone",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Z nazwą nadawcy i wiadomością",
+  "notificationSettingsDialog": "Informacje wyświetlane w powiadomieniach.",
+  "nameAndMessage": "Nazwa i treść",
   "noNameOrMessage": "Bez nadawcy i wiadomości",
   "nameOnly": "Tylko z nazwą nadawcy",
   "newMessage": "Nowa wiadomość",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
+  "createConversationNewContact": "Rozpocznij rozmowę z nowym kontaktem",
+  "createConversationNewGroup": "Utwórz grupę z istniejącymi kontaktami",
+  "joinACommunity": "Dołącz do społeczności",
   "chooseAnAction": "Choose an action to start a conversation",
   "newMessages": "Nowe wiadomości",
   "notificationMostRecentFrom": "Najnowsza z: $name$",
@@ -174,7 +176,7 @@
   "sendFailed": "Nie udało się wysłać",
   "mediaMessage": "Wiadomość multimedialna",
   "messageBodyMissing": "Wpisz wiadomość.",
-  "messageBody": "Message body",
+  "messageBody": "Treść wiadomości",
   "unblockToSend": "Odblokuj ten kontakt, aby wysłać wiadomość.",
   "unblockGroupToSend": "Odblokuj tę grupę, aby wysłać wiadomość.",
   "youChangedTheTimer": "Ustawiłeś(aś) znikające wiadomości na $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 godzin",
   "timerOption_1_day": "1 dzień",
   "timerOption_1_week": "1 tydzień",
+  "timerOption_2_weeks": "2 tygodnie",
   "disappearingMessages": "Znikające wiadomości",
   "changeNickname": "Zmień pseudonim",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 godz.",
   "timerOption_1_day_abbreviated": "1 dzień",
   "timerOption_1_week_abbreviated": "1 tydz.",
+  "timerOption_2_weeks_abbreviated": "2t",
   "disappearingMessagesDisabled": "Znikające wiadomości zostały wyłączone",
-  "disabledDisappearingMessages": "$name$ wyłączył(a) znikające wiadomości.",
+  "disabledDisappearingMessages": "$name$ wyłączył znikające wiadomości.",
   "youDisabledDisappearingMessages": "Wyłączyłeś(aś) znikające wiadomości.",
   "timerSetTo": "Czas znikania wiadomości ustawiony na $time$",
   "noteToSelf": "Moje notatki",
   "hideMenuBarTitle": "Ukryj pasek menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Przełącz widoczność systemowego paska menu.",
   "startConversation": "Rozpocznij nową rozmowę...",
-  "invalidNumberError": "Nieprawidłowy numer",
+  "invalidNumberError": "Sprawdź poprawność ID sesji lub nazwę ONS i spróbuj ponownie",
   "failedResolveOns": "Nie udało się ustalić nazwy ONS",
   "autoUpdateSettingTitle": "Automatyczna aktualizacja",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Automatycznie sprawdzaj dostępność aktualizacji podczas uruchamiania.",
   "autoUpdateNewVersionTitle": "Dostępna aktualizacja aplikacji Session",
   "autoUpdateNewVersionMessage": "Dostępna nowa wersja Session",
   "autoUpdateNewVersionInstructions": "Naciśnij Uruchom ponownie, aby zastosować aktualizacje.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ dołączyli do grupy.",
   "kickedFromTheGroup": "$name$ został usunięty z grupy.",
   "multipleKickedFromTheGroup": "$name$ zostali usunięci z grupy.",
-  "blockUser": "Zablokuj",
-  "unblockUser": "Odblokuj",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Odblokowano",
   "blocked": "Zablokowany",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Zablokowane kontakty",
+  "conversationsSettingsTitle": "Rozmowy",
   "unbanUser": "Odbanuj użytkownika",
   "userUnbanned": "Użytkownik odbanowany pomyślnie",
   "userUnbanFailed": "Odbanowanie nie powiodło się!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Ban nieudany!",
   "leaveGroup": "Opuść grupę",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Opuść grupę i zakończ ją u wszystkich",
   "leaveGroupConfirmation": "Czy na pewno chcesz opuścić tę grupę?",
   "leaveGroupConfirmationAdmin": "Ponieważ jesteś administratorem tej grupy, jeśli ją opuścisz, zostanie ona usunięta dla wszystkich obecnych użytkowników. Czy na pewno chcesz opuścić tę grupę?",
   "cannotRemoveCreatorFromGroup": "Nie można usunąć tego użytkownika",
   "cannotRemoveCreatorFromGroupDesc": "Nie możesz usunąć tego użytkownika, ponieważ jest on twórcą grupy.",
   "noContactsForGroup": "Nie masz jeszcze żadnych kontaktów",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Nie udało się dodać użytkownika jako moderatora",
+  "failedToRemoveFromModerator": "Nie udało się usunąć użytkownika z listy moderatorów",
   "copyMessage": "Skopiuj treść wiadomości",
   "selectMessage": "Wybierz wiadomość",
   "editGroup": "Edytuj grupę",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Aktualizowanie $name$...",
   "showRecoveryPhrase": "Zwrot odzyskiwania",
   "yourSessionID": "Twój identyfikator Session",
-  "setAccountPasswordTitle": "Ustaw hasło konta",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Zmień hasło konta",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Usuń hasło konta",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Hasło",
+  "setAccountPasswordDescription": "Wymagaj hasła, aby odblokować Session.",
+  "changeAccountPasswordTitle": "Zmień hasło",
+  "changeAccountPasswordDescription": "Zmień hasło wymagane do odblokowania Session.",
+  "removeAccountPasswordTitle": "Usuń hasło",
+  "removeAccountPasswordDescription": "Usuń hasło wymagane do odblokowania Session.",
   "enterPassword": "Podaj swoje hasło",
   "confirmPassword": "Potwierdź hasło",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Proszę wprowadzić nowe hasło",
+  "confirmNewPassword": "Potwierdź nowe hasło",
   "showRecoveryPhrasePasswordRequest": "Podaj swoje hasło",
   "recoveryPhraseSavePromptMain": "Twoja fraza odzyskiwania jest kluczem głównym do identyfikatora Session - możesz go użyć do przywrócenia identyfikatora Session, jeśli stracisz dostęp do urządzenia. Przechowuj swoją frazę odzyskiwania w bezpiecznym miejscu i nikomu jej nie udostępniaj.",
   "invalidOpenGroupUrl": "Nieprawidłowy URL",
-  "copiedToClipboard": "Skopiowane do schowka",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Skopiowano",
+  "passwordViewTitle": "Wprowadź hasło",
   "password": "Hasło",
   "setPassword": "Ustaw hasło",
   "changePassword": "Zmień hasło",
-  "createPassword": "Create your password",
+  "createPassword": "Utwórz hasło",
   "removePassword": "Usuń hasło",
   "maxPasswordAttempts": "Nieprawidłowe hasło. Czy chcesz zresetować bazę danych?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Wprowadź aktualne hasło",
   "invalidOldPassword": "Stare hasło jest nieprawidłowe",
   "invalidPassword": "Nieprawidłowe hasło",
   "noGivenPassword": "Podaj swoje hasło",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Podane hasła różnią się",
   "changePasswordInvalid": "Twoje stare hasło jest nieprawidłowe",
   "removePasswordInvalid": "Nieprawidłowe hasło",
-  "setPasswordTitle": "Ustaw hasło",
-  "changePasswordTitle": "Zmieniono hasło",
-  "removePasswordTitle": "Usunięto hasło",
+  "setPasswordTitle": "Hasło ustawione",
+  "changePasswordTitle": "Hasło zostało zmienione",
+  "removePasswordTitle": "Hasło zostało usunięte",
   "setPasswordToastDescription": "Hasło zostało ustawione. Proszę trzymaj je bezpieczne.",
   "changePasswordToastDescription": "Hasło zostało zmienione. Proszę trzymaj je bezpieczne.",
-  "removePasswordToastDescription": "Usunięto hasło.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Twoje hasło zostało usunięte.",
+  "publicChatExists": "Jesteś już połączony z tą społecznością",
+  "connectToServerFail": "Nie udało się dołączyć do społeczności",
   "connectingToServer": "Łączenie...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Pomyślnie połączono ze społecznością",
   "setPasswordFail": "Nie udało się ustawić hasła",
   "passwordLengthError": "Hasło musi zawierać od 6 do 64 znaków",
   "passwordTypeError": "Hasło musi być tekstem",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Nazwa grupy",
   "inviteContacts": "Zaproś znajomych",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Dodaj administratorów",
+  "removeModerators": "Usuń Administratorów",
+  "addAsModerator": "Dodaj jako administratora",
+  "removeFromModerators": "Usuń z administratorów",
   "add": "Dodaj",
   "addingContacts": "Dodawanie kontaktów do",
   "noContactsToAdd": "Nie ma kontaktów do dodania",
   "noMembersInThisGroup": "Brak członków w grupie",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "brak administratorów do usunięcia",
   "onlyAdminCanRemoveMembers": "Nie jesteś właścicielem grupy",
   "onlyAdminCanRemoveMembersDesc": "Tylko twórca grupy może usunąć użytkowników",
   "createAccount": "Create Account",
   "startInTrayTitle": "Utrzymuj w zasobniku systemowym",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Pozostaw Session włączony w tle, nawet gdy zamkniesz okno.",
   "yourUniqueSessionID": "Przywitaj się z identyfikatorem Session",
   "allUsersAreRandomly...": "Twój identyfikator Session to unikalny adres, za pomocą którego można się z Tobą kontaktować w Sesji. Bez połączenia z twoją prawdziwą tożsamością, identyfikator Session jest z założenia całkowicie anonimowy i prywatny.",
   "getStarted": "Rozpocznij",
@@ -344,40 +348,43 @@
   "linkDevice": "Połącz urządzenie",
   "restoreUsingRecoveryPhrase": "Przywróć swoje konto",
   "or": "lub",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Korzystając z tej usługi, akceptujesz nasze <a href=\"https://getsession.org/terms-of-service \">Warunki korzystania z usługi</a> i <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Politykę prywatności</a>",
   "beginYourSession": "Rozpocznij swój Session.",
   "welcomeToYourSession": "Witamy w twoim Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Szukaj w konwersacjach lub kontaktach",
+  "searchForContactsOnly": "Szukaj kontaktów",
   "enterSessionID": "Wpisz identyfikator Session",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Wprowadź identyfikator sesji (ID) lub ONS twojego rozmówcy",
   "message": "Wiadomość",
   "appearanceSettingsTitle": "Wygląd",
   "privacySettingsTitle": "Prywatność",
   "notificationsSettingsTitle": "Powiadomienia",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Zawartość powiadomień",
+  "notificationPreview": "Podgląd",
   "recoveryPhraseEmpty": "Wpisz swoją frazę odzyskiwania",
   "displayNameEmpty": "Wybierz wyświetlaną nazwę",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ członków",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Dołącz",
+  "joinOpenGroup": "Dołącz do społeczności",
+  "createGroup": "Utwórz grupę",
+  "create": "Utwórz",
   "createClosedGroupNamePrompt": "Nazwa grupy",
   "createClosedGroupPlaceholder": "Wpisz nazwę grupy",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Adres URL społeczności",
+  "enterAnOpenGroupURL": "Wprowadź adres URL społeczności",
   "next": "Dalej",
   "invalidGroupNameTooShort": "Wpisz nazwę grupy",
   "invalidGroupNameTooLong": "Wprowadź krótszą nazwę grupy",
   "pickClosedGroupMember": "Proszę wybrać co najmniej 1 członka grupy",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Brak zablokowanych kontaktów",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Grupa nie może mieć więcej niż 100 członków",
+  "noBlockedContacts": "Nie masz zablokowanych kontaktów.",
+  "userAddedToModerators": "Użytkownik dodany do listy moderatorów",
+  "userRemovedFromModerators": "Użytkownik usunięty z listy moderatorów",
   "orJoinOneOfThese": "Lub dołącz do jednej z tych...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Przetłumacz Session",
   "closedGroupInviteFailTitle": "Zaproszenie do grupy nieudane",
   "closedGroupInviteFailTitlePlural": "Zaproszenia do grupy nieudane",
   "closedGroupInviteFailMessage": "Nie można pomyślnie zaprosić członka grupy",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Ponów zaproszenia",
   "closedGroupInviteSuccessTitlePlural": "Zaproszenia do grupy zakończone",
   "closedGroupInviteSuccessTitle": "Udało się zaprosić do grupy",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Pomyślnie zaproszono członków grupy",
   "notificationForConvo": "Powiadomienia",
   "notificationForConvo_all": "Wszystko",
   "notificationForConvo_disabled": "Wyłączone",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Otworzyć ten link w przeglądarce?",
   "linkVisitWarningMessage": "Czy na pewno chcesz otworzyć $url$ w swojej przeglądarce?",
   "open": "Otwórz",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Automatyczne odtwarzaj wiadomości audio",
+  "audioMessageAutoplayDescription": "Automatycznie odtwarzaj kolejne wiadomości audio.",
   "clickToTrustContact": "Kliknij, aby pobrać multimedia",
   "trustThisContactDialogTitle": "Zaufać $name$?",
   "trustThisContactDialogDescription": "Czy na pewno chcesz pobrać multimedia wysłane przez $name$?",
   "pinConversation": "Przypnij konwersację",
   "unpinConversation": "Odepnij konwersację",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Pokaż szczegóły użytkownika",
   "sendRecoveryPhraseTitle": "Wysyłanie frazy odzyskiwania",
   "sendRecoveryPhraseMessage": "Próbujesz wysłać frazę odzyskiwania, która może być użyta do uzyskania dostępu do twojego konta. Czy na pewno chcesz wysłać tę wiadomość?",
@@ -413,33 +421,36 @@
   "dialogClearAllDataDeletionFailedDesc": "Dane nie zostały usunięte z nieznanego błędu. Czy chcesz usunąć dane tylko z tego urządzenia?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Czy chcesz usunąć dane tylko z tego urządzenia?",
   "dialogClearAllDataDeletionFailedMultiple": "Dane nie zostały usunięte przez te węzły usługowe: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Czy chcesz wyczyścić tylko to urządzenie, czy usunąć też swoje dane z sieci?",
+  "clearDevice": "Wyczyść dane z urządzenia",
+  "tryAgain": "Spróbuj ponownie",
+  "areYouSureClearDevice": "Czy jesteś pewien, że chcesz usunąć dane z urządzenia?",
+  "deviceOnly": "Wyczyść tylko urządzenie",
+  "entireAccount": "Wyczyść urządzenie i sieć",
   "areYouSureDeleteDeviceOnly": "Czy na pewno chcesz usunąć swoje dane tylko z tego urządzenia?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Czy na pewno chcesz usunąć swoje dane z sieci? Jeśli kontynuujesz, nie będziesz w stanie przywrócić swoich wiadomości lub kontaktów.",
   "iAmSure": "Na pewno",
   "recoveryPhraseSecureTitle": "Prawie gotowe!",
   "recoveryPhraseRevealMessage": "Zabezpiecz swoje konto zapisując frazę odzyskiwania. Zobacz frazę odzyskiwania, a następnie przechowuj ją bezpiecznie w celu zabezpieczenia.",
   "recoveryPhraseRevealButtonText": "Pokaż frazę odzyskiwania",
   "notificationSubtitle": "Powiadomienia - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
+  "surveyTitle": "Chcielibyśmy poznać Twoją opinię",
   "faq": "FAQ",
-  "support": "Support",
+  "support": "Pomoc",
   "clearAll": "Wyczyść wszystko",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Wyczyść dane",
   "messageRequests": "Żądania wiadomości",
   "requestsSubtitle": "Oczekujące Prośby",
   "requestsPlaceholder": "Brak zapytań",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "hideRequestBannerDescription": "Ukryj informację o żądaniach wiadomości, dopóki nie otrzymasz nowego żądania wiadomości.",
   "incomingCallFrom": "Połączenie przychodzące od '$name$'",
   "ringing": "Dzwonienie...",
   "establishingConnection": "Nawiązywanie połączenia...",
   "accept": "Akceptuj",
   "decline": "Odrzuć",
   "endCall": "Zakończ rozmowę",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Uprawnienia",
+  "helpSettingsTitle": "Pomoc",
   "cameraPermissionNeededTitle": "Wymagane uprawnienia do połączeń głosowych/wideo",
   "cameraPermissionNeeded": "Możesz włączyć uprawnienie 'Połączenia głosowe i wideo' w Ustawieniach Prywatności.",
   "unableToCall": "Najpierw anuluj bieżące połączenie",
@@ -449,44 +460,49 @@
   "noCameraFound": "Nie znaleziono kamery",
   "noAudioInputFound": "Nie znaleziono wejścia dźwięku",
   "noAudioOutputFound": "Nie znaleziono wyjścia dźwięku",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Połączenia głosowe i wideo (beta)",
   "callMissedCausePermission": "Połączenie nieodebrane od '$name$' ponieważ musisz włączyć uprawnienie 'Połączenia głosowe i wideo' w Ustawieniach Prywatności.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMissedNotApproved": "Połączenie nieodebrane od '$name$' ponieważ nie zatwierdziłeś/aś jeszcze tej rozmowy. Najpierw wyślij wiadomość do tego kontaktu.",
+  "callMediaPermissionsDescription": "Włącza połączenia głosowe i wideo do i od innych użytkowników.",
+  "callMediaPermissionsDialogContent": "Twój adres IP jest widoczny dla partnera połączenia i serwera fundacji Oxen podczas korzystania z połączeń beta. Czy na pewno chcesz włączyć połączenia głosowe i wideo?",
+  "callMediaPermissionsDialogTitle": "Połączenia głosowe i wideo (beta)",
   "startedACall": "Zadzwoniłeś/aś do $name$",
   "answeredACall": "Połączenie z $name$",
   "trimDatabase": "Przytnij bazę danych",
   "trimDatabaseDescription": "Zmniejsza rozmiar bazy danych do 10 000 ostatnich wiadomości.",
   "trimDatabaseConfirmationBody": "Czy na pewno chcesz usunąć najstarsze $deleteAmount$ otrzymane wiadomości?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "pleaseWaitOpenAndOptimizeDb": "Proszę czekać, Twoja baza danych jest otwierana i optymalizowana...",
+  "messageRequestPending": "Twoje żądanie wiadomości czeka na akceptację",
+  "messageRequestAccepted": "Twoje żądanie wiadomości zostało zaakceptowane",
+  "messageRequestAcceptedOurs": "Zaakceptowałeś żądanie wiadomości od $name$",
+  "messageRequestAcceptedOursNoName": "Zaakceptowałeś żądanie wiadomości",
+  "declineRequestMessage": "Czy na pewno chcesz odrzucić to żądanie wiadomości?",
+  "respondingToRequestWarning": "Wysłanie wiadomości do tego użytkownika spowoduje automatyczne zaakceptowanie jego żądania wiadomości i ujawnienie Twojego identyfikatora Session.",
+  "hideRequestBanner": "Ukryj baner żądania wiadomości",
+  "openMessageRequestInbox": "Żądania wiadomości",
+  "noMessageRequestsPending": "Brak oczekujących żądań wiadomości",
+  "noMediaUntilApproved": "Nie możesz wysyłać załączników, dopóki konwersacja nie zostanie zatwierdzona",
+  "mustBeApproved": "Ta konwersacja musi być zaakceptowana, aby użyć tej funkcji",
+  "youHaveANewFriendRequest": "Masz nowe zaproszenie do znajomych",
+  "clearAllConfirmationTitle": "Wyczyść wszystkie żądania wiadomości",
+  "clearAllConfirmationBody": "Czy na pewno chcesz wyczyścić wszystkie żądania wiadomości?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Ukryj",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Wyświetl prośby o kontakt",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Czy na pewno chcesz wyczyścić wszystkie $emoji$?",
+  "expandedReactionsText": "Pokaż mniej",
+  "reactionNotification": "Reaguje na wiadomość $emoji$",
+  "rateLimitReactMessage": "Zwolnij! Wysłałeś zbyt wiele reakcji emotek. Spróbuj ponownie wkrótce",
+  "otherSingular": "$number$ inny",
+  "otherPlural": "$number$ innych",
+  "reactionPopup": "zareagował",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ i $name2$",
+  "reactionPopupThree": "$name$, $name2$ i $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ i",
+  "reactionListCountSingular": "$otherSingular$ zareagował <span>$emoji$</span> na tę wiadomość",
+  "reactionListCountPlural": "$otherPlural$ zareagowali <span>$emoji$</span> na tę wiadomość"
 }
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 5b749cc37..edb45e60f 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Tela inteira",
   "viewMenuToggleDevTools": "Ferramentas de desenvolvimento",
   "contextMenuNoSuggestions": "Sem Sugestões",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Convite da comunidade",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Entrar em $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Não foi possível localizar o servidor público correspondente",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Você tem certeza que deseja entrar na comunidade $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Insira seu ID Session ou ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Inicie uma nova conversa inserindo o ID Session de alguém ou compartilhando o seu ID Session com alguém.",
   "loading": "Carregando...",
   "done": "Concluído",
   "youLeftTheGroup": "Você saiu do grupo.",
   "youGotKickedFromGroup": "Você foi removida(o) do grupo.",
   "unreadMessages": "Mensagens não lidas",
   "debugLogExplanation": "Este registro será salvo na sua área de trabalho.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Reportar um erro",
   "markAllAsRead": "Marcar todas como lidas",
   "incomingError": "Erro ao receber mensagem",
   "media": "Mídia",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Desculpe, ocorreu um erro ao anexar o documento.",
   "offline": "Off-line",
   "debugLog": "Registro de depuração ",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportar Registros",
+  "shareBugDetails": "Exporte seus logs, e envie o arquivo através do Help Desk do Session.",
   "goToReleaseNotes": "Ir para Notas de Lançamento",
   "goToSupportPage": "Ir para Página de Suporte",
   "about": "Sobre",
@@ -72,7 +72,7 @@
   "noSearchResults": "Nenhum resultado encontrado para \"$searchTerm$\"",
   "conversationsHeader": "Contatos e Grupos",
   "contactsHeader": "Contatos",
-  "messagesHeader": "Mensagens",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Configurações",
   "typingAlt": "Animação de digitação para esta conversa",
   "contactAvatarAlt": "Avatar de $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Excluir $count$ mensagens?",
   "deleteMessageQuestion": "Excluir esta mensagem?",
   "deleteMessages": "Apagar mensagens",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ excluídos",
   "messageDeletedPlaceholder": "Esta mensagem foi excluída",
   "from": "De:",
@@ -107,17 +108,18 @@
   "sent": "Enviada",
   "received": "Recebida",
   "sendMessage": "Enviar uma mensagem",
-  "groupMembers": "Membros do grupo",
+  "groupMembers": "Membros",
   "moreInformation": "Mais informações",
   "resend": "Reenviar",
   "deleteConversationConfirmation": "Você deseja apagar esta conversa definitivamente?",
-  "clear": "Clear",
+  "clear": "Limpar",
   "clearAllData": "Limpar todos os dados",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Isso irá excluir permanentemente suas mensagens e contatos.",
+  "deleteAccountFromLogin": "Tem certeza que deseja limpar seu dispositivo?",
   "deleteContactConfirmation": "Tem certeza de que deseja excluir esta conversa?",
   "quoteThumbnailAlt": "Miniatura da imagem na citação",
   "imageAttachmentAlt": "Imagem anexa à mensagem",
-  "videoAttachmentAlt": "Frame do vídeo anexo à mensagem",
+  "videoAttachmentAlt": "Captura de tela do vídeo na mensagem",
   "lightboxImageAlt": "Imagem enviada na conversa",
   "imageCaptionIconAlt": "Ícone mostrando que esta imagem possui uma legenda",
   "addACaption": "Adicionar legenda...",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$ fez uma captura de tela",
   "savedTheFile": "Mídia salva por $name$",
   "linkPreviewsTitle": "Enviar Pré-Visualizações De Links",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Gerar pré-visualizações de links para URLs suportadas.",
   "linkPreviewsConfirmMessage": "Você não terá proteção completa de metadados ao enviar pré-visualizações de links.",
   "mediaPermissionsTitle": "Microfone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Permita acesso ao microfone.",
   "spellCheckTitle": "Corretor ortográfico",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Habilitar verificação ortográfica ao digitar mensagens.",
   "spellCheckDirty": "Você precisa reiniciar o Session para aplicar as novas configurações",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Enviar confirmações de leitura em conversas individuais.",
   "readReceiptSettingTitle": "Confirmações De Leitura",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Veja e compartilhe indicadores de digitação em conversas individuais.",
   "typingIndicatorsSettingTitle": "Indicadores De Digitação",
   "zoomFactorSettingTitle": "Fator de zoom",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Temas",
+  "primaryColor": "Cor Principal",
+  "primaryColorGreen": "Cor principal verde",
+  "primaryColorBlue": "Cor primária azul",
+  "primaryColorYellow": "Cor principal amarela",
+  "primaryColorPink": "Cor principal rosa",
+  "primaryColorPurple": "Cor principal roxa",
+  "primaryColorOrange": "Cor principal laranja",
+  "primaryColorRed": "Cor principal vermelha",
+  "classicDarkThemeTitle": "Clássico Escuro",
+  "classicLightThemeTitle": "Clássico Claro",
+  "oceanDarkThemeTitle": "Oceano Escuro",
+  "oceanLightThemeTitle": "Oceano Claro",
+  "pruneSettingTitle": "Cortar Comunidades",
+  "pruneSettingDescription": "Exclua mensagens com mais de 6 meses de Comunidades que possuam mais de 2.000 mensagens.",
   "enable": "Habilitar",
   "keepDisabled": "Manter desativado",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Nome da pessoa remetente e mensagem",
+  "notificationSettingsDialog": "As informações exibidas nas notificações.",
+  "nameAndMessage": "Nome e conteúdo",
   "noNameOrMessage": "Nem nome nem mensagem",
   "nameOnly": "Apenas o nome da pessoa remetente",
   "newMessage": "Nova mensagem",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Criar uma conversa com um novo contato",
+  "createConversationNewGroup": "Criar um grupo com contatos existentes",
+  "joinACommunity": "Juntar-se a uma comunidade",
+  "chooseAnAction": "Escolha uma ação para iniciar uma conversa",
   "newMessages": "Novas mensagens",
   "notificationMostRecentFrom": "Mais recente de: $name$",
   "notificationFrom": "De:",
@@ -174,7 +176,7 @@
   "sendFailed": "Envio Falhou",
   "mediaMessage": "MMS",
   "messageBodyMissing": "Por favor, insira o corpo da mensagem.",
-  "messageBody": "Message body",
+  "messageBody": "Corpo da mensagem",
   "unblockToSend": "Desbloquear este contato para enviar uma mensagem.",
   "unblockGroupToSend": "Desbloquear este grupo para enviar uma mensagem.",
   "youChangedTheTimer": "Você definiu o tempo de duração das mensagens efêmeras como $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 horas",
   "timerOption_1_day": "1 dia",
   "timerOption_1_week": "1 semana",
+  "timerOption_2_weeks": "2 semanas",
   "disappearingMessages": "Mensagens efêmeras",
   "changeNickname": "Mudar Apelido",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1 dia",
   "timerOption_1_week_abbreviated": "1 semana",
+  "timerOption_2_weeks_abbreviated": "2 sem",
   "disappearingMessagesDisabled": "Mensagens efêmeras desabilitadas",
-  "disabledDisappearingMessages": "$name$ desabilitou as mensagens efêmeras.",
+  "disabledDisappearingMessages": "$name$ desativou o desaparecimento de mensagens.",
   "youDisabledDisappearingMessages": "Você desabilitou as mensagens efêmeras.",
   "timerSetTo": "Expiração da mensagem efêmera definida para $time$",
   "noteToSelf": "Recado pra mim",
   "hideMenuBarTitle": "Ocultar Barra de Menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Alternar visibilidade da barra de menu do sistema.",
   "startConversation": "Iniciar uma conversa…",
-  "invalidNumberError": "Número inválido",
+  "invalidNumberError": "Por favor, verifique o ID da Sessão ou nome ONS e tente novamente",
   "failedResolveOns": "Falha ao resolver o nome ONS",
   "autoUpdateSettingTitle": "Atualização Automática",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Verificar atualizações automaticamente ao iniciar.",
   "autoUpdateNewVersionTitle": "Atualização do Session disponível",
   "autoUpdateNewVersionMessage": "Uma nova versão do Session está disponível.",
   "autoUpdateNewVersionInstructions": "Por favor, toque em 'reiniciar Session' para aplicar as atualizações.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ entraram no  grupo.",
   "kickedFromTheGroup": "$name$ foi removido(a) do grupo.",
   "multipleKickedFromTheGroup": "$name$ foram removidos(as) do grupo.",
-  "blockUser": "Bloquear",
-  "unblockUser": "Desbloquear",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Desbloqueado",
   "blocked": "Bloqueado",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Contatos Bloqueados",
+  "conversationsSettingsTitle": "Conversas",
   "unbanUser": "Desbanir Usuário",
   "userUnbanned": "Usuário desbanido com sucesso",
   "userUnbanFailed": "Desbanimento falhou!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Banimento falhou!",
   "leaveGroup": "Sair Do Grupo",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Sair do Grupo e Remover para Todos",
   "leaveGroupConfirmation": "Tem certeza de que deseja sair deste grupo?",
   "leaveGroupConfirmationAdmin": "Como você é o administrador deste grupo, se você sair será removido para todos os membros atuais. Tem certeza de que deseja sair desse grupo?",
   "cannotRemoveCreatorFromGroup": "Não é possível remover esse usuário",
   "cannotRemoveCreatorFromGroupDesc": "Você não pode remover esse usuário já que ele é o criador do grupo.",
   "noContactsForGroup": "Você ainda não possui contatos",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Falha ao adicionar usuário como administrador",
+  "failedToRemoveFromModerator": "Falha ao remover usuário da lista de admin",
   "copyMessage": "Copiar texto da mensagem",
   "selectMessage": "Selecionar mensagem",
   "editGroup": "Editar grupo",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Atualizando $name$...",
   "showRecoveryPhrase": "Frase de recuperação",
   "yourSessionID": "Seu ID Session",
-  "setAccountPasswordTitle": "Definir senha da conta",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Alterar Senha da Conta",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remover Senha da Conta",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Senha",
+  "setAccountPasswordDescription": "Exigir senha para desbloquear o Session.",
+  "changeAccountPasswordTitle": "Alterar Senha",
+  "changeAccountPasswordDescription": "Altere a senha necessária para desbloquear o Session.",
+  "removeAccountPasswordTitle": "Remover Senha",
+  "removeAccountPasswordDescription": "Remova a senha requerida para desbloquear o Session.",
   "enterPassword": "Por favor, digite sua senha",
   "confirmPassword": "Confirmar senha",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Por favor, digite a sua nova senha",
+  "confirmNewPassword": "Confirmar nova senha",
   "showRecoveryPhrasePasswordRequest": "Por favor, digite sua senha",
   "recoveryPhraseSavePromptMain": "Sua frase de recuperação é a chave mestra do seu ID Session - você pode usá-la para restaurar seu ID Session se perder o acesso ao seu dispositivo. Armazene sua frase de recuperação em um local seguro e não a entregue a ninguém.",
   "invalidOpenGroupUrl": "URL inválido",
-  "copiedToClipboard": "Copiado para a área de transferência",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Copiado",
+  "passwordViewTitle": "Inserir Senha",
   "password": "Senha",
   "setPassword": "Configurar Senha",
   "changePassword": "Alterar Senha",
-  "createPassword": "Create your password",
+  "createPassword": "Crie a sua senha",
   "removePassword": "Remover Senha",
   "maxPasswordAttempts": "Senha Inválida. Gostaria de redefinir a base de dados?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Por favor, insira sua senha atual",
   "invalidOldPassword": "Senha antiga inválida",
   "invalidPassword": "Senha inválida",
   "noGivenPassword": "Por favor, digite sua senha",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "As senhas não coincidem",
   "changePasswordInvalid": "A senha antiga que você digitou está incorreta",
   "removePasswordInvalid": "Senha incorreta",
-  "setPasswordTitle": "Configurar senha",
-  "changePasswordTitle": "Senha Alterada",
+  "setPasswordTitle": "Definir senha",
+  "changePasswordTitle": "Senha alterada",
   "removePasswordTitle": "Senha Removida",
   "setPasswordToastDescription": "Sua senha foi definida. Por favor, mantenha-a segura.",
   "changePasswordToastDescription": "Sua senha foi alterada. Por favor, mantenha-a segura.",
-  "removePasswordToastDescription": "Você removeu sua senha.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Sua senha foi removida.",
+  "publicChatExists": "Você já está conectado a esta comunidade",
+  "connectToServerFail": "Não foi possível participar da comunidade",
   "connectingToServer": "Conectando...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Conectado à comunidade com sucesso",
   "setPasswordFail": "Falha ao definir a senha",
   "passwordLengthError": "A senha deve ter entre 6 e 64 caracteres",
   "passwordTypeError": "A senha deve ser uma string",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Perfil",
   "groupNamePlaceholder": "Nome Do Grupo",
   "inviteContacts": "Convidar Amigos",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Adicionar Administradores",
+  "removeModerators": "Remover Administradores",
+  "addAsModerator": "Adicionar como Administrador",
+  "removeFromModerators": "Remover dos Administradores",
   "add": "Adicionar",
   "addingContacts": "Adicionando contatos a",
   "noContactsToAdd": "Nenhum contato para adicionar",
   "noMembersInThisGroup": "Nenhum outro membro neste grupo",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "nenhum administrador para remover",
   "onlyAdminCanRemoveMembers": "Você não é o criador",
   "onlyAdminCanRemoveMembersDesc": "Somente o criador do grupo pode remover usuários",
   "createAccount": "Create Account",
   "startInTrayTitle": "Manter na Bandeja do Sistema",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Manter o Session rodando em segundo plano quando você fechar a janela.",
   "yourUniqueSessionID": "Diga olá ao seu ID Session",
   "allUsersAreRandomly...": "Seu ID Session é o endereço exclusivo que as pessoas podem usar para entrar em contato com você no Session. Sem conexão com sua identidade real, seu ID Session é totalmente anônimo e privado por definição.",
   "getStarted": "Começar",
@@ -344,40 +348,43 @@
   "linkDevice": "Sincronize dispositivo",
   "restoreUsingRecoveryPhrase": "Restaurar sua conta",
   "or": "ou",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Ao usar este serviço, você concorda com nossos <a href=\"https://getsession.org/terms-of-service \">Termos de Serviço</a> e <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Política de Privacidade</a>",
   "beginYourSession": "Inicie seu Session.",
   "welcomeToYourSession": "Bem-vindo(a) ao seu Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Pesquisar conversas e contatos",
+  "searchForContactsOnly": "Procurar por contatos",
   "enterSessionID": "Digite o ID Session",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Digite o ID de sessão do contato ou ONS",
   "message": "Mensagem",
   "appearanceSettingsTitle": "Aparência",
   "privacySettingsTitle": "Privacidade",
   "notificationsSettingsTitle": "Notificações",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Conteúdo de Notificação",
+  "notificationPreview": "Pré-visualizar",
   "recoveryPhraseEmpty": "Digite sua frase de recuperação",
   "displayNameEmpty": "Escolha um nome de exibição",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ membros",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Entrar",
+  "joinOpenGroup": "Entrar na Comunidade",
+  "createGroup": "Criar Grupo",
+  "create": "Criar",
   "createClosedGroupNamePrompt": "Nome Do Grupo",
   "createClosedGroupPlaceholder": "Digite o nome do grupo",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL da comunidade",
+  "enterAnOpenGroupURL": "Insira URL da Comunidade",
   "next": "Avançar",
   "invalidGroupNameTooShort": "Digite um nome de grupo",
   "invalidGroupNameTooLong": "Digite um nome de grupo mais curto",
   "pickClosedGroupMember": "Escolha pelo menos 2 membros do grupo",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Sem contatos bloqueados",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Um grupo não pode ter mais de 100 membros",
+  "noBlockedContacts": "Você não possui contatos bloqueados.",
+  "userAddedToModerators": "Usuário adicionado à lista de administradores",
+  "userRemovedFromModerators": "Usuário removido da lista de administradores",
   "orJoinOneOfThese": "Ou junte-se a um desses...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Traduzir o Session",
   "closedGroupInviteFailTitle": "Convite do grupo falhou",
   "closedGroupInviteFailTitlePlural": "Convites do grupo falharam",
   "closedGroupInviteFailMessage": "Não foi possível convidar um membro de grupo",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Tentar convidar novamente",
   "closedGroupInviteSuccessTitlePlural": "Convites de Grupo Concluídos",
   "closedGroupInviteSuccessTitle": "Convite de Grupo Bem-Sucedido",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Membros do grupo convidados com sucesso",
   "notificationForConvo": "Notificações",
   "notificationForConvo_all": "Todos",
   "notificationForConvo_disabled": "Desabilitado",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Abrir este link no seu navegador?",
   "linkVisitWarningMessage": "Tem certeza de que deseja abrir $url$ no seu navegador?",
   "open": "Abrir",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Reproduzir mensagens de áudio automaticamente",
+  "audioMessageAutoplayDescription": "Reproduzir automaticamente mensagens de áudio consecutivas.",
   "clickToTrustContact": "Clique para baixar a mídia",
   "trustThisContactDialogTitle": "Confiar em $name$?",
   "trustThisContactDialogDescription": "Tem certeza de que deseja baixar a mídia enviada por $name$?",
   "pinConversation": "Fixar conversa",
   "unpinConversation": "Desafixar conversa",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Mostrar Detalhes do Usuário",
   "sendRecoveryPhraseTitle": "Enviando frase de recuperação",
   "sendRecoveryPhraseMessage": "Você está tentando enviar a sua frase de recuperação que pode ser usada para acessar a sua conta. Tem certeza de que deseja enviar esta mensagem?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Dados não excluídos com um erro desconhecido. Você deseja excluir apenas os dados deste dispositivo?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Você gostaria de excluir os dados apenas deste dispositivo?",
   "dialogClearAllDataDeletionFailedMultiple": "Dados não excluídos por esses nós de serviço: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Gostaria de limpar este dispositivo apenas, ou excluir seus dados da rede também?",
+  "clearDevice": "Limpar Dispositivo",
+  "tryAgain": "Tente novamente",
+  "areYouSureClearDevice": "Tem certeza que deseja limpar seu dispositivo?",
+  "deviceOnly": "Limpar Somente o Dispositivo",
+  "entireAccount": "Limpar o Dispositivo e a Rede",
   "areYouSureDeleteDeviceOnly": "Você tem certeza que deseja excluir os dados apenas do seu dispositivo?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Tem certeza que deseja excluir seus dados da rede? Se você continuar, não será capaz de restaurar suas mensagens ou contatos.",
   "iAmSure": "Tenho certeza",
   "recoveryPhraseSecureTitle": "Você está quase lá!",
   "recoveryPhraseRevealMessage": "Proteja a sua conta salvando a sua frase de recuperação. Revele a sua frase de recuperação e então armazene-a com segurança para protegê-la.",
   "recoveryPhraseRevealButtonText": "Revelar Frase de Recuperação",
   "notificationSubtitle": "Notificações - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "Nós adoraríamos seu feedback",
+  "faq": "Perguntas Frequentes",
+  "support": "Suporte",
   "clearAll": "Apagar Tudo",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Limpar Dados",
   "messageRequests": "Pedidos de Mensagem",
   "requestsSubtitle": "Solicitações Pendentes",
   "requestsPlaceholder": "Nenhuma solicitação",
@@ -438,8 +449,8 @@
   "accept": "Aceitar",
   "decline": "Rejeitar",
   "endCall": "Encerrando chamada",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Permissões",
+  "helpSettingsTitle": "Ajuda",
   "cameraPermissionNeededTitle": "Permissões necessárias para Chamada de voz/vídeo",
   "cameraPermissionNeeded": "Você pode habilitar a permissão de 'Voz e vídeo' nas Configurações de Privacidade.",
   "unableToCall": "Primeiro desligue sua chamada atual",
@@ -449,12 +460,12 @@
   "noCameraFound": "Nenhuma câmera encontrada",
   "noAudioInputFound": "Nenhuma entrada de áudio encontrada",
   "noAudioOutputFound": "Nenhuma saída de áudio encontrada",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Chamadas de voz e vídeo (Beta)",
   "callMissedCausePermission": "Chamada perdida de '$name$' porque você precisa habilitar a permissão 'Voz e vídeo' nas Configurações de Privacidade.",
   "callMissedNotApproved": "Chamada perdida de '$name$' porque você ainda não aprovou esta conversa. Envie uma mensagem primeiro.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "Permite chamadas de voz e vídeo para e de outros usuários.",
+  "callMediaPermissionsDialogContent": "Seu endereço IP é visível ao seu parceiro de chamadas e a um servidor da Fundação Oxen durante o uso de chamadas beta. Tem certeza de que deseja ativar chamadas de voz e vídeo?",
+  "callMediaPermissionsDialogTitle": "Chamadas de voz e vídeo (Beta)",
   "startedACall": "Você ligou para $name$",
   "answeredACall": "Chamar com $name$",
   "trimDatabase": "Cortar banco de dados",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Tem certeza que deseja recusar este pedido de mensagem?",
   "respondingToRequestWarning": "Enviar uma mensagem para este usuário automaticamente aceitará seu pedido de mensagem e revelará o seu ID de sessão.",
   "hideRequestBanner": "Ocultar Banner de requisição de mensagem",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Pedidos de mensagem",
   "noMessageRequestsPending": "Nenhuma solicitação de mensagem pendente",
   "noMediaUntilApproved": "Você não pode enviar anexos até que a conversa seja aprovada",
   "mustBeApproved": "Esta conversa deve ser aceita para usar esta funcionalidade",
   "youHaveANewFriendRequest": "Você tem uma nova solicitação de amizade",
   "clearAllConfirmationTitle": "Limpar todas as solicitações de mensagem",
   "clearAllConfirmationBody": "Tem certeza de que deseja excluir todas as solicitações de mensagem?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Dispensar",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Ver sua caixa de entrada de solicitação de mensagem",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Tem certeza que deseja limpar todos os $emoji$?",
+  "expandedReactionsText": "Mostrar menos",
+  "reactionNotification": "Reage a uma mensagem com $emoji$",
+  "rateLimitReactMessage": "Vá devagar! Você enviou reações de emoji demais. Tente novamente em breve",
+  "otherSingular": "$number$ outro",
+  "otherPlural": "$number$ outros",
+  "reactionPopup": "reagiu com",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "E $otherSingular$ reagiu <span>$emoji$</span> a esta mensagem",
+  "reactionListCountPlural": "E $otherPlural$ reagiu <span>$emoji$</span> a esta mensagem"
 }
diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json
index ac772c5fb..b52b480a7 100644
--- a/_locales/pt_PT/messages.json
+++ b/_locales/pt_PT/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Ativar ecrã completo",
   "viewMenuToggleDevTools": "Ativar ferramentas do programador",
   "contextMenuNoSuggestions": "Sem Sugestões",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Convite para a comunidade",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Aderir a $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Tem a certeza que pretende aderir à $roomName$ comunidade?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Insira o ID de Sessão ou um nome ONS",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Inicie uma nova conversa inserindo o ID do Session de alguém ou compartilhe o seu Session ID com eles.",
   "loading": "A carregar...",
   "done": "Concluído",
   "youLeftTheGroup": "Você saiu do grupo",
   "youGotKickedFromGroup": "Foi removido(a) do grupo.",
   "unreadMessages": "Mensagens por Ler",
   "debugLogExplanation": "Este log será guardado no seu dispositivo.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Reportar um Erro",
   "markAllAsRead": "Marcar Todas como Lidas",
   "incomingError": "Erro a receber mensagem.",
   "media": "Média",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Não foi possível carregar o anexo selecionado.",
   "offline": "Offline",
   "debugLog": "Relatório de depuração",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportar Registros",
+  "shareBugDetails": "Exporte os seus registos e carregue o arquivo através do Help Desk do Session.",
   "goToReleaseNotes": "Ir para as notas de lançamento",
   "goToSupportPage": "Ir para a página de suporte",
   "about": "Sobre",
@@ -72,7 +72,7 @@
   "noSearchResults": "Sem resultados para \"$searchTerm$\"",
   "conversationsHeader": "Contactos e Grupos",
   "contactsHeader": "Contactos",
-  "messagesHeader": "Mensagens",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Definições",
   "typingAlt": "Apresentar escrita com animação para esta conversa.",
   "contactAvatarAlt": "Avatar do contacto $name$",
@@ -88,9 +88,9 @@
   "photo": "Foto",
   "cannotUpdate": "Impossível atualizar",
   "cannotUpdateDetail": "Falha ao atualizar a sessão no Desktop mas há uma nova versão disponível. Por favor, vá para https://getsession. rg/ e instalar a nova versão manualmente, então entre em contato com o suporte ou relate um bug sobre este problema.",
-  "ok": "OK",
+  "ok": "Ok",
   "cancel": "Cancelar",
-  "close": "Close",
+  "close": "Fechar",
   "continue": "Continuar",
   "error": "Erro",
   "delete": "Eliminar",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Apagar mensagens de $count$?",
   "deleteMessageQuestion": "Eliminar esta mensagem?",
   "deleteMessages": "Eliminar mensagens",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ apagados",
   "messageDeletedPlaceholder": "Esta mensagem foi eliminada",
   "from": "De",
@@ -107,13 +108,14 @@
   "sent": "Enviada",
   "received": "Recebida",
   "sendMessage": "Enviar uma mensagem",
-  "groupMembers": "Membros do grupo",
+  "groupMembers": "Membros",
   "moreInformation": "Mais informação",
   "resend": "Enviar novamente",
   "deleteConversationConfirmation": "Deseja eliminar definitivamente esta conversa?",
-  "clear": "Clear",
+  "clear": "Apagar",
   "clearAllData": "Limpar todos os dados",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Isto irá apagar permanentemente as tuas mensagens e contactos.",
+  "deleteAccountFromLogin": "Tem a certeza que quer restaurar o seu dispositivo?",
   "deleteContactConfirmation": "Tem certeza de que deseja excluir esta conversa?",
   "quoteThumbnailAlt": "Miniatura da imagem da mensagem",
   "imageAttachmentAlt": "Imagem anexada à mensagem",
@@ -126,47 +128,47 @@
   "save": "Guardar",
   "saveLogToDesktop": "Salvar log no desktop",
   "saved": "Guardado",
-  "tookAScreenshot": "$name$ took a screenshot",
-  "savedTheFile": "Media saved by $name$",
+  "tookAScreenshot": "$name$ fez uma captura de ecrã",
+  "savedTheFile": "Media guardada por $name$",
   "linkPreviewsTitle": "Enviar pré-visualizações de links",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Gerar pré-visualizações de links para URLs suportados.",
   "linkPreviewsConfirmMessage": "Você não terá proteção total de metadados ao enviar visualizações de links.",
   "mediaPermissionsTitle": "Microfone",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Permitir acesso ao microfone.",
   "spellCheckTitle": "Verificação ortográfica",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "spellCheckDescription": "Ativar verificação ortográfica ao digitar mensagens.",
+  "spellCheckDirty": "Tem que reiniciar o Session de modo a aplicar as novas configurações",
+  "readReceiptSettingDescription": "Enviar confirmações de leitura em chats de um-para-um.",
+  "readReceiptSettingTitle": "Recibos de Leitura",
+  "typingIndicatorsSettingDescription": "Veja e compartilhe indicadores de digitação em chats um a um.",
   "typingIndicatorsSettingTitle": "Indicador de digitação",
   "zoomFactorSettingTitle": "Fator de zoom",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Remetente e mensagem",
+  "themesSettingTitle": "Temas",
+  "primaryColor": "Cor principal",
+  "primaryColorGreen": "Cor principal verde",
+  "primaryColorBlue": "Cor principal azul",
+  "primaryColorYellow": "Cor principal amarela",
+  "primaryColorPink": "Cor principal rosa",
+  "primaryColorPurple": "Cor principal roxa",
+  "primaryColorOrange": "Cor principal laranja",
+  "primaryColorRed": "Cor principal vermelha",
+  "classicDarkThemeTitle": "Clássico Escuro",
+  "classicLightThemeTitle": "Clássico Claro",
+  "oceanDarkThemeTitle": "Oceano Escuro",
+  "oceanLightThemeTitle": "Oceano Claro",
+  "pruneSettingTitle": "Aparar Comunidades",
+  "pruneSettingDescription": "Excluir mensagens com mais de 6 meses de comunidades que têm acima de 2.000 mensagens.",
+  "enable": "Ativar",
+  "keepDisabled": "Manter desactivado",
+  "notificationSettingsDialog": "A informação exibida nas notificações.",
+  "nameAndMessage": "Nome e conteúdo",
   "noNameOrMessage": "Nem o remetente nem a mensagem",
   "nameOnly": "Apenas o remetente",
   "newMessage": "Nova mensagem",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Cria uma conversa com um novo contacto",
+  "createConversationNewGroup": "Cria um grupo com contactos existentes",
+  "joinACommunity": "Junte-se a uma comunidade",
+  "chooseAnAction": "Escolha uma ação para iniciar uma conversa",
   "newMessages": "Novas mensagens",
   "notificationMostRecentFrom": "Mais recente de:",
   "notificationFrom": "De:",
@@ -174,7 +176,7 @@
   "sendFailed": "Falha no envio",
   "mediaMessage": "Mensagem de média",
   "messageBodyMissing": "Por favor, insira o corpo da mensagem.",
-  "messageBody": "Message body",
+  "messageBody": "Corpo da mensagem",
   "unblockToSend": "Desbloqueie este contacto para enviar uma mensagem.",
   "unblockGroupToSend": "Desbloqueie este grupo para enviar uma mensagem.",
   "youChangedTheTimer": "As suas mensagens irão desaparecer após $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 horas",
   "timerOption_1_day": "1 dia",
   "timerOption_1_week": "1 semana",
+  "timerOption_2_weeks": "2 semanas",
   "disappearingMessages": "Destruição de mensagens",
   "changeNickname": "Alterar Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1 dia",
   "timerOption_1_week_abbreviated": "1 sem",
+  "timerOption_2_weeks_abbreviated": "2sem",
   "disappearingMessagesDisabled": "Destruição de mensagens desativada",
-  "disabledDisappearingMessages": "$name$ desativou a destruição de mensagens",
+  "disabledDisappearingMessages": "$name$ desativou a destruição de mensagens.",
   "youDisabledDisappearingMessages": "Desativou a destruição de mensagens",
   "timerSetTo": "Temporizador definido para $time$",
   "noteToSelf": "Nota para mim",
   "hideMenuBarTitle": "Ocultar Barra de Menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Ativar a visibilidade da barra do menu do sistema.",
   "startConversation": "Iniciar uma nova conversa…",
-  "invalidNumberError": "Número inválido",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Falha ao resolver o nome do ONS",
   "autoUpdateSettingTitle": "Atualização Automática",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ juntou-se ao grupo",
   "kickedFromTheGroup": "$name$ foi removido do grupo.",
   "multipleKickedFromTheGroup": "$name$ foram removidos do grupo.",
-  "blockUser": "Bloquear",
-  "unblockUser": "Desbloquear",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Desbloqueado",
   "blocked": "Bloqueado",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,19 +299,19 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
   "connectToServerSuccess": "Successfully connected to community",
-  "setPasswordFail": "Failed to set password",
-  "passwordLengthError": "Password must be between 6 and 64 characters long",
-  "passwordTypeError": "Password must be a string",
+  "setPasswordFail": "Falha ao colocar palavra-passe",
+  "passwordLengthError": "A palavra-passe deve ter entre 6 e 64 carateres",
+  "passwordTypeError": "A palavra-passe deve ser uma sequência de caracteres",
   "passwordCharacterError": "Apenas pode criar uma senha com letras, números e símbolos simples",
   "remove": "Remover",
   "invalidSessionId": "ID Session inválido",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Perfil",
   "groupNamePlaceholder": "Nome do Grupo",
   "inviteContacts": "Convidar Contactos",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Adicionar administrador",
+  "removeModerators": "Remover administrador",
+  "addAsModerator": "Adicionar como administrador",
+  "removeFromModerators": "Remover dos administradores",
   "add": "Adicionar",
   "addingContacts": "Adicionando contactos a",
   "noContactsToAdd": "Sem contactos para adicionar",
   "noMembersInThisGroup": "Nenhum outro membro neste grupo",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "nenhum administrador para remover",
   "onlyAdminCanRemoveMembers": "Você não é o criador",
   "onlyAdminCanRemoveMembersDesc": "Apenas o criador do grupo pode remover utilizadores",
   "createAccount": "Create Account",
   "startInTrayTitle": "Manter na Bandeja do Sistema",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Manter o Session a funcionar em segundo plano quando fechar a janela.",
   "yourUniqueSessionID": "Diga olá ao seu ID Session",
   "allUsersAreRandomly...": "O ID da sessão é o endereço único que as pessoas podem usar para entrar em contato com você na Sessão. Sem nenhuma conexão com sua identidade real, o seu ID de sessão é totalmente anônimo e privado por design.",
   "getStarted": "Começar",
@@ -344,7 +348,7 @@
   "linkDevice": "Dispositivo de Link",
   "restoreUsingRecoveryPhrase": "Restaurar sua conta",
   "or": "ou",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Ao usar este serviço, concorda com os nossos <a href=\"https://getsession.org/terms-of-service \">Termos de Serviço</a> e <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Política de Privacidade</a>",
   "beginYourSession": "Comece sua sessão.",
   "welcomeToYourSession": "Bem-vindo(a) ao Session",
   "searchFor...": "Search conversations and contacts",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Aspeto",
   "privacySettingsTitle": "Privacidade",
   "notificationsSettingsTitle": "Notificações",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Digite sua frase de recuperação",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Digite um nome de grupo mais curto",
   "pickClosedGroupMember": "Por favor escolha pelo menos 1 membro para o grupo",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Sem contactos bloqueados",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json
index d9edf0e51..9d89c6418 100644
--- a/_locales/ro/messages.json
+++ b/_locales/ro/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Alăturaţi-vă $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Introdu ID sesiune sau nume ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Se încarcă...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Nici un rezultat pentru \"$searchTerm$\"",
   "conversationsHeader": "Contate și Grupuri",
   "contactsHeader": "Contacte",
-  "messagesHeader": "Mesaje",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Setări",
   "typingAlt": "Animații la tastare pentru conversația curentă",
   "contactAvatarAlt": "Avatar pentru contactul $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Ștergi acest mesaj?",
   "deleteMessages": "Șterge mesajele",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "Acest mesaj a fost șters",
   "from": "De la",
@@ -107,29 +108,30 @@
   "sent": "Trimis",
   "received": "Primit",
   "sendMessage": "Trimite mesaj",
-  "groupMembers": "Membrii grupului",
+  "groupMembers": "Members",
   "moreInformation": "Mai multe informații",
   "resend": "Retrimite",
   "deleteConversationConfirmation": "Şterg permanent acestă conversație?",
   "clear": "Clear",
   "clearAllData": "Șterge toate datele",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Sunteți sigur că vreți să ștergeți această conversație?",
   "quoteThumbnailAlt": "Pictograma imaginii din mesajul citat",
   "imageAttachmentAlt": "Imagine atașată la mesaj",
-  "videoAttachmentAlt": "Screenshot la video atașat la mesaj",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Imagine trimisă în conversație",
   "imageCaptionIconAlt": "Pictograma care arată că această imagine are o legendă",
   "addACaption": "Adăugați un titlu...",
   "copySessionID": "Copiază ID-ul Session",
-  "copyOpenGroupURL": "Copiază URL-ul grupului",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Salvează",
   "saveLogToDesktop": "Salvează jurnalul pe desktop",
   "saved": "Salvat",
   "tookAScreenshot": "$name$ a efectuat o captură de ecran",
   "savedTheFile": "Media salvată de $name$",
   "linkPreviewsTitle": "Trimite Previzualizări Link",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Nu veți avea protecție completă asupra metadatelor atunci când trimiteți sau primiți previzualizări ale link-ului.",
   "mediaPermissionsTitle": "Microfon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Indicatori tastare",
   "zoomFactorSettingTitle": "Factor de mărire",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Şi numele expeditorului şi mesajul",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Nici numele nici mesajul",
   "nameOnly": "Numai numele expeditorului",
   "newMessage": "Mesaj nou",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 ore",
   "timerOption_1_day": "1 zi",
   "timerOption_1_week": "1 săptămână",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Mesaje care dispar",
   "changeNickname": "Schimbã Numele",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 ore",
   "timerOption_1_day_abbreviated": "O zi",
   "timerOption_1_week_abbreviated": "O săptămână",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Mesaje care dispar sunt dezactivate",
-  "disabledDisappearingMessages": "$name$ a dezactivat mesajele care dispar",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Ai dezactivat mesajele care dispar",
   "timerSetTo": "Cronometru setat la $time$",
   "noteToSelf": "Notă personală",
   "hideMenuBarTitle": "Ascundeți bara de meniu",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Pornește o conversație nouă...",
-  "invalidNumberError": "Număr invalid",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Eroare la rezolvarea numelui ONS",
   "autoUpdateSettingTitle": "Actualizare automată",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ s-a alăturat grupului",
   "kickedFromTheGroup": "$name$ a fost eliminat din grup.",
   "multipleKickedFromTheGroup": "$name$ a fost eliminat din grup.",
-  "blockUser": "Blochează",
-  "unblockUser": "Deblochează",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Dezblocat",
   "blocked": "Blocat",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Se actualizează $name$...",
   "showRecoveryPhrase": "Frază de recuperare",
   "yourSessionID": "ID-ul tău Session",
-  "setAccountPasswordTitle": "Setează parola contului",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Schimbă Parola Contului",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Eliminați parola contului",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Vă rugăm să introduceţi parola",
   "confirmPassword": "Confirmă parola",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Vă rugăm să introduceţi parola",
   "recoveryPhraseSavePromptMain": "Fraza ta de recuperare este cheia principală a ID-ului Session— o poți folosi pentru a restabili ID-ul Session dacă pierzi accesul la dispozitiv. Păstrați fraza de recuperare într-un loc sigur, și nu-l dați nimănui.",
   "invalidOpenGroupUrl": "URL invalid",
-  "copiedToClipboard": "S-a copiat în clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Parolă",
   "setPassword": "Setează parolă",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Parolele nu se potrivesc",
   "changePasswordInvalid": "Vechea parolă introdusă este incorectă",
   "removePasswordInvalid": "Parolă incorectă",
-  "setPasswordTitle": "Setează parola",
-  "changePasswordTitle": "Schimbã Parola",
-  "removePasswordTitle": "Parola a fost eliminată",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Parola ta a fost setată. Țîne-o într-un loc sigur te rugam.",
   "changePasswordToastDescription": "Parola ta a fost schimbată. Te rugăm să o păstrezi în siguranță.",
-  "removePasswordToastDescription": "Ai șters parola.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Se conectează...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Aspect",
   "privacySettingsTitle": "Confidenţialitate",
   "notificationsSettingsTitle": "Notificări",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Introduceți fraza de recuperare",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ membri",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Te rugăm să introduci un nume de grup mai scurt",
   "pickClosedGroupMember": "Te rugăm să alegi cel puțin un membru al grupului",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Nu aveți contacte blocate",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Sau alătură-te uneia dintre acestea...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Ești sigur că vrei să descarci fișiere multimedia trimise de $name$?",
   "pinConversation": "Fixare conversație",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Arată detaliile utilizatorului",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Apel pierdut de la „$name$” deoarece trebuie să oferi permisiunea pentru „Apeluri vocale și video” din setările de confidențialitate.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Ai sunat pe $name$",
   "answeredACall": "Apel cu $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index d30bf927c..dd5ae6efd 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Полноэкранный режим",
   "viewMenuToggleDevTools": "Переключить инструменты разработчика",
   "contextMenuNoSuggestions": "Нет предложений",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Приглашение в группу",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Присоединиться к $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Не удалось найти соответствующий сервер opengroup",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Вы уверены, что хотите присоединиться к группе $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Введите Session ID или ONS имя",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Введите Session ID собеседника или отправьте ему ваш Session ID чтобы начать новую беседу.",
   "loading": "Загружается...",
   "done": "Готово",
   "youLeftTheGroup": "Вы покинули группу.",
   "youGotKickedFromGroup": "Вы были удалены из группы.",
   "unreadMessages": "Непрочитанные сообщения",
   "debugLogExplanation": "Этот журнал будет сохранен на рабочем столе.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Сообщить об ошибке",
   "markAllAsRead": "Отметить все как прочитанное",
   "incomingError": "Ошибка при обработке входящего сообщения",
   "media": "Медиа",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Извините, произошла ошибка при обработке вложения.",
   "offline": "Оффлайн",
   "debugLog": "Журнал отладки",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Экспортировать логи",
+  "shareBugDetails": "Экспортируйте свои логи, затем загрузите файл через службу поддержки Session.",
   "goToReleaseNotes": "Перейти к заметкам о релизе",
   "goToSupportPage": "Перейти на страницу поддержки",
   "about": "О Session",
@@ -72,7 +72,7 @@
   "noSearchResults": "Результаты не найдены для \"$searchTerm$\"",
   "conversationsHeader": "Контакты и группы",
   "contactsHeader": "Контакты",
-  "messagesHeader": "Сообщения",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Настройки",
   "typingAlt": "Анимация набора текста для этого разговора",
   "contactAvatarAlt": "Аватар для контакта $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Удалить $count$ сообщений?",
   "deleteMessageQuestion": "Удалить это сообщение?",
   "deleteMessages": "Удалить сообщения",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ Удалено",
   "messageDeletedPlaceholder": "Это сообщение было удалено",
   "from": "От:",
@@ -107,66 +108,67 @@
   "sent": "Отправлено",
   "received": "Получено",
   "sendMessage": "Отправить сообщение",
-  "groupMembers": "Участники группы",
+  "groupMembers": "Участники",
   "moreInformation": "Больше информации",
   "resend": "Отправить повторно",
   "deleteConversationConfirmation": "Удалить эту беседу без возможности восстановления?",
-  "clear": "Clear",
+  "clear": "Очистить",
   "clearAllData": "Очистить все данные",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Это навсегда удалит ваши сообщения и контакты.",
+  "deleteAccountFromLogin": "Вы уверены, что хотите очистить ваше устройство?",
   "deleteContactConfirmation": "Вы уверены, что хотите удалить эту беседу?",
   "quoteThumbnailAlt": "Миниатюра изображения из цитируемого сообщения",
   "imageAttachmentAlt": "Изображение, прикрепленное к сообщению",
-  "videoAttachmentAlt": "Скриншот видео, прикрепленного к сообщению",
+  "videoAttachmentAlt": "Скриншот видео в сообщении",
   "lightboxImageAlt": "Изображение, отправленное в беседе",
   "imageCaptionIconAlt": "Иконка, показывающая, что у этого изображения есть подпись",
   "addACaption": "Добавить субтитры...",
   "copySessionID": "Копировать Session ID",
-  "copyOpenGroupURL": "Копировать URL группы",
+  "copyOpenGroupURL": "Скопировать URL-адрес группы",
   "save": "Сохранить",
   "saveLogToDesktop": "Сохранить журнал отладки на компьютер",
   "saved": "Сохранено",
   "tookAScreenshot": "$name$ сделал снимок экрана",
   "savedTheFile": "$name$ сохранил медиафайл",
   "linkPreviewsTitle": "Отправлять предпросмотр ссылки",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Активировать предпросмотр ссылок для поддерживаемых URL.",
   "linkPreviewsConfirmMessage": "Ваши метаданные не будут полностью защищены при отправке ссылок с предварительным просмотром.",
   "mediaPermissionsTitle": "Микрофон",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Разрешить доступ к микрофону.",
   "spellCheckTitle": "Проверка орфографии",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Включить проверку орфографии при вводе сообщений.",
   "spellCheckDirty": "Вы должны перезапустить Session, чтобы применить новые настройки",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Отправлять уведомления о прочтении в личных беседах.",
   "readReceiptSettingTitle": "Уведомления о прочтении",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Просмотр и передача индикатора о наборе в личных беседах.",
   "typingIndicatorsSettingTitle": "Индикаторы ввода текста",
   "zoomFactorSettingTitle": "Масштабирование приложения",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "Темы оформления",
+  "primaryColor": "Основной цвет",
+  "primaryColorGreen": "Основной цвет зеленый",
+  "primaryColorBlue": "Основной цвет синий",
+  "primaryColorYellow": "Основной цвет желтый",
+  "primaryColorPink": "Основной цвет розовый",
+  "primaryColorPurple": "Основной цвет сиреневый",
+  "primaryColorOrange": "Основной цвет оранжевый",
+  "primaryColorRed": "Основной цвет красный",
+  "classicDarkThemeTitle": "Классическая тёмная",
+  "classicLightThemeTitle": "Классическая светлая",
+  "oceanDarkThemeTitle": "Темный океан",
+  "oceanLightThemeTitle": "Светлый океан",
+  "pruneSettingTitle": "Обрезать сообщества",
+  "pruneSettingDescription": "Удалять сообщения старше 6 месяцев из сообществ, у которых более 2000 сообщений.",
   "enable": "Включить",
   "keepDisabled": "Не включать",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Имя отправителя и сообщение",
+  "notificationSettingsDialog": "Информация, отображаемая в уведомлениях.",
+  "nameAndMessage": "Имя и содержимое",
   "noNameOrMessage": "Нет имени или сообщения",
   "nameOnly": "Только имя отправителя",
   "newMessage": "Новое сообщение",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Создать беседу с новым контактом",
+  "createConversationNewGroup": "Создать группу с уже существующими контактами",
+  "joinACommunity": "Вступить в группу",
+  "chooseAnAction": "Выберите действие для начала беседы",
   "newMessages": "Новые сообщения",
   "notificationMostRecentFrom": "Последнее от $name$",
   "notificationFrom": "От:",
@@ -174,7 +176,7 @@
   "sendFailed": "Не удалось отправить",
   "mediaMessage": "Медиа-сообщение",
   "messageBodyMissing": "Пожалуйста, введите текст сообщения.",
-  "messageBody": "Message body",
+  "messageBody": "Текст сообщения",
   "unblockToSend": "Разблокируйте этот контакт, чтобы отправить сообщение.",
   "unblockGroupToSend": "Группа заблокирована. Разблокируйте группу чтобы отправить сообщение.",
   "youChangedTheTimer": "Вы установили таймер для исчезающих сообщений на $time$.",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 часов",
   "timerOption_1_day": "1 день",
   "timerOption_1_week": "1 неделя",
+  "timerOption_2_weeks": "2 недели",
   "disappearingMessages": "Исчезающие сообщения",
   "changeNickname": "Изменить имя пользователя",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 часов",
   "timerOption_1_day_abbreviated": "1 день",
   "timerOption_1_week_abbreviated": "1 нед.",
+  "timerOption_2_weeks_abbreviated": "2 нед",
   "disappearingMessagesDisabled": "Исчезающие сообщения отключены",
   "disabledDisappearingMessages": "$name$ отключил(а) исчезающие сообщения.",
   "youDisabledDisappearingMessages": "Вы отключили исчезающие сообщения.",
   "timerSetTo": "Время исчезновения сообщений – $time$",
   "noteToSelf": "Заметка для себя",
   "hideMenuBarTitle": "Спрятать системное меню",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Спрятать или показать системное меню.",
   "startConversation": "Начать новую беседу...",
-  "invalidNumberError": "Неверный Session ID или ONS имя",
+  "invalidNumberError": "Пожалуйста, проверьте Session ID или ONS имя и попробуйте снова",
   "failedResolveOns": "Не удалось получить ONS имя",
   "autoUpdateSettingTitle": "Автоматические обновления",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Автоматически проверять наличие обновлений при запуске.",
   "autoUpdateNewVersionTitle": "Доступно обновление Session",
   "autoUpdateNewVersionMessage": "Доступна новая версия Session",
   "autoUpdateNewVersionInstructions": "Для применения обновлений перезапустите Session.",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ присоединились к группе.",
   "kickedFromTheGroup": "$name$ был удален из группы.",
   "multipleKickedFromTheGroup": "$name$ были удалены из группы.",
-  "blockUser": "Заблокировать",
-  "unblockUser": "Разблокировать",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Разблокирован",
   "blocked": "Заблокирован",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Заблокированные контакты",
+  "conversationsSettingsTitle": "Беседы",
   "unbanUser": "Разблокировать пользователя",
   "userUnbanned": "Пользователь успешно разблокирован",
   "userUnbanFailed": "Не удалось разблокировать!",
@@ -251,14 +255,14 @@
   "userBanned": "Пользователь заблокирован",
   "userBanFailed": "Не удалось заблокировать!",
   "leaveGroup": "Покинуть группу",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Покинуть группу и удалить для всех",
   "leaveGroupConfirmation": "Вы уверены, что хотите покинуть эту группу?",
   "leaveGroupConfirmationAdmin": "Так как вы являетесь администратором этой группы, если вы покините ее, она будет удалена для всех текущих участников. Вы уверены, что хотите покинуть эту группу?",
   "cannotRemoveCreatorFromGroup": "Не удается удалить данного пользователя",
   "cannotRemoveCreatorFromGroupDesc": "Вы не можете удалить этого пользователя, так как он является создателем группы.",
   "noContactsForGroup": "У вас еще нет контактов",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Не удалось добавить пользователя в качестве администратора",
+  "failedToRemoveFromModerator": "Не удалось удалить пользователя из списка администраторов",
   "copyMessage": "Скопировать текст сообщения",
   "selectMessage": "Выбрать сообщение",
   "editGroup": "Редактировать группу",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Обновляем $name$...",
   "showRecoveryPhrase": "Секретная фраза",
   "yourSessionID": "Ваш Session ID",
-  "setAccountPasswordTitle": "Установить пароль",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
+  "setAccountPasswordTitle": "Пароль",
+  "setAccountPasswordDescription": "Требовать пароль для разблокировки Session.",
   "changeAccountPasswordTitle": "Изменить пароль",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
+  "changeAccountPasswordDescription": "Измените пароль, необходимый для разблокировки Session.",
   "removeAccountPasswordTitle": "Удалить пароль",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "removeAccountPasswordDescription": "Удалить пароль, необходимый для разблокировки Session.",
   "enterPassword": "Пожалуйста, введите ваш пароль",
   "confirmPassword": "Подтвердить пароль",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Введите новый пароль",
+  "confirmNewPassword": "Подтвердите новый пароль",
   "showRecoveryPhrasePasswordRequest": "Пожалуйста, введите ваш пароль",
   "recoveryPhraseSavePromptMain": "Фраза восстановления является главным ключом к Session ID — вы можете использовать ее для восстановления, если потеряете доступ к своему устройству. Храните вашу фразу восстановления в надежном месте и никому ее не передавайте.",
   "invalidOpenGroupUrl": "Недействительный URL-адрес",
-  "copiedToClipboard": "Скопировано в буфер обмена",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Скопировано",
+  "passwordViewTitle": "Введите пароль",
   "password": "Пароль",
   "setPassword": "Установить пароль",
   "changePassword": "Изменить пароль",
-  "createPassword": "Create your password",
+  "createPassword": "Создать пароль",
   "removePassword": "Удалить пароль",
   "maxPasswordAttempts": "Неверный пароль. Сбросить базу данных?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Пожалуйста, введите ваш действующий пароль",
   "invalidOldPassword": "Старый пароль недействителен",
   "invalidPassword": "Неверный пароль",
   "noGivenPassword": "Пожалуйста, введите ваш пароль",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Пароли не совпадают",
   "changePasswordInvalid": "Старый пароль, который вы ввели, неверен",
   "removePasswordInvalid": "Неверный пароль",
-  "setPasswordTitle": "Установить пароль",
+  "setPasswordTitle": "Пароль установлен",
   "changePasswordTitle": "Пароль изменен",
   "removePasswordTitle": "Пароль удален",
   "setPasswordToastDescription": "Ваш пароль установлен. Пожалуйста, храните его в безопасном месте.",
   "changePasswordToastDescription": "Ваш пароль был изменен. Пожалуйста, храните его в безопасном месте.",
-  "removePasswordToastDescription": "Вы удалили ваш пароль.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Ваш пароль удален.",
+  "publicChatExists": "Вы уже состоите в этой группе",
+  "connectToServerFail": "Не удалось присоединиться к сообществу",
   "connectingToServer": "Соединяемся...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Успешное подключение к сообществу",
   "setPasswordFail": "Не удалось установить пароль",
   "passwordLengthError": "Пароль должен содержать от 6 до 64 символов",
   "passwordTypeError": "Пароль должен быть строкой",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Аккаунт",
   "groupNamePlaceholder": "Название группы",
   "inviteContacts": "Пригласить друзей в Session",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Добавить администраторов",
+  "removeModerators": "Удалить администраторов",
+  "addAsModerator": "Добавить как администратора",
+  "removeFromModerators": "Удалить из администраторов",
   "add": "Добавить",
   "addingContacts": "Добавление контактов в",
   "noContactsToAdd": "Нет контактов для добавления",
   "noMembersInThisGroup": "В этой группе нет других участников",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "нет администраторов для удаления",
   "onlyAdminCanRemoveMembers": "Вы не являетесь создателем",
   "onlyAdminCanRemoveMembersDesc": "Только создатель группы может удалять пользователей",
   "createAccount": "Создать аккаунт",
   "startInTrayTitle": "При закрытии сворачивать в трей",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Session продолжит работать в фоновом режиме даже после закрытия окна.",
   "yourUniqueSessionID": "Познакомьтесь со своим Session ID",
   "allUsersAreRandomly...": "Ваш Session ID - это уникальный адрес, который другие пользователи могут использовать для связи с вами при помощи Session. Поскольку ваш Session ID никак не связан с вашей настоящей личностью, он по определению является полностью анонимным и конфиденциальным.",
   "getStarted": "Начать",
@@ -344,40 +348,43 @@
   "linkDevice": "Привязать устройство",
   "restoreUsingRecoveryPhrase": "Восстановите свой аккаунт",
   "or": "или",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Используя этот сервис, вы соглашаетесь с <a href=\"https://getsession.org/terms-of-service \">Условиями обслуживания</a> и <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Политикой конфиденциальности</a>",
   "beginYourSession": "Начать свою сессию.",
   "welcomeToYourSession": "Добро пожаловать в вашу сессию",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Поиск бесед и контактов",
+  "searchForContactsOnly": "Поиск контактов",
   "enterSessionID": "Введите Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Введите Session ID вашего контакта или ONS",
   "message": "Сообщение",
   "appearanceSettingsTitle": "Внешний вид",
   "privacySettingsTitle": "Конфиденциальность",
   "notificationsSettingsTitle": "Уведомления",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Содержимое уведомления",
+  "notificationPreview": "Предварительный просмотр",
   "recoveryPhraseEmpty": "Введите секретную фразу",
   "displayNameEmpty": "Пожалуйста, выберите отображаемое имя",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ участников",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Присоединиться",
+  "joinOpenGroup": "Присоединиться к сообществу",
+  "createGroup": "Создать группу",
+  "create": "Создать",
   "createClosedGroupNamePrompt": "Название Группы",
   "createClosedGroupPlaceholder": "Введите название группы",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "URL сообщества",
+  "enterAnOpenGroupURL": "Введите URL сообщества",
   "next": "Далее",
   "invalidGroupNameTooShort": "Пожалуйста, введите название группы",
   "invalidGroupNameTooLong": "Пожалуйста, введите более короткое название группы",
   "pickClosedGroupMember": "Пожалуйста, выберите как минимум 1 участника группы",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Нет заблокированных контактов",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "В группе не может быть более 100 участников",
+  "noBlockedContacts": "У вас нет заблокированных контактов.",
+  "userAddedToModerators": "Пользователь добавлен в список администраторов",
+  "userRemovedFromModerators": "Пользователь удален из списка администраторов",
   "orJoinOneOfThese": "Или присоединитесь к одной из этих...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Перевод Session",
   "closedGroupInviteFailTitle": "Не удалось пригласить в группу",
   "closedGroupInviteFailTitlePlural": "Не удалось пригласить в группу",
   "closedGroupInviteFailMessage": "Не удалось пригласить участника группы",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Пригласить повторно",
   "closedGroupInviteSuccessTitlePlural": "Приглашения в группу выполнены",
   "closedGroupInviteSuccessTitle": "Приглашение в группу успешно",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Успешно приглашен в участники группы",
   "notificationForConvo": "Уведомления",
   "notificationForConvo_all": "Все",
   "notificationForConvo_disabled": "Выключено",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Открыть эту ссылку в браузере по умолчанию?",
   "linkVisitWarningMessage": "Вы уверены, что хотите открыть $url$ в вашем браузере?",
   "open": "Открыть",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Автовоспроизведение аудиосообщений",
+  "audioMessageAutoplayDescription": "Автовоспроизведение последовательных аудиосообщений.",
   "clickToTrustContact": "Нажмите чтобы загрузить медиа-файл",
   "trustThisContactDialogTitle": "Доверять $name$?",
   "trustThisContactDialogDescription": "Вы уверены, что хотите загрузить медиафайлы, присланные $name$?",
   "pinConversation": "Закрепить беседу",
   "unpinConversation": "Открепить беседу",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Показывать Сведения о Пользователе",
   "sendRecoveryPhraseTitle": "Отправка секретной фразы",
   "sendRecoveryPhraseMessage": "Вы пытаетесь отправить вашу секретную фразу, которая может быть использована для доступа к вашей учетной записи. Вы уверены, что хотите отправить это сообщение?",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "Данные не удалены из-за неизвестной ошибки. Вы хотите удалить данные только с этого устройства?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Вы хотите удалить данные только с этого устройства?",
   "dialogClearAllDataDeletionFailedMultiple": "Данные не удалены узлами сервиса. Номера узлов: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Вы хотите очистить только это устройство или также удалить свои данные из сети?",
+  "clearDevice": "Очистить устройство",
+  "tryAgain": "Повторить",
+  "areYouSureClearDevice": "Вы уверены, что хотите очистить ваше устройство?",
+  "deviceOnly": "Очистить только устройство",
+  "entireAccount": "Очистить устройство и сеть",
   "areYouSureDeleteDeviceOnly": "Вы уверены, что хотите удалить только данные с вашего устройства?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Вы уверены, что хотите удалить данные из сети? Если вы продолжите, то не сможете восстановить ваши сообщения или контакты.",
   "iAmSure": "Я уверен",
   "recoveryPhraseSecureTitle": "Вы почти закончили!",
   "recoveryPhraseRevealMessage": "Обезопасьте свой аккаунт, сохранив вашу секретную фразу. Узнайте свою секретную фразу, затем сохраните её в безопасном месте.",
   "recoveryPhraseRevealButtonText": "Показать секретную фразу",
   "notificationSubtitle": "Уведомления - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "Мы будем рады вашим отзывам",
+  "faq": "Часто задаваемые вопросы",
+  "support": "Поддержка",
   "clearAll": "Очистить всё",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "Очистить данные",
   "messageRequests": "Запросы на переписку",
   "requestsSubtitle": "Ожидающие рассмотрения запросы",
   "requestsPlaceholder": "Нет запросов",
@@ -438,8 +449,8 @@
   "accept": "Принять",
   "decline": "Отклонить",
   "endCall": "Завершить вызов",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Разрешения",
+  "helpSettingsTitle": "Помощь",
   "cameraPermissionNeededTitle": "Требуются разрешения для голосовых и видеозвонков",
   "cameraPermissionNeeded": "Вы можете включить разрешения на голосовые и видеозвонки в настройках приватности.",
   "unableToCall": "Сначала отмените свой текущий вызов",
@@ -449,15 +460,15 @@
   "noCameraFound": "Камера не найдена",
   "noAudioInputFound": "Аудиовход не найден",
   "noAudioOutputFound": "Аудиовыход не найден",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Голосовые и видео вызовы (бета)",
   "callMissedCausePermission": "Пропущенный вызов от $name$. Вам необходимо включить разрешение на голосовые и видеозвонки в настройках конфиденциальности, чтобы принимать вызовы.",
   "callMissedNotApproved": "Звонок от $name$ пропущен, так как Вы еще не общались с данным человеком. Сначала отправьте ему сообщение.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
-  "startedACall": "Вы звоните $name$",
+  "callMediaPermissionsDescription": "Позволяет осуществлять голосовые и видеовызовы другим пользователям.",
+  "callMediaPermissionsDialogContent": "Ваш IP-адрес виден вашему собеседнику и серверу Oxen Foundation при использовании бета-вызовов. Вы уверены, что хотите включить голосовые и видеозвонки?",
+  "callMediaPermissionsDialogTitle": "Голосовые и видео звонки (бета)",
+  "startedACall": "Вы звонили $name$",
   "answeredACall": "Звонок с $name$",
-  "trimDatabase": "Ограничить количество",
+  "trimDatabase": "Урезать базу данных",
   "trimDatabaseDescription": "Уменьшает количество сохраненных сообщений до 10 000 последних сообщений.",
   "trimDatabaseConfirmationBody": "Вы уверены, что хотите удалить $deleteAmount$ очень старых полученных сообщений?",
   "pleaseWaitOpenAndOptimizeDb": "Подождите, пока ваш список сохранённых сообщений оптимизируется...",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "Вы действительно хотите отклонить данный запрос на переписку?",
   "respondingToRequestWarning": "Отправка сообщения этому пользователю автоматически примет его запрос на переписку и откроет ваш Session ID.",
   "hideRequestBanner": "Скрыть баннер запроса на переписку",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "Запросы на переписку",
   "noMessageRequestsPending": "Нет запросов на переписку",
   "noMediaUntilApproved": "Вы не можете добавлять файлы, пока разговор не одобрен",
   "mustBeApproved": "Этот разговор должен быть одобрен для того, чтобы можно было использовать данную функцию",
   "youHaveANewFriendRequest": "У вас новая заявка в друзья",
   "clearAllConfirmationTitle": "Очистить все запросы на переписку",
   "clearAllConfirmationBody": "Вы уверены, что хотите удалить все запросы на переписку?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Скрыть",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Просмотреть входящие запросы на переписку",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "Вы уверены, что хотите очистить все $emoji$?",
+  "expandedReactionsText": "Свернуть",
+  "reactionNotification": "Ореагировал на сообщение с $emoji$",
+  "rateLimitReactMessage": "Помедленнее! Вы отправили слишком много эмодзи-реакций. Попробуйте еще раз в ближайшее время",
+  "otherSingular": "$number$ прочий",
+  "otherPlural": "$number$ другими",
+  "reactionPopup": "отреагировал с",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "И $otherSingular$ отреагировал <span>$emoji$</span> tна это сообщение",
+  "reactionListCountPlural": "И $otherPlural$ отреагировали <span>$emoji$</span> tна это сообщение"
 }
diff --git a/_locales/si/messages.json b/_locales/si/messages.json
index 4ca270776..92f516f75 100644
--- a/_locales/si/messages.json
+++ b/_locales/si/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$ ට එක්වනවාද?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session ID හෝ ONS නම ඇතුලත් කරන්න",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "පූරණය වෙමින්…",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"$searchTerm$\" සඳහා සෙවුම් ප්‍රතිඵල නැත",
   "conversationsHeader": "සම්බන්ධතා සහ කණ්ඩායම්",
   "contactsHeader": "සබඳතා",
-  "messagesHeader": "පණිවිඩ",
+  "messagesHeader": "Conversations",
   "settingsHeader": "සැකසුම්",
   "typingAlt": "මෙම සංවාදය සඳහා සජීවිකරණය ටයිප් කිරීම",
   "contactAvatarAlt": "සම්බන්ධතා $name$සඳහා අවතාරය",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "පණිවිඩ $count$ ක් මකන්නද?",
   "deleteMessageQuestion": "මෙම පණිවිඩය මකන්නද?",
   "deleteMessages": "පණිවිඩ මකන්න",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "මෙම පණිවිඩය මකා ඇත",
   "from": "වෙතින්:",
@@ -107,29 +108,30 @@
   "sent": "යැවිණි",
   "received": "ලැබී",
   "sendMessage": "පණිවිඩය",
-  "groupMembers": "{group} සාමාජිකයින්",
+  "groupMembers": "Members",
   "moreInformation": "තව තොරතුරු",
   "resend": "නැවත යවන්න",
   "deleteConversationConfirmation": "මෙම සංවාදයේ ඇති පණිවිඩ ස්ථිරවම මකන්නද?",
   "clear": "Clear",
   "clearAllData": "සියලුම දත්ත හිස් කරන්න",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "ඔබට මෙම සංවාදය මැකීමට අවශ්‍ය බව විශ්වාසද?",
   "quoteThumbnailAlt": "උපුටා ගත් පණිවිඩයෙන් රූපයේ සිඟිති රුව",
   "imageAttachmentAlt": "පණිවිඩයට රූපය අමුණා ඇත",
-  "videoAttachmentAlt": "වීඩියෝවේ තිර රුවක් පණිවිඩයට අමුණා ඇත",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "සංවාදයේ යවන ලද රූපය",
   "imageCaptionIconAlt": "මෙම රූපයට සිරස්තලයක් ඇති බව පෙන්වන නිරූපකය",
   "addACaption": "සිරස්තලයක් එක් කරන්න...",
   "copySessionID": "සැසි හැඳුනුම්පත පිටපත් කරන්න",
-  "copyOpenGroupURL": "සමූහයේ ඒ.ස.නි. පිටපත්කරන්න",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "සුරකින්න",
   "saveLogToDesktop": "ලොගය ඩෙස්ක්ටොප් එකට සුරකින්න",
   "saved": "සුරැකිණි",
   "tookAScreenshot": "$name$ තිර රුවක් ගත්තා",
   "savedTheFile": "මාධ්‍ය $name$කින් සුරකින ලදී",
   "linkPreviewsTitle": "සබැඳියේ පෙරදසුන් යවන්න",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "සබැඳි පෙරදසුන් යැවීමේදී ඔබට සම්පූර්ණ පාරදත්ත ආරක්ෂාවක් නොලැබෙනු ඇත.",
   "mediaPermissionsTitle": "මයික්රෆෝනය",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "ටයිප් කිරීමේ දර්ශක",
   "zoomFactorSettingTitle": "විශාලන සාධකය",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "නම සහ අන්තර්ගතය",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "නමක් හෝ අන්තර්ගතයක් නැත",
   "nameOnly": "නම පමණි",
   "newMessage": "නව පණිවිඩය",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "පැය 12",
   "timerOption_1_day": "දවස් 1",
   "timerOption_1_week": "සති 1",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "නොපෙනී යන පණිවිඩ",
   "changeNickname": "අපනාමය වෙනස් කරන්න",
   "clearNickname": "පැහැදිලි අන්වර්ථ නාමය",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "පැ12",
   "timerOption_1_day_abbreviated": "ද1",
   "timerOption_1_week_abbreviated": "ස1",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "පණිවිඩ නොපෙනී යාම අබල කර ඇත",
-  "disabledDisappearingMessages": "$name$ පණිවිඩ නොපෙනී යාම අබල කළා.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "ඔබ පණිවිඩ නොපෙනී යාම අබල කළා.",
   "timerSetTo": "පණිවිඩ නොපෙනී යාමේ මුහුර්තකය $time$ ට සකසා ඇත",
   "noteToSelf": "ස්වයං සටහන්",
   "hideMenuBarTitle": "මෙනු තීරුව සඟවන්න",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "නව සම්භාෂණයක් අරඹන්න",
-  "invalidNumberError": "වලංගු නොවන Session ID හෝ ONS නම",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "ONS නම විසඳීමට අසමත් විය",
   "autoUpdateSettingTitle": "ස්වයං යාවත්කාලය",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ සමූහයට එක්වුනා.",
   "kickedFromTheGroup": "$name$ කණ්ඩායමෙන් ඉවත් කරන ලදී.",
   "multipleKickedFromTheGroup": "$name$ කණ්ඩායමෙන් ඉවත් කරන ලදී.",
-  "blockUser": "අවහිර",
-  "unblockUser": "අනවහිර",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "අනවහිර කළා",
   "blocked": "අවහිර කර ඇත",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "$name$ යාවත්කාල වෙමින්...",
   "showRecoveryPhrase": "ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය",
   "yourSessionID": "ඔබගේ සැසි හැඳුනුම්පත",
-  "setAccountPasswordTitle": "ගිණුම් මුරපදය සකසන්න",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "ගිණුමේ මුරපදය වෙනස් කරන්න",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "ගිණුමේ මුරපදය ඉවත් කරන්න",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "ඔබගේ මුරපදය ඇතුල් කරන්න",
   "confirmPassword": "මුරපදය තහවුරු කරන්න",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "ඔබගේ මුරපදය ඇතුල් කරන්න",
   "recoveryPhraseSavePromptMain": "ඔබේ ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය ඔබේ සැසි හැඳුනුම්පතේ ප්‍රධාන යතුරයි — ඔබට ඔබේ උපාංගයට ප්‍රවේශය අහිමි වුවහොත් ඔබේ සැසි හැඳුනුම්පත ප්‍රතිසාධනය කිරීමට ඔබට එය භාවිත කළ හැක. ඔබගේ ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය ආරක්ෂිත ස්ථානයක ගබඩා කරන්න, එය කිසිවෙකුට ලබා නොදෙන්න.",
   "invalidOpenGroupUrl": "වලංගු නොවන ඒ.ස.නි. කි",
-  "copiedToClipboard": "පසුරුපුවරුවට පිටපත් විය",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "මුරපදය",
   "setPassword": "මුරපදය සකසන්න",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "මුරපද නොගැලපේ",
   "changePasswordInvalid": "ඔබ ඇතුල් කළ පරණ මුරපදය සාවද්‍යයි",
   "removePasswordInvalid": "සාවද්‍ය මුරපදයකි",
-  "setPasswordTitle": "මුරපදය සකසන්න",
-  "changePasswordTitle": "මුරපදය වෙනස් කළා",
-  "removePasswordTitle": "මුරපදය ඉවත් කරන්න",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "ඔබගේ මුරපදය සකසා ඇත. කරුණාකර එය ආරක්ෂිතව තබා ගන්න.",
   "changePasswordToastDescription": "ඔබගේ මුරපදය වෙනස් කර ඇත. කරුණාකර එය ආරක්ෂිතව තබා ගන්න.",
-  "removePasswordToastDescription": "ඔබ ඔබගේ මුරපදය ඉවත් කර ඇත.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "සම්බන්ධ වෙමින්...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "පෙනුම",
   "privacySettingsTitle": "පෞද්ගලිකත්වය",
   "notificationsSettingsTitle": "දැනුම්දීම්",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "ඔබගේ ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය ඇතුලත් කරන්න",
   "displayNameEmpty": "කරුණාකර සංදර්ශක නාමයක් ඇතුළත් කරන්න",
+  "displayNameTooLong": "Display name is too long",
   "members": "සාමාජිකයින් $count$",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "කෙටි සමූහ නාමයක් ඇතුල් කරන්න",
   "pickClosedGroupMember": "කරුණාකර අවම වශයෙන් කණ්ඩායම් සාමාජිකයින් 1 දෙනෙකුවත් තෝරා ගන්න",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "අවහිර කළ සබඳතා නැත",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "නැත්නම් මේ එකකට එකතු වෙන්න...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "ඔබට $name$ එවන ලද මාධ්‍යය බාගැනීමට අවශ්‍ය බව විශ්වාසද?",
   "pinConversation": "පින් සංවාදය",
   "unpinConversation": "සංවාදය ඉවත් කරන්න",
+  "markUnread": "Mark Unread",
   "showUserDetails": "පරිශීලක විස්තර පෙන්වන්න",
   "sendRecoveryPhraseTitle": "ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය යැවීම",
   "sendRecoveryPhraseMessage": "ඔබ ඔබේ ගිණුමට ප්‍රවේශ වීමට භාවිත කළ හැකි ඔබේ ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය යැවීමට උත්සාහ කරයි. ඔබට මෙම පණිවිඩය යැවීමට අවශ්‍ය බව විශ්වාසද?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "ඔබට මෙම උපාංගයෙන් පමණක් දත්ත මැකීමට අවශ්‍යද?",
   "dialogClearAllDataDeletionFailedMultiple": "එම සේවා නෝඩ් මගින් මකා නොදැමූ දත්ත: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "ඔබට ඔබගේ උපාංග දත්ත පමණක් මැකීමට අවශ්‍ය බව විශ්වාසද?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "ඔබට රහස්‍යතා සැකසීම් තුළ 'හඬ සහ වීඩියෝ ඇමතුම්' අවසරය සබල කිරීමට අවශ්‍ය නිසා '$name$' වෙතින් ඇමතුම මඟ හැරී ඇත.",
   "callMissedNotApproved": "ඔබ තවමත් මෙම සංවාදය අනුමත කර නොමැති බැවින් '$name$' වෙතින් ඇමතුම මග හැරී ඇත. මුලින්ම ඔවුන්ට පණිවිඩයක් යවන්න.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "ඔබ $name$ඇමතුවා",
   "answeredACall": "$name$සමඟ අමතන්න",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "ඔබට නව මිතුරු ඉල්ලීමක් ඇත",
   "clearAllConfirmationTitle": "සියලුම පණිවිඩ ඉල්ලීම් හිස් කරන්න",
   "clearAllConfirmationBody": "ඔබට සියලු පණිවිඩ ඉල්ලීම් ඉවත් කිරීමට අවශ්‍ය බව විශ්වාසද?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "සඟවන්න",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "ඔබගේ පණිවිඩ ඉල්ලීම එන ලිපි බලන්න",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json
index d2bc87829..7f36e5b86 100644
--- a/_locales/sk/messages.json
+++ b/_locales/sk/messages.json
@@ -28,20 +28,20 @@
   "viewMenuToggleFullScreen": "Celá obrazovka",
   "viewMenuToggleDevTools": "Nástroje pre vývojárov",
   "contextMenuNoSuggestions": "Žiadne Návrhy",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Komunitná pozvánka",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Pripojiť sa do $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Určite sa chcete pripojiť ku komunite $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Zadajte Session ID alebo ONS meno",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Začnite novú konverzáciu zadaním niekoho Session ID alebo zdieľajte s ním svoje Session ID.",
   "loading": "Nahrávanie...",
   "done": "Hotovo",
   "youLeftTheGroup": "Opustili ste skupinu",
   "youGotKickedFromGroup": "Boli ste odstránení zo skupiny.",
-  "unreadMessages": "Neprečítané Správy",
-  "debugLogExplanation": "Tento záznam bude uložený na tvoju plochu.",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "Označiť Všetko ako Prečítané",
+  "unreadMessages": "Neprečítané správy",
+  "debugLogExplanation": "Tento záznam sa uloží na vašu pracovnú plochu.",
+  "reportIssue": "Nahlásiť chybu",
+  "markAllAsRead": "Označiť všetko ako prečítané",
   "incomingError": "Chyba pri spracovaní prichádzajúcej správy",
   "media": "Médiá",
   "mediaEmptyState": "Táto konverzácia neobsahuje žiadne médiá",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Zvolenú prílohu sa nepodarilo načítať.",
   "offline": "Offline",
   "debugLog": "Ladiaci Log",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportovať záznamy",
+  "shareBugDetails": "Exportujte vaše záznamy a potom súbor odošlite prostredníctvom služby Session Pomocník.",
   "goToReleaseNotes": "Navštíviť Poznámky k Vydaniu",
   "goToSupportPage": "Navštíviť Stránku Podpory",
   "about": "Informácie",
@@ -72,7 +72,7 @@
   "noSearchResults": "Žiadne výsledky pre \"$searchTerm$\"",
   "conversationsHeader": "Kontakty a skupiny",
   "contactsHeader": "Kontakty",
-  "messagesHeader": "Správy",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Nastavenia",
   "typingAlt": "Animácia písania pre túto konverzáciu",
   "contactAvatarAlt": "Avatar kontaktu $name$",
@@ -86,7 +86,7 @@
   "audio": "Zvuk",
   "video": "Video",
   "photo": "Fotka",
-  "cannotUpdate": "Nemožno aktualizovať",
+  "cannotUpdate": "Nie je možné aktualizovať",
   "cannotUpdateDetail": "Nepodarilo sa aktualizovať Session, avšak je dostupná nová verzia. Prosím, choďte na https://getsession.org/ a nainštalujte novú verziu manuálne, potom buď kontaktujte podporu alebo podajte chybové hlásenie o tomto probléme.",
   "ok": "OK",
   "cancel": "Zrušiť",
@@ -97,27 +97,29 @@
   "messageDeletionForbidden": "Nemáte právo vymazať správy ostatných",
   "deleteJustForMe": "Vymazať iba pre mňa",
   "deleteForEveryone": "Vymazať pre všetkých",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
+  "deleteMessagesQuestion": "Odstrániť $count$ správ?",
   "deleteMessageQuestion": "Vymazať túto správu?",
   "deleteMessages": "Zmazať správy",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ vymazaných",
   "messageDeletedPlaceholder": "Táto správa bola vymazaná",
   "from": "Od",
   "to": "pre",
   "sent": "Odoslaná",
   "received": "Prijatá",
   "sendMessage": "Poslať správu",
-  "groupMembers": "Členy skupiny",
+  "groupMembers": "Členovia",
   "moreInformation": "Viac informácií",
   "resend": "Znovu odoslať",
   "deleteConversationConfirmation": "Natrvalo zmazať túto konverzáciu?",
-  "clear": "Clear",
-  "clearAllData": "Odstrániť všetky dáta",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "clear": "Vyčistiť",
+  "clearAllData": "Odstrániť všetky údaje",
+  "deleteAccountWarning": "Týmto sa natrvalo odstránia vaše správy a kontakty.",
+  "deleteAccountFromLogin": "Ste si istí, že chcete vaše zariadenie vyčistiť?",
   "deleteContactConfirmation": "Naozaj chcete odstrániť túto konverzáciu?",
   "quoteThumbnailAlt": "Náhľad obrázku z citovanej správy.",
   "imageAttachmentAlt": "Obrázok pripojený k správe",
-  "videoAttachmentAlt": "Náhľad videa pripojený k správe",
+  "videoAttachmentAlt": "Snímka obrazovky videa v správe",
   "lightboxImageAlt": "Obrázok z konverzácie",
   "imageCaptionIconAlt": "Ikona indukujúca, že tento obrázok má popis",
   "addACaption": "Pridaj popis...",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$ odfotil obrazovku",
   "savedTheFile": "$name$ uložil médiá",
   "linkPreviewsTitle": "Posielať náhľady odkazov",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
-  "linkPreviewsConfirmMessage": "Nebudeťe mať plnú ochranu pred metadátami pri posielaní náhľadov na odkazy.",
+  "linkPreviewDescription": "Generovať náhľady odkazov pre podporované adresy URL.",
+  "linkPreviewsConfirmMessage": "Pri odosielaní náhľadov odkazov nebudete mať úplnú ochranu meta údajov.",
   "mediaPermissionsTitle": "Mikrofón",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Povoliť prístup k mikrofónu.",
   "spellCheckTitle": "Kontrola pravopisu",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "Musíťe reštartovať Session pre použitie vašich nových nastavení",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Potvrdenia o Prečítaní",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Indikátory Písania",
-  "zoomFactorSettingTitle": "Faktor Zväčšenia",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Meno a správu",
+  "spellCheckDescription": "Povoliť kontrolu pravopisu pri písaní.",
+  "spellCheckDirty": "Ak chcete použiť nové nastavenia, musíte reštartovať aplikáciu Session",
+  "readReceiptSettingDescription": "Odosielať potvrdenia o prečítaní v individuálnych konverzáciách.",
+  "readReceiptSettingTitle": "Potvrdenia o prečítaní",
+  "typingIndicatorsSettingDescription": "Zobraziť a zdieľať indikátory písania v individuálnych konverzáciách.",
+  "typingIndicatorsSettingTitle": "Indikátory písania",
+  "zoomFactorSettingTitle": "Faktor zväčšenia",
+  "themesSettingTitle": "Motívy",
+  "primaryColor": "Hlavná farba",
+  "primaryColorGreen": "Hlavná farba zelená",
+  "primaryColorBlue": "Hlavná farba modrá",
+  "primaryColorYellow": "Hlavná farba žltá",
+  "primaryColorPink": "Hlavná farba ružová",
+  "primaryColorPurple": "Hlavná farba fialová",
+  "primaryColorOrange": "Hlavná farba oranžová",
+  "primaryColorRed": "Hlavná farba červená",
+  "classicDarkThemeTitle": "Klasická tmavá",
+  "classicLightThemeTitle": "Klasická svetlá",
+  "oceanDarkThemeTitle": "Tmavý oceán",
+  "oceanLightThemeTitle": "Svetlý oceán",
+  "pruneSettingTitle": "Prečistiť komunity",
+  "pruneSettingDescription": "Odstrániť správy staršie ako 6 mesiacov zo komunít, ktoré majú viac ako 2 000 správ.",
+  "enable": "Povoliť",
+  "keepDisabled": "Ponechať vypnuté",
+  "notificationSettingsDialog": "Informácie zobrazené v oznámeniach.",
+  "nameAndMessage": "Meno a obsah",
   "noNameOrMessage": "Neukázať meno ani správu",
   "nameOnly": "Iba meno",
   "newMessage": "Nová správa",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Vytvoriť konverzáciu s novým kontaktom",
+  "createConversationNewGroup": "Vytvoriť skupinu s existujúcimi kontaktmi",
+  "joinACommunity": "Pripojiť sa ku komunite",
+  "chooseAnAction": "Vyberte akciu na začatie konverzácie",
   "newMessages": "Nové správy",
   "notificationMostRecentFrom": "Najnovšie od:",
   "notificationFrom": "Od:",
@@ -174,7 +176,7 @@
   "sendFailed": "Odoslanie zlyhalo",
   "mediaMessage": "Multimediálna správa",
   "messageBodyMissing": "Prosím, zadajte text správy.",
-  "messageBody": "Message body",
+  "messageBody": "Obsah správy",
   "unblockToSend": "Pre odoslanie správy kontakt odblokujte.",
   "unblockGroupToSend": "Odblokujte skupinu pre poslanie správy.",
   "youChangedTheTimer": "Nastavili ste časovač miznúcich správ na $time$",
@@ -192,10 +194,11 @@
   "timerOption_12_hours": "12 hodín",
   "timerOption_1_day": "1 deň",
   "timerOption_1_week": "1 týždeň",
+  "timerOption_2_weeks": "2 týždne",
   "disappearingMessages": "Miznúce správy",
-  "changeNickname": "Zmeniť Prezývku",
+  "changeNickname": "Zmeniť prezývku",
   "clearNickname": "Clear nickname",
-  "nicknamePlaceholder": "Nová Prezývka",
+  "nicknamePlaceholder": "Nová prezývka",
   "changeNicknameMessage": "Zadať prezývku pre tohto používateľa",
   "timerOption_0_seconds_abbreviated": "vypnutý",
   "timerOption_5_seconds_abbreviated": "5s",
@@ -206,21 +209,22 @@
   "timerOption_30_minutes_abbreviated": "30m",
   "timerOption_1_hour_abbreviated": "1h",
   "timerOption_6_hours_abbreviated": "6h",
-  "timerOption_12_hours_abbreviated": "1d",
+  "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1t",
+  "timerOption_2_weeks_abbreviated": "2t",
   "disappearingMessagesDisabled": "Miznúce správy vypnuté",
-  "disabledDisappearingMessages": "$name$ vypol/la miznúce správy",
+  "disabledDisappearingMessages": "$name$ vypol/la miznúce správy.",
   "youDisabledDisappearingMessages": "Vypli ste miznúce správy",
   "timerSetTo": "Časovač nastavený na $time$",
   "noteToSelf": "Poznámka pre seba",
-  "hideMenuBarTitle": "Skryť Panel Menu",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarTitle": "Skryť panel ponuky",
+  "hideMenuBarDescription": "Prepnúť viditeľnosť systémového panela ponuky.",
   "startConversation": "Začať nový rozhovor…",
-  "invalidNumberError": "Neplatné číslo",
-  "failedResolveOns": "Nepodarilo sa vyriešiť ONS meno",
-  "autoUpdateSettingTitle": "Auto Akualizácie",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "invalidNumberError": "Skontrolujte prosím Session ID alebo názov ONS a skúste to znova",
+  "failedResolveOns": "Nepodarilo sa rozpoznať názov ONS",
+  "autoUpdateSettingTitle": "Automatická aktualizácia",
+  "autoUpdateSettingDescription": "Automatická kontrola aktualizácií pri spustení.",
   "autoUpdateNewVersionTitle": "Dostupná aktualizácia pre Session",
   "autoUpdateNewVersionMessage": "Je k dispozícii nová verzia Session.",
   "autoUpdateNewVersionInstructions": "Reštartujte Session pre dokončenie aktualizácie.",
@@ -228,265 +232,277 @@
   "autoUpdateLaterButtonLabel": "Neskôr",
   "autoUpdateDownloadButtonLabel": "Stiahnuť",
   "autoUpdateDownloadedMessage": "The new update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Chceťe stiahnuť akualizáciu?",
+  "autoUpdateDownloadInstructions": "Chcete si stiahnuť aktualizáciu?",
   "leftTheGroup": "$name$ opustil/a skupinu",
   "multipleLeftTheGroup": "$name$ opustil/a skupinu",
   "updatedTheGroup": "Skupina bola aktualizovaná",
   "titleIsNow": "Názov skupiny sa zmenil na \"$name$\"",
   "joinedTheGroup": "$name$ sa pripojil/a k skupine",
   "multipleJoinedTheGroup": "$names$ sa pripojili k skupine",
-  "kickedFromTheGroup": "$name$ bol odstránený zo skupiny.",
-  "multipleKickedFromTheGroup": "$name$ boli odstánení zo skupiny.",
-  "blockUser": "Blokovať",
-  "unblockUser": "Odblokovať",
+  "kickedFromTheGroup": "$name$ bol/a odstránený/á zo skupiny.",
+  "multipleKickedFromTheGroup": "$name$ boli odstránení zo skupiny.",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Odblokovaný",
-  "blocked": "Blokovaný",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
-  "unbanUser": "Odvolať Ban",
-  "userUnbanned": "Ban bol úspešne odvolaný",
-  "userUnbanFailed": "Odvolanie banu zlyhalo!",
-  "banUser": "Zabanovať Užívateľa",
-  "banUserAndDeleteAll": "Zabanovať a Všetko Vymazať",
+  "blocked": "Zablokovaný",
+  "blockedSettingsTitle": "Zablokované kontakty",
+  "conversationsSettingsTitle": "Konverzácie",
+  "unbanUser": "Zrušiť zákaz používateľa",
+  "userUnbanned": "Zákaz používateľa bol úspešne zrušený",
+  "userUnbanFailed": "Zlyhalo zrušenie zákazu!",
+  "banUser": "Zakázať používateľa",
+  "banUserAndDeleteAll": "Zakázať a vymazať všetko",
   "userBanned": "User banned successfully",
-  "userBanFailed": "Ban neúspešný!",
-  "leaveGroup": "Opustiť Skupinu",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
-  "leaveGroupConfirmation": "Ste si istý že chcete opustiť túto skupinu?",
-  "leaveGroupConfirmationAdmin": "Keďže ste admin tejto skupiny, ak odídete bude odstránená pre každého terajšieho člena. Ste si istý že chcete opustiť skupinu?",
-  "cannotRemoveCreatorFromGroup": "Nemožno odstrániť tohto používateľa",
-  "cannotRemoveCreatorFromGroupDesc": "Nemôžete odstrániť tohto používateľa keďže oni vytvorili túto skupinu.",
+  "userBanFailed": "Zakázanie zlyhalo!",
+  "leaveGroup": "Opustiť skupinu",
+  "leaveAndRemoveForEveryone": "Opustiť skupinu a odstrániť pre všetkých",
+  "leaveGroupConfirmation": "Ste si istí, že chcete opustiť túto skupinu?",
+  "leaveGroupConfirmationAdmin": "Keďže ste správcom tejto skupiny, ak ju opustíte, bude odstránená pre všetkých súčasných členov. Ste si istí, že chcete opustiť túto skupinu?",
+  "cannotRemoveCreatorFromGroup": "Tohto používateľa nie je možné odstrániť",
+  "cannotRemoveCreatorFromGroupDesc": "Tohto používateľa nemôžete odstrániť, pretože je tvorcom skupiny.",
   "noContactsForGroup": "Zatiaľ nemáte žiadne kontakty",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Nepodarilo sa pridať používateľa ako správcu",
+  "failedToRemoveFromModerator": "Nepodarilo sa odstrániť používateľa zo zoznamu správcov",
   "copyMessage": "Kopírovať text správy",
-  "selectMessage": "Vyberte správu",
+  "selectMessage": "Vybrať správu",
   "editGroup": "Upraviť skupinu",
   "editGroupName": "Upraviť názov skupiny",
   "updateGroupDialogTitle": "Aktualizujem $name$...",
-  "showRecoveryPhrase": "Obnovovacia Fráza",
+  "showRecoveryPhrase": "Fráza pre obnovu",
   "yourSessionID": "Vaše Session ID",
-  "setAccountPasswordTitle": "Nastaviť Heslo Účtu",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Zmeniť Heslo Účtu",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Odstrániť Heslo Účtu",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
-  "enterPassword": "Prosím zadajte Vaše heslo",
-  "confirmPassword": "Potvrdiť Heslo",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
-  "showRecoveryPhrasePasswordRequest": "Prosím zadajte Vaše heslo",
-  "recoveryPhraseSavePromptMain": "Vaša obnovovacia fráza je hlavný kľúč k Vášmu Session ID - môžete ho použíť na obnovenie Vášho Session ID ak stratíte prístup k vášmu zariadeniu. Uložte vašu obnovovaciu frázu na bezpečnom mieste, a nedávajte ju nikomu.",
-  "invalidOpenGroupUrl": "Nesprávna URL",
-  "copiedToClipboard": "Kopírované do schránky",
-  "passwordViewTitle": "Enter Password",
+  "setAccountPasswordTitle": "Heslo",
+  "setAccountPasswordDescription": "Vyžadovať heslo na odomknutie Session.",
+  "changeAccountPasswordTitle": "Zmeniť heslo",
+  "changeAccountPasswordDescription": "Zmeňte heslo potrebné na odomknutie Session.",
+  "removeAccountPasswordTitle": "Odstrániť heslo",
+  "removeAccountPasswordDescription": "Odstrániť heslo potrebné na odomknutie Session.",
+  "enterPassword": "Prosím zadajte vaše heslo",
+  "confirmPassword": "Potvrdiť heslo",
+  "enterNewPassword": "Zadajte prosím svoje nové heslo",
+  "confirmNewPassword": "Potvrdiť nové heslo",
+  "showRecoveryPhrasePasswordRequest": "Zadajte prosím vaše heslo",
+  "recoveryPhraseSavePromptMain": "Vaša fráza na obnovu je hlavný kľúč k vášmu ID relácie — môžete ho použiť na obnovenie ID relácie, ak stratíte prístup k zariadeniu. Svoju frázu na obnovenie uložte na bezpečné miesto a nikomu ju nedávajte.",
+  "invalidOpenGroupUrl": "Neplatná URL adresa",
+  "copiedToClipboard": "Skopírované",
+  "passwordViewTitle": "Zadajte heslo",
   "password": "Heslo",
-  "setPassword": "Nastaviť Heslo",
-  "changePassword": "Zmeniť Heslo",
-  "createPassword": "Create your password",
-  "removePassword": "Odstrániť Heslo",
-  "maxPasswordAttempts": "Nesprávne heslo. Chceťe resetovať databázu?",
-  "typeInOldPassword": "Please enter your current password",
-  "invalidOldPassword": "Staré heslo je nesprávne",
-  "invalidPassword": "Nesprávne heslo",
-  "noGivenPassword": "Prosím zadajte Vaše heslo",
+  "setPassword": "Nastaviť heslo",
+  "changePassword": "Zmeniť heslo",
+  "createPassword": "Vytvorte si heslo",
+  "removePassword": "Odstrániť heslo",
+  "maxPasswordAttempts": "Neplatné heslo. Chcete obnoviť databázu?",
+  "typeInOldPassword": "Zadajte prosím svoje aktuálne heslo",
+  "invalidOldPassword": "Staré heslo nie je platné",
+  "invalidPassword": "Neplatné heslo",
+  "noGivenPassword": "Prosím zadajte vaše heslo",
   "passwordsDoNotMatch": "Heslá sa nezhodujú",
   "setPasswordInvalid": "Heslá sa nezhodujú",
-  "changePasswordInvalid": "Staré heslo ktoré ste zadali je nesprávne",
+  "changePasswordInvalid": "Staré heslo, ktoré ste zadali, je nesprávne",
   "removePasswordInvalid": "Nesprávne heslo",
-  "setPasswordTitle": "Nastaviť Heslo",
-  "changePasswordTitle": "Zmenené Heslo",
-  "removePasswordTitle": "Odstránené Heslo",
-  "setPasswordToastDescription": "Vaše heslo bolo nastavené. Prosím, bezpečne ho uchovajte.",
-  "changePasswordToastDescription": "Vaše heslo bolo zmenené. Prosím, bezpečne ho uchovajte.",
-  "removePasswordToastDescription": "Odstránili ste Vaše heslo.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "setPasswordTitle": "Heslo nastavené",
+  "changePasswordTitle": "Heslo bolo zmenené",
+  "removePasswordTitle": "Heslo bolo odstránené",
+  "setPasswordToastDescription": "Vaše heslo bolo nastavené. Uchovajte ho prosím v bezpečí.",
+  "changePasswordToastDescription": "Vaše heslo bolo zmenené. Uchovajte ho prosím v bezpečí.",
+  "removePasswordToastDescription": "Vaše heslo bolo odstránené.",
+  "publicChatExists": "K tejto komunite ste už pripojení",
+  "connectToServerFail": "Nie je možné sa pripojiť ku komunite",
   "connectingToServer": "Pripájanie...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Úspešné pripojenie ku komunite",
   "setPasswordFail": "Nepodarilo sa nastaviť heslo",
-  "passwordLengthError": "Heslo musí mať dĺžku medzi 6 až 64 písmen",
-  "passwordTypeError": "Heslo musí byť text",
+  "passwordLengthError": "Heslo musí mať dĺžku 6 až 64 znakov",
+  "passwordTypeError": "Heslo musí mať podobu reťazca",
   "passwordCharacterError": "Heslo môže obsahovať iba písmená, čísla a symboly",
   "remove": "Odstrániť",
-  "invalidSessionId": "Neplátné Session ID",
-  "invalidPubkeyFormat": "Nesprávny Formát Pubkey",
-  "emptyGroupNameError": "Prosím zadajte meno skupiny",
+  "invalidSessionId": "Neplatné Session ID",
+  "invalidPubkeyFormat": "Neplatný formát kľúča Pubkey",
+  "emptyGroupNameError": "Prosím zadajte názov skupiny",
   "editProfileModalTitle": "Profil",
-  "groupNamePlaceholder": "Meno Skupiny",
-  "inviteContacts": "Pozvať Kontakty",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "groupNamePlaceholder": "Názov skupiny",
+  "inviteContacts": "Pozvať kontakty",
+  "addModerators": "Pridať správcov",
+  "removeModerators": "Odstrániť správcov",
+  "addAsModerator": "Pridať ako správca",
+  "removeFromModerators": "Odstrániť zo správcov",
   "add": "Pridať",
-  "addingContacts": "Pridávanie kontaktov do",
+  "addingContacts": "Pridávanie kontaktov do $name$",
   "noContactsToAdd": "Žiadne kontakty na pridanie",
   "noMembersInThisGroup": "Žiadny iný členovia v tejto skupine",
-  "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "Nie ste tvorca",
+  "noModeratorsToRemove": "Žiadni administrátori na odstránenie",
+  "onlyAdminCanRemoveMembers": "Nie ste tvorcom",
   "onlyAdminCanRemoveMembersDesc": "Iba tvorca skupiny môže odstrániť používateľov",
   "createAccount": "Create Account",
-  "startInTrayTitle": "Keep in System Tray",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayTitle": "Ponechať v systémovej lište",
+  "startInTrayDescription": "Po zatvorení okna ponechať aplikáciu Session spustenú na pozadí.",
   "yourUniqueSessionID": "Povedz ahoj tvojmu Session ID",
-  "allUsersAreRandomly...": "Tvoj Session ID je unikátna adresa ľudia môžu používať aby Vás kontaktovali cez Session. Zo žiadným spojením ku vašej reálnej identite, Váš Session ID je úplne anonymný a súkromný.",
+  "allUsersAreRandomly...": "Vaše Session ID je jedinečná adresa, ktorú môžu ľudia použiť na kontakt s vami v službe Session. Vaše ID relácie nie je nijako spojené s vašou skutočnou identitou, je úplne anonymné a súkromné.",
   "getStarted": "Začať",
   "createSessionID": "Vytvoriť Session ID",
-  "recoveryPhrase": "Obnovoacia Fráza",
-  "enterRecoveryPhrase": "Zadajte vašu obnovovaciu frázu",
-  "displayName": "Používateľské Meno",
-  "anonymous": "Anonymný",
-  "removeResidueMembers": "Kliknutím ok tiež vymažete týchto používateľov keďže odišli zo skupiny.",
-  "enterDisplayName": "Zadajte používateľské meno",
-  "continueYourSession": "Pokračujte Váš Session",
-  "linkDevice": "Spojiť Zariadenie",
+  "recoveryPhrase": "Obnovovacia fráza",
+  "enterRecoveryPhrase": "Zadajte vašu frázu pre obnovu",
+  "displayName": "Zobrazované meno",
+  "anonymous": "Anonymné",
+  "removeResidueMembers": "Kliknutím na tlačidlo ok sa odstránia aj tí členovia, ktorí opustili skupinu.",
+  "enterDisplayName": "Zadajte zobrazované meno",
+  "continueYourSession": "Pokračujte v vašej Session",
+  "linkDevice": "Prepojiť zariadenie",
   "restoreUsingRecoveryPhrase": "Obnoviť váš účet",
   "or": "alebo",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
-  "beginYourSession": "Začať Váš Session.",
+  "ByUsingThisService...": "Používaním tejto služby súhlasíte s našimi <a href=\"https://getsession.org/terms-of-service\">Podmienkami používania služby</a> a <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Zásadami ochrany osobných údajov</a>",
+  "beginYourSession": "Začnite vašu Session.",
   "welcomeToYourSession": "Vitajte vo vašej Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Vyhľadávanie konverzácií a kontaktov",
+  "searchForContactsOnly": "Vyhľadávanie kontaktov",
   "enterSessionID": "Zadajte Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Zadajte Session ID alebo ONS vášho kontaktu",
   "message": "Správa",
   "appearanceSettingsTitle": "Vzhľad",
   "privacySettingsTitle": "Súkromie",
   "notificationsSettingsTitle": "Upozornenia",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
-  "recoveryPhraseEmpty": "Zadajte obnovovaciu frázu",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Obsah upozornenia",
+  "notificationPreview": "Náhľad",
+  "recoveryPhraseEmpty": "Zadajte frázu pre obnovu",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ členov",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
-  "createClosedGroupNamePrompt": "Meno Skupiny",
-  "createClosedGroupPlaceholder": "Zadajte meno skupiny",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "activeMembers": "$count$ active members",
+  "join": "Pripojiť sa",
+  "joinOpenGroup": "Pripojte sa ku komunite",
+  "createGroup": "Vytvoriť skupinu",
+  "create": "Vytvoriť",
+  "createClosedGroupNamePrompt": "Názov skupiny",
+  "createClosedGroupPlaceholder": "Zadajte názov skupiny",
+  "openGroupURL": "URL adresa komunity",
+  "enterAnOpenGroupURL": "Zadajte URL adresu komunity",
   "next": "Ďalej",
-  "invalidGroupNameTooShort": "Prosím zadajte meno skupiny",
-  "invalidGroupNameTooLong": "Prosím zadajte kratšie meno skupiny",
+  "invalidGroupNameTooShort": "Zadajte prosím názov skupiny",
+  "invalidGroupNameTooLong": "Zadajte prosím kratší názov skupiny",
   "pickClosedGroupMember": "Prosím vyberte aspoň 1 člena skupiny",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Žiadne zablokované kontakty",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "Skupina nemôže mať viac ako 100 členov",
+  "noBlockedContacts": "Nemáte žiadne zablokované kontakty.",
+  "userAddedToModerators": "Používateľ pridaný do zoznamu správcov",
+  "userRemovedFromModerators": "Používateľ odstránený zo zoznamu správcov",
   "orJoinOneOfThese": "Alebo sa pripojte do jednej z týchto...",
-  "helpUsTranslateSession": "Translate Session",
-  "closedGroupInviteFailTitle": "Pozvánka do Skupiny Neúspešná",
-  "closedGroupInviteFailTitlePlural": "Pozvánky do Skupiny Neúspešné",
-  "closedGroupInviteFailMessage": "Nemožno úspešne pozvať člena skupiny",
-  "closedGroupInviteFailMessagePlural": "Nemožno úspešne pozvať všetkých členov skupiny",
-  "closedGroupInviteOkText": "Pozvať Znova",
-  "closedGroupInviteSuccessTitlePlural": "Pozvánky do Skupiny Dokončené",
-  "closedGroupInviteSuccessTitle": "Pozvánky do Skupiny Úspešná",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "helpUsTranslateSession": "Preložiť Session",
+  "closedGroupInviteFailTitle": "Neúspešná pozvánka do skupiny",
+  "closedGroupInviteFailTitlePlural": "Skupinové pozvánky zlyhali",
+  "closedGroupInviteFailMessage": "Nie je možné úspešne pozvať člena skupiny",
+  "closedGroupInviteFailMessagePlural": "Nie je možné úspešne pozvať všetkých členov skupiny",
+  "closedGroupInviteOkText": "Opakovanie pozvania",
+  "closedGroupInviteSuccessTitlePlural": "Skupinové pozvánky dokončené",
+  "closedGroupInviteSuccessTitle": "Skupinová pozvánka úspešná",
+  "closedGroupInviteSuccessMessage": "Úspešne pozvaní členovia skupiny",
   "notificationForConvo": "Upozornenia",
-  "notificationForConvo_all": "Všetko",
+  "notificationForConvo_all": "Všetky",
   "notificationForConvo_disabled": "Vypnuté",
   "notificationForConvo_mentions_only": "Iba zmienky",
   "onionPathIndicatorTitle": "Cesta",
-  "onionPathIndicatorDescription": "Session skryje Vašu IP adresu tým, že vaše správy sa odrazia cez niekoľko Servisných Uzlov v decentralizovanej sieti Session. Toto sú krajiny cez ktoré sa Vaše spojenie práve odráža:",
-  "unknownCountry": "Neznáma Krajina",
+  "onionPathIndicatorDescription": "Session skryje vašu IP adresu tým, že vaše správy prechádzajú cez niekoľko servisných uzlov v decentralizovanej sieti Session. Toto sú krajiny, cez ktoré sa vaše spojenie práve prechádza:",
+  "unknownCountry": "Neznáma krajina",
   "device": "Zariadenie",
   "destination": "Cieľ",
-  "learnMore": "Viac Informácii",
-  "linkVisitWarningTitle": "Otvoriť tento odkaz vo Vašom prehliadači?",
-  "linkVisitWarningMessage": "Ste si istí, že chcete otvoriť $url$ vo Vašom prehliadači?",
+  "learnMore": "Zistiť viac",
+  "linkVisitWarningTitle": "Otvoriť tento odkaz vo vašom prehliadači?",
+  "linkVisitWarningMessage": "Ste si istí, že chcete otvoriť $url$ vo vašom prehliadači?",
   "open": "Otvoriť",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
-  "clickToTrustContact": "Klikni na stiahnutie médií",
-  "trustThisContactDialogTitle": "Veriť $name$?",
-  "trustThisContactDialogDescription": "Ste si istí že chcete stiahnuť média poslané od $name$?",
-  "pinConversation": "Pripnúť Konverzáciu",
-  "unpinConversation": "Odopnúť Konverzáciu",
-  "showUserDetails": "Zobraziť Detaily Používateľa",
-  "sendRecoveryPhraseTitle": "Posielanie Obnovovacej Frázy",
-  "sendRecoveryPhraseMessage": "Pokúšate sa poslať vašu obnovovaciu frázu ktorá môže byť použítá na prístup k Vášmu účtu. Ste si istí že chcete poslať túto správu?",
-  "dialogClearAllDataDeletionFailedTitle": "Dáta nevymazané",
-  "dialogClearAllDataDeletionFailedDesc": "Dáta nevymazané z neznámou chybou. Chcete vymazať dáta len z tohto zariadenia?",
-  "dialogClearAllDataDeletionFailedTitleQuestion": "Chcete vymazať dáta len z tohto zariadenia?",
-  "dialogClearAllDataDeletionFailedMultiple": "Dáta nevymazané týmito Servisnímy Uzlami: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
-  "areYouSureDeleteDeviceOnly": "Ste si istý že chcete vymazať iba údaje Vášho zariadenia?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
-  "iAmSure": "Som si istý",
-  "recoveryPhraseSecureTitle": "Ste takmer hotoví!",
-  "recoveryPhraseRevealMessage": "Zabezpečte Váš účet uložením Vašej obnovovacej frázy. Odhaľte vašú obnovovaciu frázu a potom ju bezpečne uložte.",
-  "recoveryPhraseRevealButtonText": "Odhaliť Obnovovaciu Frázu",
+  "audioMessageAutoplayTitle": "Automaticky prehrať zvukové správy",
+  "audioMessageAutoplayDescription": "Automaticky prehrať po sebe idúce zvukové správy.",
+  "clickToTrustContact": "Kliknutím stiahnete médiá",
+  "trustThisContactDialogTitle": "Dôverovať $name$?",
+  "trustThisContactDialogDescription": "Ste si istí, že chcete stiahnuť médiá, ktoré poslal/a $name$?",
+  "pinConversation": "Pripnúť konverzáciu",
+  "unpinConversation": "Odopnúť konverzáciu",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Zobraziť podrobnosti o používateľovi",
+  "sendRecoveryPhraseTitle": "Odoslanie frázy pre obnovu",
+  "sendRecoveryPhraseMessage": "Pokúšate sa odoslať frázu na obnovenie, ktorá sa dá použiť na prístup k vášmu účtu. Ste si istí, že chcete odoslať túto správu?",
+  "dialogClearAllDataDeletionFailedTitle": "Údaje neboli odstránené",
+  "dialogClearAllDataDeletionFailedDesc": "Údaje neboli odstránené s neznámou chybou. Chcete odstrániť údaje len z tohto zariadenia?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Chcete odstrániť údaje len z tohto zariadenia?",
+  "dialogClearAllDataDeletionFailedMultiple": "Údaje, ktoré neboli odstránené týmito uzlami služby: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Chcete vyčistiť len toto zariadenie, alebo aj vymazať svoje údaje zo siete?",
+  "clearDevice": "Vyčistiť zariadenie",
+  "tryAgain": "Skúsiť znova",
+  "areYouSureClearDevice": "Ste si istí, že chcete vaše zariadenie vyčistiť?",
+  "deviceOnly": "Vyčistiť iba zariadenie",
+  "entireAccount": "Vyčistiť zariadenie aj sieť",
+  "areYouSureDeleteDeviceOnly": "Ste si istí, že chcete vymazať iba údaje na vašom zariadení?",
+  "areYouSureDeleteEntireAccount": "Ste si istí, že chcete odstrániť svoje údaje zo siete? Ak budete pokračovať, nebudete môcť obnoviť svoje správy alebo kontakty.",
+  "iAmSure": "Som si istý/á",
+  "recoveryPhraseSecureTitle": "Už ste takmer hotoví!",
+  "recoveryPhraseRevealMessage": "Zabezpečte svoje konto uložením frázy na obnovenie. Odhaľte svoju frázu na obnovenie a potom ju bezpečne uložte, aby ste ju zabezpečili.",
+  "recoveryPhraseRevealButtonText": "Odhaliť frázu pre obnovu",
   "notificationSubtitle": "Upozornenia - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
-  "messageRequests": "Žiadosti o Správu",
-  "requestsSubtitle": "Čakajúce Žiadosti",
+  "surveyTitle": "Radi by sme získali vašu spätnú väzbu",
+  "faq": "Časté otázky",
+  "support": "Podpora",
+  "clearAll": "Vyčistiť všetko",
+  "clearDataSettingsTitle": "Vyčistiť údaje",
+  "messageRequests": "Žiadosti o správu",
+  "requestsSubtitle": "Čakajúce žiadosti",
   "requestsPlaceholder": "Žiadne žiadosti",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "hideRequestBannerDescription": "Skryť panel Žiadosť o správu, kým nedostanete novú žiadosť o správu.",
   "incomingCallFrom": "Prichádzajúci hovor od '$name$'",
-  "ringing": "Zvoním...",
-  "establishingConnection": "Nadväzujem spojenie...",
+  "ringing": "Zvonenie...",
+  "establishingConnection": "Nadväzovanie spojenia...",
   "accept": "Prijať",
   "decline": "Odmietnuť",
   "endCall": "Ukončiť hovor",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Povolenia",
+  "helpSettingsTitle": "Pomocník",
   "cameraPermissionNeededTitle": "Vyžadujú sa povolenia na hlasové/video hovory",
-  "cameraPermissionNeeded": "Môžete zapnúť 'Hlasové a video hovory' povolenie v Nastaveniach Súkromia.",
-  "unableToCall": "Najskôr položte prebiehajúci hovor",
-  "unableToCallTitle": "Nemožno začať nový hovor",
+  "cameraPermissionNeeded": "\"Hlasové a video hovory\" môžete povoliť v nastaveniach súkromia.",
+  "unableToCall": "Najskôr zrušte prebiehajúci hovor",
+  "unableToCallTitle": "Nie je možné spustiť nový hovor",
   "callMissed": "Zmeškaný hovor od $name$",
   "callMissedTitle": "Zmeškaný hovor",
-  "noCameraFound": "Nebol nájdený fotoaparát",
-  "noAudioInputFound": "Nebol nájdeny zvukový vstup",
-  "noAudioOutputFound": "Nebol nájdeny zvukový výstup",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
-  "callMissedCausePermission": "Zmeškaný hovor od '$name$' pretože potrebujete zapnúť povolenie 'Hlasové a video hovory' v Nastaveniach Súkromia.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "noCameraFound": "Nenašla sa žiadna kamera",
+  "noAudioInputFound": "Nenašiel sa žiadny zvukový vstup",
+  "noAudioOutputFound": "Nenašiel sa žiadny zvukový výstup",
+  "callMediaPermissionsTitle": "Hlasové a video hovory (Beta)",
+  "callMissedCausePermission": "Zmeškaný hovor od '$name$', pretože musíte povoliť povolenie \"Hlasové a video hovory\" v nastaveniach súkromia.",
+  "callMissedNotApproved": "Zmeškaný hovor od '$name$', keďže ste ešte neschválili túto konverzáciu. Najprv im pošlite správu.",
+  "callMediaPermissionsDescription": "Umožňuje hlasové a video hovory s inými používateľmi a od nich.",
+  "callMediaPermissionsDialogContent": "Vaša IP adresa je počas používania beta hovorov viditeľná pre vášho partnera a pre server Oxen Foundation. Ste si istí, že chcete povoliť hlasové a videohovory?",
+  "callMediaPermissionsDialogTitle": "Hlasové a video hovory (Beta)",
   "startedACall": "Volali ste $name$",
-  "answeredACall": "Volať z $name$",
-  "trimDatabase": "Trim Database",
-  "trimDatabaseDescription": "Zmenší veľkosť tvojej databázy správ na tvojich posledných 10 000 správ.",
-  "trimDatabaseConfirmationBody": "Určite chceš vymazať svoje najstaršie prijaté správy? ($deleteAmount$)",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "answeredACall": "Hovor s $name$",
+  "trimDatabase": "Prečistiť databázu",
+  "trimDatabaseDescription": "Zníži veľkosť databázy správ na posledných 10 000 správ.",
+  "trimDatabaseConfirmationBody": "Ste si istí, že chcete vymazať svojich $deleteAmount$ najstarších prijatých správ?",
+  "pleaseWaitOpenAndOptimizeDb": "Počkajte prosím, kým sa otvorí a optimalizuje vaša databáza...",
+  "messageRequestPending": "Vaša požiadavka na správu je momentálne v štádiu vybavovania",
+  "messageRequestAccepted": "Vaša žiadosť o správu bola prijatá",
+  "messageRequestAcceptedOurs": "Prijali ste žiadosť o správu od $name$",
+  "messageRequestAcceptedOursNoName": "Prijali ste žiadosť o správu",
+  "declineRequestMessage": "Ste si istí, že chcete odmietnuť túto žiadosť o správu?",
+  "respondingToRequestWarning": "Odoslaním správy tomuto používateľovi automaticky prijmete jeho žiadosť o správu a odhalíte svoje Session ID.",
+  "hideRequestBanner": "Skryť panel so žiadosťou o správu",
+  "openMessageRequestInbox": "Žiadosti o správu",
+  "noMessageRequestsPending": "Žiadne prebiehajúce žiadosti o správu",
+  "noMediaUntilApproved": "Prílohy nemôžete odosielať, kým nie je konverzácia schválená",
+  "mustBeApproved": "Ak chcete používať túto funkciu, musíte túto konverzáciu akceptovať",
+  "youHaveANewFriendRequest": "Máte novú žiadosť o priateľstvo",
+  "clearAllConfirmationTitle": "Vyčistiť všetky žiadosti o správy",
+  "clearAllConfirmationBody": "Ste si istí, že chcete vyčistiť všetky žiadosti o správu?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Skryť",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Zobraziť vašu schránku prijatých žiadostí o správu",
+  "clearAllReactions": "Ste si istí, že chcete vymazať všetky $emoji$?",
+  "expandedReactionsText": "Zobraziť menej",
+  "reactionNotification": "Reaguje na správu pomocou $emoji$",
+  "rateLimitReactMessage": "Spomaľte! Poslali ste príliš veľa emoji reakcií. Skúste to čoskoro znova",
+  "otherSingular": "$number$ iné",
+  "otherPlural": "$number$ iní",
+  "reactionPopup": "reagoval/a s",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ a $name2$",
+  "reactionPopupThree": "$name$, $name2$ a $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ a",
+  "reactionListCountSingular": "A $otherSingular$ reagoval <span>$emoji$</span> na túto správu",
+  "reactionListCountPlural": "A $otherPlural$ reagovali <span>$emoji$</span> na túto správu"
 }
diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json
index 157b928b5..300c71949 100644
--- a/_locales/sl/messages.json
+++ b/_locales/sl/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Nalagam ...",
@@ -72,7 +72,7 @@
   "noSearchResults": "Ni rezultata za \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Stiki",
-  "messagesHeader": "Sporočila",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Nastavitve",
   "typingAlt": "Animacija tipkanja za ta pogovor",
   "contactAvatarAlt": "Avatar uporabnika $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Izbriši to sporočilo?",
   "deleteMessages": "Izbriši sporočila",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "To sporočilo je bilo izbrisano",
   "from": "Pošiljatelj",
@@ -107,29 +108,30 @@
   "sent": "Poslano",
   "received": "Prejeto",
   "sendMessage": "Pošlji sporočilo",
-  "groupMembers": "Člani skupine",
+  "groupMembers": "Members",
   "moreInformation": "Več informacij",
   "resend": "Ponovno pošlji",
   "deleteConversationConfirmation": "Ali res želite nepovratno izbrisati ta pogovor?",
   "clear": "Clear",
   "clearAllData": "Počisti vse podatke",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Ste prepričani, da želite trajno izbrisati pogovor?",
   "quoteThumbnailAlt": "Predogled slike citiranega sporočila",
   "imageAttachmentAlt": "Slika je priložena sporočilu",
-  "videoAttachmentAlt": "Zajem slike videa je priložen k sporočilu",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Slika je bila poslana tekom pogovora",
   "imageCaptionIconAlt": "Ikona, ki označuje, da ima ta slika besedilo",
   "addACaption": "Dodaj besedilo ...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Shrani",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Shrani",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -138,34 +140,34 @@
   "spellCheckDirty": "You must restart Session to apply your new settings",
   "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
   "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
+  "typingIndicatorsSettingDescription": "Prikaži in deli indikatorje tipkanja v pogovorih ena na ena.",
+  "typingIndicatorsSettingTitle": "Indikator tipkanja",
   "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
+  "themesSettingTitle": "Teme",
+  "primaryColor": "Primarna barva",
+  "primaryColorGreen": "Primarna barva zelena",
+  "primaryColorBlue": "Primarna barva modra",
+  "primaryColorYellow": "Primarna barva rumena",
+  "primaryColorPink": "Primarna barva roza",
+  "primaryColorPurple": "Primarna barva vijolična",
+  "primaryColorOrange": "Primarna barva oranžna",
   "primaryColorRed": "Primary color red",
   "classicDarkThemeTitle": "Classic Dark",
   "classicLightThemeTitle": "Classic Light",
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "ime pošiljatelja in sporočilo",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "brez imena pošiljatelja in sporočila",
   "nameOnly": "samo ime pošiljatelja",
   "newMessage": "Novo sporočilo",
   "createConversationNewContact": "Create a conversation with a new contact",
   "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
+  "joinACommunity": "Pridruži se skupnosti",
   "chooseAnAction": "Choose an action to start a conversation",
   "newMessages": "Novo sporočilo",
   "notificationMostRecentFrom": "Najnovejše od:",
@@ -174,7 +176,7 @@
   "sendFailed": "Pošiljanje ni uspelo",
   "mediaMessage": "Multimedijsko sporočilo",
   "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
+  "messageBody": "Vsebina sporočila",
   "unblockToSend": "Za pošiljanje sporočila morate najprej odblokirati ta stik",
   "unblockGroupToSend": "Odblokiraj to skupino za pošiljanje sporočila.",
   "youChangedTheTimer": "Odštevanje za izginjajoča sporočila ste nastavili na $time$",
@@ -192,11 +194,12 @@
   "timerOption_12_hours": "12 ur",
   "timerOption_1_day": "1 dan",
   "timerOption_1_week": "1 teden",
+  "timerOption_2_weeks": "2 tedna",
   "disappearingMessages": "Izginjajoča sporočila",
-  "changeNickname": "Change Nickname",
+  "changeNickname": "Spremeni vzdevek",
   "clearNickname": "Clear nickname",
-  "nicknamePlaceholder": "New Nickname",
-  "changeNicknameMessage": "Enter a nickname for this user",
+  "nicknamePlaceholder": "Nov vzdevek",
+  "changeNicknameMessage": "Vstavi vzdevek za tega uporabnika",
   "timerOption_0_seconds_abbreviated": "Izključeno",
   "timerOption_5_seconds_abbreviated": "5 s",
   "timerOption_10_seconds_abbreviated": "10 s",
@@ -209,40 +212,41 @@
   "timerOption_12_hours_abbreviated": "12 h",
   "timerOption_1_day_abbreviated": "1 d",
   "timerOption_1_week_abbreviated": "1 t",
+  "timerOption_2_weeks_abbreviated": "2 ted.",
   "disappearingMessagesDisabled": "Izginjajoča sporočila so izključena",
-  "disabledDisappearingMessages": "Uporabnik $name$ je izključil izginjajoča sporočila",
+  "disabledDisappearingMessages": "Uporabnik $name$ je izključil izginjajoča sporočila.",
   "youDisabledDisappearingMessages": "Izključili ste izginjajoča sporočila",
   "timerSetTo": "Čas izginjanja je nastavljen na $time$",
   "noteToSelf": "Osebna zabeležka",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Začni nov pogovor ...",
-  "invalidNumberError": "Neveljavna številka",
+  "invalidNumberError": "Prosimo preveri Session ID ali ime ONS in poizkusi še enkrat",
   "failedResolveOns": "Failed to resolve ONS name",
-  "autoUpdateSettingTitle": "Auto Update",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingTitle": "Samodejno posodobi",
+  "autoUpdateSettingDescription": "Ob zagonu samodejno preveri za posodobitve.",
   "autoUpdateNewVersionTitle": "Na voljo je posodobitev aplikacije Session",
   "autoUpdateNewVersionMessage": "Na voljo je nova različica aplikacije Session.",
   "autoUpdateNewVersionInstructions": "Za uveljavitev nadgradenj pritisnite tipko Ponovno zaženi Session",
   "autoUpdateRestartButtonLabel": "Ponovno zaženi Session",
   "autoUpdateLaterButtonLabel": "Kasneje",
-  "autoUpdateDownloadButtonLabel": "Download",
+  "autoUpdateDownloadButtonLabel": "Prenesi",
   "autoUpdateDownloadedMessage": "The new update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Would you like to download the update?",
+  "autoUpdateDownloadInstructions": "Ali želite prenesti posodobitev?",
   "leftTheGroup": "Uporabnik $name$ je zapustil skupino",
   "multipleLeftTheGroup": "Uporabnik $name$ je zapustil skupino",
   "updatedTheGroup": "Skpina je bila posodobljena",
   "titleIsNow": "Novo ime je '$name$'",
   "joinedTheGroup": "Uporabnik $name$ se je pridružil skupini",
   "multipleJoinedTheGroup": "Uporabnik $names$ se je pridružil skupini",
-  "kickedFromTheGroup": "$name$ was removed from the group.",
-  "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
-  "unblocked": "Unblocked",
-  "blocked": "Blocked",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "kickedFromTheGroup": "$name$ je bil_a odstranjen_a iz skupine.",
+  "multipleKickedFromTheGroup": "$name$ so bili odstranjeni iz skupine.",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Odblokiran",
+  "blocked": "Blokiran",
+  "blockedSettingsTitle": "Blokirani stiki",
+  "conversationsSettingsTitle": "Pogovori",
   "unbanUser": "Unban User",
   "userUnbanned": "User unbanned successfully",
   "userUnbanFailed": "Unban failed!",
@@ -260,17 +264,17 @@
   "failedToAddAsModerator": "Failed to add user as admin",
   "failedToRemoveFromModerator": "Failed to remove user from the admin list",
   "copyMessage": "Copy message text",
-  "selectMessage": "Select message",
-  "editGroup": "Edit group",
-  "editGroupName": "Edit group name",
-  "updateGroupDialogTitle": "Updating $name$...",
-  "showRecoveryPhrase": "Recovery Phrase",
+  "selectMessage": "Izberi sporočilo",
+  "editGroup": "Uredi skupino",
+  "editGroupName": "Uredi ime skupine",
+  "updateGroupDialogTitle": "Posodabljanje $name$...",
+  "showRecoveryPhrase": "Besedna zveza za obnovitev",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json
index cda93ec30..e430c9110 100644
--- a/_locales/sq/messages.json
+++ b/_locales/sq/messages.json
@@ -1,6 +1,6 @@
 {
   "copyErrorAndQuit": "Kopjo gabimin dhe dil",
-  "unknown": "Unknown",
+  "unknown": "i panjohur",
   "databaseError": "Gabim Baze të Dhënash",
   "mainMenuFile": "&Kartelë",
   "mainMenuEdit": "&Përpunoni",
@@ -16,22 +16,22 @@
   "editMenuCut": "Prije",
   "editMenuCopy": "Kopjoje",
   "editMenuPaste": "Ngjite",
-  "editMenuDeleteContact": "Delete Contact",
-  "editMenuDeleteGroup": "Delete Group",
+  "editMenuDeleteContact": "Fshi kontaktin.",
+  "editMenuDeleteGroup": "Fshi grupin.",
   "editMenuSelectAll": "Përzgjidhi Krejt",
   "windowMenuClose": "Mbylle Dritaren",
   "windowMenuMinimize": "Minimizoje",
-  "windowMenuZoom": "Zoom",
+  "windowMenuZoom": "Zmadhoni",
   "viewMenuResetZoom": "Madhësi Faktike",
   "viewMenuZoomIn": "Zmadhoje",
   "viewMenuZoomOut": "Zvogëloje",
   "viewMenuToggleFullScreen": "Kalo në/Dil nga Sa Krejt Ekrani",
   "viewMenuToggleDevTools": "Shfaq/Fshih Mjete Zhvilluesi",
-  "contextMenuNoSuggestions": "No Suggestions",
+  "contextMenuNoSuggestions": "Nuk ka sugjerime",
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Po ngarkohet…",
@@ -72,7 +72,7 @@
   "noSearchResults": "S’ka përfundime për \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Kontakte",
-  "messagesHeader": "Mesazhe",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Animacion shtypjesh për këtë bisedë",
   "contactAvatarAlt": "Avatar për kontaktin $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "Fshini mesazhe",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "Nga",
@@ -107,29 +108,30 @@
   "sent": "Dërguar më",
   "received": "Marrë më",
   "sendMessage": "Dërgoni një mesazh",
-  "groupMembers": "Anëtarë grupi",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "Të fshihet përgjithmonë kjo bisedë?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Miniaturë e figurës nga mesazhi i cituar",
   "imageAttachmentAlt": "Figurë bashkëngjitur mesazhit",
-  "videoAttachmentAlt": "Foto ekrani e videos bashkëngjitur mesazhit",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Figurë e dërguar në bisedë",
   "imageCaptionIconAlt": "Ikonë që tregon  se për këtë figurë ka një titull",
   "addACaption": "Shtoni një përshkrim…",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Ruaje",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Emrin e dërguesit dhe mesazhin",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "As emrin, as mesazhin",
   "nameOnly": "Vetëm emër dërguesi",
   "newMessage": "Mesazh i Ri",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 orë",
   "timerOption_1_day": "1 ditë",
   "timerOption_1_week": "1 javë",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Zhdukje mesazhesh",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1j",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Zhdukja e mesazheve është e çaktivizuar",
-  "disabledDisappearingMessages": "$name$ çaktivizoi zhdukjen e mesazheve",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Çaktivizuat zhdukjen e mesazheve",
   "timerSetTo": "Afatmatësi është caktuar për $time$",
   "noteToSelf": "Shënim për Veten",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Filloni bisedë të re…",
-  "invalidNumberError": "Numër i pavlefshëm",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ u bënë pjesë e grupit",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index 6e34780cf..f85cea648 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Pridruži se $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Unesite ID sesije ili naziv ONS -a",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Učitavanje...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "Контакти",
-  "messagesHeader": "Поруке",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Podešavanja",
   "typingAlt": "Unos animacije za ovaj razgovor",
   "contactAvatarAlt": "Avatar za kontakt $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Izbriši ovu poruku?",
   "deleteMessages": "Уклони пошиљке",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "Poruka je izbrisana",
   "from": "Од",
@@ -107,29 +108,30 @@
   "sent": "Послата",
   "received": "Примљена",
   "sendMessage": "Пошаљи поруку",
-  "groupMembers": "Чланови групе",
+  "groupMembers": "Members",
   "moreInformation": "Više informacija",
   "resend": "Pošalji ponovo",
   "deleteConversationConfirmation": "Неопозиво уклонити преписку?",
   "clear": "Clear",
   "clearAllData": "Počisti sve podatke",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Jeste li sigurni da želite da izbrišete ovaj razgovor?",
   "quoteThumbnailAlt": "Sličica slike iz citirane poruke",
   "imageAttachmentAlt": "Fotografija je priložena uz poruku",
-  "videoAttachmentAlt": "Snimak ekrana video zapisa u prilogu poruke",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Slika je poslata u razgovoru",
   "imageCaptionIconAlt": "Ikona pokazuje da ova slika ima naslov",
   "addACaption": "Dodaj natpis...",
   "copySessionID": "Kreiraj Session ID",
-  "copyOpenGroupURL": "Kopiraj URL-ove grupa",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Сачувај",
   "saveLogToDesktop": "Sačuvati beleške na desktop",
   "saved": "Sačuvano",
   "tookAScreenshot": "$name$ je uradio screenshot",
   "savedTheFile": "Medij je sačuvao $name$",
   "linkPreviewsTitle": "Pošalji preglede veza",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Nećete imati potpunu zaštitu metapodataka prilikom slanja pregleda linkova.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Indikatori pisanja",
   "zoomFactorSettingTitle": "Faktor zumiranja",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Име дописника и порука",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Скривено",
   "nameOnly": "Име дописника",
   "newMessage": "Нова порука",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 sati",
   "timerOption_1_day": "1 дан",
   "timerOption_1_week": "1 недеља",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Самонестајуће поруке",
   "changeNickname": "Promеni nadimak",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 ч",
   "timerOption_1_day_abbreviated": "1 д",
   "timerOption_1_week_abbreviated": "1 нед",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Poruke koje nestaju su onemogućene",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Рок постављен на $time$",
   "noteToSelf": "Napomena za sebe",
   "hideMenuBarTitle": "Sakrij meni",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Неисправан број",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Rešavanje ONSa nije uspelo",
   "autoUpdateSettingTitle": "Automatsko ažuriranje",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ joined the group",
   "kickedFromTheGroup": "$name$ je izbrisan iz grupe.",
   "multipleKickedFromTheGroup": "$name$ je izbrisan iz grupe.",
-  "blockUser": "Blokiraj korisnika",
-  "unblockUser": "Odblokirajte",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Odblokirajte",
   "blocked": "Blokiran",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Ažuriranje $name$...",
   "showRecoveryPhrase": "Fraza za oporavak",
   "yourSessionID": "Tvoj Session ID",
-  "setAccountPasswordTitle": "Podesite lozinku naloga",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Promenite lozinku naloga",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Uklonite lozinku za ovaj nalog",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Unesite lozinku",
   "confirmPassword": "Potvrda lozinke",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Unesite lozinku",
   "recoveryPhraseSavePromptMain": "Fraza za oporavak je glavni ključ za Session ID - možete ga koristiti za vraćanje ISession ID-a ako izgubite pristup svom uređaju. Čuvajte frazu za oporavak na sigurnom mestu i ne delite je nisakim.",
   "invalidOpenGroupUrl": "Neispravan URL",
-  "copiedToClipboard": "Kopirano u klipobord",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Lozinka",
   "setPassword": "Postavi lozinku",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Lozinke se ne poklapaju",
   "changePasswordInvalid": "Stara lozinka je neispravna",
   "removePasswordInvalid": "Pogrešna lozinka",
-  "setPasswordTitle": "Postavi lozinku",
-  "changePasswordTitle": "Promeni lozinku",
-  "removePasswordTitle": "Lozinka je uklonjena",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Vaša lozinka je podešena. Čuvajte lozinku na sigurnom.",
   "changePasswordToastDescription": "Vaša lozinka je podešena. Čuvajte lozinku na sigurnom.",
-  "removePasswordToastDescription": "Uklonili ste lozinku.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Povezivanje...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Izglеd",
   "privacySettingsTitle": "Privatnost",
   "notificationsSettingsTitle": "Notifikacije",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Unesite frazu za oporavak",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ korisnika",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Unesite kraći naziv grupe",
   "pickClosedGroupMember": "Molimo izaberite najmanje jednog člana grupe",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Nema blokiranih kontakata",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Ili se pridružite nekoj od ovih...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Da li ste sigurni da želite da preuzmete medije koje šalje $name$?",
   "pinConversation": "Zalepi konverzaciju na vrh",
   "unpinConversation": "Otkači konverzaciju sa vrha",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Pokaži detalje korisnika",
   "sendRecoveryPhraseTitle": "Slanje fraze za oporavak",
   "sendRecoveryPhraseMessage": "Pokušavate da pošaljete svoju frazu za oporavak koja se može koristiti za pristup vašem nalogu. Jeste li sigurni da želite poslati ovu poruku?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Da li želite da izbrišete podatke samo sa ovog uređaja?",
   "dialogClearAllDataDeletionFailedMultiple": "Podaci koje servisni čvorovi nisu izbrisali: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Jeste li sigurni da želite da izbrišete podatke samo sa urađaja?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Propušten poziv od $name$ jer morate da omogućite dozvolu za 'Glasovne i video pozive' u podešavanjima Privatnosti.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Pozvali ste $name$",
   "answeredACall": "Poziv sa $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index f51c488d9..92bafa1dc 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Slå av/på fullskärm",
   "viewMenuToggleDevTools": "Slå på utvecklingsverktyg",
   "contextMenuNoSuggestions": "Inga förslag",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Gemenskapsinbjudan",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Gå med i $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Är du säker på att du vill gå med i $roomName$ -gemenskapen?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Ange sessions-ID eller ONS-namn",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Starta en ny diskussion genom att ange någons Sessions-ID eller dela ditt Sessions-ID med dem.",
   "loading": "Läser in...",
   "done": "Slutfört",
   "youLeftTheGroup": "Du lämnade gruppen",
   "youGotKickedFromGroup": "Du togs bort från gruppen.",
   "unreadMessages": "Olästa meddelanden",
   "debugLogExplanation": "Den här loggen kommer att sparas på skrivbordet.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Rapportera ett fel",
   "markAllAsRead": "Markera alla som lästa",
   "incomingError": "Fel med att hantera inkommande meddelande",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Kunde inte läsa in vald bilaga",
   "offline": "Ej ansluten",
   "debugLog": "Felsökningslogg",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Exportera loggar",
+  "shareBugDetails": "Exportera dina loggar, ladda sedan upp filen via Sessions hjälpdisk.",
   "goToReleaseNotes": "Gå till versionsanteckningar",
   "goToSupportPage": "Gå till supportsidan",
   "about": "Om",
@@ -72,7 +72,7 @@
   "noSearchResults": "Inga resultat för \"$searchTerm$\"",
   "conversationsHeader": "Kontakter och grupper",
   "contactsHeader": "Kontakter",
-  "messagesHeader": "Meddelanden",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Inställningar",
   "typingAlt": "Skrivanimation för denna konversation",
   "contactAvatarAlt": "Avatar för kontakten $name$",
@@ -97,76 +97,78 @@
   "messageDeletionForbidden": "Du har inte behörighet att ta bort andras meddelanden",
   "deleteJustForMe": "Radera bara för mig",
   "deleteForEveryone": "Radera för alla",
-  "deleteMessagesQuestion": "Delete $count$ messages?",
+  "deleteMessagesQuestion": "Radera $count$ meddelanden?",
   "deleteMessageQuestion": "Radera detta meddelande?",
   "deleteMessages": "Radera meddelanden",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ raderades",
   "messageDeletedPlaceholder": "Detta meddelande har tagits bort",
   "from": "Från",
   "to": "till",
   "sent": "Skickat",
   "received": "Mottagit",
   "sendMessage": "Skicka ett meddelande",
-  "groupMembers": "Gruppmedlemmar",
+  "groupMembers": "Medlemmar",
   "moreInformation": "Mer information",
   "resend": "Skicka på nytt",
   "deleteConversationConfirmation": "Vill du radera denna konversation för alltid?",
-  "clear": "Clear",
+  "clear": "Rensa",
   "clearAllData": "Rensa all data",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Detta kommer att ta bort dina meddelanden och kontakter permanent.",
+  "deleteAccountFromLogin": "Är du säker på att du vill rensa din enhet?",
   "deleteContactConfirmation": "Är du säker på att du vill ta bort denna konversation?",
   "quoteThumbnailAlt": "Miniatyr av bild för citerat meddelande",
   "imageAttachmentAlt": "Bild bifogat till meddelande",
-  "videoAttachmentAlt": "Skärmbild av video bifogat till meddelande",
+  "videoAttachmentAlt": "Skärmdump av video i meddelande",
   "lightboxImageAlt": "Bild skickad i konversation",
   "imageCaptionIconAlt": "Ikon visandes att denna bild har en bildtext",
   "addACaption": "Lägg till en rubrik...",
   "copySessionID": "Kopiera Session-ID",
-  "copyOpenGroupURL": "Kopiera gruppens URL",
+  "copyOpenGroupURL": "Kopiera grupp-URL",
   "save": "Spara",
   "saveLogToDesktop": "Spara loggen på skrivbordet",
   "saved": "Sparad",
   "tookAScreenshot": "$name$ tog en skärmdump",
   "savedTheFile": "Media sparad av $name$",
   "linkPreviewsTitle": "Skicka förhandsvisningar av länk",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Skapa länkförhandsvisningar för stödda URL:er.",
   "linkPreviewsConfirmMessage": "Du kommer inte att ha fullt metadata-skydd när du skickar förhandsgranskningar.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "Tillåt åtkomst till mikrofon.",
   "spellCheckTitle": "Kontrollera stavning",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "Aktivera stavningskontroll när du skriver meddelanden.",
   "spellCheckDirty": "Du måste starta om Session för att tillämpa dina nya inställningar",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "Skicka läskvitton i en-till-en-chattar.",
   "readReceiptSettingTitle": "Läskvitton",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "Se och dela typindikatorer i en-till-en chattar.",
   "typingIndicatorsSettingTitle": "Skriv Indikatorer",
   "zoomFactorSettingTitle": "Zoomfaktor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Både sändarens namn och meddelande",
+  "themesSettingTitle": "Teman",
+  "primaryColor": "Primärfärg",
+  "primaryColorGreen": "Grön primärfärg",
+  "primaryColorBlue": "Blå primärfärg",
+  "primaryColorYellow": "Gul primärfärg",
+  "primaryColorPink": "Rosa primärfärg",
+  "primaryColorPurple": "Lila primärfärg",
+  "primaryColorOrange": "Orange primärfärg",
+  "primaryColorRed": "Röd primärfärg",
+  "classicDarkThemeTitle": "Klassisk mörk",
+  "classicLightThemeTitle": "Klassisk ljus",
+  "oceanDarkThemeTitle": "Mörkt hav",
+  "oceanLightThemeTitle": "Ljust hav",
+  "pruneSettingTitle": "Beskär gemenskaper",
+  "pruneSettingDescription": "Ta bort meddelanden äldre än 6 månader från gemenskaper som har över 2000 meddelanden.",
+  "enable": "Aktivera",
+  "keepDisabled": "Behåll inaktiverad",
+  "notificationSettingsDialog": "Informationen som visas i aviseringar.",
+  "nameAndMessage": "Namn & Innehåll",
   "noNameOrMessage": "Varken namn eller meddelande",
   "nameOnly": "Enbart sändarens namn",
   "newMessage": "Nytt meddelande",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "Skapa en konversation med en ny kontakt",
+  "createConversationNewGroup": "Skapa en grupp med befintliga kontakter",
+  "joinACommunity": "Gå med i en gemenskap",
+  "chooseAnAction": "Välj en åtgärd för att starta en konversation",
   "newMessages": "Nya meddelanden",
   "notificationMostRecentFrom": "Nyligen från:",
   "notificationFrom": "Från:",
@@ -174,7 +176,7 @@
   "sendFailed": "Att skicka meddelandet misslyckades",
   "mediaMessage": "Mediameddelande",
   "messageBodyMissing": "Ange ett meddelande.",
-  "messageBody": "Message body",
+  "messageBody": "Meddelandetext",
   "unblockToSend": "Avblockera denna kontakt för att skicka meddelanden.",
   "unblockGroupToSend": "Avblockera denna grupp för att skicka meddelanden.",
   "youChangedTheTimer": "Du satte tiden för försvinnande meddelanden till $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 timmar",
   "timerOption_1_day": "1 dag",
   "timerOption_1_week": "1 vecka",
+  "timerOption_2_weeks": "2 veckor",
   "disappearingMessages": "Försvinnande meddelanden",
   "changeNickname": "Ändra smeknamn",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 tim",
   "timerOption_1_day_abbreviated": "1 dag",
   "timerOption_1_week_abbreviated": "1v",
+  "timerOption_2_weeks_abbreviated": "2v",
   "disappearingMessagesDisabled": "Försvinnande meddelanden inaktiverat",
-  "disabledDisappearingMessages": "$name$ stängde av att meddelanden försvinner.",
+  "disabledDisappearingMessages": "$name$ har stängt av försvinnande meddelanden.",
   "youDisabledDisappearingMessages": "Du stängde av att meddelanden försvinner.",
   "timerSetTo": "Tidsgräns inställt till $time$",
   "noteToSelf": "Notera till mig själv",
   "hideMenuBarTitle": "Dölj menyfältet",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "Växla synlighet för systemmenyraden.",
   "startConversation": "Starta en ny konversation…",
-  "invalidNumberError": "Felaktigt nummer",
+  "invalidNumberError": "Kontrollera sessions-ID eller ONS-namn och försök igen",
   "failedResolveOns": "Misslyckades att lösa ONS-namnet",
   "autoUpdateSettingTitle": "Uppdatera automatiskt",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "Sök efter uppdateringar automatiskt vid uppstart.",
   "autoUpdateNewVersionTitle": "Uppdatering för Session tillgänglig",
   "autoUpdateNewVersionMessage": "Det finns en ny version av Session tillgänglig.",
   "autoUpdateNewVersionInstructions": "Vänligen starta om Session för att uppdatera",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$ gick med i gruppen",
   "kickedFromTheGroup": "$name$ togs bort från gruppen.",
   "multipleKickedFromTheGroup": "$name$ vart borttagen från gruppen.",
-  "blockUser": "Blockera",
-  "unblockUser": "Avblockera",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Avblockerad",
   "blocked": "Blockerad",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Spärrade kontakter",
+  "conversationsSettingsTitle": "Konversationer",
   "unbanUser": "Avbannlys användaren",
   "userUnbanned": "Användaren har blivit avbannlyst",
   "userUnbanFailed": "Obannlysning misslyckades!",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "Bannlysning misslyckades!",
   "leaveGroup": "Lämna grupp",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Lämna gruppen och ta bort för alla",
   "leaveGroupConfirmation": "Är du säker på att du vill lämna denna grupp?",
   "leaveGroupConfirmationAdmin": "Eftersom du är administratör för denna grupp, om du lämnar kommer den tas bort för alla nuvarande medlemmar. Är du säker på att du vill lämna denna grupp?",
   "cannotRemoveCreatorFromGroup": "Kan inte ta bort denna användare",
   "cannotRemoveCreatorFromGroupDesc": "Du kan inte ta bort denna användare eftersom de är skaparen av gruppen.",
   "noContactsForGroup": "Du har inga kontakter än",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "Kunde inte lägga till användare som administratör",
+  "failedToRemoveFromModerator": "Det gick inte att ta bort användaren från administratörslistan",
   "copyMessage": "Kopiera meddelande",
   "selectMessage": "Markera meddelande",
   "editGroup": "Redigera grupp",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "Uppdaterar $name$...",
   "showRecoveryPhrase": "Återställningsfras",
   "yourSessionID": "Ditt Session-ID",
-  "setAccountPasswordTitle": "Ange kontolösenord",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Ändra konto lösenord",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Ta bort kontots lösenord",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "Lösenord",
+  "setAccountPasswordDescription": "Kräv lösenord för att låsa upp Session.",
+  "changeAccountPasswordTitle": "Ändra lösenord",
+  "changeAccountPasswordDescription": "Ändra lösenordet som krävs för att låsa upp Session.",
+  "removeAccountPasswordTitle": "Ta bort lösenord",
+  "removeAccountPasswordDescription": "Ändra lösenordet som krävs för att låsa upp Session.",
   "enterPassword": "Ange ditt lösenord",
   "confirmPassword": "Bekräfta lösenord",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "Ange nytt lösenord",
+  "confirmNewPassword": "Bekräfta nytt lösenord",
   "showRecoveryPhrasePasswordRequest": "Ange ditt lösenord",
   "recoveryPhraseSavePromptMain": "Din återställningsfras är huvudnyckeln till ditt Session-ID – du kan använda den för att återställa ditt Session-ID om du förlorar åtkomst till enheten. Förvara din återställningsfras på en säker plats, och ge den inte till någon.",
   "invalidOpenGroupUrl": "Ogiltig URL",
-  "copiedToClipboard": "Kopierat till urklipp",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "Kopierad",
+  "passwordViewTitle": "Ange lösenord",
   "password": "Lösenord",
   "setPassword": "Ange lösenord",
   "changePassword": "Ändra lösenord",
-  "createPassword": "Create your password",
+  "createPassword": "Skapa ditt lösenord",
   "removePassword": "Ta bort lösenordet",
   "maxPasswordAttempts": "Ogiltigt lösenord. Vill du återställa databasen?",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "Ange ditt nuvarande lösenord",
   "invalidOldPassword": "Ditt gamla lösenord är ogiltigt",
   "invalidPassword": "Ogiltigt lösenord",
   "noGivenPassword": "Ange ditt lösenord",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "Lösenorden matchar ej",
   "changePasswordInvalid": "Det gamla lösenordet du angav är felaktigt",
   "removePasswordInvalid": "Felaktigt lösenord",
-  "setPasswordTitle": "Ange ett lösenord",
-  "changePasswordTitle": "Ändrat lösenord",
-  "removePasswordTitle": "Tog bort lösenord",
+  "setPasswordTitle": "Lösenord sparat",
+  "changePasswordTitle": "Lösenord ändrat",
+  "removePasswordTitle": "Lösenord har tagits bort",
   "setPasswordToastDescription": "Ditt lösenord har angetts. Håll det säkert.",
   "changePasswordToastDescription": "Ditt lösenord har ändrats. Håll det säkert.",
-  "removePasswordToastDescription": "Du har tagit bort ditt lösenord.",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "Ditt lösenord har tagits bort.",
+  "publicChatExists": "Du är redan ansluten till denna gemenskap",
+  "connectToServerFail": "Kunde inte ansluta till gemenskapen",
   "connectingToServer": "Ansluter...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "Anslutning till gemenskap lyckades",
   "setPasswordFail": "Misslyckades att uppdatera lösenordet",
   "passwordLengthError": "Lösenordet måste vara mellan 6 och 12 tecken långt",
   "passwordTypeError": "Lösenordet måste vara en sträng",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "Profil",
   "groupNamePlaceholder": "Gruppnamn",
   "inviteContacts": "Bjud in vänner",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "Lägg till administratörer",
+  "removeModerators": "Ta bort Administratörer",
+  "addAsModerator": "Lägg till som administratör",
+  "removeFromModerators": "Ta bort från administratörer",
   "add": "Lägg till",
   "addingContacts": "Lägger till kontakter till $name$",
   "noContactsToAdd": "Inga kontakter att lägga till",
   "noMembersInThisGroup": "Inga andra medlemmar i gruppen",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "inga administratörer att ta bort",
   "onlyAdminCanRemoveMembers": "Du är inte skaparen",
   "onlyAdminCanRemoveMembersDesc": "Endast skaparen av gruppen kan ta bort användare",
   "createAccount": "Create Account",
   "startInTrayTitle": "Behåll i systemfältet",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Session fortsätter att köras i bakgrunden när du stänger fönstret.",
   "yourUniqueSessionID": "Säg hej till ditt Session-ID",
   "allUsersAreRandomly...": "Ditt session-ID är en unik adress folk kan använda för att kontakta dig på Session. Utan koppling till din riktiga identitet, ditt Sessions-ID är helt anonymt och privat.",
   "getStarted": "Kom igång",
@@ -344,40 +348,43 @@
   "linkDevice": "Koppla enhet",
   "restoreUsingRecoveryPhrase": "Återställ ditt konto",
   "or": "eller",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "Genom att använda denna tjänst godkänner du våra <a href=\"https://getsession.org/terms-of-service \">Användarvillkor</a> och <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Sekretesspolicy</a>",
   "beginYourSession": "Börja din Session.",
   "welcomeToYourSession": "Välkommen till Session",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "Sök i konversationer och kontakter",
+  "searchForContactsOnly": "Sök kontakter",
   "enterSessionID": "Ange Session-ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "Ange din kontakts Session-ID eller ONS",
   "message": "Meddelande",
   "appearanceSettingsTitle": "Utseende",
   "privacySettingsTitle": "Sekretess",
   "notificationsSettingsTitle": "Aviseringar",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Aviseringsinnehåll",
+  "notificationPreview": "Förhandsgranska",
   "recoveryPhraseEmpty": "Ange din återställningsfras",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ medlemmar",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "Anslut",
+  "joinOpenGroup": "Gå med i gemenskapen",
+  "createGroup": "Skapa grupp",
+  "create": "Skapa",
   "createClosedGroupNamePrompt": "Gruppnamn",
   "createClosedGroupPlaceholder": "Ange ett gruppnamn",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "Gemenskapens URL",
+  "enterAnOpenGroupURL": "Ange Gemenskapens URL",
   "next": "Nästa",
   "invalidGroupNameTooShort": "Ange ett gruppnamn",
   "invalidGroupNameTooLong": "Ange ett kortare gruppnamn",
   "pickClosedGroupMember": "Välj minst 1 gruppmedlem",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Inga blockerade kontakter",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "En grupp kan inte ha fler än 100 medlemmar",
+  "noBlockedContacts": "Du har inga blockerade kontakter.",
+  "userAddedToModerators": "Användare tillagd i admin-listan",
+  "userRemovedFromModerators": "Användare borttagen från admin-listan",
   "orJoinOneOfThese": "Eller gå med i en av dessa...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "Översätt Session",
   "closedGroupInviteFailTitle": "Gruppinbjudan misslyckades",
   "closedGroupInviteFailTitlePlural": "Gruppinbjudningar misslyckades",
   "closedGroupInviteFailMessage": "Kunde inte bjuda in en gruppmedlem",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "Försök att bjuda igen",
   "closedGroupInviteSuccessTitlePlural": "Gruppinbjudningar misslyckades",
   "closedGroupInviteSuccessTitle": "Gruppinbjudan misslyckades",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "Lyckades bjuda in gruppmedlemmar",
   "notificationForConvo": "Aviseringar",
   "notificationForConvo_all": "Alla",
   "notificationForConvo_disabled": "Inaktiverad",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "Öppna länken i din webbläsare?",
   "linkVisitWarningMessage": "Är du säker du vill öppna $url$ i din webbläsare?",
   "open": "Öppna",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "Spela automatiskt upp ljudmeddelanden",
+  "audioMessageAutoplayDescription": "Automatisk spela upp efterföljande ljudmeddelanden.",
   "clickToTrustContact": "Klicka för att ladda ned",
   "trustThisContactDialogTitle": "Lita på $name$?",
   "trustThisContactDialogDescription": "Är du säker du vill hämta media skickat av $name$?",
   "pinConversation": "Fäst konversation",
   "unpinConversation": "Lossa konversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Visa användardetaljer",
   "sendRecoveryPhraseTitle": "Skickar återställningsfras",
   "sendRecoveryPhraseMessage": "Du försöker skicka din återställningsfras som kan användas för att komma åt ditt konto. Är du säker på att du vill skicka detta meddelande?",
@@ -413,33 +421,36 @@
   "dialogClearAllDataDeletionFailedDesc": "Uppgifterna raderades inte med ett okänt fel. Vill du radera uppgifterna från bara den här enheten?",
   "dialogClearAllDataDeletionFailedTitleQuestion": "Vill du radera data från bara den här enheten?",
   "dialogClearAllDataDeletionFailedMultiple": "Uppgifterna raderades inte av dessa tjänstnoder: $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "Vill du bara rensa den här enheten eller ta bort dina data från nätverket?",
+  "clearDevice": "Nollställ enheten",
+  "tryAgain": "Försök igen",
+  "areYouSureClearDevice": "Är du säker på att du vill återställa enheten?",
+  "deviceOnly": "Nollställ endast enheten",
+  "entireAccount": "Nollställ enhet och nätverk",
   "areYouSureDeleteDeviceOnly": "Är du säker på att du vill radera din enhets uppgifter?",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "Är du säker på att du vill ta bort dina data från nätverket? Om du fortsätter kommer du inte att kunna återställa dina meddelanden eller kontakter.",
   "iAmSure": "Jag är säker",
   "recoveryPhraseSecureTitle": "Du är nästan färdig!",
   "recoveryPhraseRevealMessage": "Säkra ditt konto genom att spara din återställningsfras. Visa din återställningsfras och lagra den på ett säkert sätt.",
   "recoveryPhraseRevealButtonText": "Visa återställningsfras",
   "notificationSubtitle": "Notifierings - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
+  "surveyTitle": "Vi skulle uppskatta din feedback",
+  "faq": "Vanliga frågor",
   "support": "Support",
-  "clearAll": "Clear All",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearAll": "Rensa Allt",
+  "clearDataSettingsTitle": "Rensa data",
   "messageRequests": "Meddelandeförfrågningar",
   "requestsSubtitle": "Pågående förfrågningar",
   "requestsPlaceholder": "Inga förfrågningar",
-  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "hideRequestBannerDescription": "Dölj annonsen för meddelandebegäran tills du får en ny meddelandeförfrågan.",
   "incomingCallFrom": "Inkommande samtal från '$name$'",
   "ringing": "Ringer...",
   "establishingConnection": "Etablerar anslutning...",
   "accept": "Acceptera",
   "decline": "Neka",
   "endCall": "Avsluta samtal",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "Behörigheter",
+  "helpSettingsTitle": "Hjälp",
   "cameraPermissionNeededTitle": "Kräver behörigheter för röst/video-samtal",
   "cameraPermissionNeeded": "Du kan aktivera behörigheten \"Röst- och videosamtal\" i Sekretessinställningarna.",
   "unableToCall": "Avbryt pågående samtal först",
@@ -449,44 +460,49 @@
   "noCameraFound": "Ingen kamera hittades",
   "noAudioInputFound": "Ingen ljudinmatning hittades",
   "noAudioOutputFound": "Ingen ljudutmatning hittades",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "Röst- och videosamtal (Beta)",
   "callMissedCausePermission": "Missade ett samtal från \"$name$\" eftersom du måste aktivera behörigheten \"Röst- och videosamtal\" i Sekretessinställningarna.",
-  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMissedNotApproved": "Samtal missade från '$name$' som du inte har godkänt denna konversation ännu. Skicka ett meddelande till dem först.",
+  "callMediaPermissionsDescription": "Aktiverar röst- och videosamtal till och från andra användare.",
+  "callMediaPermissionsDialogContent": "Din IP-adress är synlig för din samtalspartner och en Oxen Foundation-server när du använder beta-samtal. Är du säker på att du vill aktivera röst- och videosamtal?",
+  "callMediaPermissionsDialogTitle": "Röst- och videosamtal (Beta)",
   "startedACall": "Du ringde $name$",
   "answeredACall": "Samtal med $name$",
   "trimDatabase": "Trimma databasen",
   "trimDatabaseDescription": "Minskar storleken på ditt meddelande databas till dina senaste 10.000 meddelanden.",
   "trimDatabaseConfirmationBody": "Är du säker på att du vill ta bort dina $deleteAmount$ äldsta mottagna meddelanden?",
-  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
-  "messageRequestPending": "Your message request is currently pending",
-  "messageRequestAccepted": "Your message request has been accepted",
-  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
-  "messageRequestAcceptedOursNoName": "You have accepted the message request",
-  "declineRequestMessage": "Are you sure you want to decline this message request?",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
-  "hideRequestBanner": "Hide Message Request Banner",
-  "openMessageRequestInbox": "Message Requests",
-  "noMessageRequestsPending": "No pending message requests",
-  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
-  "youHaveANewFriendRequest": "You have a new friend request",
-  "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "hideBanner": "Hide",
-  "openMessageRequestInboxDescription": "View your Message Request inbox",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "pleaseWaitOpenAndOptimizeDb": "Vänligen vänta medan din databas öppnas och optimeras...",
+  "messageRequestPending": "Din meddelandeförfrågan inväntar svar",
+  "messageRequestAccepted": "Din meddelandeförfrågan har godkänts",
+  "messageRequestAcceptedOurs": "Du har accepterat $name$s meddelandebegäran",
+  "messageRequestAcceptedOursNoName": "Du har godkänt meddelandeförfrågan",
+  "declineRequestMessage": "Är du säker på att du vill avvisa denna meddelandeförfrågan?",
+  "respondingToRequestWarning": "Att skicka ett meddelande till den här användaren godkänner automatiskt deras meddelandebegäran och avslöjar ditt Session ID.",
+  "hideRequestBanner": "Dölj meddelandeförfrågningsbanner",
+  "openMessageRequestInbox": "Meddelandeförfrågningar",
+  "noMessageRequestsPending": "Inga väntande meddelandeförfrågningar",
+  "noMediaUntilApproved": "Du kan inte skicka bilagor förrän konversationen har godkänts",
+  "mustBeApproved": "Denna konversation måste godkännas för att använda denna funktion",
+  "youHaveANewFriendRequest": "Du har en ny vänförfrågan",
+  "clearAllConfirmationTitle": "Rensa alla meddelandeförfrågningar",
+  "clearAllConfirmationBody": "Är du säker på att du vill rensa alla meddelandeförfrågningar?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Dölj",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "Visa inkorg för meddelandebegäran",
+  "clearAllReactions": "Vill du verkligen rensa alla $emoji$ ?",
+  "expandedReactionsText": "Visa färre",
+  "reactionNotification": "Reagerar på ett meddelande med $emoji$",
+  "rateLimitReactMessage": "Lugna ner dig! Du har sänt för många emojis. Försök igen om en stund",
+  "otherSingular": "$number$ annat",
+  "otherPlural": "$number$ övriga",
+  "reactionPopup": "reagerade med",
   "reactionPopupOne": "$name$",
   "reactionPopupTwo": "$name$ & $name2$",
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountSingular": "Ytterligare $otherSingular$ har reagerat <span>$emoji$</span> på detta meddelande",
+  "reactionListCountPlural": "Ytterligare $otherPlural$ har reagerat <span>$emoji$</span> på detta meddelande"
 }
diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json
index 5e01ba741..d434657c4 100644
--- a/_locales/ta/messages.json
+++ b/_locales/ta/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$ குழுவில் சேர வேண்டுமா?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "தொடர்புடைய திறந்த குழு சேவையகத்தைக் கண்டறிய முடியவில்லை",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "அமர்வு ஐடி அல்லது ஓஎன்எஸ் பெயரை உள்ளிடுக",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "ஏற்றபடுகின்றது...",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"{$searchTerm$\" க்கான தேடல் முடிவுகள் எதுவும் இல்லை",
   "conversationsHeader": "தொடர்புகள் மற்றும் குழுக்கள்",
   "contactsHeader": "தொடர்புகள்",
-  "messagesHeader": "தகவல்கள்",
+  "messagesHeader": "Conversations",
   "settingsHeader": "அமைப்புகள்",
   "typingAlt": "இந்த உரையாடலுக்கான அனிமேஷன் தட்டச்சு",
   "contactAvatarAlt": "தொடர்பு $name$ க்கான அவதார்",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "தகவலைகலை நீக்கு",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "அனுப்புனர்:",
@@ -107,29 +108,30 @@
   "sent": "அனுப்பப்பட்டது",
   "received": "பெறப்பட்டது",
   "sendMessage": "செய்தி",
-  "groupMembers": "குழு ",
+  "groupMembers": "Members",
   "moreInformation": "மேற்கொண்ட தகவல்கள்",
   "resend": "மீண்டும் அனுப்பு",
   "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Image sent in conversation",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "No name or content",
   "nameOnly": "Name Only",
   "newMessage": "புதிய தகவல்",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 hours",
   "timerOption_1_day": "1 day",
   "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Disappearing messages",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 மணி நேரம்",
   "timerOption_1_day_abbreviated": "1 நாள்",
   "timerOption_1_week_abbreviated": "1 வாரம்",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/th/messages.json b/_locales/th/messages.json
index 48e7d94f1..161c7a64f 100644
--- a/_locales/th/messages.json
+++ b/_locales/th/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "กำลังโหลด...",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Contacts and Groups",
   "contactsHeader": "ผู้ติดต่อ",
-  "messagesHeader": "ข้อความ",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "ภาพบุคคลที่ติดต่อ",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
   "deleteMessages": "ลบข้อความ",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "This message has been deleted",
   "from": "จาก",
@@ -107,29 +108,30 @@
   "sent": "ส่งแล้ว",
   "received": "ได้รับแล้ว",
   "sendMessage": "ส่งข้อความ",
-  "groupMembers": "สมาชิกกลุ่ม",
+  "groupMembers": "Members",
   "moreInformation": "More information",
   "resend": "Resend",
   "deleteConversationConfirmation": "ลบการสนทนานี้โดยถาวรหรือไม่",
   "clear": "Clear",
   "clearAllData": "Clear All Data",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
   "quoteThumbnailAlt": "รูปย่อจากข้อความที่อ้างถึง",
   "imageAttachmentAlt": "Image attached to message",
-  "videoAttachmentAlt": "Screenshot of video attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "ภาพถูกส่งไปในการสนทนา",
   "imageCaptionIconAlt": "Icon showing that this image has a caption",
   "addACaption": "Add a caption...",
   "copySessionID": "Copy Session ID",
-  "copyOpenGroupURL": "Copy Group's URL",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "บันทึก",
   "saveLogToDesktop": "Save log to desktop",
   "saved": "Saved",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
   "mediaPermissionsTitle": "Microphone",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "ทั้งชื่อผู้ส่งและข้อความ",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "ไม่ทั้งชื่อหรือข้อความ",
   "nameOnly": "เฉพาะชื่อผู้ส่ง",
   "newMessage": "ข้อความใหม่",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 ชั่วโมง",
   "timerOption_1_day": "1 วัน",
   "timerOption_1_week": "1 อาทิตย์",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "ข้อความที่ลบตัวเอง",
   "changeNickname": "Change Nickname",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12h",
   "timerOption_1_day_abbreviated": "1d",
   "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "ตั้งค่าตัวตั้งเวลาไว้ที่ $time$",
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "หมายเลขไม่ถูกต้อง",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Auto Update",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ ได้เข้าร่วมกลุ่ม",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
-  "blockUser": "Block",
-  "unblockUser": "Unblock",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Unblocked",
   "blocked": "Blocked",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Change Account Password",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Remove Account Password",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Password",
   "setPassword": "Set Password",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Set Password",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Connecting...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Privacy",
   "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Please enter a shorter group name",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/tl/messages.json b/_locales/tl/messages.json
new file mode 100644
index 000000000..0eece458b
--- /dev/null
+++ b/_locales/tl/messages.json
@@ -0,0 +1,508 @@
+{
+  "copyErrorAndQuit": "Kopyahin ang error at umalis",
+  "unknown": "Hindi kilala",
+  "databaseError": "Error ang Database",
+  "mainMenuFile": "&File",
+  "mainMenuEdit": "&I-edit",
+  "mainMenuView": "&Tingnan",
+  "mainMenuWindow": "&Window",
+  "mainMenuHelp": "&Tulong",
+  "appMenuHide": "Itago",
+  "appMenuHideOthers": "Itago ang Iba",
+  "appMenuUnhide": "Ipakita ang Lahat",
+  "appMenuQuit": "Umalis sa Session",
+  "editMenuUndo": "Ipawalang-bisa",
+  "editMenuRedo": "Gawin muli",
+  "editMenuCut": "Putulin",
+  "editMenuCopy": "Kopyahin",
+  "editMenuPaste": "Idikit",
+  "editMenuDeleteContact": "ALisin ang Contact",
+  "editMenuDeleteGroup": "Alisin ang Grupo",
+  "editMenuSelectAll": "Piliin lahat",
+  "windowMenuClose": "Isara ang Window",
+  "windowMenuMinimize": "Paliitin",
+  "windowMenuZoom": "I-zoom",
+  "viewMenuResetZoom": "Aktwal na Sukat",
+  "viewMenuZoomIn": "Palakihin",
+  "viewMenuZoomOut": "Paliitin",
+  "viewMenuToggleFullScreen": "I-toogle ang Buong Screen",
+  "viewMenuToggleDevTools": "I-toggle ang Mga Tool ng Developer",
+  "contextMenuNoSuggestions": "Walang Mga Mungkahi",
+  "openGroupInvitation": "Imbitasyon ng Komunidad",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Sumali sa $roomName$?",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Sigurado ka bang gusto mong sumali sa grupo ng $roomName$?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "enterSessionIDOrONSName": "Ilagay ang Session ID o pangalan ng ONS",
+  "startNewConversationBy...": "Magsimula ng bagong usapan sa pamamagitan ng paglalagay ng Session ID ng isang tao o ibahagi ang Session ID mo sa kanila.",
+  "loading": "Naglo-loading...",
+  "done": "Tapos na",
+  "youLeftTheGroup": "Umalis ka na sa grupo.",
+  "youGotKickedFromGroup": "Tinanggal ka mula sa grupo.",
+  "unreadMessages": "Mga Hindi Nabasang Mensahe",
+  "debugLogExplanation": "Ise-save ang log na ito sa iyong desktop.",
+  "reportIssue": "Mag-ulat ng Bug",
+  "markAllAsRead": "Markahan ang Lahat bilang Nabasa",
+  "incomingError": "Error sa paghawak ng papasok na mensahe",
+  "media": "Media",
+  "mediaEmptyState": "Walang media",
+  "documents": "Mga dokumento",
+  "documentsEmptyState": "Walang mga dokumento",
+  "today": "Ngayong Araw",
+  "yesterday": "Kahapon",
+  "thisWeek": "Ngayong linggo",
+  "thisMonth": "Ngayong Buwan",
+  "voiceMessage": "Mensahe ng Boses",
+  "stagedPreviewThumbnail": "I-draft ang preview ng link ng thumbnail para sa $domain$",
+  "previewThumbnail": "Preeview ng link ng thumbnail para sa $domain$",
+  "stagedImageAttachment": "I-draft ang attachment ng imahe: $path$",
+  "oneNonImageAtATimeToast": "Paumanhin, may limitasyon ang isang hindi imaheng attachment bawat mensahe",
+  "cannotMixImageAndNonImageAttachments": "Paumanhin, hindi mo maaaring ihalo ang mga imahe sa iba pang mga uri ng file sa isang mensahe",
+  "maximumAttachments": "Naabot ang maximum na bilang ng mga attachment. Pakiipadala ang natitirang mga attachment sa isang hiwalay na mensahe.",
+  "fileSizeWarning": "Ang attachment ay lumampas sa mga limitasyon sa laki para sa uri ng mensahe na ipinapadala mo.",
+  "unableToLoadAttachment": "Paumanhin, nagkaroon ng error sa pagtatakda ng iyong attachment.",
+  "offline": "Offline",
+  "debugLog": "I-debug ang Log",
+  "showDebugLog": "I-export ang mga Log",
+  "shareBugDetails": "I-export ang iyong mga log, pagkatapos ay i-upload ang file sa Help Desk ng Session.",
+  "goToReleaseNotes": "Pumunta sa Mga Tala sa Paglabas",
+  "goToSupportPage": "Pumunta sa Pahina ng Suporta",
+  "about": "Tungkol sa",
+  "show": "Ipakita",
+  "sessionMessenger": "Session",
+  "noSearchResults": "Walang nakitang mga resulta para sa \"$searchTerm$\"",
+  "conversationsHeader": "Mga Contact at Grupo",
+  "contactsHeader": "Mga Contact",
+  "messagesHeader": "Conversations",
+  "settingsHeader": "Settings",
+  "typingAlt": "Pag-type ng animation para sa usapan na ito",
+  "contactAvatarAlt": "Avatar para sa contact na si $name$",
+  "downloadAttachment": "I-download ang Attachment",
+  "replyToMessage": "Sagutin ang mensahe",
+  "replyingToMessage": "Sinasagot si:",
+  "originalMessageNotFound": "Hindi nakita ang orihinal na mensahe",
+  "you": "Ikaw",
+  "audioPermissionNeededTitle": "Kinakailangan ang Access sa Microphone",
+  "audioPermissionNeeded": "Maaari mong i-enable ang access sa microphone sa ilalim ng: Settings (icon ng Gear) => Privacy",
+  "audio": "Audio",
+  "video": "Video",
+  "photo": "Larawan",
+  "cannotUpdate": "Hindi Ma-update",
+  "cannotUpdateDetail": "Nabigong i-update ang Session Desktop, ngunit may available na bagong bersyon. Mangyaring pumunta sa https://getsession.org/ at manwal na i-install ang bagong bersyon, pagkatapos ay makipag-ugnayan sa suporta o mag-file ng bug tungkol sa problemang ito.",
+  "ok": "OK",
+  "cancel": "Ikansela",
+  "close": "Isara",
+  "continue": "Continue",
+  "error": "Error",
+  "delete": "I-delete",
+  "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
+  "deleteJustForMe": "Delete just for me",
+  "deleteForEveryone": "Delete for everyone",
+  "deleteMessagesQuestion": "Delete $count$ messages?",
+  "deleteMessageQuestion": "Delete this message?",
+  "deleteMessages": "Delete Messages",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ deleted",
+  "messageDeletedPlaceholder": "This message has been deleted",
+  "from": "From:",
+  "to": "To:",
+  "sent": "Sent",
+  "received": "Received",
+  "sendMessage": "Message",
+  "groupMembers": "Members",
+  "moreInformation": "More information",
+  "resend": "Resend",
+  "deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
+  "clear": "Clear",
+  "clearAllData": "Clear All Data",
+  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
+  "deleteContactConfirmation": "Are you sure you want to delete this conversation?",
+  "quoteThumbnailAlt": "Thumbnail of image from quoted message",
+  "imageAttachmentAlt": "Image attached to message",
+  "videoAttachmentAlt": "Screenshot of video in message",
+  "lightboxImageAlt": "Image sent in conversation",
+  "imageCaptionIconAlt": "Icon showing that this image has a caption",
+  "addACaption": "Add a caption...",
+  "copySessionID": "Copy Session ID",
+  "copyOpenGroupURL": "Copy Group URL",
+  "save": "I-save",
+  "saveLogToDesktop": "Save log to desktop",
+  "saved": "Saved",
+  "tookAScreenshot": "$name$ took a screenshot",
+  "savedTheFile": "Media saved by $name$",
+  "linkPreviewsTitle": "Send Link Previews",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
+  "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
+  "mediaPermissionsTitle": "Microphone",
+  "mediaPermissionsDescription": "Allow access to microphone.",
+  "spellCheckTitle": "Spell Check",
+  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDirty": "You must restart Session to apply your new settings",
+  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingTitle": "Read Receipts",
+  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingTitle": "Typing Indicators",
+  "zoomFactorSettingTitle": "Zoom Factor",
+  "themesSettingTitle": "Themes",
+  "primaryColor": "Primary Colour",
+  "primaryColorGreen": "Primary color green",
+  "primaryColorBlue": "Primary color blue",
+  "primaryColorYellow": "Primary color yellow",
+  "primaryColorPink": "Primary color pink",
+  "primaryColorPurple": "Primary color purple",
+  "primaryColorOrange": "Primary color  orange",
+  "primaryColorRed": "Primary color red",
+  "classicDarkThemeTitle": "Classic Dark",
+  "classicLightThemeTitle": "Classic Light",
+  "oceanDarkThemeTitle": "Ocean Dark",
+  "oceanLightThemeTitle": "Ocean Light",
+  "pruneSettingTitle": "Trim Communities",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
+  "enable": "Enable",
+  "keepDisabled": "Keep disabled",
+  "notificationSettingsDialog": "The information shown in notifications.",
+  "nameAndMessage": "Name & Content",
+  "noNameOrMessage": "No name or content",
+  "nameOnly": "Name Only",
+  "newMessage": "New Message",
+  "createConversationNewContact": "Create a conversation with a new contact",
+  "createConversationNewGroup": "Create a group with existing contacts",
+  "joinACommunity": "Join a community",
+  "chooseAnAction": "Choose an action to start a conversation",
+  "newMessages": "New Messages",
+  "notificationMostRecentFrom": "Most recent from: $name$",
+  "notificationFrom": "From:",
+  "notificationMostRecent": "Most recent:",
+  "sendFailed": "Send Failed",
+  "mediaMessage": "Media message",
+  "messageBodyMissing": "Please enter a message body.",
+  "messageBody": "Message body",
+  "unblockToSend": "Unblock this contact to send a message.",
+  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
+  "youChangedTheTimer": "You set the disappearing message timer to $time$",
+  "timerSetOnSync": "Updated disappearing message timer to $time$",
+  "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
+  "timerOption_0_seconds": "Off",
+  "timerOption_5_seconds": "5 seconds",
+  "timerOption_10_seconds": "10 seconds",
+  "timerOption_30_seconds": "30 seconds",
+  "timerOption_1_minute": "1 minute",
+  "timerOption_5_minutes": "5 minutes",
+  "timerOption_30_minutes": "30 minutes",
+  "timerOption_1_hour": "1 hour",
+  "timerOption_6_hours": "6 hours",
+  "timerOption_12_hours": "12 hours",
+  "timerOption_1_day": "1 day",
+  "timerOption_1_week": "1 week",
+  "timerOption_2_weeks": "2 weeks",
+  "disappearingMessages": "Disappearing messages",
+  "changeNickname": "Change Nickname",
+  "clearNickname": "Clear Nickname",
+  "nicknamePlaceholder": "New Nickname",
+  "changeNicknameMessage": "Enter a nickname for this user",
+  "timerOption_0_seconds_abbreviated": "off",
+  "timerOption_5_seconds_abbreviated": "5s",
+  "timerOption_10_seconds_abbreviated": "10s",
+  "timerOption_30_seconds_abbreviated": "30s",
+  "timerOption_1_minute_abbreviated": "1m",
+  "timerOption_5_minutes_abbreviated": "5m",
+  "timerOption_30_minutes_abbreviated": "30m",
+  "timerOption_1_hour_abbreviated": "1h",
+  "timerOption_6_hours_abbreviated": "6h",
+  "timerOption_12_hours_abbreviated": "12h",
+  "timerOption_1_day_abbreviated": "1d",
+  "timerOption_1_week_abbreviated": "1w",
+  "timerOption_2_weeks_abbreviated": "2w",
+  "disappearingMessagesDisabled": "Disappearing messages disabled",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
+  "youDisabledDisappearingMessages": "You disabled disappearing messages.",
+  "timerSetTo": "Disappearing message time set to $time$",
+  "noteToSelf": "Note to Self",
+  "hideMenuBarTitle": "Hide Menu Bar",
+  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "startConversation": "Start New Conversation",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
+  "failedResolveOns": "Failed to resolve ONS name",
+  "autoUpdateSettingTitle": "Auto Update",
+  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateNewVersionTitle": "Session update available",
+  "autoUpdateNewVersionMessage": "There is a new version of Session available.",
+  "autoUpdateNewVersionInstructions": "Press Restart Session to apply the updates.",
+  "autoUpdateRestartButtonLabel": "Restart Session",
+  "autoUpdateLaterButtonLabel": "Later",
+  "autoUpdateDownloadButtonLabel": "Download",
+  "autoUpdateDownloadedMessage": "Update has been downloaded.",
+  "autoUpdateDownloadInstructions": "Would you like to download the update?",
+  "leftTheGroup": "$name$ has left the group.",
+  "multipleLeftTheGroup": "$name$ left the group",
+  "updatedTheGroup": "Group updated",
+  "titleIsNow": "Group name is now '$name$'.",
+  "joinedTheGroup": "$name$ joined the group.",
+  "multipleJoinedTheGroup": "$name$ joined the group.",
+  "kickedFromTheGroup": "$name$ was removed from the group.",
+  "multipleKickedFromTheGroup": "$name$ were removed from the group.",
+  "block": "Block",
+  "unblock": "Unblock",
+  "unblocked": "Unblocked",
+  "blocked": "Blocked",
+  "blockedSettingsTitle": "Blocked Contacts",
+  "conversationsSettingsTitle": "Conversations",
+  "unbanUser": "Unban User",
+  "userUnbanned": "User unbanned successfully",
+  "userUnbanFailed": "Unban failed!",
+  "banUser": "Ban User",
+  "banUserAndDeleteAll": "Ban and Delete All",
+  "userBanned": "Banned successfully",
+  "userBanFailed": "Ban failed!",
+  "leaveGroup": "Leave Group",
+  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveGroupConfirmation": "Are you sure you want to leave this group?",
+  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
+  "cannotRemoveCreatorFromGroup": "Cannot remove this user",
+  "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
+  "noContactsForGroup": "You don't have any contacts yet",
+  "failedToAddAsModerator": "Failed to add user as admin",
+  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "copyMessage": "Copy message text",
+  "selectMessage": "Select message",
+  "editGroup": "Edit group",
+  "editGroupName": "Edit group name",
+  "updateGroupDialogTitle": "Updating $name$...",
+  "showRecoveryPhrase": "Recovery Phrase",
+  "yourSessionID": "Your Session ID",
+  "setAccountPasswordTitle": "Password",
+  "setAccountPasswordDescription": "Require password to unlock Session.",
+  "changeAccountPasswordTitle": "Change Password",
+  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
+  "removeAccountPasswordTitle": "Remove Password",
+  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "enterPassword": "Please enter your password",
+  "confirmPassword": "Confirm password",
+  "enterNewPassword": "Please enter your new password",
+  "confirmNewPassword": "Confirm new password",
+  "showRecoveryPhrasePasswordRequest": "Please enter your password",
+  "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
+  "invalidOpenGroupUrl": "Invalid URL",
+  "copiedToClipboard": "Copied",
+  "passwordViewTitle": "Enter Password",
+  "password": "Password",
+  "setPassword": "Set Password",
+  "changePassword": "Change Password",
+  "createPassword": "Create your password",
+  "removePassword": "Remove Password",
+  "maxPasswordAttempts": "Invalid Password. Would you like to reset the database?",
+  "typeInOldPassword": "Please enter your current password",
+  "invalidOldPassword": "Old password is invalid",
+  "invalidPassword": "Invalid password",
+  "noGivenPassword": "Please enter your password",
+  "passwordsDoNotMatch": "Passwords do not match",
+  "setPasswordInvalid": "Passwords do not match",
+  "changePasswordInvalid": "The old password you entered is incorrect",
+  "removePasswordInvalid": "Incorrect password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
+  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
+  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
+  "removePasswordToastDescription": "Your password has been removed.",
+  "publicChatExists": "You are already connected to this community",
+  "connectToServerFail": "Couldn't join community",
+  "connectingToServer": "Connecting...",
+  "connectToServerSuccess": "Successfully connected to community",
+  "setPasswordFail": "Failed to set password",
+  "passwordLengthError": "Password must be between 6 and 64 characters long",
+  "passwordTypeError": "Password must be a string",
+  "passwordCharacterError": "Password must only contain letters, numbers and symbols",
+  "remove": "Remove",
+  "invalidSessionId": "Invalid Session ID",
+  "invalidPubkeyFormat": "Invalid Pubkey Format",
+  "emptyGroupNameError": "Please enter a group name",
+  "editProfileModalTitle": "Profile",
+  "groupNamePlaceholder": "Group Name",
+  "inviteContacts": "Invite Contacts",
+  "addModerators": "Add Admins",
+  "removeModerators": "Remove Admins",
+  "addAsModerator": "Add as Admin",
+  "removeFromModerators": "Remove From Admins",
+  "add": "Add",
+  "addingContacts": "Adding contacts to $name$",
+  "noContactsToAdd": "No contacts to add",
+  "noMembersInThisGroup": "No other members in this group",
+  "noModeratorsToRemove": "no admins to remove",
+  "onlyAdminCanRemoveMembers": "You are not the creator",
+  "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
+  "createAccount": "Create account",
+  "startInTrayTitle": "Keep in System Tray",
+  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "yourUniqueSessionID": "Say hello to your Session ID",
+  "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.",
+  "getStarted": "Get started",
+  "createSessionID": "Create Session ID",
+  "recoveryPhrase": "Recovery Phrase",
+  "enterRecoveryPhrase": "Enter your recovery phrase",
+  "displayName": "Display Name",
+  "anonymous": "Anonymous",
+  "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
+  "enterDisplayName": "Enter a display name",
+  "continueYourSession": "Continue Your Session",
+  "linkDevice": "Link Device",
+  "restoreUsingRecoveryPhrase": "Restore your account",
+  "or": "or",
+  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "beginYourSession": "Begin your Session.",
+  "welcomeToYourSession": "Welcome to your Session",
+  "searchFor...": "Search conversations and contacts",
+  "searchForContactsOnly": "Search for contacts",
+  "enterSessionID": "Enter Session ID",
+  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "message": "Message",
+  "appearanceSettingsTitle": "Appearance",
+  "privacySettingsTitle": "Privacy",
+  "notificationsSettingsTitle": "Notifications",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "Notification Content",
+  "notificationPreview": "Preview",
+  "recoveryPhraseEmpty": "Enter your recovery phrase",
+  "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
+  "members": "$count$ members",
+  "activeMembers": "$count$ active members",
+  "join": "Join",
+  "joinOpenGroup": "Join Community",
+  "createGroup": "Create Group",
+  "create": "Create",
+  "createClosedGroupNamePrompt": "Group Name",
+  "createClosedGroupPlaceholder": "Enter a group name",
+  "openGroupURL": "Community URL",
+  "enterAnOpenGroupURL": "Enter Community URL",
+  "next": "Susunod",
+  "invalidGroupNameTooShort": "Please enter a group name",
+  "invalidGroupNameTooLong": "Please enter a shorter group name",
+  "pickClosedGroupMember": "Please pick at least 1 group member",
+  "closedGroupMaxSize": "A group cannot have more than 100 members",
+  "noBlockedContacts": "You have no blocked contacts.",
+  "userAddedToModerators": "User added to admin list",
+  "userRemovedFromModerators": "User removed from admin list",
+  "orJoinOneOfThese": "Or join one of these...",
+  "helpUsTranslateSession": "Translate Session",
+  "closedGroupInviteFailTitle": "Group Invitation Failed",
+  "closedGroupInviteFailTitlePlural": "Group Invitations Failed",
+  "closedGroupInviteFailMessage": "Unable to successfully invite a group member",
+  "closedGroupInviteFailMessagePlural": "Unable to successfully invite all group members",
+  "closedGroupInviteOkText": "Retry invitations",
+  "closedGroupInviteSuccessTitlePlural": "Group Invitations Completed",
+  "closedGroupInviteSuccessTitle": "Group Invitation Succeeded",
+  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "notificationForConvo": "Notifications",
+  "notificationForConvo_all": "All",
+  "notificationForConvo_disabled": "Disabled",
+  "notificationForConvo_mentions_only": "Mentions only",
+  "onionPathIndicatorTitle": "Path",
+  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
+  "unknownCountry": "Unknown Country",
+  "device": "Device",
+  "destination": "Destination",
+  "learnMore": "Learn more",
+  "linkVisitWarningTitle": "Open this link in your browser?",
+  "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?",
+  "open": "Buksan",
+  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
+  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "clickToTrustContact": "Click to download media",
+  "trustThisContactDialogTitle": "Trust $name$?",
+  "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
+  "pinConversation": "Pin Conversation",
+  "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
+  "showUserDetails": "Show User Details",
+  "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
+  "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
+  "dialogClearAllDataDeletionFailedTitle": "Data not deleted",
+  "dialogClearAllDataDeletionFailedDesc": "Data not deleted with an unknown error. Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
+  "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
+  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
+  "deviceOnly": "Clear Device Only",
+  "entireAccount": "Clear Device and Network",
+  "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
+  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "iAmSure": "I am sure",
+  "recoveryPhraseSecureTitle": "You're almost finished!",
+  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it.",
+  "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
+  "notificationSubtitle": "Notifications - $setting$",
+  "surveyTitle": "We'd Love Your Feedback",
+  "faq": "FAQ",
+  "support": "Support",
+  "clearAll": "Clear All",
+  "clearDataSettingsTitle": "Clear Data",
+  "messageRequests": "Message Requests",
+  "requestsSubtitle": "Pending Requests",
+  "requestsPlaceholder": "No requests",
+  "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
+  "incomingCallFrom": "Incoming call from '$name$'",
+  "ringing": "Ringing...",
+  "establishingConnection": "Establishing connection...",
+  "accept": "Tanggapin",
+  "decline": "Tanggihan",
+  "endCall": "End call",
+  "permissionsSettingsTitle": "Permissions",
+  "helpSettingsTitle": "Help",
+  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
+  "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
+  "unableToCall": "Cancel your ongoing call first",
+  "unableToCallTitle": "Cannot start new call",
+  "callMissed": "Missed call from $name$",
+  "callMissedTitle": "Call missed",
+  "noCameraFound": "No camera found",
+  "noAudioInputFound": "No audio input found",
+  "noAudioOutputFound": "No audio output found",
+  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
+  "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
+  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "startedACall": "You called $name$",
+  "answeredACall": "Call with $name$",
+  "trimDatabase": "Trim Database",
+  "trimDatabaseDescription": "Reduces your message database size to your last 10,000 messages.",
+  "trimDatabaseConfirmationBody": "Are you sure you want to delete your $deleteAmount$ oldest received messages?",
+  "pleaseWaitOpenAndOptimizeDb": "Please wait while your database is opened and optimized...",
+  "messageRequestPending": "Your message request is currently pending",
+  "messageRequestAccepted": "Your message request has been accepted",
+  "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
+  "messageRequestAcceptedOursNoName": "You have accepted the message request",
+  "declineRequestMessage": "Are you sure you want to decline this message request?",
+  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
+  "hideRequestBanner": "Hide Message Request Banner",
+  "openMessageRequestInbox": "Message Requests",
+  "noMessageRequestsPending": "No pending message requests",
+  "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
+  "mustBeApproved": "This conversation must be accepted to use this feature",
+  "youHaveANewFriendRequest": "You have a new friend request",
+  "clearAllConfirmationTitle": "Clear All Message Requests",
+  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
+  "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "openMessageRequestInboxDescription": "View your Message Request inbox",
+  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
+  "expandedReactionsText": "Show Less",
+  "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
+  "otherSingular": "$number$ other",
+  "otherPlural": "$number$ others",
+  "reactionPopup": "reacted with",
+  "reactionPopupOne": "$name$",
+  "reactionPopupTwo": "$name$ & $name2$",
+  "reactionPopupThree": "$name$, $name2$ & $name3$",
+  "reactionPopupMany": "$name$, $name2$, $name3$ &",
+  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
+  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+}
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index b3940f978..cccabe66c 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "$roomName$'e katıl?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "İlgili opengroup sunucusu bulunamadı",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session Kimliğini veya ONS adını girin",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Yükleniyor...",
@@ -40,7 +40,7 @@
   "youGotKickedFromGroup": "Gruptan atıldınız.",
   "unreadMessages": "Okunmamış İletiler",
   "debugLogExplanation": "Bu sistem günlüğü masaüstünüze kaydedilecektir.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Bir Hata Bildir",
   "markAllAsRead": "Tümünü Okundu Olarak İşaretle",
   "incomingError": "Gelen ileti işlenirken hata oluştu",
   "media": "Medya",
@@ -62,7 +62,7 @@
   "unableToLoadAttachment": "Seçilen eklenti yüklenemedi.",
   "offline": "Çevrimdışı",
   "debugLog": "Hata Ayıklama Günlüğü",
-  "showDebugLog": "Export Logs",
+  "showDebugLog": "Günlüğu Dışa Aktar",
   "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
   "goToReleaseNotes": "Sürüm Notlarına Git",
   "goToSupportPage": "Destek Sayfasına Git",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"$searchTerm$\" için arama sonucu yok",
   "conversationsHeader": "Arama sırasında çıkan Kişiler ve Gruplar bölümü başlığının sonuçları",
   "contactsHeader": "Kişiler",
-  "messagesHeader": "İletiler",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Ayarlar",
   "typingAlt": "Bu sohbet için yazma animasyonu",
   "contactAvatarAlt": "$name$ kişisinin avatarı",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "$count$ mesajı sil?",
   "deleteMessageQuestion": "Bu ileti silinsin mi?",
   "deleteMessages": "İletileri sil",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ silinmiş",
   "messageDeletedPlaceholder": "Bu ileti silindi",
   "from": "Gönderen",
@@ -107,29 +108,30 @@
   "sent": "Gönderildi",
   "received": "Alındı",
   "sendMessage": "İleti gönder",
-  "groupMembers": "Grup üyeleri",
+  "groupMembers": "Üyeler",
   "moreInformation": "Daha fazla bilgi",
   "resend": "Tekrar gönder",
   "deleteConversationConfirmation": "Bu sohbeti kalıcı olarak sil?",
-  "clear": "Clear",
+  "clear": "Temizle",
   "clearAllData": "Tüm Veriyi Temizle",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Bu işlem mesajlarınızı ve kişilerinizi kalıcı olarak siler.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Bu konuşmayı silmek istediğinizden emin misiniz?",
   "quoteThumbnailAlt": "Alıntılanmış iletideki görüntünün önizlemesi",
   "imageAttachmentAlt": "İletiye görüntü eklenmiş",
-  "videoAttachmentAlt": "İletiye eklenen videonun ekran görüntüsü",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Konuşmada gönderilen görüntü",
   "imageCaptionIconAlt": "Bu görüntünün başlığı olduğunu gösteren ikon",
   "addACaption": "Bir başlık ekleyin...",
   "copySessionID": "Session Kimliğini Kopyala",
-  "copyOpenGroupURL": "Grubun URL'sini Kopyala",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Kaydet",
   "saveLogToDesktop": "Günlüğü masaüstüne kaydet",
   "saved": "Kaydedildi",
   "tookAScreenshot": "$name$ ekran görüntüsü aldı",
   "savedTheFile": "Medya, $name$ tarafından kaydedildi",
   "linkPreviewsTitle": "Bağlantı Önizlemelerini Gönder",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Bağlantı önizlemeleri gönderirken tamamıyla metaveri korumasına sahip olmazsınız.",
   "mediaPermissionsTitle": "Mikrofon",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -141,8 +143,8 @@
   "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
   "typingIndicatorsSettingTitle": "Yazıyor Göstergesi",
   "zoomFactorSettingTitle": "Yakınlaştırma faktörü",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "themesSettingTitle": "Temalar",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Etkinleştir",
   "keepDisabled": "Devre dışı tut",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Gönderenin adını ve iletisini",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Ne gönderenin adını ne de iletisini",
   "nameOnly": "Sadece gönderenin adı",
   "newMessage": "Yeni İleti",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 saat",
   "timerOption_1_day": "1 gün",
   "timerOption_1_week": "1 hafta",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Kaybolan iletiler",
   "changeNickname": "Takma Adı Değiştir",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12s",
   "timerOption_1_day_abbreviated": "1g",
   "timerOption_1_week_abbreviated": "1h",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Kaybolan iletiler devre dışı",
-  "disabledDisappearingMessages": "$name$ kaybolan iletileri devre dışı bıraktı",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "Kaybolan iletileri devre dışı bıraktınız",
   "timerSetTo": "Zamanlayıcı $time$ olarak ayarlandı",
   "noteToSelf": "Kendime Not",
   "hideMenuBarTitle": "Menü Çubuğunu Gizle",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Yeni sohbet başlat…",
-  "invalidNumberError": "Geçersiz numara",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "ONS adını çözümlemede başarısız oldu",
   "autoUpdateSettingTitle": "Otomatik Güncelleme",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ gruba katıldı",
   "kickedFromTheGroup": "$name$, gruptan kaldırıldı.",
   "multipleKickedFromTheGroup": "$name$, gruptan çıkarıldı.",
-  "blockUser": "Engelle",
-  "unblockUser": "Engeli Kaldır",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Engel kaldırıldı",
   "blocked": "Engellendi",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "$name$ güncelleniyor...",
   "showRecoveryPhrase": "Kurtarma Sözcük Grubu",
   "yourSessionID": "Session Kimliğiniz",
-  "setAccountPasswordTitle": "Hesap Şifresini Belirleyin",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Hesap Şifresini Değiştir",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Hesap Şifresini Kaldır",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Lütfen şifrenizi girin",
   "confirmPassword": "Şifreyi Doğrula",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Lütfen şifrenizi girin",
   "recoveryPhraseSavePromptMain": "Kurtarma ifadeniz Session ID'nizin asıl anahtarıdır; cihazınıza erişiminizi kaybederseniz Session ID'nizi geri yüklemek için bunu kullanabilirsiniz. Kurtarma ifadenizi güvenli bir yerde saklayın ve kimseye vermeyin.",
   "invalidOpenGroupUrl": "Geçersiz URL",
-  "copiedToClipboard": "Panoya kopyalandı",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Şifre",
   "setPassword": "Şifre Belirle",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Şifreler uyuşmuyor",
   "changePasswordInvalid": "Girmiş olduğunuz eski parola yanlış",
   "removePasswordInvalid": "Yanlış şifre",
-  "setPasswordTitle": "Şifre Belirle",
-  "changePasswordTitle": "Şifre Değiştirildi",
-  "removePasswordTitle": "Şifre Kaldırıldı",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Şifreniz ayarlandı. Lütfen güvende tutunuz.",
   "changePasswordToastDescription": "Şifreniz değiştirildi. Lütfen güvende tutunuz.",
-  "removePasswordToastDescription": "Şifrenizi sildiniz.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Bağlanılıyor...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Görünüm",
   "privacySettingsTitle": "Gizlilik",
   "notificationsSettingsTitle": "Bildirimler",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Kurtarma metninizi girin",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ üye",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Lütfen daha kısa bir grup ismi giriniz",
   "pickClosedGroupMember": "Lütfen en az 1 grup üyesi seçin",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Engellenmiş kişi yok",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Ya da bunlardan birine katılın...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "$name$ tarafından gönderilen medyayı indirmek istediğine emin misin?",
   "pinConversation": "Konuşmayı sabitle",
   "unpinConversation": "Konuşmanın Sabitlemesini Kaldır",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Kullanıcı Detaylarını Göster",
   "sendRecoveryPhraseTitle": "Kurtarma Sözcük Grubunu Gönder",
   "sendRecoveryPhraseMessage": "Hesabınıza erişmek için kullanılabilecek kurtarma ifadenizi göndermeye çalışıyorsunuz. Bu mesajı göndermek istediğinizden emin misiniz?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Sadece cihazdan silmek ister misiniz?",
   "dialogClearAllDataDeletionFailedMultiple": "Bu Hizmet Düğümleri tarafından silinmeyen veriler: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Sadece cihaz verisini silmek istediğinizden emin misiniz?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "'$name$' tarafından cevaplanmayan çağrınız var çünkü Gizlilik Ayarlarında 'Sesli ve görüntülü aramalar' iznini etkinleştirmeniz gerekiyor.",
   "callMissedNotApproved": "Bu konuşmayı henüz onaylamadığınız için '$name$' adlı kişiden gelen arama cevapsız. Önce onlara mesaj at.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "$name$ kullanıcısını aradınız",
   "answeredACall": "$name$ ile ara",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "Yeni bir arkadaşlık isteğin var",
   "clearAllConfirmationTitle": "Tüm Mesaj İsteklerini temizle",
   "clearAllConfirmationBody": "Tüm mesaj isteklerinizi silmek istediğinizden emin misiniz?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Gizle",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Mesaj İstek kutunu görüntüle",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json
index 05f98e6d0..8c34300db 100644
--- a/_locales/uk/messages.json
+++ b/_locales/uk/messages.json
@@ -31,7 +31,7 @@
   "openGroupInvitation": "Community invitation",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Приєднатися до $roomName$?",
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Не вдалося знайти відповідний сервер opengroup",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Введіть ID сесії або ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Оновлення…",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Контакти та Групи",
   "contactsHeader": "Контакти",
-  "messagesHeader": "Повідомлення",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Параметри",
   "typingAlt": "Анімація вводу для цієї розмови",
   "contactAvatarAlt": "Аватар для контакту $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Видалити ${ count } повідомлень?",
   "deleteMessageQuestion": "Видалити це повідомлення?",
   "deleteMessages": "Видалити повідомлення",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ вилучено",
   "messageDeletedPlaceholder": "Повідомлення видалено",
   "from": "Від",
@@ -107,29 +108,30 @@
   "sent": "Надіслано",
   "received": "Отримано",
   "sendMessage": "Надіслати повідомлення",
-  "groupMembers": "Члени групи",
+  "groupMembers": "Members",
   "moreInformation": "Дізнатися більше",
   "resend": "Надіслати повторно",
   "deleteConversationConfirmation": "Видалити цю розмову без можливості відновлення?",
   "clear": "Clear",
   "clearAllData": "Очистити всі дані",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Ви дійсно хочете видалити цю бесіду?",
   "quoteThumbnailAlt": "Мініатюра зображення цитованого повідомлення",
   "imageAttachmentAlt": "Зображення, прикріплене до повідомлення",
-  "videoAttachmentAlt": "Скріншот з відео, прикріпленого до повідомлення",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Зображення відправлено в бесіді",
   "imageCaptionIconAlt": "Іконка, яка вказує на те, що це зображення має текстовий підпис",
   "addACaption": "Додайте підпис...",
   "copySessionID": "Скопіювати ідентифікатор Session",
-  "copyOpenGroupURL": "Скопіювати URL групи",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Зберегти",
   "saveLogToDesktop": "Зберегти журнал на робочий стіл",
   "saved": "Збережено",
   "tookAScreenshot": "$name$ зробив знімок екрану",
   "savedTheFile": "$name$ зберіг медіафайл",
   "linkPreviewsTitle": "Надсилати попередній перегляд посилань",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "У вас не буде повного захисту метаданих при надсиланні попереднього перегляду посилань.",
   "mediaPermissionsTitle": "Мікрофон",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Індикатор набору тексту",
   "zoomFactorSettingTitle": "Коефіцієнт масштабування",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Увімкнути",
   "keepDisabled": "Лишити вимкненим",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Ім'я відправника і повідомлення",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Нічого",
   "nameOnly": "Тільки ім'я відправника",
   "newMessage": "Нове Повідомлення",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 годин",
   "timerOption_1_day": "1 день",
   "timerOption_1_week": "1 тиждень",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Зникаючі повідомлення ",
   "changeNickname": "Змінити нікнейм",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12г",
   "timerOption_1_day_abbreviated": "1д",
   "timerOption_1_week_abbreviated": "1т",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Зникаючі повідомлення заборонені",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Таймер встановленно на $time$",
   "noteToSelf": "Замітка для себе",
   "hideMenuBarTitle": "Сховати панель меню",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Почати нову розмову…",
-  "invalidNumberError": "Невірний номер",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Не вдалося отримати назву ONS",
   "autoUpdateSettingTitle": "Автоматичне оновлення",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$names$ приєдналися до групи",
   "kickedFromTheGroup": "$name$ було вилучено із групи.",
   "multipleKickedFromTheGroup": "$name$ були вилучені із групи.",
-  "blockUser": "Заблокувати",
-  "unblockUser": "Розблокувати",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Розблоковано",
   "blocked": "Заблоковано",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Оновлення $name$...",
   "showRecoveryPhrase": "Фраза відновлення",
   "yourSessionID": "Ваша Session ID адресса",
-  "setAccountPasswordTitle": "Встановити пароль облікового запису",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Змінити пароль до профілю",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Видалити пароль акаунта",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Будь ласка, введіть ваш пароль",
   "confirmPassword": "Підтвердіть пароль",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Будь ласка, введіть ваш пароль",
   "recoveryPhraseSavePromptMain": "Ваша фраза відновлення - це головний ключ до вашогї Session ID адреси - ви можете використовувати її для відновлення вашої Session ID адреси якщо ви втратите доступ до пристрою. Запишіть на папері та зберігайте вашу фразу відновлення у безпечному місці і не дайте її нікому.",
   "invalidOpenGroupUrl": "Недійсне URL посилання",
-  "copiedToClipboard": "Скопійовано до буфера обміну",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Пароль",
   "setPassword": "Встановити пароль",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Паролі не співпадають",
   "changePasswordInvalid": "Старий пароль введений невірно",
   "removePasswordInvalid": "Неправильний пароль",
-  "setPasswordTitle": "Встановити пароль",
-  "changePasswordTitle": "Змінений пароль",
-  "removePasswordTitle": "Видалений пароль",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Ваш пароль встановлено. Будь ласка, збережіть його в безпеці.",
   "changePasswordToastDescription": "Ваш пароль змінено. Будь ласка, збережіть його в безпеці.",
-  "removePasswordToastDescription": "Ви видалили свій пароль.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Підключення...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Зовнішній вигляд",
   "privacySettingsTitle": "Конфіденційність",
   "notificationsSettingsTitle": "Сповіщення",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Введіть вашу фразу відновлення",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ учасників",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Будь ласка, введіть коротше ім'я групи",
   "pickClosedGroupMember": "Будь ласка виберіть принаймні 1 учасника групи",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "Немає заблокованих контактів",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Або приєднуйтесь до одного з цих...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Ви впевнені що хочете завантажити медіафайл відправлений $name$?",
   "pinConversation": "Закріпити розмову",
   "unpinConversation": "Відкріпити розмову",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Показати деталі користувача",
   "sendRecoveryPhraseTitle": "Надсилання фрази відновлення",
   "sendRecoveryPhraseMessage": "Ви намагаєтеся надіслати фразу відновлення, яку можна використати для доступу до вашого облікового запису. Ви впевнені, що хочете надіслати це повідомлення?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Видалити дані лише з цього пристрою?",
   "dialogClearAllDataDeletionFailedMultiple": "Дані не видалено цими сервісними вузлами: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Ви впевнені, що хочете видалити лише дані свого пристрою?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Пропущений виклик від $name$, тому що вам потрібно ввімкнути дозвіл на голосові та відеодзвінки в параметрах конфіденційності.",
   "callMissedNotApproved": "Пропущений виклик від $name$ оскільки ви ще не схвалили цю розмову. Спочатку надішліть їм повідомлення.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Ви дзвонили $name$",
   "answeredACall": "Дзвінок з $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "У вас є новий запит у друзі",
   "clearAllConfirmationTitle": "Очистити всі запити",
   "clearAllConfirmationBody": "Ви впевнені, що бажаєте очистити всі запити на повідомлення?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Приховати",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "Перегляд папки вхідних повідомлень",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/uz/messages.json b/_locales/uz/messages.json
index b14acdfdc..31d25866d 100644
--- a/_locales/uz/messages.json
+++ b/_locales/uz/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "To'liq ekran",
   "viewMenuToggleDevTools": "Dasturchiga",
   "contextMenuNoSuggestions": "Afsus",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Jamoa taklifnomasi",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Qo'shilaman $xonaNomi$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Haqiqattan shu $roomName$ guruhga qo'shilmoqchimisiz?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Session ID raqamini yoki ONS ismingi tashla",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Boshqa kishining Session IDsini kiritish orqali yangi suhbatni boshlang yoki ular bilan Session IDyingizni ulashing.",
   "loading": "Yuklanmoqda...",
   "done": "Bo'ldi",
   "youLeftTheGroup": "Siz guruhni tark etdingiz.",
   "youGotKickedFromGroup": "Sizni guruhdan chiqarib yuborishdi.",
   "unreadMessages": "Oʻqilmagan xabarlar",
   "debugLogExplanation": "Bu narsani o'zimga saqlab qo'ymoqchiman.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Xato haqida habar bering",
   "markAllAsRead": "Hammasini o'qilgan qil",
   "incomingError": "Kelgan maktubni tahrir qilishda hatolik yuz berdi",
   "media": "Media",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "Uzur, o'rnatish vaqtida xatolik yuz berdi.",
   "offline": "Oflayn",
   "debugLog": "Keyinga qoldirilgan",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "Jurnallarni eksport qilish",
+  "shareBugDetails": "Jurnallaringizni eksport qiling, so'ngra Session yordam stoli orqali faylni yuklang.",
   "goToReleaseNotes": "Qaydlarni och",
   "goToSupportPage": "Yordamchilar sahifasini och",
   "about": "Haqida",
@@ -72,7 +72,7 @@
   "noSearchResults": "\"$searchTerm$\" boʻyicha hech narsa topilmadi",
   "conversationsHeader": "Kontaktlar va guruhlar",
   "contactsHeader": "Kontaktlar",
-  "messagesHeader": "Maktub",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Tamir",
   "typingAlt": "Yozib turganligini bildiruvchi uch nuqta",
   "contactAvatarAlt": "Kishi rasmi $name$",
@@ -100,99 +100,102 @@
   "deleteMessagesQuestion": "$count$ ta xabar oʻchirilsinmi?",
   "deleteMessageQuestion": "Ushbu xabar o‘chirilsinmi?",
   "deleteMessages": "Xabarlarni oʻchirish",
-  "deleted": "$count$ deleted",
+  "deleteConversation": "Delete Conversation",
+  "deleted": "$count$ o'chirildi",
   "messageDeletedPlaceholder": "Bu xabar oʻchirilgan",
   "from": "Kimdan:",
   "to": "Kimga:",
   "sent": "Joʻnatilgan",
   "received": "Qabul qilingan",
   "sendMessage": "Xabar",
-  "groupMembers": "Guruh aʼzolari",
+  "groupMembers": "A'zolar",
   "moreInformation": "Koʻproq maʼlumot",
   "resend": "Qayta joʻnatish",
   "deleteConversationConfirmation": "Bu suhbatni tag-tomiri bilan o'chiremi?",
-  "clear": "Clear",
+  "clear": "Tozalamoq",
   "clearAllData": "Barcha hujjatlarni o'chir",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "Bu sizning xabarlaringiz va kontaktlaringizni butunlay o'chirib tashlaydi.",
+  "deleteAccountFromLogin": "Haqiqatan ham qurilmangizni tozalamoqchimisiz?",
   "deleteContactConfirmation": "O'chirvorelikmi buni?",
   "quoteThumbnailAlt": "Tanishizi rasmchasi",
   "imageAttachmentAlt": "Suratga maktubni qistirish",
-  "videoAttachmentAlt": "Video tagiga maktubni qo'yish",
+  "videoAttachmentAlt": "Xabardagi videoning skrinshoti",
   "lightboxImageAlt": "Surat suhabt ichida ketdi",
   "imageCaptionIconAlt": "Suratda bir kishini qo'li borligi",
   "addACaption": "Qo'l qo'yish...",
   "copySessionID": "Session ID ni nusxalash",
-  "copyOpenGroupURL": "Jamoa URL nusxalash",
+  "copyOpenGroupURL": "Guruh URL manzilini nusxalash",
   "save": "Saqlash",
   "saveLogToDesktop": "O'zimga saqlab olmoqchiman",
   "saved": "Saqlandi",
   "tookAScreenshot": "$name$ skrinshot qildi",
   "savedTheFile": "Media shu $name$ bilan saqlandi",
   "linkPreviewsTitle": "Linkni yuborilgandagi ko'rinishi",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Qo'llab-quvvatlanadigan URL manzillar uchun havolalarni oldindan ko'rishni yarating.",
   "linkPreviewsConfirmMessage": "Biz sizni to'liq himoya qila olmasligimiz mumkin agar linkni ko'rsatedigon qilib qo'ysez.",
   "mediaPermissionsTitle": "Mikrofon",
-  "mediaPermissionsDescription": "Allow access to microphone.",
-  "spellCheckTitle": "Spell Check",
-  "spellCheckDescription": "Enable spell check when typing messages.",
-  "spellCheckDirty": "You must restart Session to apply your new settings",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
-  "readReceiptSettingTitle": "Read Receipts",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
-  "typingIndicatorsSettingTitle": "Typing Indicators",
-  "zoomFactorSettingTitle": "Zoom Factor",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
-  "enable": "Enable",
-  "keepDisabled": "Keep disabled",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Name and content",
-  "noNameOrMessage": "No name or content",
-  "nameOnly": "Name Only",
-  "newMessage": "New Message",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
-  "newMessages": "New Messages",
-  "notificationMostRecentFrom": "Most recent from: $name$",
-  "notificationFrom": "From:",
-  "notificationMostRecent": "Most recent:",
-  "sendFailed": "Send Failed",
-  "mediaMessage": "Media message",
-  "messageBodyMissing": "Please enter a message body.",
-  "messageBody": "Message body",
-  "unblockToSend": "Unblock this contact to send a message.",
-  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
-  "youChangedTheTimer": "You set the disappearing message timer to $time$",
-  "timerSetOnSync": "Updated disappearing message timer to $time$",
-  "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
-  "timerOption_0_seconds": "Off",
-  "timerOption_5_seconds": "5 seconds",
-  "timerOption_10_seconds": "10 seconds",
-  "timerOption_30_seconds": "30 seconds",
-  "timerOption_1_minute": "1 minute",
-  "timerOption_5_minutes": "5 minutes",
+  "mediaPermissionsDescription": "Mikrofonga kirishga ruxsat bering.",
+  "spellCheckTitle": "Imlo tekshiruvi",
+  "spellCheckDescription": "Xabarlarni yozayotganda imlo tekshiruvini yoqish.",
+  "spellCheckDirty": "Yangi sozlamalarni qo'llash uchun Session qayta ishga tushirishingiz shart",
+  "readReceiptSettingDescription": "O'qilganligi to'g'risidagi xabarlarni birma-bir chatlarda yuboring.",
+  "readReceiptSettingTitle": "Cheklarni o'qish",
+  "typingIndicatorsSettingDescription": "Birma-bir chatlarda yozish ko'rsatkichlarini ko'ring va ulashing.",
+  "typingIndicatorsSettingTitle": "Yozish ko'rsatkichlari",
+  "zoomFactorSettingTitle": "Kattalashtirish darajasi",
+  "themesSettingTitle": "Mavzular",
+  "primaryColor": "Asosiy rang",
+  "primaryColorGreen": "Asosiy rang yashil",
+  "primaryColorBlue": "Asosiy rang ko'k",
+  "primaryColorYellow": "Asosiy rang sariq",
+  "primaryColorPink": "Asosiy rang pushti",
+  "primaryColorPurple": "Asosiy rang siyohrang",
+  "primaryColorOrange": "Asosiy rang apelsinrang",
+  "primaryColorRed": "Asosiy rang qizil",
+  "classicDarkThemeTitle": "Klassik qorong'u",
+  "classicLightThemeTitle": "Klassik yorug'lik",
+  "oceanDarkThemeTitle": "Okean qorong'i",
+  "oceanLightThemeTitle": "Okean nuri",
+  "pruneSettingTitle": "Jamiyatlarni qisqartiring",
+  "pruneSettingDescription": "2000 dan ortiq xabarlari boʻlgan jamiyatlardan 6 oydan eski xabarlarni oʻchirib tashlang.",
+  "enable": "Yoqish",
+  "keepDisabled": "O'chiriq qo'yish",
+  "notificationSettingsDialog": "Ma'lumotlar bildirishnomalarda ko'rsatilgan.",
+  "nameAndMessage": "Ism & Mazmun",
+  "noNameOrMessage": "Nomi yoki mazmuni yo'q",
+  "nameOnly": "Faqat ism",
+  "newMessage": "Yangi xabar",
+  "createConversationNewContact": "Yangi kontakt bilan suhbat yarating",
+  "createConversationNewGroup": "Mavjud kontaktlar bilan guruh yarating",
+  "joinACommunity": "Hamjamiyatga qo'shiling",
+  "chooseAnAction": "Suhbatni boshlash uchun harakatni tanlang",
+  "newMessages": "Yangi xabarlar",
+  "notificationMostRecentFrom": "Eng oxirgi: $name$dan",
+  "notificationFrom": "Dan:",
+  "notificationMostRecent": "Eng so'nggi:",
+  "sendFailed": "Yuborish amalga oshmadi",
+  "mediaMessage": "Media xabar",
+  "messageBodyMissing": "Iltimos, xabar matnini kiriting.",
+  "messageBody": "Xabar matni",
+  "unblockToSend": "Xabar yuborish uchun ushbu kontaktni blokdan chiqaring.",
+  "unblockGroupToSend": "Bu guruh bloklangan. Agar siz xabar yubormoqchi bo'lsangiz, uni blokdan chiqaring.",
+  "youChangedTheTimer": "Siz yo'qolgan xabar taymerini $time$ ga o'rnatdingiz",
+  "timerSetOnSync": "Yoʻqolgan xabar taymer $time$ qilib yangilandi",
+  "theyChangedTheTimer": "$name$ yoʻqolgan xabar taymerini $time$ ga oʻrnatdi",
+  "timerOption_0_seconds": "O'chirilgan",
+  "timerOption_5_seconds": "5 soniya",
+  "timerOption_10_seconds": "10 soniya",
+  "timerOption_30_seconds": "30 soniya",
+  "timerOption_1_minute": "1 daqiqa",
+  "timerOption_5_minutes": "5 daqiqa",
   "timerOption_30_minutes": "30 daqiqa",
   "timerOption_1_hour": "1 soat",
   "timerOption_6_hours": "6 soat",
   "timerOption_12_hours": "12 soat",
   "timerOption_1_day": "1 kun",
   "timerOption_1_week": "1 hafta",
-  "disappearingMessages": "Disappearing messages",
+  "timerOption_2_weeks": "2 hafta",
+  "disappearingMessages": "Yo'qolgan xabarlar",
   "changeNickname": "Taxallusni oʻzgartirish",
   "clearNickname": "Taxallusni tozalash",
   "nicknamePlaceholder": "Yangi taxallus",
@@ -209,26 +212,27 @@
   "timerOption_12_hours_abbreviated": "12 soat",
   "timerOption_1_day_abbreviated": "1k",
   "timerOption_1_week_abbreviated": "1h",
-  "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages.",
-  "youDisabledDisappearingMessages": "You disabled disappearing messages.",
-  "timerSetTo": "Disappearing message time set to $time$",
-  "noteToSelf": "Note to Self",
-  "hideMenuBarTitle": "Hide Menu Bar",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
-  "startConversation": "Start New Conversation",
-  "invalidNumberError": "Invalid Session ID or ONS Name",
-  "failedResolveOns": "Failed to resolve ONS name",
+  "timerOption_2_weeks_abbreviated": "2 hafta",
+  "disappearingMessagesDisabled": "Yo'qolgan xabarlar o'chirildi",
+  "disabledDisappearingMessages": "$name$ yoʻqolgan xabarlarni oʻchirib qoʻydi.",
+  "youDisabledDisappearingMessages": "Siz yo'qolgan xabarlarni o'chirib qo'ydingiz.",
+  "timerSetTo": "Yoʻqolgan xabar vaqti $time$ qilib belgilandi",
+  "noteToSelf": "O'zizga eslatma",
+  "hideMenuBarTitle": "Menyu panelini yashirish",
+  "hideMenuBarDescription": "Tizim menyusi paneli koʻrinishini oʻzgartirish.",
+  "startConversation": "Yangi suhbatni boshlang",
+  "invalidNumberError": "Iltimos Session Id va ONS nomini tekshiring va qaytadan harakat qiling",
+  "failedResolveOns": "ONS nomini hal qilib boʻlmadi",
   "autoUpdateSettingTitle": "Avtomatik yangilash",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
-  "autoUpdateNewVersionTitle": "Session update available",
-  "autoUpdateNewVersionMessage": "There is a new version of Session available.",
-  "autoUpdateNewVersionInstructions": "Press Restart Session to apply the updates.",
-  "autoUpdateRestartButtonLabel": "Restart Session",
+  "autoUpdateSettingDescription": "Ishga tushganda yangilanishlarni avtomatik tekshirish.",
+  "autoUpdateNewVersionTitle": "Session yangilanishi mavjud",
+  "autoUpdateNewVersionMessage": "Session ning yangi versiyasi mavjud.",
+  "autoUpdateNewVersionInstructions": "Yangilanishlarni qo'llash uchun Sessiyani qayta boshlash tugmasini bosing.",
+  "autoUpdateRestartButtonLabel": "Session ni qayta ishga tushiring",
   "autoUpdateLaterButtonLabel": "Keyinroq",
   "autoUpdateDownloadButtonLabel": "Yuklash",
-  "autoUpdateDownloadedMessage": "Update has been downloaded.",
-  "autoUpdateDownloadInstructions": "Would you like to download the update?",
+  "autoUpdateDownloadedMessage": "Yangilanish yuklandi.",
+  "autoUpdateDownloadInstructions": "Yangilanishnni yuklashni xohlaysizmi?",
   "leftTheGroup": "$name$ guruhni tark etdi.",
   "multipleLeftTheGroup": "$name$ guruhni tark etdi",
   "updatedTheGroup": "Jamoa yangilandi",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$name$ guruhga qoʻshildi.",
   "kickedFromTheGroup": "$name$ guruhdan chiqarib yuborildi.",
   "multipleKickedFromTheGroup": "$name$ jamoadan haydaldi.",
-  "blockUser": "Surgun qil",
-  "unblockUser": "Surgunlikdan qaytar",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Af qilingan",
   "blocked": "Af qilinmagan",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "Bloklangan kontaktlar",
+  "conversationsSettingsTitle": "Suhbatlar",
   "unbanUser": "Kishini af qil",
   "userUnbanned": "Kishi af qilindi",
   "userUnbanFailed": "Af qilinmadi!",
@@ -251,14 +255,14 @@
   "userBanned": "Hamma yog'i bilan surgun qilindi",
   "userBanFailed": "Surgunlik vaqtida muammo chiqdi!",
   "leaveGroup": "Jamoadan ajralish",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "Guruhni tark eting va hamma uchun o'chirish",
   "leaveGroupConfirmation": "Jamoani tark etishing rostmi?",
-  "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
-  "cannotRemoveCreatorFromGroup": "Cannot remove this user",
-  "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
-  "noContactsForGroup": "You don't have any contacts yet",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "leaveGroupConfirmationAdmin": "Siz ushbu guruhning administratori ekansiz, agar uni tark etsangiz, u har bir joriy aʼzo uchun oʻchirib tashlanadi. Haqiqatan ham bu guruhni tark etmoqchimisiz?",
+  "cannotRemoveCreatorFromGroup": "Bu foydalanuvchini olib tashlab bo‘lmaydi",
+  "cannotRemoveCreatorFromGroupDesc": "Siz bu foydalanuvchini olib tashlay olmaysiz, chunki ular guruh yaratuvchisi.",
+  "noContactsForGroup": "Sizda hali kontaktlar yo‘q",
+  "failedToAddAsModerator": "Foydalanuvchini administrator sifatida qo‘shib bo‘lmadi",
+  "failedToRemoveFromModerator": "Foydalanuvchini administrator ro‘yxatidan olib tashlab bo‘lmadi",
   "copyMessage": "Copy message text",
   "selectMessage": "Select message",
   "editGroup": "Edit group",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Updating $name$...",
   "showRecoveryPhrase": "Recovery Phrase",
   "yourSessionID": "Your Session ID",
-  "setAccountPasswordTitle": "Set Account Password",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Akkaunt parolini oʻzgartirish",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Akkaunt parolini olib tashlash",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Please enter your password",
   "confirmPassword": "Parolni tasdiqlash",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",
-  "copiedToClipboard": "Copied to clipboard",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Parol",
   "setPassword": "Parol o‘rnatish",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Parollar mos kelmadi",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Parol oʻrnatish",
-  "changePasswordTitle": "Changed Password",
-  "removePasswordTitle": "Removed Password",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
-  "removePasswordToastDescription": "You have removed your password.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Ulanmoqda...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Appearance",
   "privacySettingsTitle": "Maxfiylik",
   "notificationsSettingsTitle": "Bildirishnomalar",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Enter your recovery phrase",
   "displayNameEmpty": "Please enter a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ ta aʼzo",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Iltimos, qisqaroq guruh nomini kiriting",
   "pickClosedGroupMember": "Please pick at least 1 group member",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Do you want to delete data from just this device?",
   "dialogClearAllDataDeletionFailedMultiple": "Data not deleted by those Service Nodes: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Are you sure you want to delete your device data only?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "You called $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Yashirish",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json
index a817e23f2..4c82052d0 100644
--- a/_locales/vi/messages.json
+++ b/_locales/vi/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "Bật/Tắt toàn màn hình",
   "viewMenuToggleDevTools": "Bật/Tắt Công Cụ Nhà Phát Triển",
   "contextMenuNoSuggestions": "Không có đề xuất",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "Lời mời tham gia nhóm",
   "joinOpenGroupAfterInvitationConfirmationTitle": "Tham gia vào $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Bạn có chắc bạn muốn tham gia vào nhóm mở $roomName$ ?",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "Nhập Session ID hoặc tên OSN",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "Bắt đầu cuộc trò chuyện mới bằng cách nhập ID phiên của ai đó hoặc chia sẻ ID phiên của bạn với họ.",
   "loading": "Đang tải...",
   "done": "Xong",
   "youLeftTheGroup": "Bạn đã rời nhóm.",
   "youGotKickedFromGroup": "Bạn đã bị xoá khỏi nhóm.",
   "unreadMessages": "Các tin nhắn chưa đọc",
   "debugLogExplanation": "Nhật ký này sẽ được lưu ở màn hình chính.",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Báo cáo lỗi",
   "markAllAsRead": "Đánh dấu tất cả là đã đọc",
   "incomingError": "Lỗi xử lí tin nhắn mới nhận",
   "media": "Đa phương tiện",
@@ -62,7 +62,7 @@
   "unableToLoadAttachment": "Xin lỗi, có lỗi thiết đặt tập tin đính kèm của bạn.",
   "offline": "Ngoại tuyến",
   "debugLog": "Nhật ký sửa lỗi",
-  "showDebugLog": "Export Logs",
+  "showDebugLog": "Xuất nhật ký",
   "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
   "goToReleaseNotes": "Đi tới các ghi chú phát hành",
   "goToSupportPage": "Đi đến trang Hỗ trợ",
@@ -72,7 +72,7 @@
   "noSearchResults": "No results for \"$searchTerm$\"",
   "conversationsHeader": "Các liên hệ và nhóm",
   "contactsHeader": "Liên hệ",
-  "messagesHeader": "Tin nhắn",
+  "messagesHeader": "Conversations",
   "settingsHeader": "Cài đặt",
   "typingAlt": "Hoạt ảnh đánh chữ cho cuộc trò chuyện này",
   "contactAvatarAlt": "Ảnh cá nhân cho liên hệ: $name$",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "Xóa $count$ tin nhắn đã chọn?",
   "deleteMessageQuestion": "Xoá tin nhắn này?",
   "deleteMessages": "Xóa tin nhắn",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ deleted",
   "messageDeletedPlaceholder": "Tin nhắn này đã bị xóa",
   "from": "Từ:",
@@ -107,29 +108,30 @@
   "sent": "Đã gửi",
   "received": "Đã nhận",
   "sendMessage": "Gửi tin nhắn",
-  "groupMembers": "Thành viên trong nhóm",
+  "groupMembers": "Members",
   "moreInformation": "Thông tin chi tiết",
   "resend": "Gửi lại",
   "deleteConversationConfirmation": "Xóa cuộc trò chuyện này vĩnh viễn?",
   "clear": "Clear",
   "clearAllData": "Xóa tất cả dữ liệu",
   "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountFromLogin": "Are you sure you want to clear your device?",
   "deleteContactConfirmation": "Bạn có chắc chắn rằng bạn muốn xoá cuộc hội thoại này không?",
   "quoteThumbnailAlt": "Ảnh xem trước của tin nhắn trích dẫn",
   "imageAttachmentAlt": "Hình ảnh đã được đính kèm trong tin nhắn",
-  "videoAttachmentAlt": "Ảnh chụp màn hình video được đính kèm từ tin nhắn",
+  "videoAttachmentAlt": "Screenshot of video in message",
   "lightboxImageAlt": "Hình ảnh được gửi trong cuộc trò chuyện",
   "imageCaptionIconAlt": "Biểu tượng cho thấy hình ảnh này có chú thích",
   "addACaption": "Thêm mô tả...",
   "copySessionID": "Sao chép Session ID",
-  "copyOpenGroupURL": "Sao chép URL nhóm",
+  "copyOpenGroupURL": "Copy Group URL",
   "save": "Lưu",
   "saveLogToDesktop": "Lưu nhật ký vào máy",
   "saved": "Đã lưu",
   "tookAScreenshot": "$name$ đã chụp màn hình",
   "savedTheFile": "Phương tiện được lưu bởi $name$",
   "linkPreviewsTitle": "Gửi đường dẫn xem trước",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "Generate link previews for supported URLs.",
   "linkPreviewsConfirmMessage": "Bạn sẽ không được bảo vệ siêu dữ liệu đầy đủ khi gửi bản xem trước liên kết.",
   "mediaPermissionsTitle": "Micrô",
   "mediaPermissionsDescription": "Allow access to microphone.",
@@ -142,7 +144,7 @@
   "typingIndicatorsSettingTitle": "Typing Indicators",
   "zoomFactorSettingTitle": "Zoom Factor",
   "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
+  "primaryColor": "Primary Colour",
   "primaryColorGreen": "Primary color green",
   "primaryColorBlue": "Primary color blue",
   "primaryColorYellow": "Primary color yellow",
@@ -155,11 +157,11 @@
   "oceanDarkThemeTitle": "Ocean Dark",
   "oceanLightThemeTitle": "Ocean Light",
   "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "enable": "Enable",
   "keepDisabled": "Keep disabled",
   "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "Cả tên người gửi lẫn tin nhắn",
+  "nameAndMessage": "Name & Content",
   "noNameOrMessage": "Không hiện tên cũng như tin nhắn",
   "nameOnly": "Chỉ tên người gửi",
   "newMessage": "Tin nhắn mới",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 tiếng",
   "timerOption_1_day": "1 ngày",
   "timerOption_1_week": "1 tuần",
+  "timerOption_2_weeks": "2 weeks",
   "disappearingMessages": "Xóa (tự động) tin nhắn",
   "changeNickname": "Đổi biệt danh",
   "clearNickname": "Clear nickname",
@@ -209,15 +212,16 @@
   "timerOption_12_hours_abbreviated": "12 giờ",
   "timerOption_1_day_abbreviated": "1 ngày",
   "timerOption_1_week_abbreviated": "1 tuần",
+  "timerOption_2_weeks_abbreviated": "2w",
   "disappearingMessagesDisabled": "Chế độ tin nhắn tự huỷ đã tắt",
-  "disabledDisappearingMessages": "$name$ disabled disappearing messages",
+  "disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
   "youDisabledDisappearingMessages": "You disabled disappearing messages",
   "timerSetTo": "Thời gian thiết lập đến $time$",
   "noteToSelf": "Ghi chú bản thân",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start new conversation…",
-  "invalidNumberError": "Số không chính xác",
+  "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
   "autoUpdateSettingTitle": "Tự động cập nhật",
   "autoUpdateSettingDescription": "Automatically check for updates on startup.",
@@ -237,8 +241,8 @@
   "multipleJoinedTheGroup": "$name$ đã tham gia nhóm.",
   "kickedFromTheGroup": "$name$ đã bị xoá khỏi nhóm.",
   "multipleKickedFromTheGroup": "$name$ đã bị xoá khỏi nhóm.",
-  "blockUser": "Chặn",
-  "unblockUser": "Không chặn",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "Bỏ chặn",
   "blocked": "Đã chặn",
   "blockedSettingsTitle": "Blocked Contacts",
@@ -266,11 +270,11 @@
   "updateGroupDialogTitle": "Cập nhật $name$...",
   "showRecoveryPhrase": "Cụm từ khôi phục",
   "yourSessionID": "Session ID của bạn",
-  "setAccountPasswordTitle": "Đặt mật khẩu tài khoản",
+  "setAccountPasswordTitle": "Password",
   "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "Đổi mật khẩu tài khoản",
+  "changeAccountPasswordTitle": "Change Password",
   "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "Xoá mật khẩu tài khoản",
+  "removeAccountPasswordTitle": "Remove Password",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "enterPassword": "Vui lòng nhập mật khẩu",
   "confirmPassword": "Xác nhận mật khẩu",
@@ -279,7 +283,7 @@
   "showRecoveryPhrasePasswordRequest": "Vui lòng nhập mật khẩu",
   "recoveryPhraseSavePromptMain": "Cụm từ khôi phục của bạn là chìa khoá chủ cho Session ID của bạn — bạn có thể sử dụng nó để khôi phục Session ID khi bị mất tiếp cận với thiết bị của bạn. Hãy lưu cụm từ khôi phục của bạn ở một nơi an toàn và không cung cấp cho bất kì ai.",
   "invalidOpenGroupUrl": "URL không hợp lệ",
-  "copiedToClipboard": "Sao chép vào bộ nhớ tạm",
+  "copiedToClipboard": "Copied",
   "passwordViewTitle": "Enter Password",
   "password": "Mật khẩu",
   "setPassword": "Đặt mật khẩu",
@@ -295,12 +299,12 @@
   "setPasswordInvalid": "Mật khẩu không khớp",
   "changePasswordInvalid": "Mật khẩu cũ chưa đúng",
   "removePasswordInvalid": "Mật khẩu không chính xác",
-  "setPasswordTitle": "Thiết lập mật khẩu",
-  "changePasswordTitle": "Đổi mật khẩu thành công",
-  "removePasswordTitle": "Xóa mật khẩu thành công",
+  "setPasswordTitle": "Password Set",
+  "changePasswordTitle": "Password Changed",
+  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Mật khẩu của bạn đã được đặt. Hãy giữ nó cẩn thận.",
   "changePasswordToastDescription": "Mật khẩu của bạn đã được đổi. Hãy giữ nó cẩn thận.",
-  "removePasswordToastDescription": "Bạn đã xoá mật khẩu của bạn.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "publicChatExists": "You are already connected to this community",
   "connectToServerFail": "Couldn't join community",
   "connectingToServer": "Đang kết nối...",
@@ -355,11 +359,14 @@
   "appearanceSettingsTitle": "Diện mạo",
   "privacySettingsTitle": "Riêng tư",
   "notificationsSettingsTitle": "Thông báo",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
   "notificationsSettingsContent": "Notification Content",
   "notificationPreview": "Preview",
   "recoveryPhraseEmpty": "Nhập cụm từ khôi phục của bạn.",
   "displayNameEmpty": "Vui lòng chọn một tên hiển thị",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ members",
+  "activeMembers": "$count$ active members",
   "join": "Join",
   "joinOpenGroup": "Join Community",
   "createGroup": "Create Group",
@@ -373,7 +380,7 @@
   "invalidGroupNameTooLong": "Vui lòng nhập một tên nhóm ngắn hơn",
   "pickClosedGroupMember": "Vui lòng chọn ít nhất 2 thành viên trong nhóm",
   "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "No blocked contacts",
+  "noBlockedContacts": "You have no blocked contacts.",
   "userAddedToModerators": "User added to admin list",
   "userRemovedFromModerators": "User removed from admin list",
   "orJoinOneOfThese": "Or join one of these...",
@@ -406,6 +413,7 @@
   "trustThisContactDialogDescription": "Bạn có chắc bạn muốn tải tệp đa phương tiện gửi bởi $name$?",
   "pinConversation": "Ghim cuộc trò chuyện",
   "unpinConversation": "Bỏ ghim cuộc trò chuyện",
+  "markUnread": "Mark Unread",
   "showUserDetails": "Hiện thông tin người dùng",
   "sendRecoveryPhraseTitle": "Đang gửi vế phục hồi",
   "sendRecoveryPhraseMessage": "Bạn đang chuẩn bị gởi vế khôi phục của bạn dùng vào mục đích truy cập tài khoản của bạn. Bạn có chắc bạn muốn gửi tin nhắn này?",
@@ -414,6 +422,9 @@
   "dialogClearAllDataDeletionFailedTitleQuestion": "Bạn có muốn xoá dữ liệu chỉ thiết bị này?",
   "dialogClearAllDataDeletionFailedMultiple": "Dữ liệu xoá không thành công bởi các Node Dịch vụ: $snodes$",
   "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
+  "clearDevice": "Clear Device",
+  "tryAgain": "Try Again",
+  "areYouSureClearDevice": "Are you sure you want to clear your device?",
   "deviceOnly": "Clear Device Only",
   "entireAccount": "Clear Device and Network",
   "areYouSureDeleteDeviceOnly": "Bạn có chắc bạn muốn xoá chỉ dữ liệu từ thiết bị của bạn?",
@@ -453,7 +464,7 @@
   "callMissedCausePermission": "Cuộc gọi từ '$name$' bị nhỡ vì bạn chưa cho phép quyền truy cập 'Gọi giọng nói và video' trong mục Cài đặt Quyền riêng tư.",
   "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
   "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
+  "callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
   "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
   "startedACall": "Bạn đã gọi $name$",
   "answeredACall": "Call with $name$",
@@ -475,11 +486,16 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",
   "reactionNotification": "Reacts to a message with $emoji$",
+  "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "otherSingular": "$number$ other",
   "otherPlural": "$number$ others",
   "reactionPopup": "reacted with",
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index a3674fa53..a668529fb 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "全屏开关",
   "viewMenuToggleDevTools": "开发者工具开关",
   "contextMenuNoSuggestions": "没有任何建议",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "群聊邀请",
   "joinOpenGroupAfterInvitationConfirmationTitle": "加入 $roomName$ 吗？",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "无法找到相应的 openggroup服务器",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "你确定你要加入群聊 ：$roomName$ 吗？",
+  "couldntFindServerMatching": "无法找到相应的community服务器",
   "enterSessionIDOrONSName": "输入Session ID或ONS名称",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "通过某人的 Session ID 或与他人分享你自己的 Session ID 来开始新的会话。",
   "loading": "加载中...",
   "done": "完成",
   "youLeftTheGroup": "你已经离开了群组",
   "youGotKickedFromGroup": "您已被移出群组。",
   "unreadMessages": "未读消息",
   "debugLogExplanation": "此日志将被保存到您的桌面。",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "Bug 反馈",
   "markAllAsRead": "全部标为已读",
   "incomingError": "处理传入消息时出错",
   "media": "媒体",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "无法加载选中的附件。",
   "offline": "离线",
   "debugLog": "调试日志",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "导出日志",
+  "shareBugDetails": "导出你的日志，然后通过Session帮助台上传日志",
   "goToReleaseNotes": "前往发布说明",
   "goToSupportPage": "前往支持页面",
   "about": "关于",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "是否删除已被选择$count$条信息？",
   "deleteMessageQuestion": "删除这条消息？",
   "deleteMessages": "删除消息",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ 已删除",
   "messageDeletedPlaceholder": "该消息已被删除",
   "from": "来自",
@@ -107,13 +108,14 @@
   "sent": "已发送",
   "received": "已接收",
   "sendMessage": "发送一条消息",
-  "groupMembers": "群组成员",
+  "groupMembers": "成员",
   "moreInformation": "更多信息",
   "resend": "重发",
   "deleteConversationConfirmation": "永久删除此会话？",
-  "clear": "Clear",
+  "clear": "清除",
   "clearAllData": "清除所有数据",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "这将永久删除您的消息和联系人",
+  "deleteAccountFromLogin": "你确定你要清除你设备上的账号数据吗？",
   "deleteContactConfirmation": "您确定要删除此对话吗？",
   "quoteThumbnailAlt": "引用消息图片的缩略图",
   "imageAttachmentAlt": "消息图片",
@@ -129,44 +131,44 @@
   "tookAScreenshot": "$name$ 做了屏幕截图。",
   "savedTheFile": "$name$ 保存了媒体内容。",
   "linkPreviewsTitle": "发送链接预览",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "为支持的链接生成预览",
   "linkPreviewsConfirmMessage": "您无法在绝对的数据安全保障前提下发送链接预览。",
   "mediaPermissionsTitle": "麦克风",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "允许使用麦克风",
   "spellCheckTitle": "拼写检查",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "在键入信息时进行拼写检查",
   "spellCheckDirty": "您必须重新启动Session才能应用您的新设置",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "在私聊中发送已读回执",
   "readReceiptSettingTitle": "已读回执",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "在私聊中查看他人并展示自己的键入状态",
   "typingIndicatorsSettingTitle": "键入指示器",
   "zoomFactorSettingTitle": "缩放倍数",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "主题",
+  "primaryColor": "主色调",
+  "primaryColorGreen": "绿色",
+  "primaryColorBlue": "蓝色",
+  "primaryColorYellow": "黄色",
+  "primaryColorPink": "粉色",
+  "primaryColorPurple": "紫色",
+  "primaryColorOrange": "橘色",
+  "primaryColorRed": "红色",
+  "classicDarkThemeTitle": "经典暗黑",
+  "classicLightThemeTitle": "经典浅色",
+  "oceanDarkThemeTitle": "浅暗黑",
+  "oceanLightThemeTitle": "浅亮色",
+  "pruneSettingTitle": "清理群组旧消息",
+  "pruneSettingDescription": "删除消息超过2000条的群组中6个月之前的消息",
   "enable": "启用",
   "keepDisabled": "保持禁用",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "发件人和信息提醒",
+  "notificationSettingsDialog": "在通知中显示的信息",
+  "nameAndMessage": "发件人名称和信息内容",
   "noNameOrMessage": "发件人和信息均不提醒",
   "nameOnly": "仅显示发送者",
   "newMessage": "新消息",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "与新联系人开始对话",
+  "createConversationNewGroup": "与您的联系人创建群聊",
+  "joinACommunity": "加入社区",
+  "chooseAnAction": "点击联系人开始对话",
   "newMessages": "新消息",
   "notificationMostRecentFrom": "最近来自：",
   "notificationFrom": "来自：",
@@ -174,7 +176,7 @@
   "sendFailed": "发送失败",
   "mediaMessage": "附件信息",
   "messageBodyMissing": "请输入消息正文。",
-  "messageBody": "Message body",
+  "messageBody": "消息正文",
   "unblockToSend": "取消屏蔽此联系人以发送消息。",
   "unblockGroupToSend": "取消屏蔽此群组以发送消息。",
   "youChangedTheTimer": "您已将阅后即焚的时长设为$time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12小时",
   "timerOption_1_day": "1天",
   "timerOption_1_week": "1周",
+  "timerOption_2_weeks": "2周",
   "disappearingMessages": "阅后即焚",
   "changeNickname": "更改昵称",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12小时",
   "timerOption_1_day_abbreviated": "1天",
   "timerOption_1_week_abbreviated": "1周",
+  "timerOption_2_weeks_abbreviated": "2 周",
   "disappearingMessagesDisabled": "阅后即焚已停用",
-  "disabledDisappearingMessages": "$name$停用了阅后即焚",
+  "disabledDisappearingMessages": "$name$ 关闭了阅后即焚消息.",
   "youDisabledDisappearingMessages": "您停用了阅后即焚",
   "timerSetTo": "计时器设置为$time$",
   "noteToSelf": "备忘录",
   "hideMenuBarTitle": "隐藏菜单栏",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "开启菜单栏可见",
   "startConversation": "开始新会话...",
-  "invalidNumberError": "无效的号码",
+  "invalidNumberError": "请检查 Session ID 或 ONS 名称，然后重试。",
   "failedResolveOns": "无法解析数据！",
   "autoUpdateSettingTitle": "自动更新",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "启动时自动检查更新",
   "autoUpdateNewVersionTitle": "Session 有可用更新",
   "autoUpdateNewVersionMessage": "有新版的 Session 可用。",
   "autoUpdateNewVersionInstructions": "点击“重启 Session",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$加入了群聊",
   "kickedFromTheGroup": "$name$ 已被移出群组。",
   "multipleKickedFromTheGroup": "$name$ 已被移出群组。",
-  "blockUser": "加入黑名单",
-  "unblockUser": "从黑名单中移除",
+  "block": "加入黑名单",
+  "unblock": "从黑名单中移除",
   "unblocked": "已从黑名单中移除",
   "blocked": "已加入黑名单",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "已屏蔽的联系人",
+  "conversationsSettingsTitle": "对话",
   "unbanUser": "解封用户",
   "userUnbanned": "用户解封成功",
   "userUnbanFailed": "解封失败！",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "封禁失败！",
   "leaveGroup": "离开群聊",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "离开群组并为每个人删除",
   "leaveGroupConfirmation": "您确定要离开这个群组吗？",
   "leaveGroupConfirmationAdmin": "因为您是这个组的管理员，如果您离开它，它将被移除给每个当前成员。 您确定要离开此群组吗？",
   "cannotRemoveCreatorFromGroup": "无法删除该用户",
   "cannotRemoveCreatorFromGroupDesc": "您不能删除此用户，因为他们是群组的创建人。",
   "noContactsForGroup": "您还没有任何联系人",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "设定用户管理者失败",
+  "failedToRemoveFromModerator": "无法从列表移除此用户",
   "copyMessage": "复制消息文本",
   "selectMessage": "选择消息",
   "editGroup": "编辑群组",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "正在更新 $name$...",
   "showRecoveryPhrase": "您的恢复口令",
   "yourSessionID": "您的Session ID",
-  "setAccountPasswordTitle": "设置账户密码",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "更改帐户密码",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "删除账户密码",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "密码",
+  "setAccountPasswordDescription": "设置Session的解锁密码",
+  "changeAccountPasswordTitle": "更改密码",
+  "changeAccountPasswordDescription": "更改Session的解锁密码",
+  "removeAccountPasswordTitle": "移除密码",
+  "removeAccountPasswordDescription": "删除Session的解锁密码",
   "enterPassword": "请输入您的密码",
   "confirmPassword": "确认密码",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "请输入您的新密码",
+  "confirmNewPassword": "确认新密码",
   "showRecoveryPhrasePasswordRequest": "请输入您的密码",
   "recoveryPhraseSavePromptMain": "您的恢复口令是Session ID的主密钥 - 如果您无法访问您的现有设备，则可以使用它在其他设备上恢复您的Session ID。请将您的恢复口令存储在安全的地方，不要将其提供给任何人。",
   "invalidOpenGroupUrl": "无效的链接",
-  "copiedToClipboard": "复制到剪贴板",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "已复制",
+  "passwordViewTitle": "请输入密码",
   "password": "密码",
   "setPassword": "设置密码",
   "changePassword": "更改密码",
-  "createPassword": "Create your password",
+  "createPassword": "创建您的密码",
   "removePassword": "移除密码",
   "maxPasswordAttempts": "密码无效。您想要重置数据库吗？",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "请输入您的当前密码",
   "invalidOldPassword": "旧密码无效",
   "invalidPassword": "密码无效",
   "noGivenPassword": "请输入您的密码",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "密码不一致",
   "changePasswordInvalid": "您输入的旧密码不正确",
   "removePasswordInvalid": "密码不正确",
-  "setPasswordTitle": "设置密码",
-  "changePasswordTitle": "修改密码",
+  "setPasswordTitle": "密码已设置",
+  "changePasswordTitle": "密码已更改",
   "removePasswordTitle": "密码已移除",
   "setPasswordToastDescription": "您的密码已经设定。请保管好它。",
   "changePasswordToastDescription": "您的密码已经设定。请保管好它。",
-  "removePasswordToastDescription": "您已经删除了您的密码。",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "您的密码已被移除",
+  "publicChatExists": "您已连接到此社群",
+  "connectToServerFail": "无法加入社群",
   "connectingToServer": "正在连接...",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "成功连接到社群",
   "setPasswordFail": "设置密码失败",
   "passwordLengthError": "密码长度必须在6到64个字符之间",
   "passwordTypeError": "密码必须为字符串",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "资料",
   "groupNamePlaceholder": "群组名称",
   "inviteContacts": "邀请好友",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "添加管理员",
+  "removeModerators": "移除管理员",
+  "addAsModerator": "添加为管理员：",
+  "removeFromModerators": "从管理员中移除",
   "add": "添加",
   "addingContacts": "将联系人添加到",
   "noContactsToAdd": "没有联系人可供添加",
   "noMembersInThisGroup": "此群组没有成员。",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "没有管理员可删除",
   "onlyAdminCanRemoveMembers": "你不是创建者",
   "onlyAdminCanRemoveMembersDesc": "只有群组的创建者可以移除用户",
   "createAccount": "创建账号",
   "startInTrayTitle": "保留在系统托盘",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "当您关闭窗口后，Session会在后台继续运行.",
   "yourUniqueSessionID": "向您的Session ID打个招呼吧",
   "allUsersAreRandomly...": "您的Session ID是其他用户在与您聊天时使用的独一无二的地址。Session ID与您的真实身份无关，它在设计上完全是匿名且私密的。",
   "getStarted": "开始使用",
@@ -344,40 +348,43 @@
   "linkDevice": "关联设备",
   "restoreUsingRecoveryPhrase": "恢复您的帐号",
   "or": "或者",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "使用服务过程中，您同意并接受我们的 <a href=\"https://getsession.org/terms-of-service \">服务条款</a> 和 <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">隐私政策</a>",
   "beginYourSession": "开始<您的会话。",
   "welcomeToYourSession": "欢迎来到 Session 。",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "搜索对话内容或联系人",
+  "searchForContactsOnly": "搜索联系人",
   "enterSessionID": "输入Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "输入您联系人的Session ID 或 ONS",
   "message": "消息",
   "appearanceSettingsTitle": "外观",
   "privacySettingsTitle": "隐私",
   "notificationsSettingsTitle": "通知",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "通知内容",
+  "notificationPreview": "通知效果预览",
   "recoveryPhraseEmpty": "输入您的恢复口令",
   "displayNameEmpty": "请设定一个名称",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ 位成员",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "加入",
+  "joinOpenGroup": "加入社群",
+  "createGroup": "创建群组",
+  "create": "新建",
   "createClosedGroupNamePrompt": "群组名称",
   "createClosedGroupPlaceholder": "输入群组名称",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "社区 URL",
+  "enterAnOpenGroupURL": "输入社区 URL",
   "next": "下一步",
   "invalidGroupNameTooShort": "请输入群组名称",
   "invalidGroupNameTooLong": "请输入较短的群组名称",
   "pickClosedGroupMember": "请选择至少一名群组成员",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "没有屏蔽的联系人",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "私密群组成员不可超过 100 位",
+  "noBlockedContacts": "您没有屏蔽任何联系人。",
+  "userAddedToModerators": "用户被添加到管理员列表",
+  "userRemovedFromModerators": "已从管理员列表中移除用户",
   "orJoinOneOfThese": "或加入下列群组…...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "翻译 Session",
   "closedGroupInviteFailTitle": "群组邀请失败",
   "closedGroupInviteFailTitlePlural": "群组邀请失败",
   "closedGroupInviteFailMessage": "无法成功邀请群组成员",
@@ -385,7 +392,7 @@
   "closedGroupInviteOkText": "重新邀请",
   "closedGroupInviteSuccessTitlePlural": "群组邀请已完成",
   "closedGroupInviteSuccessTitle": "群组邀请成功",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "成功邀请群组成员",
   "notificationForConvo": "通知",
   "notificationForConvo_all": "全部",
   "notificationForConvo_disabled": "关闭",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "在浏览器中打开此链接?",
   "linkVisitWarningMessage": "您确定要在浏览器中打开 $url$ 吗？",
   "open": "打开",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "自动播放音频消息",
+  "audioMessageAutoplayDescription": "自动播放连续音频消息。",
   "clickToTrustContact": "点击下载文件",
   "trustThisContactDialogTitle": "是否信任 $name$?",
   "trustThisContactDialogDescription": "您确定要下载$name$发送的媒体消息吗?",
   "pinConversation": "置顶对话",
   "unpinConversation": "取消置顶对话",
+  "markUnread": "Mark Unread",
   "showUserDetails": "显示用户信息",
   "sendRecoveryPhraseTitle": "正在发送恢复口令",
   "sendRecoveryPhraseMessage": "您正在尝试发送恢复口令，它能用来登录和访问您的账号。\n您确定要发送该消息吗？",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "出现未知错误，数据删除失败。您想要仅在此设备中删除数据吗？",
   "dialogClearAllDataDeletionFailedTitleQuestion": "仅在此设备中删除数据吗？",
   "dialogClearAllDataDeletionFailedMultiple": "数据删除失败。节点错误： $snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "您想只清除此设备，还是也从网络中删除您的数据？",
+  "clearDevice": "清除设备",
+  "tryAgain": "重试",
+  "areYouSureClearDevice": "你确定要清除你的设备吗？",
+  "deviceOnly": "仅清除设备上的信息",
+  "entireAccount": "清除设备和网络上的数据",
   "areYouSureDeleteDeviceOnly": "是否仅删除这台设备上的数据？",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "您确定要从网络中删除您的数据吗？ 如果您继续，您将无法恢复您的消息或联系人。",
   "iAmSure": "确认",
   "recoveryPhraseSecureTitle": "就快要完成了！",
   "recoveryPhraseRevealMessage": "通过发送恢复口令，保障您账号安全。展示恢复口令，并将其储存到安全的地方。",
   "recoveryPhraseRevealButtonText": "展示恢复口令",
   "notificationSubtitle": "通知设置 - $setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "感谢您的反馈。",
+  "faq": "常见问题（FAQ）",
+  "support": "帮助和支持",
   "clearAll": "清除全部",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "清除数据",
   "messageRequests": "消息请求",
   "requestsSubtitle": "待处理的请求",
   "requestsPlaceholder": "无请求",
@@ -438,8 +449,8 @@
   "accept": "接受",
   "decline": "拒绝",
   "endCall": "结束呼叫",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "权限",
+  "helpSettingsTitle": "帮助",
   "cameraPermissionNeededTitle": "需要语音/视频通话权限",
   "cameraPermissionNeeded": "您可以在隐私设置中启用“语音和视频通话”权限。",
   "unableToCall": "请先取消您正在进行的通话",
@@ -449,12 +460,12 @@
   "noCameraFound": "找不到摄像头",
   "noAudioInputFound": "找不到音频输入",
   "noAudioOutputFound": "找不到音频输出",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "语音和视频通话(Beta功能)",
   "callMissedCausePermission": "未接听 '$name$'，因为您需要在隐私设置中启用“语音和视频通话”权限。",
   "callMissedNotApproved": "因为您尚未接受此对话，'$name$'的来电未接通。请先给联系人发送一条信息。",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "允许与其它用户进行语音和视频通话。",
+  "callMediaPermissionsDialogContent": "当使用测试中的呼叫功能时，您的 IP 地址对您的通话伙伴和一个 Oxen 基金会服务器可见。 您确定要启用语音和视频通话吗？",
+  "callMediaPermissionsDialogTitle": "语音和视频通话(Beta功能)",
   "startedACall": "您呼叫了 $name$",
   "answeredACall": "与 $name$ 通话",
   "trimDatabase": "修整数据库",
@@ -468,25 +479,30 @@
   "declineRequestMessage": "您确定要拒绝此消息请求吗？",
   "respondingToRequestWarning": "发送消息给此用户将自动接受他们的消息请求并暴露您的账号。",
   "hideRequestBanner": "隐藏消息请求提示",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "消息请求",
   "noMessageRequestsPending": "没有待处理的消息请求",
   "noMediaUntilApproved": "在对话被接受前您不能发送附件",
   "mustBeApproved": "此对话须被接受才可使用该功能",
   "youHaveANewFriendRequest": "您有一个新的好友申请",
   "clearAllConfirmationTitle": "清除所有的消息请求",
   "clearAllConfirmationBody": "您确定要清除所有的消息请求吗？",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "隐藏消息提示",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "查看消息请求信箱",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "您确定要清除所有 $emoji$ 吗？",
+  "expandedReactionsText": "展示更少",
+  "reactionNotification": "用 $emoji$ 对一条消息作出表态。",
+  "rateLimitReactMessage": "慢点！您已经发送了太多的表情回应。请稍后再试。",
+  "otherSingular": "$number$ 个其他的人",
+  "otherPlural": "$number$ 个其他的人",
+  "reactionPopup": "回应",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ 与 $name2$",
+  "reactionPopupThree": "$name$、$name2$ 与 $name3$",
+  "reactionPopupMany": "$name$、$name2$、$name3$ 与",
+  "reactionListCountSingular": "$otherSingular$ 对这消息回应 <span>$emoji$</span>",
+  "reactionListCountPlural": "$otherPlural$ 对这消息回应 <span>$emoji$</span>"
 }
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index 696063add..59dcbafae 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -28,19 +28,19 @@
   "viewMenuToggleFullScreen": "切換全螢幕",
   "viewMenuToggleDevTools": "切換開發者工具",
   "contextMenuNoSuggestions": "沒有建議",
-  "openGroupInvitation": "Community invitation",
+  "openGroupInvitation": "社群邀請",
   "joinOpenGroupAfterInvitationConfirmationTitle": "加入 $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "您確定要加入 $roomName$ 社群嗎？",
+  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "enterSessionIDOrONSName": "請輸入您的 ID 或 ONS 的名稱",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
+  "startNewConversationBy...": "輸入他人的 Session ID 以展開新會話，或分享你的 Session ID 給對方。",
   "loading": "載入中...",
   "done": "完成",
   "youLeftTheGroup": "你已離開此群組",
   "youGotKickedFromGroup": "您已從群組中移除",
   "unreadMessages": "未讀訊息",
   "debugLogExplanation": "這個紀錄檔將儲存到桌面",
-  "reportIssue": "Report a Bug",
+  "reportIssue": "回報錯誤",
   "markAllAsRead": "全部標記為已讀",
   "incomingError": "在處理來訊時出現錯誤",
   "media": "媒體",
@@ -62,8 +62,8 @@
   "unableToLoadAttachment": "無法上傳所選附件。",
   "offline": "離線",
   "debugLog": "除錯日誌",
-  "showDebugLog": "Export Logs",
-  "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
+  "showDebugLog": "匯出記錄",
+  "shareBugDetails": "匯出你的 Log 日誌記錄，然後透過幫助服務台 Session's Help Desk 上傳日誌記錄。",
   "goToReleaseNotes": "前往發行紀錄",
   "goToSupportPage": "前往支援頁面",
   "about": "關於",
@@ -72,7 +72,7 @@
   "noSearchResults": "無 \"$searchTerm$\" 的搜尋結果",
   "conversationsHeader": "聯絡人和群組",
   "contactsHeader": "聯絡人",
-  "messagesHeader": "訊息",
+  "messagesHeader": "Conversations",
   "settingsHeader": "設定",
   "typingAlt": "本次對話中輸入動畫",
   "contactAvatarAlt": "聯絡人 $name$ 頭像圖示",
@@ -100,6 +100,7 @@
   "deleteMessagesQuestion": "您確定要刪除 $count$ 則訊息嗎？",
   "deleteMessageQuestion": "刪除這則訊息",
   "deleteMessages": "刪除訊息",
+  "deleteConversation": "Delete Conversation",
   "deleted": "$count$ 已刪除",
   "messageDeletedPlaceholder": "這則訊息已經刪除",
   "from": "來自",
@@ -107,66 +108,67 @@
   "sent": "已送出",
   "received": "已接收",
   "sendMessage": "送出一則訊息",
-  "groupMembers": "群組成員",
+  "groupMembers": "成員",
   "moreInformation": "更多信息",
   "resend": "重傳",
   "deleteConversationConfirmation": "永久刪除對話？",
-  "clear": "Clear",
+  "clear": "清除",
   "clearAllData": "清除所有資料",
-  "deleteAccountWarning": "This will permanently delete your messages and contacts.",
+  "deleteAccountWarning": "這樣做將永久刪除您的帳號、訊息及聯絡人。",
+  "deleteAccountFromLogin": "您確定要在這部裝置，移除這帳號嗎？",
   "deleteContactConfirmation": "確定刪除此會話？",
   "quoteThumbnailAlt": "引用訊息的縮圖",
   "imageAttachmentAlt": "訊息裏插入的圖片",
-  "videoAttachmentAlt": "伴隨訊息的影片截圖",
+  "videoAttachmentAlt": "訊息中影片的截圖",
   "lightboxImageAlt": "會話中送出的圖片",
   "imageCaptionIconAlt": "圖標顯示此圖像有說明文字",
   "addACaption": "加入一個標題...",
   "copySessionID": "複製Session ID",
-  "copyOpenGroupURL": "複製群組 URL",
+  "copyOpenGroupURL": "拷貝開放群組連結",
   "save": "儲存",
   "saveLogToDesktop": "儲存記錄檔到桌面",
   "saved": "已儲存",
   "tookAScreenshot": "$name$ 擷取了螢幕畫面",
   "savedTheFile": "$name$ 儲存了媒體",
   "linkPreviewsTitle": "傳送連結預覽",
-  "linkPreviewDescription": "Show link previews for supported URLs.",
+  "linkPreviewDescription": "生成連結預覽（需連結支持）。",
   "linkPreviewsConfirmMessage": "您在傳送連結預覽時無法得到完整的元數據保護。",
   "mediaPermissionsTitle": "麥克風",
-  "mediaPermissionsDescription": "Allow access to microphone.",
+  "mediaPermissionsDescription": "允許存取麥克風。",
   "spellCheckTitle": "拼寫檢查",
-  "spellCheckDescription": "Enable spell check when typing messages.",
+  "spellCheckDescription": "輸入訊息時進行檢查拼寫",
   "spellCheckDirty": "您必須重新啓動 Session 以應用您的新設定",
-  "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
+  "readReceiptSettingDescription": "在一對一會話時發送以讀回執",
   "readReceiptSettingTitle": "已讀回條",
-  "typingIndicatorsSettingDescription": "See and share typing indicators in one-to-one chats.",
+  "typingIndicatorsSettingDescription": "一對一會話時查看他人及展示自己的鍵入狀態。",
   "typingIndicatorsSettingTitle": "輸入狀態",
   "zoomFactorSettingTitle": "縮放係數",
-  "themesSettingTitle": "Themes",
-  "primaryColor": "Primary Color",
-  "primaryColorGreen": "Primary color green",
-  "primaryColorBlue": "Primary color blue",
-  "primaryColorYellow": "Primary color yellow",
-  "primaryColorPink": "Primary color pink",
-  "primaryColorPurple": "Primary color purple",
-  "primaryColorOrange": "Primary color  orange",
-  "primaryColorRed": "Primary color red",
-  "classicDarkThemeTitle": "Classic Dark",
-  "classicLightThemeTitle": "Classic Light",
-  "oceanDarkThemeTitle": "Ocean Dark",
-  "oceanLightThemeTitle": "Ocean Light",
-  "pruneSettingTitle": "Trim Communities",
-  "pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
+  "themesSettingTitle": "主題",
+  "primaryColor": "主要色彩",
+  "primaryColorGreen": "主要色彩：綠色",
+  "primaryColorBlue": "主要色彩：藍色",
+  "primaryColorYellow": "主要色彩：黃色",
+  "primaryColorPink": "主要色彩：粉色",
+  "primaryColorPurple": "主要色彩：紫色",
+  "primaryColorOrange": "主要色彩：橙色",
+  "primaryColorRed": "主要色彩：紅色",
+  "classicDarkThemeTitle": "經典深色",
+  "classicLightThemeTitle": "經典淺色",
+  "oceanDarkThemeTitle": "海洋深色",
+  "oceanLightThemeTitle": "海洋淺色",
+  "pruneSettingTitle": "刪裁 Community 舊訊息",
+  "pruneSettingDescription": "如 Community 中有超過2000條訊息，就刪除掉6個月前的舊訊息。",
   "enable": "啟用",
   "keepDisabled": "保持停用",
-  "notificationSettingsDialog": "The information shown in notifications.",
-  "nameAndMessage": "傳送者與訊息",
+  "notificationSettingsDialog": "在通知面板中展示的資訊。",
+  "nameAndMessage": "名稱與訊息內容",
   "noNameOrMessage": "沒有名稱與訊息",
   "nameOnly": "只有傳送者的名稱",
   "newMessage": "新訊息",
-  "createConversationNewContact": "Create a conversation with a new contact",
-  "createConversationNewGroup": "Create a group with existing contacts",
-  "joinACommunity": "Join a community",
-  "chooseAnAction": "Choose an action to start a conversation",
+  "createConversationNewContact": "與新聯絡人開始對話",
+  "createConversationNewGroup": "與已知的聯絡人創建聊天群組",
+  "joinACommunity": "加入社群",
+  "chooseAnAction": "選擇一項以開始會話",
   "newMessages": "新訊息",
   "notificationMostRecentFrom": "最近來自：",
   "notificationFrom": "來自：",
@@ -174,7 +176,7 @@
   "sendFailed": "傳送失敗",
   "mediaMessage": "媒體訊息",
   "messageBodyMissing": "請輸入訊息內容。",
-  "messageBody": "Message body",
+  "messageBody": "訊息正文",
   "unblockToSend": "解鎖聯絡人來傳送訊息。",
   "unblockGroupToSend": "解除此群組封鎖以傳送訊息。",
   "youChangedTheTimer": "您設定訊息讀後焚毀的時間為 $time$",
@@ -192,6 +194,7 @@
   "timerOption_12_hours": "12 小時",
   "timerOption_1_day": "1 天",
   "timerOption_1_week": "1 週",
+  "timerOption_2_weeks": "2 週",
   "disappearingMessages": "自動銷毀訊息",
   "changeNickname": "變更暱稱",
   "clearNickname": "Clear nickname",
@@ -209,18 +212,19 @@
   "timerOption_12_hours_abbreviated": "12 小時",
   "timerOption_1_day_abbreviated": "1 天",
   "timerOption_1_week_abbreviated": "1 週",
+  "timerOption_2_weeks_abbreviated": "2 週",
   "disappearingMessagesDisabled": "關閉訊息讀後焚毀功能",
-  "disabledDisappearingMessages": "$name$ 關閉訊息讀後焚毀功能",
+  "disabledDisappearingMessages": "$name$ 關閉了閱後即焚。",
   "youDisabledDisappearingMessages": "您關閉了訊息讀後焚毀功能",
   "timerSetTo": "計時器設定為 $time$",
   "noteToSelf": "給自己的筆記",
   "hideMenuBarTitle": "隱藏選單列",
-  "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "hideMenuBarDescription": "切換系統選單列可見性。",
   "startConversation": "開始新的對話...",
-  "invalidNumberError": "無效號碼",
+  "invalidNumberError": "請檢查 Session ID 或 ONS，然後再試一次。",
   "failedResolveOns": "無法解析 ONS 名稱",
   "autoUpdateSettingTitle": "自動更新",
-  "autoUpdateSettingDescription": "Automatically check for updates on startup.",
+  "autoUpdateSettingDescription": "啟動時自動檢查更新。",
   "autoUpdateNewVersionTitle": "Session 可用的更新",
   "autoUpdateNewVersionMessage": "這是新版本的 Session",
   "autoUpdateNewVersionInstructions": "點選重啟 Session 來套用更新。",
@@ -237,12 +241,12 @@
   "multipleJoinedTheGroup": "$names$ 已加入群組。",
   "kickedFromTheGroup": "$name$ 已被移出群組。",
   "multipleKickedFromTheGroup": "$name$ 已被移出群組。",
-  "blockUser": "封鎖",
-  "unblockUser": "解除封鎖",
+  "block": "Block",
+  "unblock": "Unblock",
   "unblocked": "解除封鎖",
   "blocked": "已封鎖",
-  "blockedSettingsTitle": "Blocked Contacts",
-  "conversationsSettingsTitle": "Conversations",
+  "blockedSettingsTitle": "已封鎖的聯絡人",
+  "conversationsSettingsTitle": "對話",
   "unbanUser": "解除封鎖用戶",
   "userUnbanned": "已解除封鎖用戶",
   "userUnbanFailed": "解除封鎖失敗！",
@@ -251,14 +255,14 @@
   "userBanned": "User banned successfully",
   "userBanFailed": "封鎖失敗！",
   "leaveGroup": "離開群組",
-  "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
+  "leaveAndRemoveForEveryone": "離開群組並為所有人移除",
   "leaveGroupConfirmation": "您確定要離開此群組？",
   "leaveGroupConfirmationAdmin": "您確定要離開這個群組嗎？",
   "cannotRemoveCreatorFromGroup": "不能移除該用戶",
   "cannotRemoveCreatorFromGroupDesc": "您不能從群組中移除群組創建者。",
   "noContactsForGroup": "您尚未添加聯絡人",
-  "failedToAddAsModerator": "Failed to add user as admin",
-  "failedToRemoveFromModerator": "Failed to remove user from the admin list",
+  "failedToAddAsModerator": "無法設定使用者為管理者",
+  "failedToRemoveFromModerator": "無法將使用者從管理員清單中移除",
   "copyMessage": "複製訊息文字",
   "selectMessage": "選取訊息",
   "editGroup": "編輯群組",
@@ -266,28 +270,28 @@
   "updateGroupDialogTitle": "更新 $name$...",
   "showRecoveryPhrase": "回復用字句",
   "yourSessionID": "您的 Session ID",
-  "setAccountPasswordTitle": "設置賬戶密碼",
-  "setAccountPasswordDescription": "Require password to unlock Session.",
-  "changeAccountPasswordTitle": "更改帳戶密碼",
-  "changeAccountPasswordDescription": "Change the password required to unlock Session.",
-  "removeAccountPasswordTitle": "移除帳戶密碼",
-  "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
+  "setAccountPasswordTitle": "密碼",
+  "setAccountPasswordDescription": "需要密碼才能解鎖 Session。",
+  "changeAccountPasswordTitle": "變更密碼",
+  "changeAccountPasswordDescription": "更改解鎖 Session 的密碼。",
+  "removeAccountPasswordTitle": "移除密碼",
+  "removeAccountPasswordDescription": "去除解鎖 Session 的密碼。",
   "enterPassword": "請輸入您的密碼",
   "confirmPassword": "確認密碼",
-  "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm new password",
+  "enterNewPassword": "請輸入您的新密碼",
+  "confirmNewPassword": "確認新密碼",
   "showRecoveryPhrasePasswordRequest": "請輸入您的密碼",
   "recoveryPhraseSavePromptMain": "當您遺失裝置時，您的回復用字句是用來找回您的Session ID的主要資訊。請儲存好您的Session ID在一個安全的地方，不要給任何人。",
   "invalidOpenGroupUrl": "無效 URL",
-  "copiedToClipboard": "已複製到剪貼簿",
-  "passwordViewTitle": "Enter Password",
+  "copiedToClipboard": "已拷貝",
+  "passwordViewTitle": "輸入密碼",
   "password": "密碼",
   "setPassword": "設定密碼",
   "changePassword": "變更密碼",
-  "createPassword": "Create your password",
+  "createPassword": "建立您的密碼",
   "removePassword": "移除密碼",
   "maxPasswordAttempts": "錯誤的密碼。您要重設資料庫嗎？",
-  "typeInOldPassword": "Please enter your current password",
+  "typeInOldPassword": "請輸入您目前的密碼",
   "invalidOldPassword": "舊密碼錯誤",
   "invalidPassword": "密碼錯誤",
   "noGivenPassword": "請輸入您的密碼",
@@ -295,16 +299,16 @@
   "setPasswordInvalid": "密碼不一致",
   "changePasswordInvalid": "您輸入的舊密碼錯誤",
   "removePasswordInvalid": "密碼錯誤",
-  "setPasswordTitle": "設定密碼",
-  "changePasswordTitle": "變更密碼",
-  "removePasswordTitle": "移除密碼",
+  "setPasswordTitle": "已設定密碼",
+  "changePasswordTitle": "密碼已變更",
+  "removePasswordTitle": "密碼已移除",
   "setPasswordToastDescription": "您的密碼設定完成。請保持安全。",
   "changePasswordToastDescription": "您的密碼變更完成。請保持安全",
-  "removePasswordToastDescription": "您的密碼已經移除。",
-  "publicChatExists": "You are already connected to this community",
-  "connectToServerFail": "Couldn't join community",
+  "removePasswordToastDescription": "已移除密碼。",
+  "publicChatExists": "您已連接到此 Community.",
+  "connectToServerFail": "無法加入 Community",
   "connectingToServer": "連線中",
-  "connectToServerSuccess": "Successfully connected to community",
+  "connectToServerSuccess": "成功連接到此 Community",
   "setPasswordFail": "設定密碼失敗",
   "passwordLengthError": "密碼必須介於6到64個字元之間。",
   "passwordTypeError": "密碼必須是一個字元",
@@ -316,20 +320,20 @@
   "editProfileModalTitle": "個人檔案",
   "groupNamePlaceholder": "群組名稱",
   "inviteContacts": "邀請聯絡人",
-  "addModerators": "Add Admins",
-  "removeModerators": "Remove Admins",
-  "addAsModerator": "Add as Admin",
-  "removeFromModerators": "Remove From Admins",
+  "addModerators": "新增管理員",
+  "removeModerators": "移除管理員",
+  "addAsModerator": "新增為管理員",
+  "removeFromModerators": "從管理員中移除",
   "add": "新增",
   "addingContacts": "新增聯絡人到\n$name$",
   "noContactsToAdd": "沒有要新增的聯絡人",
   "noMembersInThisGroup": "這個群組沒有其他成員",
-  "noModeratorsToRemove": "no admins to remove",
+  "noModeratorsToRemove": "沒有可移除的管理者",
   "onlyAdminCanRemoveMembers": "您不是建立者",
   "onlyAdminCanRemoveMembersDesc": "只有這個群組的建立者可以移除成員",
   "createAccount": "Create Account",
   "startInTrayTitle": "保持在系統的通知區域",
-  "startInTrayDescription": "Keep Session running in the background when you close the window.",
+  "startInTrayDescription": "Session 視窗關閉時，Session 仍在後台運行。",
   "yourUniqueSessionID": "迎接您新的Session ID",
   "allUsersAreRandomly...": "您的Session ID是您唯一的聯絡資訊，他人可以聯絡您，不會連結到您的真實個人資訊，您的Session ID是完全匿名且私密的。",
   "getStarted": "開始",
@@ -344,40 +348,43 @@
   "linkDevice": "連結裝置",
   "restoreUsingRecoveryPhrase": "恢復您的帳戶",
   "or": "或",
-  "ByUsingThisService...": "By using this service, you agree to our <a href=\"https://getsession.org/terms-of-service \">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\">Privacy Policy</a>",
+  "ByUsingThisService...": "若使用此服務，表示您同意 <a href=\"https://getsession.org/terms-of-service \"> 服務條款 </a> 及 <a href=\"https://getsession.org/privacy-policy\" target=\"_blank\"> 隱私條款 </a>",
   "beginYourSession": "開始您的 Session。",
   "welcomeToYourSession": "歡迎來到您的 Session。",
-  "searchFor...": "Search conversations and contacts",
-  "searchForContactsOnly": "Search for contacts",
+  "searchFor...": "搜尋對話或聯絡人",
+  "searchForContactsOnly": "搜尋聯絡人",
   "enterSessionID": "輸入 Session ID",
-  "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS",
+  "enterSessionIDOfRecipient": "輸入聯絡人的 Session ID 或其 ONS",
   "message": "訊息",
   "appearanceSettingsTitle": "外觀",
   "privacySettingsTitle": "隱私權",
   "notificationsSettingsTitle": "通知",
-  "notificationsSettingsContent": "Notification Content",
-  "notificationPreview": "Preview",
+  "audioNotificationsSettingsTitle": "Audio Notifications",
+  "notificationsSettingsContent": "通知內容",
+  "notificationPreview": "預覽",
   "recoveryPhraseEmpty": "輸入您的回復用字句",
   "displayNameEmpty": "Please pick a display name",
+  "displayNameTooLong": "Display name is too long",
   "members": "$count$ 成員",
-  "join": "Join",
-  "joinOpenGroup": "Join Community",
-  "createGroup": "Create Group",
-  "create": "Create",
+  "activeMembers": "$count$ active members",
+  "join": "加入",
+  "joinOpenGroup": "加入社群",
+  "createGroup": "建立群組",
+  "create": "建立",
   "createClosedGroupNamePrompt": "群組名稱",
   "createClosedGroupPlaceholder": "輸入一個群組名稱",
-  "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter Community URL",
+  "openGroupURL": "社群 URL",
+  "enterAnOpenGroupURL": "輸入社群 URL",
   "next": "下一步",
   "invalidGroupNameTooShort": "請輸入一個群組名稱",
   "invalidGroupNameTooLong": "請輸入一個較短的群組名稱",
   "pickClosedGroupMember": "請選擇至少一個群組成員",
-  "closedGroupMaxSize": "A group cannot have more than 100 members",
-  "noBlockedContacts": "沒有被封鎖的聯絡人",
-  "userAddedToModerators": "User added to admin list",
-  "userRemovedFromModerators": "User removed from admin list",
+  "closedGroupMaxSize": "一個群組不能超過 100 位成員",
+  "noBlockedContacts": "您沒有封鎖的聯絡人。",
+  "userAddedToModerators": "使用者已新增至管理員清單",
+  "userRemovedFromModerators": "使用者已從管理員清單移除",
   "orJoinOneOfThese": "或加入這些...",
-  "helpUsTranslateSession": "Translate Session",
+  "helpUsTranslateSession": "翻譯 Session",
   "closedGroupInviteFailTitle": "群組邀請失敗",
   "closedGroupInviteFailTitlePlural": "群組邀請失敗",
   "closedGroupInviteFailMessage": "無法成功邀請一個群組成員",
@@ -385,13 +392,13 @@
   "closedGroupInviteOkText": "重試邀請",
   "closedGroupInviteSuccessTitlePlural": "群組邀請完成",
   "closedGroupInviteSuccessTitle": "群組邀請成功",
-  "closedGroupInviteSuccessMessage": "Successfully invited group members",
+  "closedGroupInviteSuccessMessage": "成功邀請 Group 成員",
   "notificationForConvo": "通知",
   "notificationForConvo_all": "全部",
   "notificationForConvo_disabled": "已關閉",
   "notificationForConvo_mentions_only": "只有提及",
   "onionPathIndicatorTitle": "目錄",
-  "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
+  "onionPathIndicatorDescription": "Session 將您傳送的訊息經由 Session 的去中心化網絡做多重的路徑與節點傳輸以隱藏您的 IP，這些是您現在傳送訊息將經過的節點服務所設立之國家。",
   "unknownCountry": "不明的國家",
   "device": "裝置",
   "destination": "目標位置",
@@ -399,13 +406,14 @@
   "linkVisitWarningTitle": "使用瀏覽器開啟這個連結",
   "linkVisitWarningMessage": "您確定要使用瀏覽器開啟 $url$ 嗎？",
   "open": "開啟",
-  "audioMessageAutoplayTitle": "Autoplay Audio Messages",
-  "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "audioMessageAutoplayTitle": "自動播放語音訊息",
+  "audioMessageAutoplayDescription": "自動連續播放語音訊息",
   "clickToTrustContact": "點擊下載媒體",
   "trustThisContactDialogTitle": "性任\n$name$?",
   "trustThisContactDialogDescription": "您確定要下載從$name$傳送的媒體嗎？",
   "pinConversation": "置頂對話",
   "unpinConversation": "取消置頂",
+  "markUnread": "Mark Unread",
   "showUserDetails": "顯示使用者詳細資料",
   "sendRecoveryPhraseTitle": "正在傳送回復用字句",
   "sendRecoveryPhraseMessage": "您將傳送用來恢復您帳戶的回復用字句，您確定要傳送這個訊息嗎？",
@@ -413,21 +421,24 @@
   "dialogClearAllDataDeletionFailedDesc": "發生不明錯誤，資料未完全刪除。您要只從這個裝置刪除訊息嗎？",
   "dialogClearAllDataDeletionFailedTitleQuestion": "您要只從這個裝置刪除訊息嗎？",
   "dialogClearAllDataDeletionFailedMultiple": "資料未在這些服務中刪除\n$snodes$",
-  "dialogClearAllDataDeletionQuestion": "Would you like to clear this device only, or delete your data from the network as well?",
-  "deviceOnly": "Clear Device Only",
-  "entireAccount": "Clear Device and Network",
+  "dialogClearAllDataDeletionQuestion": "您要僅清除此設備上的帳號，或要同時刪除網絡中您的資料？",
+  "clearDevice": "清除此設備儲存的的帳號資訊",
+  "tryAgain": "再試一次",
+  "areYouSureClearDevice": "您確定要在這部裝置，移除儲存的帳號資料嗎？",
+  "deviceOnly": "清除此設備儲存的的帳號資訊",
+  "entireAccount": "完全刪除帳號和設備儲存的帳號資訊",
   "areYouSureDeleteDeviceOnly": "您確定要只刪除這個裝置的資料嗎？",
-  "areYouSureDeleteEntireAccount": "Are you sure you want to delete your data from the network? If you continue, you will not be able to restore your messages or contacts.",
+  "areYouSureDeleteEntireAccount": "確定要完全刪除網絡中的資料嗎？這樣您將無法恢復訊息和聯絡人。",
   "iAmSure": "我確認",
   "recoveryPhraseSecureTitle": "您幾乎完成了！",
   "recoveryPhraseRevealMessage": "透過儲存你的復原片語，你的帳戶將保持安全。顯示你的復原片語並將其記錄下來以保持安全。",
   "recoveryPhraseRevealButtonText": "顯示復原片語",
   "notificationSubtitle": "通知\n$setting$",
-  "surveyTitle": "We'd Love Your Feedback",
-  "faq": "FAQ",
-  "support": "Support",
+  "surveyTitle": "我們樂意聽見您的寶貴意見",
+  "faq": "常見問題",
+  "support": "支援",
   "clearAll": "全部清除",
-  "clearDataSettingsTitle": "Clear Data",
+  "clearDataSettingsTitle": "清除資料",
   "messageRequests": "訊息請求",
   "requestsSubtitle": "等待中的請求",
   "requestsPlaceholder": "沒有請求",
@@ -438,8 +449,8 @@
   "accept": "接受",
   "decline": "拒絕",
   "endCall": "結束通話",
-  "permissionsSettingsTitle": "Permissions",
-  "helpSettingsTitle": "Help",
+  "permissionsSettingsTitle": "權限",
+  "helpSettingsTitle": "說明",
   "cameraPermissionNeededTitle": "語音/視訊通話需要權限",
   "cameraPermissionNeeded": "您可以從隱私權設定中開啟語音和視訊通話的權限",
   "unableToCall": "請先取消正在撥打的來電",
@@ -449,12 +460,12 @@
   "noCameraFound": "未找到相機",
   "noAudioInputFound": "未找到音訊輸入裝置",
   "noAudioOutputFound": "未找到音訊輸出裝置",
-  "callMediaPermissionsTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsTitle": "語音和視訊通話 (測試版)",
   "callMissedCausePermission": "來自 $name$ 的未接來電，您必須從隱私權設定開啟語音和視訊通話的權限。",
   "callMissedNotApproved": "來自 $name$ 的未接來電，您尚未接受這個對話，請先傳送一則訊息給對方。",
-  "callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
-  "callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
-  "callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
+  "callMediaPermissionsDescription": "啟用語音通話和視像通話功能",
+  "callMediaPermissionsDialogContent": "使用測試版通話功能，會使您的 IP 地址可見於通話對方，及 Oxen Foundation 的伺服器。您是否確定要啟用語音通話和視像通話功能？",
+  "callMediaPermissionsDialogTitle": "語音和視訊通話 (測試版)",
   "startedACall": "您撥打給\n$name$",
   "answeredACall": "撥打給\n$name$",
   "trimDatabase": "修剪資料庫",
@@ -466,27 +477,32 @@
   "messageRequestAcceptedOurs": "您已接受\n$name$ 的訊息請求",
   "messageRequestAcceptedOursNoName": "您已接受訊息請求",
   "declineRequestMessage": "您確定要拒絕這則訊息請求嗎？",
-  "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
+  "respondingToRequestWarning": "傳送訊息給這位使用者將自動接受他們的訊息要求並顯示您的 Session ID",
   "hideRequestBanner": "隱藏訊息請求橫幅",
-  "openMessageRequestInbox": "Message Requests",
+  "openMessageRequestInbox": "訊息要求",
   "noMessageRequestsPending": "沒有正在等待的訊息請求",
   "noMediaUntilApproved": "您無法傳送附件直到對話被接受",
-  "mustBeApproved": "This conversation must be accepted to use this feature",
+  "mustBeApproved": "此會話必須接受才可使用該功能",
   "youHaveANewFriendRequest": "您有一個新的好友請求",
   "clearAllConfirmationTitle": "清除所有訊息請求",
   "clearAllConfirmationBody": "您確定要清除所有訊息請求嗎？",
+  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
+  "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "隱藏",
+  "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
   "openMessageRequestInboxDescription": "檢視訊息要求收件匣",
-  "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
-  "expandedReactionsText": "Show Less",
-  "reactionNotification": "Reacts to a message with $emoji$",
-  "otherSingular": "$number$ other",
-  "otherPlural": "$number$ others",
-  "reactionPopup": "reacted with",
+  "clearAllReactions": "您確定要清除所有 $emoji$ 嗎？",
+  "expandedReactionsText": "顯示更少",
+  "reactionNotification": "回應 $emoji$ 於此訊息",
+  "rateLimitReactMessage": "請慢些！您發了太多 Emoji 回應，請稍等再試。",
+  "otherSingular": "$number$ 其他",
+  "otherPlural": "$number$ 其他",
+  "reactionPopup": "回應",
   "reactionPopupOne": "$name$",
-  "reactionPopupTwo": "$name$ & $name2$",
-  "reactionPopupThree": "$name$, $name2$ & $name3$",
-  "reactionPopupMany": "$name$, $name2$, $name3$ &",
-  "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionPopupTwo": "$name$ 與 $name2$",
+  "reactionPopupThree": "$name$、$name2$ 與 $name3$",
+  "reactionPopupMany": "$name$、$name2$、$name3$ 與",
+  "reactionListCountSingular": "$otherSingular$ 對此訊息回應 <span>$emoji$</span>",
+  "reactionListCountPlural": "$otherPlural$ 也對此訊息回應了<span>$emoji$</span>"
 }

From eb04e75e33710a42b6974f3d519114cf8c2b5efd Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 15 May 2023 13:38:54 +1000
Subject: [PATCH 094/178] chore: add cleanup of integration test linux cmd

---
 ts/test/automation/setup/beforeEach.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index aceaaaa00..b0f7f421f 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -1,7 +1,8 @@
 import { Page } from '@playwright/test';
 import { readdirSync, rmdirSync } from 'fs-extra';
 import { join } from 'path';
-import { isMacOS } from '../../../OS';
+import { homedir } from 'os';
+import { isLinux, isMacOS } from '../../../OS';
 import { MULTI_PREFIX, NODE_ENV } from './open';
 // tslint:disable: no-console
 
@@ -23,13 +24,17 @@ function cleanUpOtherTest() {
 
   alreadyCleanedWaiting = true;
 
-  const parentFolderOfAllDataPath = isMacOS() ? '~/Library/Application Support/' : null;
+  const parentFolderOfAllDataPath = isMacOS()
+    ? '~/Library/Application Support/'
+    : isLinux()
+    ? homedir() + '/.config/'
+    : null;
   if (!parentFolderOfAllDataPath) {
     throw new Error('Only macOS is currrently supported ');
   }
 
-  if (!parentFolderOfAllDataPath || parentFolderOfAllDataPath.length < 20) {
-    throw new Error('parentFolderOfAllDataPath not found or invalid');
+  if (!parentFolderOfAllDataPath || parentFolderOfAllDataPath.length < 9) {
+    throw new Error('parentFolderOfAllDataPath not found or invalid:' + parentFolderOfAllDataPath);
   }
   console.info('cleaning other tests leftovers...', parentFolderOfAllDataPath);
 

From b4af13fce8532b20f5947f4ed3a715d3d94bd0e3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 15 May 2023 13:39:57 +1000
Subject: [PATCH 095/178] chore: enable userconfig libsession by default for
 testing

---
 ts/util/releaseFeature.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 552f3fcbc..46ca8f9c4 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -48,8 +48,8 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
     case 'user_config_libsession':
       // TODO update to agreed value between platforms for `user_config_libsession`
       // FIXME once we are done with testing the user config over libsession feature
-      return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
-    //   return 1677488400000; // testing: unix 27/02/2023 09:00
+      // return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
+      return 1677488400000; // testing: unix 27/02/2023 09:00
 
     default:
       assertUnreachable(featureName, 'case not handled for getFeatureReleaseTimestamp');

From 768e0e1b5fb106f22f961ee8da2b5484a80bbe99 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 15 May 2023 13:39:57 +1000
Subject: [PATCH 096/178] chore: enable userconfig libsession by default for
 testing

---
 ts/util/releaseFeature.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 552f3fcbc..46ca8f9c4 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -48,8 +48,8 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
     case 'user_config_libsession':
       // TODO update to agreed value between platforms for `user_config_libsession`
       // FIXME once we are done with testing the user config over libsession feature
-      return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
-    //   return 1677488400000; // testing: unix 27/02/2023 09:00
+      // return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
+      return 1677488400000; // testing: unix 27/02/2023 09:00
 
     default:
       assertUnreachable(featureName, 'case not handled for getFeatureReleaseTimestamp');

From a551d4d7cc4f816c28735e3b6c64573eac21f9d5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 15 May 2023 13:46:41 +1000
Subject: [PATCH 097/178] chore: add yarn commands to build workers

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1cbcf108e..72d74490a 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,9 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
-    "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn worker:utils && yarn worker:libsession",
-    "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn worker:utils && yarn worker:libsession && tsc -w",
+    "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
+    "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
+    "build:workers": "yarn worker:utils && yarn worker:libsession",
     "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",

From 52291ff524133acd0e5a822d06fca36dec364866 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 09:45:58 +1000
Subject: [PATCH 098/178] chore: update integration tests to use generic open
 and close function

---
 .../overlay/OverlayMessageRequest.tsx         |  16 +--
 ts/session/onions/onionPath.ts                |   5 +-
 ts/test/automation/call_checks.spec.ts        |   6 +-
 ts/test/automation/create_user.spec.ts        |  16 +--
 ts/test/automation/delete_account.spec.ts     |   4 +-
 .../automation/disappearing_messages.spec.ts  |  10 +-
 ts/test/automation/group_testing.spec.ts      |  32 ++---
 ts/test/automation/group_upkeep.spec.ts       | 131 +++++++++---------
 .../automation/linked_device_group.spec.ts    |   8 +-
 .../automation/linked_device_requests.spec.ts |  13 +-
 ts/test/automation/linked_device_user.spec.ts |  12 +-
 ts/test/automation/message_checks.spec.ts     |  33 ++---
 ts/test/automation/message_requests.spec.ts   |  15 +-
 ts/test/automation/password.spec.ts           |  14 +-
 ts/test/automation/setup/new_user.ts          |  27 ----
 ts/test/automation/setup/open.ts              |   2 +-
 ts/test/automation/setup/sessionTest.ts       |  81 +++++++++++
 ts/test/automation/switching_theme.spec.ts    |  13 +-
 ts/test/automation/test.spec.ts               |   9 +-
 ts/test/automation/to do                      |   1 -
 ts/test/automation/user_actions.spec.ts       |  31 ++---
 ts/test/automation/utilities/linked_device.ts |   2 +-
 ts/test/automation/utilities/utils.ts         |   4 +-
 23 files changed, 216 insertions(+), 269 deletions(-)
 create mode 100644 ts/test/automation/setup/sessionTest.ts
 delete mode 100644 ts/test/automation/to do

diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 5d9bd695a..f39a2b21a 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 // tslint:disable: no-submodule-imports use-simple-attributes
 
 import { useDispatch, useSelector } from 'react-redux';
@@ -6,9 +6,8 @@ import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { declineConversationWithoutConfirm } from '../../../interactions/conversationInteractions';
 import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
-import { resetConversationExternal } from '../../../state/ducks/conversations';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
-import { SectionType, resetOverlayMode, showLeftPaneSection } from '../../../state/ducks/section';
+import { resetOverlayMode } from '../../../state/ducks/section';
 import { getConversationRequests } from '../../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
@@ -51,17 +50,6 @@ export const OverlayMessageRequest = () => {
   const currentlySelectedConvo = useSelectedConversationKey();
   const convoRequestCount = useSelector(getConversationRequests).length;
   const messageRequests = useSelector(getConversationRequests);
-
-  useEffect(() => {
-    // if no more requests, return to placeholder screen
-
-    if (convoRequestCount === 0) {
-      dispatch(resetOverlayMode());
-      dispatch(showLeftPaneSection(SectionType.Message));
-      dispatch(resetConversationExternal());
-    }
-  }, [dispatch, convoRequestCount]);
-
   const buttonText = window.i18n('clearAll');
 
   /**
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 737398a83..0fb74988b 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -497,7 +497,10 @@ async function buildNewOnionPathsWorker() {
       for (let i = 0; i < maxPath; i += 1) {
         const path = [guards[i]];
         for (let j = 0; j < nodesNeededPerPaths; j += 1) {
-          const randomWinner = _.sample(otherNodes) as Snode;
+          const randomWinner = _.sample(otherNodes);
+          if (!randomWinner) {
+            throw new Error('randomWinner unset during path building task');
+          }
           otherNodes = otherNodes.filter(n => {
             return n.pubkey_ed25519 !== randomWinner?.pubkey_ed25519;
           });
diff --git a/ts/test/automation/call_checks.spec.ts b/ts/test/automation/call_checks.spec.ts
index a4c5f6bf2..8285de6ba 100644
--- a/ts/test/automation/call_checks.spec.ts
+++ b/ts/test/automation/call_checks.spec.ts
@@ -1,12 +1,10 @@
-import { test } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
 import { createContact } from './utilities/create_contact';
 import { clickOnMatchingText, clickOnTestIdWithText } from './utilities/utils';
+import { sessionTestTwoWindows } from './setup/sessionTest';
 
-test('Voice calls', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Voice calls', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 
   await createContact(windowA, windowB, userA, userB);
diff --git a/ts/test/automation/create_user.spec.ts b/ts/test/automation/create_user.spec.ts
index 453a56430..e3e884524 100644
--- a/ts/test/automation/create_user.spec.ts
+++ b/ts/test/automation/create_user.spec.ts
@@ -1,25 +1,13 @@
-import { Page, test } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
-import { beforeAllClean } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
-import { openAppAndWait } from './setup/open';
 import {
   clickOnMatchingText,
   clickOnTestIdWithText,
   waitForTestIdWithText,
 } from './utilities/utils';
+import { sessionTestOneWindow } from './setup/sessionTest';
 
-let window: Page | undefined;
-test.beforeEach(beforeAllClean);
-
-// test.afterEach(async () => {
-//   if (window) {
-//     await forceCloseAllWindows([window]);
-//   }
-// });
-test('Create User', async () => {
-  // Launch Electron app.
-  window = await openAppAndWait('1');
+sessionTestOneWindow('Create User', async ([window]) => {
   // // Create User
   const userA = await newUser(window, 'userA');
   // Open profile tab
diff --git a/ts/test/automation/delete_account.spec.ts b/ts/test/automation/delete_account.spec.ts
index 34feaa031..caee2934e 100644
--- a/ts/test/automation/delete_account.spec.ts
+++ b/ts/test/automation/delete_account.spec.ts
@@ -10,7 +10,7 @@ import { openApp } from './setup/open';
 test.beforeEach(beforeAllClean);
 
 test('Delete account from swarm', async () => {
-  const [windowA, windowB] = await openApp(2);
+  const [windowA, windowB] = await openApp(2); // not using sessionTest here as we need to close and reopen one of the window
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const testMessage = `${userA.userName} to ${userB.userName}`;
   const testReply = `${userB.userName} to ${userA.userName}`;
@@ -33,7 +33,7 @@ test('Delete account from swarm', async () => {
   // Wait for window to close and reopen
   await sleepFor(10000, true);
   // await windowA.close();
-  const restoringWindows = await openApp(1);
+  const restoringWindows = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
   const [restoringWindow] = restoringWindows;
   // Sign in with deleted account and check that nothing restores
   await clickOnTestIdWithText(restoringWindow, 'restore-using-recovery', 'Restore your account');
diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index 4044c44b4..80dd16ea5 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -1,8 +1,6 @@
-import { test } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
-import { beforeAllClean } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
+import { sessionTestTwoWindows } from './setup/sessionTest';
 import { sendMessage } from './utilities/message';
 import { sendNewMessage } from './utilities/send_message';
 import {
@@ -13,9 +11,6 @@ import {
   waitForTestIdWithText,
 } from './utilities/utils';
 
-test.beforeEach(beforeAllClean);
-
-// test.afterEach(() => forceCloseAllWindows(windows));
 // tslint:disable: no-console
 
 const testMessage = 'Test-Message- (A -> B) ';
@@ -23,10 +18,9 @@ const testReply = 'Reply-Test-Message- (B -> A)';
 const sentMessage = `${testMessage}${Date.now()}`;
 const sentReplyMessage = `${testReply} :${Date.now()}`;
 
-test('Disappearing messages', async () => {
+sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
   // Open App
   // Create User
-  const [windowA, windowB] = await openApp(2);
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   // Create Contact
   await sendNewMessage(windowA, userB.sessionid, sentMessage);
diff --git a/ts/test/automation/group_testing.spec.ts b/ts/test/automation/group_testing.spec.ts
index 7b560df12..d0084f0eb 100644
--- a/ts/test/automation/group_testing.spec.ts
+++ b/ts/test/automation/group_testing.spec.ts
@@ -1,5 +1,6 @@
-import { expect, test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
+import { expect } from '@playwright/test';
+import { createGroup } from './setup/create_group';
+import { renameGroup } from './utilities/rename_group';
 import {
   clickOnElement,
   clickOnMatchingText,
@@ -10,22 +11,15 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
-import { renameGroup } from './utilities/rename_group';
-import { createGroup } from './setup/create_group';
 // import { leaveGroup } from './utilities/leave_group';
-import { newUser } from './setup/new_user';
-import { leaveGroup } from './utilities/leave_group';
-import { openApp } from './setup/open';
 import { sleepFor } from '../../session/utils/Promise';
+import { newUser } from './setup/new_user';
+import { sessionTestFourWindows, sessionTestThreeWindows } from './setup/sessionTest';
 import { createContact } from './utilities/create_contact';
+import { leaveGroup } from './utilities/leave_group';
 
-test.beforeEach(beforeAllClean);
-
-// test.afterEach(() => forceCloseAllWindows(windows));
-
-test('Create group', async () => {
+sessionTestThreeWindows('Create group', async ([windowA, windowB, windowC]) => {
   // Open Electron
-  const [windowA, windowB, windowC] = await openApp(3);
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowB, 'Bob'),
@@ -52,8 +46,7 @@ test('Create group', async () => {
   ]);
 });
 
-test('Add contact to group', async () => {
-  const [windowA, windowB, windowC, windowD] = await openApp(4);
+sessionTestFourWindows('Add contact to group', async ([windowA, windowB, windowC, windowD]) => {
   const [userA, userB, userC, userD] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowB, 'Bob'),
@@ -94,8 +87,7 @@ test('Add contact to group', async () => {
   await doesTextIncludeString(windowD, 'control-message', 'You joined the group.');
 });
 
-test('Change group name', async () => {
-  const [windowA, windowB, windowC] = await openApp(3);
+sessionTestThreeWindows('Change group name', async ([windowA, windowB, windowC]) => {
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowB, 'Bob'),
@@ -130,8 +122,7 @@ test('Change group name', async () => {
   await clickOnTestIdWithText(windowA, 'back-button-conversation-options');
 });
 
-test('Test mentions', async () => {
-  const [windowA, windowB, windowC] = await openApp(3);
+sessionTestThreeWindows('Test mentions', async ([windowA, windowB, windowC]) => {
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowB, 'Bob'),
@@ -173,8 +164,7 @@ test('Test mentions', async () => {
   await waitForTestIdWithText(windowC, 'mentions-popup-row', userB.userName);
 });
 
-test('Leave group', async () => {
-  const [windowA, windowB, windowC] = await openApp(3);
+sessionTestThreeWindows('Leave group', async ([windowA, windowB, windowC]) => {
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowB, 'Bob'),
diff --git a/ts/test/automation/group_upkeep.spec.ts b/ts/test/automation/group_upkeep.spec.ts
index 2a77b762a..281904233 100644
--- a/ts/test/automation/group_upkeep.spec.ts
+++ b/ts/test/automation/group_upkeep.spec.ts
@@ -1,70 +1,63 @@
-import { _electron, test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
-import { sendNewMessage } from './utilities/send_message';
-import { logIn } from './setup/log_in';
-import { userA, userB, userC, userD, userE } from './setup/test_user';
-import { openApp } from './setup/open';
+// FIXME enable this test again once we fixed it
+// sessionTestFiveWindows(
+//   'Group upkeep - should be skipped',
+//   async ([windowA, windowB, windowC, windowD, windowE]) => {
+//     await Promise.all([
+//       logIn(windowA, userA.recoveryPhrase),
+//       logIn(windowB, userB.recoveryPhrase),
+//       logIn(windowC, userC.recoveryPhrase),
+//       logIn(windowD, userD.recoveryPhrase),
+//       logIn(windowE, userE.recoveryPhrase),
+//     ]);
+//     // Send message from test users to all of it's contacts to maintain contact status
 
-test.beforeEach(beforeAllClean);
-
-test.skip('Group upkeep', async () => {
-  const [windowA, windowB, windowC, windowD, windowE] = await openApp(5);
-
-  await Promise.all([
-    logIn(windowA, userA.recoveryPhrase),
-    logIn(windowB, userB.recoveryPhrase),
-    logIn(windowC, userC.recoveryPhrase),
-    logIn(windowD, userD.recoveryPhrase),
-    logIn(windowE, userE.recoveryPhrase),
-  ]);
-  // Send message from test users to all of it's contacts to maintain contact status
-
-  // Send message from user A to Whale(TC1)
-  await sendNewMessage(
-    windowA,
-    userB.sessionid,
-    `${userA.userName} -> ${userB.userName}: ${Date.now()}`
-  );
-  // Send message from Whale to user A
-  await sendNewMessage(
-    windowB,
-    userA.sessionid,
-    `${userB.userName} -> ${userA.userName} : ${Date.now()}`
-  );
-  // Send message from user A to Dragon(TC2)
-  await sendNewMessage(
-    windowA,
-    userC.sessionid,
-    `${userA.userName} -> ${userC.userName}: ${Date.now()}`
-  );
-  // Send message from Dragon to user A
-  await sendNewMessage(
-    windowC,
-    userA.sessionid,
-    `${userC.userName} -> ${userA.userName} : ${Date.now()}`
-  );
-  // Send message from user A to Fish(TC3)
-  await sendNewMessage(
-    windowA,
-    userD.sessionid,
-    `${userA.userName} -> ${userD.userName}: ${Date.now()}`
-  );
-  // Send message from Fish to user A
-  await sendNewMessage(
-    windowD,
-    userA.sessionid,
-    `${userD.userName} -> ${userA.userName} : ${Date.now()}`
-  );
-  // Send message from user A to Gopher(TC4)
-  await sendNewMessage(
-    windowA,
-    userE.sessionid,
-    `${userA.userName} -> ${userD.userName}: ${Date.now()}`
-  );
-  // Send message from Gopher to user A
-  await sendNewMessage(
-    windowE,
-    userA.sessionid,
-    `${userD.userName} -> ${userA.userName} : ${Date.now()}`
-  );
-});
+//     // Send message from user A to Whale(TC1)
+//     await sendNewMessage(
+//       windowA,
+//       userB.sessionid,
+//       `${userA.userName} -> ${userB.userName}: ${Date.now()}`
+//     );
+//     // Send message from Whale to user A
+//     await sendNewMessage(
+//       windowB,
+//       userA.sessionid,
+//       `${userB.userName} -> ${userA.userName} : ${Date.now()}`
+//     );
+//     // Send message from user A to Dragon(TC2)
+//     await sendNewMessage(
+//       windowA,
+//       userC.sessionid,
+//       `${userA.userName} -> ${userC.userName}: ${Date.now()}`
+//     );
+//     // Send message from Dragon to user A
+//     await sendNewMessage(
+//       windowC,
+//       userA.sessionid,
+//       `${userC.userName} -> ${userA.userName} : ${Date.now()}`
+//     );
+//     // Send message from user A to Fish(TC3)
+//     await sendNewMessage(
+//       windowA,
+//       userD.sessionid,
+//       `${userA.userName} -> ${userD.userName}: ${Date.now()}`
+//     );
+//     // Send message from Fish to user A
+//     await sendNewMessage(
+//       windowD,
+//       userA.sessionid,
+//       `${userD.userName} -> ${userA.userName} : ${Date.now()}`
+//     );
+//     // Send message from user A to Gopher(TC4)
+//     await sendNewMessage(
+//       windowA,
+//       userE.sessionid,
+//       `${userA.userName} -> ${userD.userName}: ${Date.now()}`
+//     );
+//     // Send message from Gopher to user A
+//     await sendNewMessage(
+//       windowE,
+//       userA.sessionid,
+//       `${userD.userName} -> ${userA.userName} : ${Date.now()}`
+//     );
+//   }
+// );
diff --git a/ts/test/automation/linked_device_group.spec.ts b/ts/test/automation/linked_device_group.spec.ts
index b05471000..433cd6e5a 100644
--- a/ts/test/automation/linked_device_group.spec.ts
+++ b/ts/test/automation/linked_device_group.spec.ts
@@ -3,7 +3,7 @@ import { sleepFor } from '../../session/utils/Promise';
 import { beforeAllClean } from './setup/beforeEach';
 import { createGroup } from './setup/create_group';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
+import { sessionTestThreeWindows } from './setup/sessionTest';
 import { leaveGroup } from './utilities/leave_group';
 import { linkedDevice } from './utilities/linked_device';
 import {
@@ -14,8 +14,7 @@ import {
 
 test.beforeEach(beforeAllClean);
 
-test('Check group syncs', async () => {
-  const [windowA, windowC, windowD] = await openApp(3);
+sessionTestThreeWindows('Check group syncs', async ([windowA, windowC, windowD]) => {
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowC, 'Bob'),
@@ -36,8 +35,7 @@ test('Check group syncs', async () => {
   await waitForTestIdWithText(windowB, 'module-conversation__user__profile-name', group.userName);
 });
 
-test('Check leaving group syncs', async () => {
-  const [windowA, windowC, windowD] = await openApp(3);
+sessionTestThreeWindows('Check leaving group syncs', async ([windowA, windowC, windowD]) => {
   const [userA, userB, userC] = await Promise.all([
     newUser(windowA, 'Alice'),
     newUser(windowC, 'Bob'),
diff --git a/ts/test/automation/linked_device_requests.spec.ts b/ts/test/automation/linked_device_requests.spec.ts
index d4983a2bc..c2db549ed 100644
--- a/ts/test/automation/linked_device_requests.spec.ts
+++ b/ts/test/automation/linked_device_requests.spec.ts
@@ -1,8 +1,5 @@
-import { test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
-// import { leaveGroup } from './utilities/leave_group';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
+import { sessionTestTwoWindows } from './setup/sessionTest';
 import { linkedDevice } from './utilities/linked_device';
 import { sendMessage } from './utilities/message';
 import { sendNewMessage } from './utilities/send_message';
@@ -13,10 +10,7 @@ import {
   waitForTextMessage,
 } from './utilities/utils';
 
-test.beforeEach(beforeAllClean);
-
-test('Accept request syncs', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Accept request syncs', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const [windowC] = await linkedDevice(userB.recoveryPhrase);
 
@@ -41,8 +35,7 @@ test('Accept request syncs', async () => {
   await waitForTestIdWithText(windowC, 'module-conversation__user__profile-name', userA.userName);
 });
 
-test('Decline request syncs', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Decline request syncs', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const [windowC] = await linkedDevice(userB.recoveryPhrase);
 
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index 7fb81869b..daa7b9564 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -25,9 +25,9 @@ test.afterEach(() => forceCloseAllWindows(windows));
 // tslint:disable: no-console
 
 test('Link a device', async () => {
-  const [windowA] = await openApp(1);
+  const [windowA] = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
   const userA = await newUser(windowA, 'Alice');
-  const [windowB] = await linkedDevice(userA.recoveryPhrase);
+  const [windowB] = await linkedDevice(userA.recoveryPhrase); // not using sessionTest here as we need to close and reopen one of the window
   await clickOnTestIdWithText(windowA, 'leftpane-primary-avatar');
   // Verify Username
   await waitForTestIdWithText(windowA, 'your-profile-name', userA.userName);
@@ -72,9 +72,9 @@ test('Check changed username syncs', async () => {
 });
 
 test('Check profile picture syncs', async () => {
-  const [windowA] = await openApp(1);
+  const [windowA] = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
   const userA = await newUser(windowA, 'Alice');
-  const [windowB] = await linkedDevice(userA.recoveryPhrase);
+  const [windowB] = await linkedDevice(userA.recoveryPhrase); // not using sessionTest here as we need to close and reopen one of the window
   await clickOnTestIdWithText(windowA, 'leftpane-primary-avatar');
   // Click on current profile picture
   await waitForTestIdWithText(windowA, 'copy-button-profile-update', 'Copy');
@@ -97,9 +97,9 @@ test('Check profile picture syncs', async () => {
 });
 
 test('Check contacts sync', async () => {
-  const [windowA, windowC] = await openApp(2);
+  const [windowA, windowC] = await openApp(2); // not using sessionTest here as we need to close and reopen one of the window
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
-  const [windowB] = await linkedDevice(userA.recoveryPhrase);
+  const [windowB] = await linkedDevice(userA.recoveryPhrase); // not using sessionTest here as we need to close and reopen one of the window
   // Waiting for linked device to finish loading
   await waitForLoadingAnimationToFinish(windowB, 'loading-spinner');
   await createContact(windowA, windowC, userA, userB);
diff --git a/ts/test/automation/message_checks.spec.ts b/ts/test/automation/message_checks.spec.ts
index 7e8596e0b..fe254cc32 100644
--- a/ts/test/automation/message_checks.spec.ts
+++ b/ts/test/automation/message_checks.spec.ts
@@ -1,8 +1,6 @@
-import { test } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
-import { beforeAllClean } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
+import { sessionTestTwoWindows } from './setup/sessionTest';
 import { createContact } from './utilities/create_contact';
 import { sendMessage } from './utilities/message';
 import { replyTo } from './utilities/reply_message';
@@ -18,10 +16,7 @@ import {
   waitForTextMessage,
 } from './utilities/utils';
 
-test.beforeEach(beforeAllClean);
-
-test('Send image and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send image and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const testMessage = `${userA.userName} sending image to ${userB.userName}`;
   const testReply = `${userB.userName} replying to image from ${userA.userName}`;
@@ -41,8 +36,7 @@ test('Send image and reply test', async () => {
   await replyTo(windowB, testMessage, testReply);
 });
 
-test('Send video and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send video and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const testMessage = `${userA.userName} sending video to ${userB.userName}`;
   const testReply = `${userB.userName} replying to video from ${userA.userName}`;
@@ -61,8 +55,7 @@ test('Send video and reply test', async () => {
   await replyTo(windowB, testMessage, testReply);
 });
 
-test('Send document and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send document and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const testMessage = `${userA.userName} sending document to ${userB.userName}`;
   const testReply = `${userB.userName} replying to document from ${userA.userName}`;
@@ -81,8 +74,7 @@ test('Send document and reply test', async () => {
   await replyTo(windowB, testMessage, testReply);
 });
 
-test('Send voice message and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send voice message and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   // const testReply = `${userB.userName} to ${userA.userName}`;
   await createContact(windowA, windowB, userA, userB);
@@ -101,8 +93,7 @@ test('Send voice message and reply test', async () => {
   await clickOnTestIdWithText(windowB, 'session-confirm-ok-button');
 });
 
-test('Send GIF and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send GIF and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   // const testReply = `${userB.userName} to ${userA.userName}`;
   await createContact(windowA, windowB, userA, userB);
@@ -114,8 +105,7 @@ test('Send GIF and reply test', async () => {
   await clickOnMatchingText(windowB, 'Click to download media');
 });
 
-test('Send long text and reply test', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Send long text and reply test', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 
   const testReply = `${userB.userName} replying to long text message from ${userA.userName}`;
@@ -131,8 +121,7 @@ test('Send long text and reply test', async () => {
   await replyTo(windowB, longText, testReply);
 });
 
-test('Unsend text message', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Unsend text message', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const unsendMessage = 'Testing unsend functionality';
   await createContact(windowA, windowB, userA, userB);
@@ -147,8 +136,7 @@ test('Unsend text message', async () => {
   await waitForMatchingText(windowB, 'This message has been deleted');
 });
 
-test('Delete message', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Delete message', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const deletedMessage = 'Testing deletion functionality';
   await createContact(windowA, windowB, userA, userB);
@@ -164,8 +152,7 @@ test('Delete message', async () => {
 });
 
 // *************** NEED TO WAIT FOR LINK PREVIEW FIX *************************************************
-// test('Send link and reply test', async () => {
-//   const [windowA, windowB] = await openApp(2);
+// sessionTestTwoWindows('Send link and reply test', async ([windowA, windowB]) => {
 //   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 //   const testMessage = 'https://nerdlegame.com/';
 //   const testReply = `${userB.userName} replying to link from ${userA.userName}`;
diff --git a/ts/test/automation/message_requests.spec.ts b/ts/test/automation/message_requests.spec.ts
index 2cc277b59..a9a0cd104 100644
--- a/ts/test/automation/message_requests.spec.ts
+++ b/ts/test/automation/message_requests.spec.ts
@@ -1,7 +1,6 @@
 import { test } from '@playwright/test';
 import { beforeAllClean } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
 import { sendMessage } from './utilities/message';
 import { sendNewMessage } from './utilities/send_message';
 import {
@@ -10,14 +9,14 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
+import { sessionTestTwoWindows } from './setup/sessionTest';
 
 test.beforeEach(beforeAllClean);
 
 // test.afterEach(() => forceCloseAllWindows(windows));
 // Open two windows and log into 2 separate accounts
 test.describe('Message requests', () => {
-  test('Message requests accept', async () => {
-    const [windowA, windowB] = await openApp(2);
+  sessionTestTwoWindows('Message requests accept', async ([windowA, windowB]) => {
     const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
     const testMessage = `Sender: ${userA.userName} Receiver: ${userB.userName}`;
     // send a message to User B from User A
@@ -36,8 +35,7 @@ test.describe('Message requests', () => {
     );
     await waitForMatchingText(windowB, 'No pending message requests');
   });
-  test('Message requests text reply', async () => {
-    const [windowA, windowB] = await openApp(2);
+  sessionTestTwoWindows('Message requests text reply', async ([windowA, windowB]) => {
     const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
     const testMessage = `Sender: ${userA.userName}, Receiver: ${userB.userName}`;
     const testReply = `Sender: ${userB.userName}, Receiver: ${userA.userName}`;
@@ -57,8 +55,7 @@ test.describe('Message requests', () => {
     );
     await waitForMatchingText(windowB, 'No pending message requests');
   });
-  test('Message requests decline', async () => {
-    const [windowA, windowB] = await openApp(2);
+  sessionTestTwoWindows('Message requests decline', async ([windowA, windowB]) => {
     const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
     const testMessage = `Sender: ${userA.userName}, Receiver: ${userB.userName}`;
     // send a message to User B from User A
@@ -72,11 +69,9 @@ test.describe('Message requests', () => {
     // Confirm decline
     await clickOnTestIdWithText(windowB, 'session-confirm-ok-button', 'Decline');
     // Check config message of message request acceptance
-    await waitForTestIdWithText(windowB, 'session-toast', 'Blocked');
     await waitForMatchingText(windowB, 'No pending message requests');
   });
-  test('Message requests clear all', async () => {
-    const [windowA, windowB] = await openApp(2);
+  sessionTestTwoWindows('Message requests clear all', async ([windowA, windowB]) => {
     const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
     const testMessage = `Sender: ${userA.userName}, Receiver: ${userB.userName}`;
     // send a message to User B from User A
diff --git a/ts/test/automation/password.spec.ts b/ts/test/automation/password.spec.ts
index 55e6fe160..6aef1a791 100644
--- a/ts/test/automation/password.spec.ts
+++ b/ts/test/automation/password.spec.ts
@@ -1,8 +1,6 @@
-import { Page, test } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
-import { beforeAllClean } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
-import { openAppAndWait } from './setup/open';
+import { sessionTestOneWindow } from './setup/sessionTest';
 import {
   clickOnMatchingText,
   clickOnTestIdWithText,
@@ -10,17 +8,12 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
-let window: Page | undefined;
 // tslint:disable: no-console
 
-test.beforeEach(beforeAllClean);
-
 const testPassword = '123456';
 const newTestPassword = '789101112';
 
-test('Set Password', async () => {
-  // open Electron
-  window = await openAppAndWait('1');
+sessionTestOneWindow('Set Password', async ([window]) => {
   // Create user
   await newUser(window, 'userA');
   // Click on settings tab
@@ -73,9 +66,8 @@ test('Set Password', async () => {
   );
 });
 
-test('Wrong password', async () => {
+sessionTestOneWindow('Wrong password', async ([window]) => {
   // Check if incorrect password works
-  window = await openAppAndWait('1');
   // Create user
   await newUser(window, 'userA');
   // Click on settings tab
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 026a34cc1..e57cebba1 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -21,30 +21,3 @@ export const newUser = async (window: Page, userName: string): Promise<User> =>
   await window.click('.session-icon-button.small');
   return { userName, sessionid, recoveryPhrase };
 };
-
-// const openAppAndNewUser = async (multi: string): Promise<User & { window: Page }> => {
-//   const window = await openAppAndWait(multi);
-
-//   const userName = `${multi}-user`;
-//   const loggedIn = await newUser(window, userName);
-//   return { window, ...loggedIn };
-// };
-
-// export async function openAppsAndNewUsers(windowToCreate: number) {
-//   if (windowToCreate >= multisAvailable.length) {
-//     throw new Error(`Do you really need ${multisAvailable.length} windows?!`);
-//   }
-//   // if windowToCreate = 3, this array will be ABC. If windowToCreate = 5, this array will be ABCDE
-//   const multisToUse = multisAvailable.slice(0, windowToCreate);
-//   const loggedInDetails = await Promise.all(
-//     [...multisToUse].map(async m => {
-//       return openAppAndNewUser(m);
-//     })
-//   );
-
-//   const windows = loggedInDetails.map(w => w.window);
-//   const users = loggedInDetails.map(w => {
-//     return _.pick(w, ['sessionid', 'recoveryPhrase', 'userName']);
-//   });
-//   return { windows, users };
-// }
diff --git a/ts/test/automation/setup/open.ts b/ts/test/automation/setup/open.ts
index 756affb89..61f380d63 100644
--- a/ts/test/automation/setup/open.ts
+++ b/ts/test/automation/setup/open.ts
@@ -32,7 +32,7 @@ export const openElectronAppOnly = async (multi: string) => {
   return electronApp;
 };
 
-export const openAppAndWait = async (multi: string) => {
+const openAppAndWait = async (multi: string) => {
   const electronApp = await openElectronAppOnly(multi);
   // Get the first window that the app opens, wait if necessary.
   const window = await electronApp.firstWindow();
diff --git a/ts/test/automation/setup/sessionTest.ts b/ts/test/automation/setup/sessionTest.ts
new file mode 100644
index 000000000..afba32320
--- /dev/null
+++ b/ts/test/automation/setup/sessionTest.ts
@@ -0,0 +1,81 @@
+import { Page, test } from '@playwright/test';
+import { beforeAllClean, forceCloseAllWindows } from './beforeEach';
+import { openApp } from './open';
+
+// This is not ideal, most of our test needs to open a specific number of windows and close them once the test is done or failed.
+// This file contains a bunch of utility function to use to open those windows and clean them afterwards.
+// Note: those function only keep track (and close) the windows they open. If you open a new window or need to close and reopen an existing one, this won't take of it.
+
+type Tuple<T, N extends number> = N extends N
+  ? number extends N
+    ? T[]
+    : _TupleOf<T, N, []>
+  : never;
+type _TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N
+  ? R
+  : _TupleOf<T, N, [T, ...R]>;
+
+type CountWindows = 1 | 2 | 3 | 4 | 5;
+
+async function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
+  testName: string,
+  testCallback: (windows: N) => Promise<void>,
+  count: T
+) {
+  return test(testName, async () => {
+    beforeAllClean();
+    const windows = await openApp(count);
+
+    try {
+      if (windows.length !== count) {
+        throw new Error(`openApp should have opened ${count} windows but did not.`);
+      }
+      await testCallback(windows as N);
+    } catch (e) {
+      throw e;
+    } finally {
+      try {
+        await forceCloseAllWindows(windows);
+      } catch (e) {
+        console.error(`forceCloseAllWindows of ${testName} failed with: `, e);
+      }
+    }
+  });
+}
+
+export async function sessionTestOneWindow(
+  testName: string,
+  testCallback: (windows: Tuple<Page, 1>) => Promise<void>
+) {
+  return sessionTest(testName, testCallback, 1);
+}
+
+export async function sessionTestTwoWindows(
+  testName: string,
+  testCallback: ([windowA, windowB]: [Page, Page]) => Promise<void>
+) {
+  return sessionTest(testName, testCallback, 2);
+}
+
+export async function sessionTestThreeWindows(
+  testName: string,
+  testCallback: ([windowA, windowB, windowC]: [Page, Page, Page]) => Promise<void>
+) {
+  return sessionTest(testName, testCallback, 3);
+}
+
+export async function sessionTestFourWindows(
+  testName: string,
+  testCallback: ([windowA, windowB, windowC, windowD]: [Page, Page, Page, Page]) => Promise<void>
+) {
+  return sessionTest(testName, testCallback, 4);
+}
+
+export async function sessionTestFiveWindows(
+  testName: string,
+  testCallback: ([windowA, windowB, windowC, windowD]: [Page, Page, Page, Page, Page]) => Promise<
+    void
+  >
+) {
+  return sessionTest(testName, testCallback, 5);
+}
diff --git a/ts/test/automation/switching_theme.spec.ts b/ts/test/automation/switching_theme.spec.ts
index 6ff483870..5627d9643 100644
--- a/ts/test/automation/switching_theme.spec.ts
+++ b/ts/test/automation/switching_theme.spec.ts
@@ -1,16 +1,9 @@
-import { expect, test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
+import { expect } from '@playwright/test';
 import { newUser } from './setup/new_user';
-import { openApp } from './setup/open';
 import { clickOnTestIdWithText } from './utilities/utils';
+import { sessionTestOneWindow } from './setup/sessionTest';
 
-test.beforeEach(beforeAllClean);
-
-// test.afterEach(() => forceCloseAllWindows(windows));
-
-test('Switch themes', async () => {
-  // Open App
-  const [windowA] = await openApp(1);
+sessionTestOneWindow('Switch themes', async ([windowA]) => {
   // Create User
   await newUser(windowA, 'Alice');
   // Check light theme colour is correct
diff --git a/ts/test/automation/test.spec.ts b/ts/test/automation/test.spec.ts
index c501c3ee8..4910014be 100644
--- a/ts/test/automation/test.spec.ts
+++ b/ts/test/automation/test.spec.ts
@@ -1,11 +1,6 @@
-import { test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
-import { openApp } from './setup/open';
 import { clickOnMatchingText } from './utilities/utils';
+import { sessionTestOneWindow } from './setup/sessionTest';
 
-test.beforeEach(beforeAllClean);
-
-test('Tiny test', async () => {
-  const [windowA] = await openApp(1);
+sessionTestOneWindow('Tiny test', async ([windowA]) => {
   await clickOnMatchingText(windowA, 'Create Session ID');
 });
diff --git a/ts/test/automation/to do b/ts/test/automation/to do
deleted file mode 100644
index 8337712ea..000000000
--- a/ts/test/automation/to do	
+++ /dev/null
@@ -1 +0,0 @@
-//
diff --git a/ts/test/automation/user_actions.spec.ts b/ts/test/automation/user_actions.spec.ts
index babd5d5ca..d26476440 100644
--- a/ts/test/automation/user_actions.spec.ts
+++ b/ts/test/automation/user_actions.spec.ts
@@ -1,7 +1,7 @@
-import { expect, test } from '@playwright/test';
-import { beforeAllClean } from './setup/beforeEach';
+import { expect } from '@playwright/test';
 import { sleepFor } from '../../session/utils/Promise';
 import { newUser } from './setup/new_user';
+import { createContact } from './utilities/create_contact';
 import { sendNewMessage } from './utilities/send_message';
 import {
   clickOnMatchingText,
@@ -11,16 +11,10 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
-import { openApp } from './setup/open';
-import { createContact } from './utilities/create_contact';
-
-test.beforeEach(beforeAllClean);
-
-// test.afterEach(() => forceCloseAllWindows(windows));
+import { sessionTestOneWindow, sessionTestTwoWindows } from './setup/sessionTest';
 
 // Send message in one to one conversation with new contact
-test('Create contact', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Create contact', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 
   const testMessage = `${userA.userName} to ${userB.userName}`;
@@ -39,9 +33,8 @@ test('Create contact', async () => {
   await clickOnTestIdWithText(windowA, 'new-conversation-button');
 });
 
-test('Block user in conversation options', async () => {
+sessionTestTwoWindows('Block user in conversation options', async ([windowA, windowB]) => {
   // Open app and create user
-  const [windowA, windowB] = await openApp(2);
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 
   const testMessage = `${userA.userName} to ${userB.userName}`;
@@ -77,9 +70,8 @@ test('Block user in conversation options', async () => {
   await waitForMatchingText(windowA, 'No blocked contacts');
 });
 
-test('Block user in conversation list', async () => {
+sessionTestTwoWindows('Block user in conversation list', async ([windowA, windowB]) => {
   // Open app and create user
-  const [windowA, windowB] = await openApp(2);
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
 
   const testMessage = `${userA.userName} to ${userB.userName}`;
@@ -119,10 +111,7 @@ test('Block user in conversation list', async () => {
   await waitForTestIdWithText(windowA, 'session-toast', 'Unblocked');
   await waitForMatchingText(windowA, 'No blocked contacts');
 });
-
-test('Change username', async () => {
-  // Open App
-  const [window] = await openApp(1);
+sessionTestOneWindow('Change username', async ([window]) => {
   // Create user
   const newUsername = 'Tiny bubble';
   await newUser(window, 'Alice');
@@ -143,8 +132,7 @@ test('Change username', async () => {
   await window.click('.session-icon-button.small');
 });
 
-test('Change avatar', async () => {
-  const [window] = await openApp(1);
+sessionTestOneWindow('Change avatar', async ([window]) => {
   await newUser(window, 'Alice');
   // Open profile
   await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
@@ -168,8 +156,7 @@ test('Change avatar', async () => {
   expect(screenshot).toMatchSnapshot({ name: 'avatar-updated-blue.jpeg' });
 });
 
-test('Set nickname', async () => {
-  const [windowA, windowB] = await openApp(2);
+sessionTestTwoWindows('Set nickname', async ([windowA, windowB]) => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   const nickname = 'new nickname for Bob';
 
diff --git a/ts/test/automation/utilities/linked_device.ts b/ts/test/automation/utilities/linked_device.ts
index 4af36e8dc..2db8d7165 100644
--- a/ts/test/automation/utilities/linked_device.ts
+++ b/ts/test/automation/utilities/linked_device.ts
@@ -3,7 +3,7 @@ import { logIn } from '../setup/log_in';
 import { openApp } from '../setup/open';
 
 export async function linkedDevice(recoveryPhrase: string) {
-  const [windowB] = await openApp(1);
+  const [windowB] = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
 
   await logIn(windowB, recoveryPhrase);
 
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index a85805158..93c3ae00c 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -79,8 +79,8 @@ export async function waitForLoadingAnimationToFinish(
   do {
     try {
       loadingAnimation = await waitForElement(window, 'data-testid', `${loader}`, 100);
-      await sleepFor(100);
-      console.info('loading-animation was found, waiting for it to be gone');
+      await sleepFor(500);
+      console.info(`${loader} was found, waiting for it to be gone`);
     } catch (e) {
       loadingAnimation = undefined;
     }

From b826dfd62bb94a9ce609976995ceb034e2f5fc8e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 10:40:21 +1000
Subject: [PATCH 099/178] fix: add copy pubkey on the triple dots menu too

---
 ts/components/menu/ConversationHeaderMenu.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 8250e8b60..bbc3f409c 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -40,6 +40,7 @@ import {
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
   DeletePrivateConversationMenuItem,
+  CopyMenuItem,
 } from './Menu';
 import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
 import { isSearching } from '../../state/selectors/search';
@@ -75,6 +76,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
           <DisappearingMessageMenuItem />
           <NotificationForConvoMenuItem />
           <BlockMenuItem />
+          <CopyMenuItem />
           <MarkAllReadMenuItem />
           <ChangeNicknameMenuItem />
           <ClearNicknameMenuItem />

From 37ec948daf06c011e775e3e02d8e156f7395d09c Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 10:59:27 +1000
Subject: [PATCH 100/178] fix: send invite to closed group message to
 UserMessages namespace

---
 ts/session/group/closed-group.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 87faacf54..5c1c07722 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -319,7 +319,7 @@ async function sendAddedMembers(
     await getMessageQueue().sendToPubKey(
       memberPubKey,
       newClosedGroupUpdate,
-      SnodeNamespaces.ClosedGroupMessage
+      SnodeNamespaces.UserMessages
     );
   });
   await Promise.all(promises);

From 739693024b40867268444f6176cde22b23088e33 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 11:45:34 +1000
Subject: [PATCH 101/178] test: fix create group integration test

---
 .../conversation/SessionConversation.tsx      |  4 +-
 .../conversation/SubtleNotification.tsx       |  4 +-
 ts/test/automation/group_testing.spec.ts      | 14 ---
 ts/test/automation/setup/create_group.ts      | 89 +++++++++++++------
 4 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index 99a553f13..e8db1d73a 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -52,7 +52,7 @@ import { InConversationCallContainer } from '../calling/InConversationCallContai
 import { LightboxGallery, MediaItemType } from '../lightbox/LightboxGallery';
 import { ConversationHeaderWithDetails } from './ConversationHeader';
 import { SessionRightPanelWithDetails } from './SessionRightPanel';
-import { NoMessageNoMessageInConversation } from './SubtleNotification';
+import { NoMessageInConversation } from './SubtleNotification';
 import { MessageDetail } from './message/message-item/MessageDetail';
 
 import styled from 'styled-components';
@@ -271,7 +271,7 @@ export class SessionConversation extends React.Component<Props, State> {
               {lightBoxOptions?.media && this.renderLightBox(lightBoxOptions)}
 
               <div className="conversation-messages">
-                <NoMessageNoMessageInConversation />
+                <NoMessageInConversation />
 
                 <SplitViewContainer
                   top={<InConversationCallContainer />}
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
index 57c9a3ce2..084bda830 100644
--- a/ts/components/conversation/SubtleNotification.tsx
+++ b/ts/components/conversation/SubtleNotification.tsx
@@ -54,7 +54,7 @@ export const ConversationRequestExplanation = () => {
 /**
  * This component is used to display a warning when the user is looking at an empty conversation.
  */
-export const NoMessageNoMessageInConversation = () => {
+export const NoMessageInConversation = () => {
   const selectedConversation = useSelectedConversationKey();
 
   const hasMessage = useSelector(getSelectedHasMessages);
@@ -75,7 +75,7 @@ export const NoMessageNoMessageInConversation = () => {
   }
 
   return (
-    <Container>
+    <Container data-testid="empty-conversation-notification">
       <TextInner>
         <SessionHtmlRenderer html={window.i18n(localizedKey, [nameToRender])} />
       </TextInner>
diff --git a/ts/test/automation/group_testing.spec.ts b/ts/test/automation/group_testing.spec.ts
index d0084f0eb..eddd48194 100644
--- a/ts/test/automation/group_testing.spec.ts
+++ b/ts/test/automation/group_testing.spec.ts
@@ -30,20 +30,6 @@ sessionTestThreeWindows('Create group', async ([windowA, windowB, windowC]) => {
   // Check config messages in all windows
   await sleepFor(1000);
   // await waitForTestIdWithText(windowA, 'control-message');
-  await Promise.all([
-    waitForControlMessageWithText(
-      windowA,
-      `"${userB.userName}", "${userC.userName}", You joined the group.`
-    ),
-    waitForControlMessageWithText(
-      windowB,
-      `You, "${userC.userName}", "${userA.userName}" joined the group.`
-    ),
-    waitForControlMessageWithText(
-      windowC,
-      `"${userB.userName}", You, "${userA.userName}" joined the group.`
-    ),
-  ]);
 });
 
 sessionTestFourWindows('Add contact to group', async ([windowA, windowB, windowC, windowD]) => {
diff --git a/ts/test/automation/setup/create_group.ts b/ts/test/automation/setup/create_group.ts
index 6003208ff..08aaf086e 100644
--- a/ts/test/automation/setup/create_group.ts
+++ b/ts/test/automation/setup/create_group.ts
@@ -10,8 +10,6 @@ import {
 } from '../utilities/utils';
 import { Group, User } from '../types/testing';
 
-// let windows: Array<Page> = [];
-
 export const createGroup = async (
   userName: string,
   userOne: User,
@@ -22,6 +20,7 @@ export const createGroup = async (
   windowC: Page
 ): Promise<Group> => {
   const group: Group = { userName, userOne, userTwo, userThree };
+  const emptyStateGroupText = `You have no messages from ${group.userName}. Send a message to start the conversation!`;
 
   const messageAB = `${userOne.userName} to ${userTwo.userName}`;
   const messageBA = `${userTwo.userName} to ${userOne.userName}`;
@@ -55,34 +54,68 @@ export const createGroup = async (
   // Check group was successfully created
   await clickOnMatchingText(windowB, group.userName);
   await waitForTestIdWithText(windowB, 'header-conversation-name', group.userName);
-  // Send message in group chat from user A
-  await sendMessage(windowA, msgAToGroup);
-  // Focus screen
-  await clickOnMatchingText(windowA, msgAToGroup);
-  // Verify it was received by other two accounts
-  // Navigate to group in window B
-  await clickOnTestIdWithText(windowB, 'message-section');
-  // Click on test group
-  await clickOnMatchingText(windowB, userName);
-  // wait for selector 'test message' in chat window
-  await waitForControlMessageWithText(windowB, msgAToGroup);
-  // Send reply message
-  await sendMessage(windowB, msgBToGroup);
+  // Make sure the empty state is in windowA
+  await waitForTestIdWithText(windowA, 'empty-conversation-notification', emptyStateGroupText);
+
+  await Promise.all([
+    (async () => {
+      // Navigate to group in window B
+      await clickOnTestIdWithText(windowB, 'message-section');
+      // Click on test group
+      await clickOnMatchingText(windowB, group.userName);
+      // Make sure the empty state is in windowB
+      return waitForTestIdWithText(windowB, 'empty-conversation-notification', emptyStateGroupText);
+    })(),
+    (async () => {
+      // Navigate to group in window C
+      await clickOnTestIdWithText(windowC, 'message-section');
+      // Click on test group
+      await clickOnMatchingText(windowC, group.userName);
+      // Make sure the empty state is in windowC
+      return waitForTestIdWithText(windowC, 'empty-conversation-notification', emptyStateGroupText);
+    })(),
+  ]);
+
+  await Promise.all([
+    (async () => {
+      // Send message in group chat from user A
+      await sendMessage(windowA, msgAToGroup);
+      // Focus screen
+      await clickOnMatchingText(windowA, msgAToGroup);
+    })(),
+    (async () => {
+      // Send message in group chat from user B
+      await sendMessage(windowB, msgBToGroup);
+      await clickOnMatchingText(windowB, msgBToGroup);
+    })(),
+    (async () => {
+      // Send message from C to the group
+      await sendMessage(windowC, msgCToGroup);
+      await clickOnMatchingText(windowC, msgCToGroup);
+    })(),
+  ]);
+
+  // Verify that each messages was received by the other two accounts
+  await Promise.all([
+    (async () => {
+      // windowA should see the message from B and the message from C
+      await waitForControlMessageWithText(windowA, msgBToGroup);
+      await waitForControlMessageWithText(windowA, msgCToGroup);
+    })(),
+    (async () => {
+      // windowB should see the message from A and the message from C
+      await waitForControlMessageWithText(windowB, msgAToGroup);
+      await waitForControlMessageWithText(windowB, msgCToGroup);
+    })(),
+    (async () => {
+      // windowC must see the message from A and the message from B
+      await waitForControlMessageWithText(windowC, msgAToGroup);
+      await waitForControlMessageWithText(windowC, msgBToGroup);
+    })(),
+  ]);
+
   // Focus screen
   // await clickOnTestIdWithText(windowB, 'scroll-to-bottom-button');
-  await clickOnMatchingText(windowB, msgBToGroup);
-  // Navigate to group in window C
-  await clickOnTestIdWithText(windowC, 'message-section');
-  // Click on test group
-  await clickOnMatchingText(windowC, userName);
-  // windowC must see the message from A and the message from B
-  await waitForControlMessageWithText(windowC, msgAToGroup);
-  await waitForControlMessageWithText(windowC, msgBToGroup);
-  // Send message from C to the group
-  await sendMessage(windowC, msgCToGroup);
-  // windowA should see the message from B and the message from C
-  await waitForControlMessageWithText(windowA, msgBToGroup);
-  await waitForControlMessageWithText(windowA, msgCToGroup);
 
   return { userName, userOne, userTwo, userThree };
 };

From a7e8c4a31da18a11762680150a57278c721efcfe Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 12:06:41 +1000
Subject: [PATCH 102/178] chore: reduce notice banner text size to 15px

---
 ts/components/NoticeBanner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx
index 6c9aeb184..090b5b529 100644
--- a/ts/components/NoticeBanner.tsx
+++ b/ts/components/NoticeBanner.tsx
@@ -7,7 +7,7 @@ const StyledNoticeBanner = styled(Flex)`
   position: relative;
   background-color: var(--primary-color);
   color: var(--background-primary-color);
-  font-size: var(--font-size-lg);
+  font-size: var(--font-size-md);
   padding: var(--margins-xs) var(--margins-sm);
   text-align: center;
   flex-shrink: 0;

From 37639077a11eba66f9b5a2d57e0ad3f6cc338d70 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 14:26:03 +1000
Subject: [PATCH 103/178] chore: fix the "Add contact to group" integrationt
 test

---
 playwright.config.ts                     | 6 ++++--
 ts/test/automation/group_testing.spec.ts | 4 ++--
 ts/test/automation/utilities/utils.ts    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/playwright.config.ts b/playwright.config.ts
index aa9e8c8c6..dd2a231dd 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -9,8 +9,10 @@ const config: PlaywrightTestConfig = {
   testDir: './ts/test/automation',
   testIgnore: '*.js',
   outputDir: './ts/test/automation/test-results',
-  retries: 1,
-  repeatEach: 1,
+  retries: process.env.PLAYWRIGHT_RETRIES_COUNT
+    ? toNumber(process.env.PLAYWRIGHT_RETRIES_COUNT)
+    : 1,
+
   workers: toNumber(process.env.PLAYWRIGHT_WORKER_COUNT) || 1,
   reportSlowTests: null,
 };
diff --git a/ts/test/automation/group_testing.spec.ts b/ts/test/automation/group_testing.spec.ts
index eddd48194..b10fda3da 100644
--- a/ts/test/automation/group_testing.spec.ts
+++ b/ts/test/automation/group_testing.spec.ts
@@ -5,7 +5,6 @@ import {
   clickOnElement,
   clickOnMatchingText,
   clickOnTestIdWithText,
-  doesTextIncludeString,
   typeIntoInput,
   waitForControlMessageWithText,
   waitForMatchingText,
@@ -70,7 +69,8 @@ sessionTestFourWindows('Add contact to group', async ([windowA, windowB, windowC
     'module-conversation__user__profile-name',
     testGroup.userName
   );
-  await doesTextIncludeString(windowD, 'control-message', 'You joined the group.');
+  const emptyStateGroupText = `You have no messages from ${testGroup.userName}. Send a message to start the conversation!`;
+  await waitForTestIdWithText(windowD, 'empty-conversation-notification', emptyStateGroupText);
 });
 
 sessionTestThreeWindows('Change group name', async ([windowA, windowB, windowC]) => {
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 93c3ae00c..39ed571bd 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -161,7 +161,7 @@ export async function doesTextIncludeString(window: Page, dataTestId: string, te
   if (builtSelector) {
     console.info('Text found:', text);
   } else {
-    throw new Error(`Text not found: , ${text}`);
+    throw new Error(`Text not found: "${text}"`);
   }
 }
 

From eeb94b937e6414b4e4de92420dbe17b2734658be Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Tue, 16 May 2023 14:31:44 +1000
Subject: [PATCH 104/178] Remove look for text in blocked user test and updated
 disappearing message test

---
 .../automation/disappearing_messages.spec.ts  |  2 +-
 ts/test/automation/linked_device_user.spec.ts | 50 ++++++++-----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index 80dd16ea5..cf89e8ad6 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -29,7 +29,7 @@ sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
   // await waitForMatchingText(windowA, `You have accepted ${userA.userName}'s message request`);
   // await waitForMatchingText(windowB, 'Your message request has been accepted');
   // Click on user's avatar to open conversation options
-  await clickOnTestIdWithText(windowA, 'conversation-options-avatar');
+  await clickOnTestIdWithText(windowA, 'conversation-options-avatar')
   // Select disappearing messages drop down
   await clickOnMatchingText(windowA, 'Disappearing messages');
   // Select 5 seconds
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index daa7b9564..12ebe2b28 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -12,10 +12,9 @@ import {
   clickOnTestIdWithText,
   hasTextElementBeenDeleted,
   typeIntoInput,
-  waitForLoadingAnimationToFinish,
   waitForMatchingText,
   waitForTestIdWithText,
-  waitForTextMessage,
+  waitForTextMessage
 } from './utilities/utils';
 
 const windows: Array<Page> = [];
@@ -96,12 +95,10 @@ test('Check profile picture syncs', async () => {
   expect(screenshot).toMatchSnapshot({ name: 'avatar-updated-blue.jpeg' });
 });
 
-test('Check contacts sync', async () => {
+test('Check contacts syncs', async () => {
   const [windowA, windowC] = await openApp(2); // not using sessionTest here as we need to close and reopen one of the window
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
   const [windowB] = await linkedDevice(userA.recoveryPhrase); // not using sessionTest here as we need to close and reopen one of the window
-  // Waiting for linked device to finish loading
-  await waitForLoadingAnimationToFinish(windowB, 'loading-spinner');
   await createContact(windowA, windowC, userA, userB);
   // Check linked device (windowB)
   await waitForTestIdWithText(windowB, 'module-conversation__user__profile-name', userB.userName);
@@ -113,7 +110,6 @@ test('Check deleted message syncs', async () => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
   const [windowB] = await linkedDevice(userA.recoveryPhrase);
   const deletedMessage = 'Testing deletion functionality for linked device';
-  await waitForLoadingAnimationToFinish(windowB, 'loading-spinner');
   await createContact(windowA, windowC, userA, userB);
   await sendMessage(windowA, deletedMessage);
   // Navigate to conversation on linked device and check for message from user A to user B
@@ -138,7 +134,6 @@ test('Check unsent message syncs', async () => {
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
   const [windowB] = await linkedDevice(userA.recoveryPhrase);
   const unsentMessage = 'Testing unsending functionality for linked device';
-  await waitForLoadingAnimationToFinish(windowB, 'loading-spinner');
   await createContact(windowA, windowC, userA, userB);
   await sendMessage(windowA, unsentMessage);
   // Navigate to conversation on linked device and check for message from user A to user B
@@ -155,24 +150,23 @@ test('Check unsent message syncs', async () => {
   await hasTextElementBeenDeleted(windowB, unsentMessage, 1000);
 });
 
-// test('Check blocked user syncs', async () => {
-//   const [windowA, windowC] = await openApp(2);
-//   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
-//   const [windowB] = await linkedDevice(userA.recoveryPhrase);
-//   const testMessage = 'Testing blocking functionality for linked device';
-//   await waitForLoadingAnimationToFinish(windowB, 'loading-spinner');
-//   await createContact(windowA, windowC, userA, userB);
-//   await sendMessage(windowA, testMessage);
-//   // Navigate to conversation on linked device and check for message from user A to user B
-//   await clickOnTestIdWithText(windowB, 'module-conversation__user__profile-name', userB.userName);
-//   await clickOnElement(windowA, 'data-testid', 'three-dots-conversation-options');
-//   await clickOnMatchingText(windowA, 'Block');
-//   await waitForTestIdWithText(windowA, 'session-toast', 'Blocked');
-//   await waitForMatchingText(windowA, 'Unblock this contact to send a message.');
-//   // Check linked device for blocked contact in settings screen
-//   await clickOnTestIdWithText(windowB, 'settings-section');
-//   await clickOnTestIdWithText(windowB, 'conversations-settings-menu-item');
-//   await clickOnTestIdWithText(windowB, 'reveal-blocked-user-settings');
-//   // Check if user B is in blocked contact list
-//   await waitForMatchingText(windowB, userB.userName);
-// });
+test('Check blocked user syncs', async () => {
+  const [windowA, windowC] = await openApp(2);
+  const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowC, 'Bob')]);
+  const [windowB] = await linkedDevice(userA.recoveryPhrase);
+  const testMessage = 'Testing blocking functionality for linked device';
+  await createContact(windowA, windowC, userA, userB);
+  await sendMessage(windowA, testMessage);
+  // Navigate to conversation on linked device and check for message from user A to user B
+  await clickOnTestIdWithText(windowB, 'module-conversation__user__profile-name', userB.userName);
+  await clickOnElement(windowA, 'data-testid', 'three-dots-conversation-options');
+  await clickOnMatchingText(windowA, 'Block');
+  await waitForTestIdWithText(windowA, 'session-toast', 'Blocked');
+  // await waitForMatchingText(windowA, 'Unblock this contact to send a message.');
+  // Check linked device for blocked contact in settings screen
+  await clickOnTestIdWithText(windowB, 'settings-section');
+  await clickOnTestIdWithText(windowB, 'conversations-settings-menu-item');
+  await clickOnTestIdWithText(windowB, 'reveal-blocked-user-settings');
+  // Check if user B is in blocked contact list
+  await waitForMatchingText(windowB, userB.userName);
+});

From 6ac4dd8db5a854d580366391670897e3d488506a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 17 May 2023 10:09:22 +1000
Subject: [PATCH 105/178] fix: linking allows legacy config message if one is
 found

---
 ts/components/menu/ConversationListItemContextMenu.tsx | 1 +
 ts/receiver/configMessage.ts                           | 7 ++++---
 ts/session/apis/snode_api/snodePool.ts                 | 2 ++
 ts/session/onions/onionPath.ts                         | 2 ++
 ts/util/accountManager.ts                              | 8 +++++++-
 ts/util/registration.ts                                | 7 ++-----
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index c8cbeda5e..8b407032c 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -41,6 +41,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
   if (isSearchingMode) {
     return null;
   }
+
   return (
     <SessionContextMenuContainer>
       <Menu id={triggerId} animation={animation.fade}>
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index dbf842190..0d1b52ad4 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -35,6 +35,7 @@ import { ReleasedFeatures } from '../util/releaseFeature';
 import {
   Storage,
   getLastProfileUpdateTimestamp,
+  isSignInByLinking,
   setLastProfileUpdateTimestamp,
 } from '../util/storage';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
@@ -767,7 +768,7 @@ async function handleOurProfileUpdateLegacy(
 ) {
   const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
   // we want to allow if we are not registered, as we might need to fetch an old config message (can be removed once we released for a weeks the libsession util)
-  if (userConfigLibsession && Registration.isDone()) {
+  if (userConfigLibsession && !isSignInByLinking()) {
     return;
   }
   const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp();
@@ -978,7 +979,7 @@ async function handleConfigurationMessageLegacy(
   // the process of those messages is always done after the process of the shared config messages, so that's only a fallback.
   const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
-  if (userConfigLibsession && Registration.isDone()) {
+  if (userConfigLibsession && !isSignInByLinking()) {
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
@@ -987,7 +988,7 @@ async function handleConfigurationMessageLegacy(
     return;
   }
 
-  window?.log?.info('Handling configuration message');
+  window?.log?.info('Handling legacy configuration message');
   const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
   if (!ourPubkey) {
     return;
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index ece4b4f60..9f69ce9bd 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -189,9 +189,11 @@ export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() {
 
     return;
   }
+  const start = Date.now();
   try {
     randomSnodePool = await SeedNodeAPI.fetchSnodePoolFromSeedNodeWithRetries(seedNodes);
     await Data.updateSnodePoolOnDb(JSON.stringify(randomSnodePool));
+    window.log.info(`fetchSnodePoolFromSeedNodeWithRetries took ${Date.now() - start}ms`);
 
     OnionPaths.resetPathFailureCount();
     Onions.resetSnodeFailureCount();
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 0fb74988b..8e1760183 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -431,7 +431,9 @@ export async function getGuardNodeOrSelectNewOnes() {
   // If guard nodes is still empty (the old nodes are now invalid), select new ones:
   if (guardNodes.length < desiredGuardCount) {
     // if an error is thrown, the caller must take care of it.
+    const start = Date.now();
     guardNodes = await OnionPaths.selectGuardNodes();
+    window.log.info(`OnionPaths.selectGuardNodes took ${Date.now() - start}ms`);
   }
 }
 
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 62c0d2cfb..cbe6961bb 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -176,8 +176,13 @@ async function createAccount(identityKeyPair: SessionKeyPair) {
   await setLocalPubKey(pubKeyString);
 }
 
+/**
+ *
+ * @param ourPubkey the pubkey recovered from the seed
+ * @param displayName the display name entered by the user, if any. This is not a display name found from a config message in the network.
+ */
 async function registrationDone(ourPubkey: string, displayName: string) {
-  window?.log?.info('registration done');
+  window?.log?.info(`registration done with user provided displayName "${displayName}"`);
 
   // initializeLibSessionUtilWrappers needs our publicKey to be set
   await Storage.put('primaryDevicePubKey', ourPubkey);
@@ -208,5 +213,6 @@ async function registrationDone(ourPubkey: string, displayName: string) {
   window.inboxStore?.dispatch(userActions.userChanged(user));
 
   window?.log?.info('dispatching registration event');
+  // this will make the poller start fetching messages, needed to find a configuration message
   trigger('registration_done');
 }
diff --git a/ts/util/registration.ts b/ts/util/registration.ts
index 446efdc84..99b9513b0 100644
--- a/ts/util/registration.ts
+++ b/ts/util/registration.ts
@@ -1,10 +1,7 @@
 import { Storage } from './storage';
 
-async function markEverDone() {
-  await Storage.put('chromiumRegistrationDoneEver', '');
-}
 async function markDone() {
-  await markEverDone();
+  await Storage.put('chromiumRegistrationDoneEver', '');
   await Storage.put('chromiumRegistrationDone', '');
 }
 function isDone() {
@@ -20,4 +17,4 @@ async function remove() {
   await Storage.remove('chromiumRegistrationDone');
 }
 
-export const Registration = { markEverDone, markDone, isDone, everDone, remove };
+export const Registration = { markDone, isDone, everDone, remove };

From 87e445864504b04f57e4e20280cbef6dd105a70a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 15 May 2023 13:46:41 +1000
Subject: [PATCH 106/178] chore: add yarn commands to build workers

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 283adc168..e861a8107 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,9 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
-    "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn worker:utils && yarn worker:libsession",
-    "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn worker:utils && yarn worker:libsession && tsc -w",
+    "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
+    "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
+    "build:workers": "yarn worker:utils && yarn worker:libsession",
     "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",

From 5d4bce3e040d76343c4265e6e970198afdd2fcfe Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 17 May 2023 10:45:09 +1000
Subject: [PATCH 107/178] fix: keep the "no pending message requests" opened
 when none are there

---
 .../leftpane/overlay/OverlayMessageRequest.tsx    | 15 ++-------------
 ts/session/onions/onionPath.ts                    |  5 ++++-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 5d9bd695a..cc63d7cff 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 // tslint:disable: no-submodule-imports use-simple-attributes
 
 import { useDispatch, useSelector } from 'react-redux';
@@ -6,9 +6,8 @@ import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { declineConversationWithoutConfirm } from '../../../interactions/conversationInteractions';
 import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
-import { resetConversationExternal } from '../../../state/ducks/conversations';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
-import { SectionType, resetOverlayMode, showLeftPaneSection } from '../../../state/ducks/section';
+import { resetOverlayMode } from '../../../state/ducks/section';
 import { getConversationRequests } from '../../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
@@ -52,16 +51,6 @@ export const OverlayMessageRequest = () => {
   const convoRequestCount = useSelector(getConversationRequests).length;
   const messageRequests = useSelector(getConversationRequests);
 
-  useEffect(() => {
-    // if no more requests, return to placeholder screen
-
-    if (convoRequestCount === 0) {
-      dispatch(resetOverlayMode());
-      dispatch(showLeftPaneSection(SectionType.Message));
-      dispatch(resetConversationExternal());
-    }
-  }, [dispatch, convoRequestCount]);
-
   const buttonText = window.i18n('clearAll');
 
   /**
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 737398a83..0fb74988b 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -497,7 +497,10 @@ async function buildNewOnionPathsWorker() {
       for (let i = 0; i < maxPath; i += 1) {
         const path = [guards[i]];
         for (let j = 0; j < nodesNeededPerPaths; j += 1) {
-          const randomWinner = _.sample(otherNodes) as Snode;
+          const randomWinner = _.sample(otherNodes);
+          if (!randomWinner) {
+            throw new Error('randomWinner unset during path building task');
+          }
           otherNodes = otherNodes.filter(n => {
             return n.pubkey_ed25519 !== randomWinner?.pubkey_ed25519;
           });

From 381413b33b93ea3202f622a70895dcd47261d5d9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 10:40:21 +1000
Subject: [PATCH 108/178] fix: add copy pubkey on the triple dots menu too

---
 ts/components/menu/ConversationHeaderMenu.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index 8250e8b60..bbc3f409c 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -40,6 +40,7 @@ import {
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
   DeletePrivateConversationMenuItem,
+  CopyMenuItem,
 } from './Menu';
 import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
 import { isSearching } from '../../state/selectors/search';
@@ -75,6 +76,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
           <DisappearingMessageMenuItem />
           <NotificationForConvoMenuItem />
           <BlockMenuItem />
+          <CopyMenuItem />
           <MarkAllReadMenuItem />
           <ChangeNicknameMenuItem />
           <ClearNicknameMenuItem />

From 153e592464d7da4303358103fc46eea3b1b6d5bc Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 10:59:27 +1000
Subject: [PATCH 109/178] fix: send invite to closed group message to
 UserMessages namespace

---
 ts/session/group/closed-group.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 87faacf54..5c1c07722 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -319,7 +319,7 @@ async function sendAddedMembers(
     await getMessageQueue().sendToPubKey(
       memberPubKey,
       newClosedGroupUpdate,
-      SnodeNamespaces.ClosedGroupMessage
+      SnodeNamespaces.UserMessages
     );
   });
   await Promise.all(promises);

From dc59c25be76f82c3f9d1bd21df0426098c2e17b9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 17 May 2023 10:46:58 +1000
Subject: [PATCH 110/178] fix: typo in NoMessageInConversation component

---
 ts/components/conversation/SessionConversation.tsx | 4 ++--
 ts/components/conversation/SubtleNotification.tsx  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index 99a553f13..e8db1d73a 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -52,7 +52,7 @@ import { InConversationCallContainer } from '../calling/InConversationCallContai
 import { LightboxGallery, MediaItemType } from '../lightbox/LightboxGallery';
 import { ConversationHeaderWithDetails } from './ConversationHeader';
 import { SessionRightPanelWithDetails } from './SessionRightPanel';
-import { NoMessageNoMessageInConversation } from './SubtleNotification';
+import { NoMessageInConversation } from './SubtleNotification';
 import { MessageDetail } from './message/message-item/MessageDetail';
 
 import styled from 'styled-components';
@@ -271,7 +271,7 @@ export class SessionConversation extends React.Component<Props, State> {
               {lightBoxOptions?.media && this.renderLightBox(lightBoxOptions)}
 
               <div className="conversation-messages">
-                <NoMessageNoMessageInConversation />
+                <NoMessageInConversation />
 
                 <SplitViewContainer
                   top={<InConversationCallContainer />}
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
index 57c9a3ce2..688211458 100644
--- a/ts/components/conversation/SubtleNotification.tsx
+++ b/ts/components/conversation/SubtleNotification.tsx
@@ -54,7 +54,7 @@ export const ConversationRequestExplanation = () => {
 /**
  * This component is used to display a warning when the user is looking at an empty conversation.
  */
-export const NoMessageNoMessageInConversation = () => {
+export const NoMessageInConversation = () => {
   const selectedConversation = useSelectedConversationKey();
 
   const hasMessage = useSelector(getSelectedHasMessages);

From c0d69b0e00d9a329bb4a047ce6fa2061b0b79468 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 16 May 2023 12:06:41 +1000
Subject: [PATCH 111/178] chore: reduce notice banner text size to 15px

---
 ts/components/NoticeBanner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx
index 6c9aeb184..090b5b529 100644
--- a/ts/components/NoticeBanner.tsx
+++ b/ts/components/NoticeBanner.tsx
@@ -7,7 +7,7 @@ const StyledNoticeBanner = styled(Flex)`
   position: relative;
   background-color: var(--primary-color);
   color: var(--background-primary-color);
-  font-size: var(--font-size-lg);
+  font-size: var(--font-size-md);
   padding: var(--margins-xs) var(--margins-sm);
   text-align: center;
   flex-shrink: 0;

From ce63ce37978b5b80a80b48a72e08cb30a10f04ce Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 17 May 2023 10:09:22 +1000
Subject: [PATCH 112/178] fix: linking allows legacy config message if one is
 found

---
 ts/components/menu/ConversationListItemContextMenu.tsx | 1 +
 ts/receiver/configMessage.ts                           | 7 ++++---
 ts/session/apis/snode_api/snodePool.ts                 | 2 ++
 ts/session/onions/onionPath.ts                         | 2 ++
 ts/util/accountManager.ts                              | 8 +++++++-
 ts/util/registration.ts                                | 7 ++-----
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index c8cbeda5e..8b407032c 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -41,6 +41,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
   if (isSearchingMode) {
     return null;
   }
+
   return (
     <SessionContextMenuContainer>
       <Menu id={triggerId} animation={animation.fade}>
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index dbf842190..0d1b52ad4 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -35,6 +35,7 @@ import { ReleasedFeatures } from '../util/releaseFeature';
 import {
   Storage,
   getLastProfileUpdateTimestamp,
+  isSignInByLinking,
   setLastProfileUpdateTimestamp,
 } from '../util/storage';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
@@ -767,7 +768,7 @@ async function handleOurProfileUpdateLegacy(
 ) {
   const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
   // we want to allow if we are not registered, as we might need to fetch an old config message (can be removed once we released for a weeks the libsession util)
-  if (userConfigLibsession && Registration.isDone()) {
+  if (userConfigLibsession && !isSignInByLinking()) {
     return;
   }
   const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp();
@@ -978,7 +979,7 @@ async function handleConfigurationMessageLegacy(
   // the process of those messages is always done after the process of the shared config messages, so that's only a fallback.
   const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
 
-  if (userConfigLibsession && Registration.isDone()) {
+  if (userConfigLibsession && !isSignInByLinking()) {
     window?.log?.info(
       'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"'
     );
@@ -987,7 +988,7 @@ async function handleConfigurationMessageLegacy(
     return;
   }
 
-  window?.log?.info('Handling configuration message');
+  window?.log?.info('Handling legacy configuration message');
   const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
   if (!ourPubkey) {
     return;
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index ece4b4f60..9f69ce9bd 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -189,9 +189,11 @@ export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() {
 
     return;
   }
+  const start = Date.now();
   try {
     randomSnodePool = await SeedNodeAPI.fetchSnodePoolFromSeedNodeWithRetries(seedNodes);
     await Data.updateSnodePoolOnDb(JSON.stringify(randomSnodePool));
+    window.log.info(`fetchSnodePoolFromSeedNodeWithRetries took ${Date.now() - start}ms`);
 
     OnionPaths.resetPathFailureCount();
     Onions.resetSnodeFailureCount();
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 0fb74988b..8e1760183 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -431,7 +431,9 @@ export async function getGuardNodeOrSelectNewOnes() {
   // If guard nodes is still empty (the old nodes are now invalid), select new ones:
   if (guardNodes.length < desiredGuardCount) {
     // if an error is thrown, the caller must take care of it.
+    const start = Date.now();
     guardNodes = await OnionPaths.selectGuardNodes();
+    window.log.info(`OnionPaths.selectGuardNodes took ${Date.now() - start}ms`);
   }
 }
 
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 62c0d2cfb..cbe6961bb 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -176,8 +176,13 @@ async function createAccount(identityKeyPair: SessionKeyPair) {
   await setLocalPubKey(pubKeyString);
 }
 
+/**
+ *
+ * @param ourPubkey the pubkey recovered from the seed
+ * @param displayName the display name entered by the user, if any. This is not a display name found from a config message in the network.
+ */
 async function registrationDone(ourPubkey: string, displayName: string) {
-  window?.log?.info('registration done');
+  window?.log?.info(`registration done with user provided displayName "${displayName}"`);
 
   // initializeLibSessionUtilWrappers needs our publicKey to be set
   await Storage.put('primaryDevicePubKey', ourPubkey);
@@ -208,5 +213,6 @@ async function registrationDone(ourPubkey: string, displayName: string) {
   window.inboxStore?.dispatch(userActions.userChanged(user));
 
   window?.log?.info('dispatching registration event');
+  // this will make the poller start fetching messages, needed to find a configuration message
   trigger('registration_done');
 }
diff --git a/ts/util/registration.ts b/ts/util/registration.ts
index 446efdc84..99b9513b0 100644
--- a/ts/util/registration.ts
+++ b/ts/util/registration.ts
@@ -1,10 +1,7 @@
 import { Storage } from './storage';
 
-async function markEverDone() {
-  await Storage.put('chromiumRegistrationDoneEver', '');
-}
 async function markDone() {
-  await markEverDone();
+  await Storage.put('chromiumRegistrationDoneEver', '');
   await Storage.put('chromiumRegistrationDone', '');
 }
 function isDone() {
@@ -20,4 +17,4 @@ async function remove() {
   await Storage.remove('chromiumRegistrationDone');
 }
 
-export const Registration = { markEverDone, markDone, isDone, everDone, remove };
+export const Registration = { markDone, isDone, everDone, remove };

From 4f66ff4c986ac6c29cb861b453f4cca4414c5ac3 Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Wed, 17 May 2023 11:26:10 +1000
Subject: [PATCH 113/178] Removed double waitForAnimation function

---
 ts/test/automation/disappearing_messages.spec.ts  | 14 ++++----------
 ts/test/automation/linked_device_requests.spec.ts |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index cf89e8ad6..b19c33d21 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -1,33 +1,26 @@
 import { sleepFor } from '../../session/utils/Promise';
 import { newUser } from './setup/new_user';
 import { sessionTestTwoWindows } from './setup/sessionTest';
+import { createContact } from './utilities/create_contact';
 import { sendMessage } from './utilities/message';
-import { sendNewMessage } from './utilities/send_message';
 import {
   clickOnMatchingText,
   clickOnTestIdWithText,
-  waitForControlMessageWithText,
   waitForMatchingText,
-  waitForTestIdWithText,
+  waitForTestIdWithText
 } from './utilities/utils';
 
 // tslint:disable: no-console
 
 const testMessage = 'Test-Message- (A -> B) ';
-const testReply = 'Reply-Test-Message- (B -> A)';
 const sentMessage = `${testMessage}${Date.now()}`;
-const sentReplyMessage = `${testReply} :${Date.now()}`;
 
 sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
   // Open App
   // Create User
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   // Create Contact
-  await sendNewMessage(windowA, userB.sessionid, sentMessage);
-  await sendNewMessage(windowB, userA.sessionid, sentReplyMessage);
-  await waitForControlMessageWithText(windowA, 'Your message request has been accepted');
-  // await waitForMatchingText(windowA, `You have accepted ${userA.userName}'s message request`);
-  // await waitForMatchingText(windowB, 'Your message request has been accepted');
+  await createContact(windowA, windowB, userA, userB)
   // Click on user's avatar to open conversation options
   await clickOnTestIdWithText(windowA, 'conversation-options-avatar')
   // Select disappearing messages drop down
@@ -81,6 +74,7 @@ sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
     `${userA.userName} set the disappearing message timer to 5 seconds`
   );
   // Wait 5 seconds
+  await sleepFor(5000)
   await waitForMatchingText(windowB, `${userA.userName} has turned off disappearing messages.`);
   // verify message is deleted in windowB
   const errorDesc2 = 'Should not be found';
diff --git a/ts/test/automation/linked_device_requests.spec.ts b/ts/test/automation/linked_device_requests.spec.ts
index c2db549ed..9a9adbab4 100644
--- a/ts/test/automation/linked_device_requests.spec.ts
+++ b/ts/test/automation/linked_device_requests.spec.ts
@@ -48,7 +48,6 @@ sessionTestTwoWindows('Decline request syncs', async ([windowA, windowB]) => {
   await waitForTestIdWithText(windowC, 'module-conversation__user__profile-name', userA.userName);
   await clickOnTestIdWithText(windowB, 'decline-message-request');
   await clickOnTestIdWithText(windowB, 'session-confirm-ok-button', 'Decline');
-  await waitForTestIdWithText(windowB, 'session-toast', 'Blocked');
 
   await waitForMatchingText(windowB, 'No pending message requests');
   await waitForMatchingText(windowC, 'No pending message requests');

From 6676bf77f958bf24daa3eb8148e6a89d9166ff19 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 18 May 2023 16:28:01 +1000
Subject: [PATCH 114/178] chore: fix unit tests for userconfig changes

---
 .../leftpane/LeftPaneMessageSection.tsx       |   2 +-
 .../overlay/OverlayMessageRequest.tsx         |   2 +-
 ts/data/configDump/configDumpType.ts          |   0
 ts/receiver/configMessage.ts                  |   2 -
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |   2 +-
 ts/session/apis/snode_api/namespaces.ts       |   6 +-
 ts/session/apis/snode_api/swarmPolling.ts     |   1 -
 .../group/v3/GroupAdminGroupMessage.ts        |  55 ----------
 .../group/v3/GroupInviteMessage.ts            |  48 --------
 .../group/v3/GroupMemberLeftMessage.ts        |  18 ---
 .../controlMessage/group/v3/GroupMessage.ts   |  18 ---
 .../group/v3/GroupPromoteMessage.ts           |  34 ------
 .../utils/job_runners/jobs/JobRunnerType.ts   |   1 -
 .../automation/disappearing_messages.spec.ts  |   8 +-
 ts/test/automation/linked_device_user.spec.ts |   2 +-
 ts/test/automation/setup/beforeEach.ts        |   4 +-
 ts/test/automation/setup/sessionTest.ts       |  12 +-
 ts/test/automation/tslint.json                |  10 ++
 .../receiver/opengroup/deduplicate_test.ts    |   7 --
 .../receiving/ConfigurationMessage_test.ts    |  28 ++---
 .../unit/swarm_polling/SwarmPolling_test.ts   | 103 +++++++++---------
 ts/test/test-utils/utils/stubbing.ts          |   6 +
 ts/types/Util.ts                              |   2 -
 .../browser/libsession_worker_interface.ts    |   4 +-
 24 files changed, 104 insertions(+), 271 deletions(-)
 delete mode 100644 ts/data/configDump/configDumpType.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
 delete mode 100644 ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
 create mode 100644 ts/test/automation/tslint.json

diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index e439957ac..b46507888 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -84,7 +84,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
       throw new Error('renderRow: conversations selector returned element containing falsy value.');
     }
 
-    return <MemoConversationListItemWithDetails key={key} style={style} {...conversation} />;
+    return <MemoConversationListItemWithDetails key={key} style={style} {...conversation} />; // TODO there should not be a need for the ...conversation here?
   };
 
   public renderList(): JSX.Element {
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index cc63d7cff..9f1360b25 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -34,7 +34,7 @@ const MessageRequestList = () => {
   return (
     <MessageRequestListContainer>
       {conversationRequests.map(conversation => {
-        return <MemoConversationListItemWithDetails key={conversation.id} {...conversation} />;
+        return <MemoConversationListItemWithDetails key={conversation.id} {...conversation} />; // TODO there should not be a need for the ...conversation here?
       })}
     </MessageRequestListContainer>
   );
diff --git a/ts/data/configDump/configDumpType.ts b/ts/data/configDump/configDumpType.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 0d1b52ad4..9bb7b3797 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1000,9 +1000,7 @@ async function handleConfigurationMessageLegacy(
   }
 
   await handleOurProfileUpdateLegacy(envelope.timestamp, configurationMessage);
-
   await handleGroupsAndContactsFromConfigMessageLegacy(envelope, configurationMessage);
-
   await removeFromCache(envelope);
 }
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index 5a6e90c7b..aee542ede 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -119,7 +119,7 @@ async function handlePollInfoResponse(
     read,
     write,
     upload,
-    active_users: active_users,
+    active_users,
     details: pick(
       details,
       'admins',
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index a1558953d..23d60450c 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -16,7 +16,7 @@ export enum SnodeNamespaces {
    */
   UserContacts = 3,
   /**
-   * This is the namespace used to sync our contacts
+   * This is the namespace used to sync our volatile info (currently read status only)
    */
   ConvoInfoVolatile = 4,
 
@@ -94,9 +94,9 @@ function namespacePriority(namespace: SnodeNamespaces): number {
 
     default:
       try {
-        assertUnreachable(namespace, `isUserConfigNamespace case not handled: ${namespace}`);
+        assertUnreachable(namespace, `namespacePriority case not handled: ${namespace}`);
       } catch (e) {
-        window.log.warn(`isUserConfigNamespace case not handled: ${namespace}: ${e.message}`);
+        window.log.warn(`namespacePriority case not handled: ${namespace}: ${e.message}`);
         return 1;
       }
   }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 6b497652b..e1b1ebea8 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -172,7 +172,6 @@ export class SwarmPolling {
         getConversationController()
           .get(group.pubkey.key)
           ?.idForLogging() || group.pubkey.key;
-
       if (diff >= convoPollingTimeout) {
         window?.log?.debug(
           `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} `
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
deleted file mode 100644
index 4688b1229..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// import { SignalService } from '../../../../../../protobuf';
-// import { isArray } from 'lodash';
-// import { GroupMessage, GroupMessageParams } from './GroupMessage';
-// // import { PubKey } from '../../../../../types';
-// // import { from_hex } from 'libsodium-wrappers-sumo';
-
-// interface GroupAdminMessageParams extends GroupMessageParams {
-//   /*
-//    * A proof that we are an admin (a proof that we have access to the private key of the closed group).
-//    * this field is needed  for all types of admin messages so that every member can make
-//    */
-//   groupSignature: Uint8Array;
-// }
-
-// interface GroupAdminMessageParams extends GroupMessageParams {
-//   /**
-//    * hex string of the members to delete the group from.
-//    * a single '*' is allowed too and means 'every members'
-//    *
-//    */
-//   members: Array<string>;
-// }
-
-// export class GroupAdminGroupMessage extends GroupMessage {
-//   // private readonly members: Array<string>;
-
-//   constructor(params: GroupAdminMessageParams) {
-//     super(params);
-
-//     if (!params.members || !isArray(params.members) || !params.members.length) {
-//       throw new Error('members parameter must be set');
-//     }
-
-//     // if (params.members.length === 1 && params.members[0] === '*') {
-//     //   this.members = params.members;
-//     // } else {
-//     //   const allAreValid = params.members.every(PubKey.isValidGroupPubkey);
-//     //   if (!allAreValid) {
-//     //     throw new Error('One of the members is not a `isValidGroupPubkey`');
-//     //   }
-
-//     //   this.members = params.members;
-//     // }
-//     throw new Error('TODO and add tests');
-//   }
-
-//   public dataProto(): SignalService.DataMessage {
-//     const dataMessage = new SignalService.DataMessage();
-//     dataMessage.groupMessage = super.groupMessage();
-//     dataMessage.groupMessage.adminMessage = new SignalService.GroupAdminMessage();
-//     // dataMessage.groupMessage.members = this.members.map(from_hex);
-
-//     return dataMessage;
-//   }
-// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
deleted file mode 100644
index d922745b8..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// import { SignalService } from '../../../../../../protobuf';
-// import { isEmpty, isString } from 'lodash';
-// import { GroupMessage, GroupMessageParams } from './GroupMessage';
-// import { PubKey } from '../../../../../types';
-// import { from_hex } from 'libsodium-wrappers-sumo';
-
-// export interface GroupInviteMessageParams extends GroupMessageParams {
-//   name: string;
-//   /**
-//    * hex string of that member private key
-//    */
-//   memberPrivateKey: string;
-// }
-
-// export class GroupInviteMessage extends GroupMessage {
-//   private readonly name: string;
-//   private readonly memberPrivateKey: string;
-
-//   constructor(params: GroupInviteMessageParams) {
-//     super(params);
-
-//     if (!params.name || isEmpty(params.name) || !isString(params.name)) {
-//       throw new Error('name parameter must be valid');
-//     }
-
-//     if (
-//       !params.memberPrivateKey ||
-//       isEmpty(params.memberPrivateKey) ||
-//       !isString(params.memberPrivateKey) ||
-//       !PubKey.isHexOnly(params.memberPrivateKey)
-//     ) {
-//       throw new Error('memberPrivateKey parameter must be valid');
-//     }
-
-//     this.name = params.name;
-//     this.memberPrivateKey = params.memberPrivateKey;
-//   }
-
-//   public dataProto(): SignalService.DataMessage {
-//     const dataMessage = new SignalService.DataMessage();
-//     dataMessage.groupMessage = super.groupMessage();
-//     dataMessage.groupMessage.inviteMessage = new SignalService.GroupInviteMessage();
-//     dataMessage.groupMessage.inviteMessage.name = this.name;
-//     dataMessage.groupMessage.inviteMessage.memberPrivateKey = from_hex(this.memberPrivateKey);
-
-//     return dataMessage;
-//   }
-// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
deleted file mode 100644
index a85fd659d..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// import { SignalService } from '../../../../../../protobuf';
-// import { GroupMessage, GroupMessageParams } from './GroupMessage';
-
-// interface GroupMemberLeftMessageParams extends GroupMessageParams {}
-
-// export class GroupMemberLeftMessage extends GroupMessage {
-//   constructor(params: GroupMemberLeftMessageParams) {
-//     super(params);
-//   }
-
-//   public dataProto(): SignalService.DataMessage {
-//     const dataMessage = new SignalService.DataMessage();
-//     dataMessage.groupMessage = super.groupMessage();
-//     dataMessage.groupMessage.memberLeftMessage = new SignalService.GroupMemberLeftMessage();
-
-//     return dataMessage;
-//   }
-// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
deleted file mode 100644
index b2fc845c4..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupMessage.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// import { SignalService } from '../../../../../../protobuf';
-// import { DataMessage } from '../../../DataMessage';
-// import { MessageParams } from '../../../Message';
-
-// export interface GroupMessageParams extends MessageParams {}
-
-// export abstract class GroupMessage extends DataMessage {
-//   constructor(params: GroupMessageParams) {
-//     super({
-//       timestamp: params.timestamp,
-//       identifier: params.identifier,
-//     });
-//   }
-
-//   protected groupMessage() {
-//     return new SignalService.GroupMessage();
-//   }
-// }
diff --git a/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
deleted file mode 100644
index 292ff1312..000000000
--- a/ts/session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// import { SignalService } from '../../../../../../protobuf';
-// import { isEmpty } from 'lodash';
-// import { GroupMessage, GroupMessageParams } from './GroupMessage';
-// import { from_hex } from 'libsodium-wrappers-sumo';
-
-// export interface GroupPromoteMessageParams extends GroupMessageParams {
-//   /**
-//    * hex string of the group private key
-//    */
-//   privateKey: string;
-// }
-
-// export class GroupPromoteMessage extends GroupMessage {
-//   private readonly privateKey: string;
-
-//   constructor(params: GroupPromoteMessageParams) {
-//     super(params);
-
-//     if (!params.privateKey || isEmpty(params.privateKey)) {
-//       throw new Error('privateKey parameter must be set');
-//     }
-
-//     this.privateKey = params.privateKey;
-//   }
-
-//   public dataProto(): SignalService.DataMessage {
-//     const dataMessage = new SignalService.DataMessage();
-//     dataMessage.groupMessage = super.groupMessage();
-//     dataMessage.groupMessage.promoteMessage = new SignalService.GroupPromoteMessage();
-//     dataMessage.groupMessage.promoteMessage.privateKey = from_hex(this.privateKey);
-
-//     return dataMessage;
-//   }
-// }
diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
index c88f9a4ba..d24a2dc78 100644
--- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts
+++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts
@@ -1,6 +1,5 @@
 export type JobRunnerType =
   | 'ConfigurationSyncJob'
-  | 'ConfigurationSyncDumpJob'
   | 'FakeSleepForJob'
   | 'FakeSleepForMultiJob'
   | 'AvatarDownloadJob';
diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index b19c33d21..1e88e4d37 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -7,7 +7,7 @@ import {
   clickOnMatchingText,
   clickOnTestIdWithText,
   waitForMatchingText,
-  waitForTestIdWithText
+  waitForTestIdWithText,
 } from './utilities/utils';
 
 // tslint:disable: no-console
@@ -20,9 +20,9 @@ sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
   // Create User
   const [userA, userB] = await Promise.all([newUser(windowA, 'Alice'), newUser(windowB, 'Bob')]);
   // Create Contact
-  await createContact(windowA, windowB, userA, userB)
+  await createContact(windowA, windowB, userA, userB);
   // Click on user's avatar to open conversation options
-  await clickOnTestIdWithText(windowA, 'conversation-options-avatar')
+  await clickOnTestIdWithText(windowA, 'conversation-options-avatar');
   // Select disappearing messages drop down
   await clickOnMatchingText(windowA, 'Disappearing messages');
   // Select 5 seconds
@@ -74,7 +74,7 @@ sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
     `${userA.userName} set the disappearing message timer to 5 seconds`
   );
   // Wait 5 seconds
-  await sleepFor(5000)
+  await sleepFor(5000);
   await waitForMatchingText(windowB, `${userA.userName} has turned off disappearing messages.`);
   // verify message is deleted in windowB
   const errorDesc2 = 'Should not be found';
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index 12ebe2b28..6b1690202 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -14,7 +14,7 @@ import {
   typeIntoInput,
   waitForMatchingText,
   waitForTestIdWithText,
-  waitForTextMessage
+  waitForTextMessage,
 } from './utilities/utils';
 
 const windows: Array<Page> = [];
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index b0f7f421f..f47f97418 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -27,14 +27,14 @@ function cleanUpOtherTest() {
   const parentFolderOfAllDataPath = isMacOS()
     ? '~/Library/Application Support/'
     : isLinux()
-    ? homedir() + '/.config/'
+    ? `${homedir()}/.config/`
     : null;
   if (!parentFolderOfAllDataPath) {
     throw new Error('Only macOS is currrently supported ');
   }
 
   if (!parentFolderOfAllDataPath || parentFolderOfAllDataPath.length < 9) {
-    throw new Error('parentFolderOfAllDataPath not found or invalid:' + parentFolderOfAllDataPath);
+    throw new Error(`parentFolderOfAllDataPath not found or invalid: ${parentFolderOfAllDataPath}`);
   }
   console.info('cleaning other tests leftovers...', parentFolderOfAllDataPath);
 
diff --git a/ts/test/automation/setup/sessionTest.ts b/ts/test/automation/setup/sessionTest.ts
index afba32320..4b92a80c8 100644
--- a/ts/test/automation/setup/sessionTest.ts
+++ b/ts/test/automation/setup/sessionTest.ts
@@ -17,7 +17,7 @@ type _TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N
 
 type CountWindows = 1 | 2 | 3 | 4 | 5;
 
-async function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
+function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
   testName: string,
   testCallback: (windows: N) => Promise<void>,
   count: T
@@ -43,35 +43,35 @@ async function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
   });
 }
 
-export async function sessionTestOneWindow(
+export function sessionTestOneWindow(
   testName: string,
   testCallback: (windows: Tuple<Page, 1>) => Promise<void>
 ) {
   return sessionTest(testName, testCallback, 1);
 }
 
-export async function sessionTestTwoWindows(
+export function sessionTestTwoWindows(
   testName: string,
   testCallback: ([windowA, windowB]: [Page, Page]) => Promise<void>
 ) {
   return sessionTest(testName, testCallback, 2);
 }
 
-export async function sessionTestThreeWindows(
+export function sessionTestThreeWindows(
   testName: string,
   testCallback: ([windowA, windowB, windowC]: [Page, Page, Page]) => Promise<void>
 ) {
   return sessionTest(testName, testCallback, 3);
 }
 
-export async function sessionTestFourWindows(
+export function sessionTestFourWindows(
   testName: string,
   testCallback: ([windowA, windowB, windowC, windowD]: [Page, Page, Page, Page]) => Promise<void>
 ) {
   return sessionTest(testName, testCallback, 4);
 }
 
-export async function sessionTestFiveWindows(
+export function sessionTestFiveWindows(
   testName: string,
   testCallback: ([windowA, windowB, windowC, windowD]: [Page, Page, Page, Page, Page]) => Promise<
     void
diff --git a/ts/test/automation/tslint.json b/ts/test/automation/tslint.json
new file mode 100644
index 000000000..ff7a903b3
--- /dev/null
+++ b/ts/test/automation/tslint.json
@@ -0,0 +1,10 @@
+{
+  "defaultSeverity": "error",
+  "extends": ["../tslint.json"],
+  "rules": {
+    "no-empty": false,
+    "array-type": false,
+    "no-console": false,
+    "no-void-expression": false
+  }
+}
diff --git a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
index 44977ddc5..ac7bd2ecd 100644
--- a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
+++ b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
@@ -94,11 +94,4 @@ describe('filterDuplicatesFromDbAndIncomingV4', () => {
       expect(filtered[0]).to.be.deep.eq(msg1);
     });
   });
-
-  describe('filters duplicated message from database', () => {
-    //sadly better-sqlite3 does not allow us to easily create an in memory db for now (issues with sqlite binary)
-    // so testing this part is not easy as all the logic is made in sqlite
-    // tslint:disable-next-line: no-empty
-    it.skip('in memory database', () => {});
-  });
 });
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index b462971fc..7a8e9f62f 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -1,7 +1,7 @@
 // tslint:disable: no-implicit-dependencies
 
-import { SignalService } from '../../../../protobuf';
 import chai from 'chai';
+import { SignalService } from '../../../../protobuf';
 
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { UserUtils } from '../../../../session/utils';
@@ -13,13 +13,15 @@ import { EnvelopePlus } from '../../../../receiver/types';
 
 import chaiAsPromised from 'chai-as-promised';
 import { ConfigMessageHandler } from '../../../../receiver/configMessage';
+import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { stubData } from '../../../test-utils/utils';
 chai.use(chaiAsPromised as any);
 chai.should();
 
 const { expect } = chai;
 
-describe('ConfigurationMessage_receiving', () => {
+describe('handleConfigurationMessageLegacy_receiving', () => {
   let createOrUpdateStub: Sinon.SinonStub<any>;
   let getItemByIdStub: Sinon.SinonStub<any>;
   let sender: string;
@@ -39,6 +41,8 @@ describe('ConfigurationMessage_receiving', () => {
       displayName: 'displayName',
       contacts: [],
     });
+    Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves();
+    TestUtils.stubWindow('setSettingValue', () => undefined);
   });
 
   afterEach(() => {
@@ -46,18 +50,26 @@ describe('ConfigurationMessage_receiving', () => {
   });
 
   it('should not be processed if we do not have a pubkey', async () => {
+    TestUtils.stubWindowLog();
     Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').resolves(undefined);
+
     envelope = TestUtils.generateEnvelopePlus(sender);
 
     const proto = config.contentProto();
     createOrUpdateStub = stubData('createOrUpdateItem').resolves();
     getItemByIdStub = stubData('getItemById').resolves();
+    const checkIsUserConfigFeatureReleasedStub = Sinon.stub(
+      ReleasedFeatures,
+      'checkIsUserConfigFeatureReleased'
+    ).resolves(false);
     await ConfigMessageHandler.handleConfigurationMessageLegacy(
       envelope,
       proto.configurationMessage as SignalService.ConfigurationMessage
     );
+
     expect(createOrUpdateStub.callCount).to.equal(0);
     expect(getItemByIdStub.callCount).to.equal(0);
+    expect(checkIsUserConfigFeatureReleasedStub.callCount).to.be.eq(1); // should only have the one as part of the global legacy check, but none for the smaller handlers
   });
 
   describe('with ourNumber set', () => {
@@ -71,7 +83,7 @@ describe('ConfigurationMessage_receiving', () => {
       const proto = config.contentProto();
       // sender !== ourNumber
       envelope = TestUtils.generateEnvelopePlus(sender);
-
+      Sinon.stub(ReleasedFeatures, 'checkIsUserConfigFeatureReleased').resolves(false);
       createOrUpdateStub = stubData('createOrUpdateItem').resolves();
       getItemByIdStub = stubData('getItemById').resolves();
       await ConfigMessageHandler.handleConfigurationMessageLegacy(
@@ -81,15 +93,5 @@ describe('ConfigurationMessage_receiving', () => {
       expect(createOrUpdateStub.callCount).to.equal(0);
       expect(getItemByIdStub.callCount).to.equal(0);
     });
-
-    // it('should be processed if the message is coming from our number', async () => {
-    //     const proto = config.contentProto();
-    //     envelope = TestUtils.generateEnvelopePlus(ourNumber);
-
-    //     createOrUpdateStub = sandbox.stub(data, 'createOrUpdateItem').resolves();
-    //     getItemByIdStub = sandbox.stub(data, 'getItemById').resolves();
-    //     await handleConfigurationMessageLegacy(envelope, proto.configurationMessage as SignalService.ConfigurationMessage);
-    //     expect(getItemByIdStub.callCount).to.equal(1);
-    // });
   });
 });
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index de03273fa..f1be4f069 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -15,7 +15,9 @@ import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants';
 import { getConversationController } from '../../../../session/conversations';
 import { PubKey } from '../../../../session/types';
 import { UserUtils } from '../../../../session/utils';
+import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { sleepFor } from '../../../../session/utils/Promise';
+import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { TestUtils } from '../../../test-utils';
 import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
 // tslint:disable: chai-vague-errors
@@ -41,6 +43,8 @@ describe('SwarmPolling', () => {
   beforeEach(async () => {
     getConversationController().reset();
     TestUtils.stubWindowFeatureFlags();
+    Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves();
+
     // Utils Stubs
     Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
 
@@ -75,6 +79,9 @@ describe('SwarmPolling', () => {
   });
 
   describe('getPollingTimeout', () => {
+    beforeEach(() => {
+      TestUtils.stubLibSessionWorker(undefined);
+    });
     it('returns INACTIVE for non existing convo', () => {
       const fakeConvo = TestUtils.generateFakePubKey();
 
@@ -200,7 +207,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -212,27 +219,16 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-    });
-
-    it('does run for our pubkey even if activeAt is recent ', async () => {
-      const convo = getConversationController().getOrCreate(
-        ourNumber,
-        ConversationTypeEnum.PRIVATE
-      );
-      convo.set('active_at', Date.now());
-      await swarmPolling.start(true);
-
-      expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     describe('legacy group', () => {
-      it('does run for group pubkey on start no matter the recent timestamp  ', async () => {
+      it('does run for group pubkey on start no matter the recent timestamp', async () => {
         const convo = getConversationController().getOrCreate(
           TestUtils.generateFakePubKeyStr(),
           ConversationTypeEnum.GROUP
         );
+        TestUtils.stubLibSessionWorker(undefined);
         convo.set('active_at', Date.now());
         const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
@@ -240,23 +236,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-      });
-
-      it('does run for groupv3 pubkey on start no matter the recent timestamp  ', async () => {
-        const convo = getConversationController().getOrCreate(
-          TestUtils.generateFakePubKeyStr(),
-          ConversationTypeEnum.GROUP
-        );
-        convo.set('active_at', Date.now());
-        const groupConvoPubkey = PubKey.cast(convo.id as string);
-        swarmPolling.addGroupId(groupConvoPubkey);
-        await swarmPolling.start(true);
-
-        // our pubkey will be polled for, hence the 2
-        expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -265,6 +245,7 @@ describe('SwarmPolling', () => {
           TestUtils.generateFakePubKeyStr(),
           ConversationTypeEnum.GROUP
         );
+        TestUtils.stubLibSessionWorker(undefined);
         getItemByIdStub.restore();
         getItemByIdStub = TestUtils.stubData('getItemById');
         getItemByIdStub
@@ -281,7 +262,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         getItemByIdStub.restore();
         getItemByIdStub = TestUtils.stubData('getItemById');
@@ -294,6 +275,7 @@ describe('SwarmPolling', () => {
           TestUtils.generateFakePubKeyStr(),
           ConversationTypeEnum.GROUP
         );
+        TestUtils.stubLibSessionWorker(undefined);
 
         convo.set('active_at', 1); // really old, but active
         const groupConvoPubkey = PubKey.cast(convo.id as string);
@@ -306,9 +288,9 @@ describe('SwarmPolling', () => {
         await swarmPolling.pollForAllKeys();
 
         expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       it('does run twice if activeAt less than one hour ', async () => {
@@ -317,27 +299,31 @@ describe('SwarmPolling', () => {
           ConversationTypeEnum.GROUP
         );
 
+        // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event
+        Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any);
+
         convo.set('active_at', Date.now());
         const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
+        pollOnceForKeySpy.resetHistory();
         clock.tick(9000);
+
         // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys();
         /** this is not easy to explain, but
          * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id)
          * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails.
          * the only fix is to restore the clock and force the a small sleep to let the thing run in bg
          */
+
         await sleepFor(10);
 
-        expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.callCount).to.eq(2);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
-        expect(pollOnceForKeySpy.getCall(3).args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
       it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => {
@@ -345,7 +331,8 @@ describe('SwarmPolling', () => {
           TestUtils.generateFakePubKeyStr(),
           ConversationTypeEnum.GROUP
         );
-
+        // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event
+        Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any);
         pollOnceForKeySpy.resetHistory();
         convo.set('active_at', Date.now());
         const groupConvoPubkey = PubKey.cast(convo.id as string);
@@ -365,9 +352,9 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
         // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -377,7 +364,7 @@ describe('SwarmPolling', () => {
           ConversationTypeEnum.GROUP
         );
         pollOnceForKeySpy.resetHistory();
-
+        TestUtils.stubLibSessionWorker(undefined);
         convo.set('active_at', Date.now());
         const groupConvoPubkey = PubKey.cast(convo.id as string);
         swarmPolling.addGroupId(groupConvoPubkey);
@@ -392,7 +379,7 @@ describe('SwarmPolling', () => {
         // we should have only one more call here, the one for our direct pubkey fetch
         expect(pollOnceForKeySpy.callCount).to.eq(3);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       describe('multiple runs', () => {
@@ -404,6 +391,7 @@ describe('SwarmPolling', () => {
             TestUtils.generateFakePubKeyStr(),
             ConversationTypeEnum.GROUP
           );
+          TestUtils.stubLibSessionWorker({});
 
           convo.set('active_at', Date.now());
           groupConvoPubkey = PubKey.cast(convo.id as string);
@@ -411,6 +399,13 @@ describe('SwarmPolling', () => {
           await swarmPolling.start(true);
         });
 
+        afterEach(() => {
+          Sinon.restore();
+          getConversationController().reset();
+          clock.restore();
+          resetHardForkCachedValues();
+        });
+
         it('does run twice if activeAt is less than 2 days', async () => {
           pollOnceForKeySpy.resetHistory();
           // less than 2 days old, this is an active group
@@ -426,29 +421,33 @@ describe('SwarmPolling', () => {
           // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
           expect(pollOnceForKeySpy.callCount).to.eq(4);
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
 
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
 
-        it('does run twice if activeAt is more than 2 days old and we tick more than one minute ', async () => {
+        it('does run twice if activeAt is more than 2 days old and we tick more than one minute', async () => {
           pollOnceForKeySpy.resetHistory();
+          TestUtils.stubWindowLog();
           convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active
+          // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event
 
-          const timeToTick = 65 * 1000;
+          const timeToTick = 65 * 1000; // more than one minute
           swarmPolling.forcePolledTimestamp(convo.id, timeToTick);
-
           clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group)
 
+          // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event
+
           await swarmPolling.pollForAllKeys();
+
           expect(pollOnceForKeySpy.callCount).to.eq(4);
 
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
       });
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 362060e15..8ff01faf8 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -5,6 +5,7 @@ import { OpenGroupData } from '../../../data/opengroups';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 
 import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface';
+import * as libsessionWorker from '../../../webworker/workers/browser/libsession_worker_interface';
 
 const globalAny: any = global;
 
@@ -38,6 +39,11 @@ export function stubUtilWorker(fnName: string, returnedValue: any): sinon.SinonS
     .withArgs(fnName as any)
     .resolves(returnedValue);
 }
+
+export function stubLibSessionWorker(value: any) {
+  Sinon.stub(libsessionWorker, 'callLibSessionWorker').resolves(value);
+}
+
 export function stubCreateObjectUrl() {
   // tslint:disable-next-line: no-empty no-function-expression
   (global as any).URL = function() {};
diff --git a/ts/types/Util.ts b/ts/types/Util.ts
index 5e494da0d..ccea6b792 100644
--- a/ts/types/Util.ts
+++ b/ts/types/Util.ts
@@ -7,5 +7,3 @@ export type RenderTextCallbackType = (options: {
 }) => JSX.Element;
 
 export type LocalizerType = (key: LocalizerKeys, values?: Array<string>) => string;
-
-export type FixedLengthArray<T, Length extends number> = Array<T> & { length: Length };
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 030515e35..0d746ea08 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -314,6 +314,8 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
     ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['eraseCommunityByFullUrl']>>,
 };
 
-const callLibSessionWorker = async (callToMake: LibSessionWorkerFunctions): Promise<unknown> => {
+export const callLibSessionWorker = async (
+  callToMake: LibSessionWorkerFunctions
+): Promise<unknown> => {
   return internalCallLibSessionWorker(callToMake);
 };

From 1b7d09bb771dc78e3a07349d096fef52efb6f750 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 10:56:21 +1000
Subject: [PATCH 115/178] chore: bump to Session 1.11.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72d74490a..5cfe48437 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.10.8",
+  "version": "1.11.0",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",

From 2c2656d5453f5e0c673b12c8d3e84c6fd88556e7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 10:56:35 +1000
Subject: [PATCH 116/178] chore: make an internal build with userconfig forced
 ON

---
 ts/util/releaseFeature.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 46ca8f9c4..ceb98a59b 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -56,13 +56,17 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
   }
 }
 
+function featureStorageItemId(featureName: FeatureNameTracked) {
+  return `featureReleased-${featureName}`;
+}
+
 export async function getIsFeatureReleased(featureName: FeatureNameTracked): Promise<boolean> {
   if (getIsFeatureReleasedCached(featureName) === undefined) {
     // read values from db and cache them as it looks like we did not
-    const oldIsFeatureReleased = Boolean(Storage.get(`featureReleased-${featureName}`));
+    const oldIsFeatureReleased = Boolean(Storage.get(featureStorageItemId(featureName)));
     // values do not exist in the db yet. Let's store false for now in the db and update our cached value.
     if (oldIsFeatureReleased === undefined) {
-      await Storage.put(`featureReleased-${featureName}`, false);
+      await Storage.put(featureStorageItemId(featureName), false);
       setIsFeatureReleasedCached(featureName, false);
     } else {
       setIsFeatureReleasedCached(featureName, oldIsFeatureReleased);
@@ -77,10 +81,11 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<
   // Is it time to release the feature based on the network timestamp?
   if (
     !featureAlreadyReleased &&
-    GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName)
+    (GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName) ||
+      featureName === 'user_config_libsession') // we want to make a build which has user config enabled by default for internal testing // TODO to remove for official build
   ) {
     window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`);
-    await Storage.put(`featureReleased-${featureName}`, true);
+    await Storage.put(featureStorageItemId(featureName), true);
     setIsFeatureReleasedCached(featureName, true);
     // trigger a sync right away so our user data is online
     await ConfigurationSync.queueNewJobIfNeeded();

From 7046c6c9b6bab238c96d40e6cecca8e255392dbe Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 11:00:22 +1000
Subject: [PATCH 117/178] fix: cap unread count to the
 CONVERSATION.MAX_UNREAD_COUNT value

---
 ts/hooks/useParamSelector.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index ecfc62c6c..df837c162 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -9,6 +9,7 @@ import { UserUtils } from '../session/utils';
 import { StateType } from '../state/reducer';
 import { getMessageReactsProps } from '../state/selectors/conversations';
 import { isPrivateAndFriend } from '../state/selectors/selectedConversation';
+import { CONVERSATION } from '../session/constants';
 
 export function useAvatarPath(convoId: string | undefined) {
   const convoProps = useConversationPropsById(convoId);
@@ -232,9 +233,14 @@ export function useMessageReactsPropsById(messageId?: string) {
   });
 }
 
+/**
+ * Returns the unread count of that conversation, or 0 if none are found.
+ * Note: returned value is capped at a max of CONVERSATION.MAX_UNREAD_COUNT
+ */
 export function useUnreadCount(conversationId?: string): number {
   const convoProps = useConversationPropsById(conversationId);
-  return convoProps?.unreadCount || 0;
+  const convoUnreadCount = convoProps?.unreadCount || 0;
+  return Math.min(CONVERSATION.MAX_UNREAD_COUNT, convoUnreadCount);
 }
 
 export function useHasUnread(conversationId?: string): boolean {

From 50459d8da8a126d3365ba1fd8aa84a822f56b271 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 11:15:16 +1000
Subject: [PATCH 118/178] chore: remove completely commented test files related
 to groupv3

---
 .../libsession/libsession_utils_contacts.ts   |   1 +
 .../v3/GroupAdminGroupMessage_test.ts         | 123 ------------------
 .../v3/GroupInviteMessage_test.ts             |  89 -------------
 .../v3/GroupMemberLeftMessage_test.ts         |  52 --------
 .../v3/GroupPromoteMessage_test.ts            |  60 ---------
 5 files changed, 1 insertion(+), 324 deletions(-)
 delete mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
 delete mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
 delete mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
 delete mode 100644 ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts

diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 9283b684e..a7323414b 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -111,6 +111,7 @@ function setMappedValue(info: ContactInfo) {
   mappedContactWrapperValues.set(info.id, info);
 }
 
+// TODO we should probably update the returned type as we only use the createdAt from the wrapper returned data
 function getContactCached(id: string) {
   return mappedContactWrapperValues.get(id);
 }
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
deleted file mode 100644
index 0010e4741..000000000
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupAdminGroupMessage_test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// import { expect } from 'chai';
-
-// import { SignalService } from '../../../../../../protobuf';
-// import { TestUtils } from '../../../../../test-utils';
-// import { GroupAdminGroupMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupAdminGroupMessage';
-// import { v4 } from 'uuid';
-// import { Constants } from '../../../../../../session';
-// import { from_hex } from 'libsodium-wrappers-sumo';
-
-describe('GroupAdminGroupMessage', () => {
-  // let groupPk: string;
-  // beforeEach(async () => {
-  //   groupPk = TestUtils.generateFakeClosedGroupV3PkStr();
-  // });
-  // it('can create valid message with array of members', async () => {
-  //   const member = TestUtils.generateFakePubKeyStr();
-  //   const message = new GroupAdminGroupMessage({
-  //     timestamp: 12345,
-  //     identifier: v4(),
-  //     members: [member],
-  //   });
-  //   const plainText = message.plainTextBuffer();
-  //   const decoded = SignalService.Content.decode(plainText);
-  //   expect(decoded.dataMessage)
-  //     .to.have.property('groupMessage')
-  //     .to.have.deep.property('publicKey', from_hex(groupPk));
-  //   expect(decoded.dataMessage)
-  //     .to.have.property('closedGroupControlMessage')
-  //     .to.have.deep.property('members', [member].map(from_hex));
-  //   expect(message)
-  //     .to.have.property('timestamp')
-  //     .to.be.equal(12345);
-  // });
-  // it('correct ttl', () => {
-  //   const message = new GroupAdminGroupMessage({
-  //     timestamp: 12345,
-  //     identifier: v4(),
-  //     members: [TestUtils.generateFakePubKeyStr()],
-  //   });
-  //   expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-  // });
-  // it('has an identifier even if none are provided', () => {
-  //   const message = new GroupAdminGroupMessage({
-  //     timestamp: 12345,
-  //     members: [TestUtils.generateFakePubKeyStr()],
-  //   });
-  //   expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-  //   expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-  // });
-  // it('has the right type', () => {
-  //   const message = new GroupAdminGroupMessage({
-  //     timestamp: 12345,
-  //     identifier: v4(),
-  //     members: [TestUtils.generateFakePubKeyStr()],
-  //   });
-  //   const plainText = message.plainTextBuffer();
-  //   const decoded = SignalService.Content.decode(plainText);
-  //   expect(decoded.dataMessage)
-  //     .to.have.property('closedGroupControlMessage')
-  //     .to.have.deep.property(
-  //       'type',
-  //       SignalService.DataMessage.ClosedGroupControlMessage.Type.PROMOTE
-  //     );
-  // });
-  // describe('constructor throws on invalid ', () => {
-  //   it('groupPk empty', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: [TestUtils.generateFakePubKeyStr()],
-  //       });
-  //     }).throws();
-  //   });
-  //   it('groupPk does not have group v3 prefix', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: [TestUtils.generateFakePubKeyStr()],
-  //       });
-  //     }).throws();
-  //   });
-  //   it('groupPk does not have group v3 length', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: [TestUtils.generateFakePubKeyStr()],
-  //       });
-  //     }).throws();
-  //   });
-  //   it('members is empty', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: undefined as any,
-  //       });
-  //     }).throws();
-  //   });
-  //   it('members is not an Array', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: '05123456' as any,
-  //       });
-  //     }).throws();
-  //   });
-  //   it('members array has one not a hex string', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: [TestUtils.generateFakePubKeyStr(), '05ggggggggggg'],
-  //       });
-  //     }).throws();
-  //   });
-  //   it('members array has one item not a valid pubkey and not a `*`', () => {
-  //     expect(() => {
-  //       new GroupAdminGroupMessage({
-  //         timestamp: 12345,
-  //         members: ['03opoerpero'],
-  //       });
-  //     }).throws();
-  //   });
-  // });
-});
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
deleted file mode 100644
index c5f39d889..000000000
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupInviteMessage_test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// import { expect } from 'chai';
-
-// import { SignalService } from '../../../../../../protobuf';
-// import { GroupInviteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupInviteMessage';
-// import { v4 } from 'uuid';
-// import { Constants } from '../../../../../../session';
-// import { from_hex } from 'libsodium-wrappers-sumo';
-
-// describe('GroupInviteMessage', () => {
-//   beforeEach(async () => {});
-
-//   it('can create valid message', async () => {
-//     const message = new GroupInviteMessage({
-//       timestamp: 12345,
-//       memberPrivateKey: '654321',
-//       name: 'groupName',
-//       identifier: v4(),
-//     });
-
-//     const plainText = message.plainTextBuffer();
-//     const decoded = SignalService.Content.decode(plainText);
-//     expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('inviteMessage')
-//       .to.have.deep.property('name', 'groupName');
-//     expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('inviteMessage')
-//       .to.have.deep.property('memberPrivateKey', from_hex('654321'));
-
-//     expect(message)
-//       .to.have.property('timestamp')
-//       .to.be.equal(12345);
-//   });
-
-//   it('correct ttl', () => {
-//     const message = new GroupInviteMessage({
-//       timestamp: 12345,
-//       memberPrivateKey: '654321',
-//       name: 'groupName',
-//       identifier: v4(),
-//     });
-
-//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-//   });
-
-//   it('has an identifier even if none are provided', () => {
-//     const message = new GroupInviteMessage({
-//       timestamp: 12345,
-//       memberPrivateKey: '654321',
-//       name: 'groupName',
-//     });
-
-//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-//   });
-
-//   describe('constructor throws on invalid ', () => {
-//     it('memberPk is empty', () => {
-//       expect(() => {
-//         new GroupInviteMessage({
-//           timestamp: 12345,
-//           memberPrivateKey: undefined as any,
-//           name: 'groupName',
-//         });
-//       }).throws();
-//     });
-
-//     it('memberPk is not a string', () => {
-//       expect(() => {
-//         new GroupInviteMessage({
-//           timestamp: 12345,
-//           memberPrivateKey: 1234 as any,
-//           name: 'groupName',
-//         });
-//       }).throws();
-//     });
-
-//     it('memberPk is not a hex string', () => {
-//       expect(() => {
-//         new GroupInviteMessage({
-//           timestamp: 12345,
-//           memberPrivateKey: '03ghklmnopqrstuvxyz' as any,
-//           name: 'groupName',
-//         });
-//       }).throws();
-//     });
-//   });
-// });
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
deleted file mode 100644
index e3e50c3f8..000000000
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupMemberLeftMessage_test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// import { expect } from 'chai';
-
-// import { SignalService } from '../../../../../../protobuf';
-// import { v4 } from 'uuid';
-// import { Constants } from '../../../../../../session';
-// import { GroupMemberLeftMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupMemberLeftMessage';
-
-// describe('GroupMemberLeftMessage', () => {
-//   beforeEach(async () => {});
-
-//   it('can create valid message', async () => {
-//     const message = new GroupMemberLeftMessage({
-//       timestamp: 12345,
-//       identifier: v4(),
-//     });
-
-//     const plainText = message.plainTextBuffer();
-//     const decoded = SignalService.Content.decode(plainText);
-//     expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('memberLeftMessage').to.be.not.undefined;
-//     expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('memberLeftMessage').to.be.not.null;
-
-//       expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('memberLeftMessage').to.be.empty;
-//     expect(message)
-//       .to.have.property('timestamp')
-//       .to.be.equal(12345);
-//   });
-
-//   it('correct ttl', () => {
-//     const message = new GroupMemberLeftMessage({
-//       timestamp: 12345,
-//       identifier: v4(),
-//     });
-
-//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-//   });
-
-//   it('has an identifier even if none are provided', () => {
-//     const message = new GroupMemberLeftMessage({
-//       timestamp: 12345,
-//     });
-
-//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-//   });
-
-// });
diff --git a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts b/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
deleted file mode 100644
index c50503382..000000000
--- a/ts/test/session/unit/messages/closed_groups/v3/GroupPromoteMessage_test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// import { expect } from 'chai';
-
-// import { SignalService } from '../../../../../../protobuf';
-// import { GroupPromoteMessage } from '../../../../../../session/messages/outgoing/controlMessage/group/v3/GroupPromoteMessage';
-// import { v4 } from 'uuid';
-// import { Constants } from '../../../../../../session';
-// import { from_hex } from 'libsodium-wrappers-sumo';
-
-// describe('GroupPromoteMessage', () => {
-//   beforeEach(async () => {});
-
-//   it('can create valid message', async () => {
-//     const message = new GroupPromoteMessage({
-//       timestamp: 12345,
-//       identifier: v4(),
-//       privateKey: '1234',
-//     });
-
-//     const plainText = message.plainTextBuffer();
-//     const decoded = SignalService.Content.decode(plainText);
-//     expect(decoded.dataMessage)
-//       .to.have.property('groupMessage')
-//       .to.have.property('promoteMessage')
-//       .to.have.deep.property('privateKey', from_hex('1234'));
-//     expect(message)
-//       .to.have.property('timestamp')
-//       .to.be.equal(12345);
-//   });
-
-//   it('correct ttl', () => {
-//     const message = new GroupPromoteMessage({
-//       timestamp: 12345,
-//       identifier: v4(),
-//       privateKey: '1234',
-//     });
-
-//     expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX);
-//   });
-
-//   it('has an identifier even if none are provided', () => {
-//     const message = new GroupPromoteMessage({
-//       timestamp: 12345,
-//       privateKey: '1234',
-//     });
-
-//     expect(message.identifier).to.not.equal(null, 'identifier cannot be null');
-//     expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined');
-//   });
-
-//   describe('constructor throws on invalid ', () => {
-//     it('privateKey empty', () => {
-//       expect(() => {
-//         new GroupPromoteMessage({
-//           timestamp: 12345,
-//           privateKey: null as any,
-//         });
-//       }).throws();
-//     });
-//   });
-// });

From 3b7589796c3d197383d1d4518b03f0c370263566 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 13:05:41 +1000
Subject: [PATCH 119/178] fix: noticebanner and scrollable right panel ui
 glitch

---
 stylesheets/_session_conversation.scss        |  1 +
 stylesheets/_session_group_panel.scss         |  2 +-
 .../conversation/SessionRightPanel.tsx        | 24 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 867ac787b..491bc2083 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -78,6 +78,7 @@
 }
 
 .session-conversation {
+  position: relative;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss
index f2e4e3010..250672916 100644
--- a/stylesheets/_session_group_panel.scss
+++ b/stylesheets/_session_group_panel.scss
@@ -1,7 +1,7 @@
 .group-settings {
   display: flex;
   flex-direction: column;
-  height: 100vh;
+  height: 100%;
   width: -webkit-fill-available;
 
   align-items: center;
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 8672068c8..6f15fe3f7 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -1,9 +1,10 @@
+import _ from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { SessionIconButton } from '../icon';
-import _ from 'lodash';
 // tslint:disable-next-line: no-submodule-imports
-import useInterval from 'react-use/lib/useInterval';
 import { useDispatch, useSelector } from 'react-redux';
+import useInterval from 'react-use/lib/useInterval';
+import styled from 'styled-components';
 import { Data } from '../../data/data';
 import {
   deleteAllMessagesByConvoIdWithConfirmation,
@@ -18,16 +19,6 @@ import {
 import { Constants } from '../../session';
 import { closeRightPanel } from '../../state/ducks/conversations';
 import { isRightPanelShowing } from '../../state/selectors/conversations';
-import { getTimerOptions } from '../../state/selectors/timerOptions';
-import { AttachmentTypeWithPath } from '../../types/Attachment';
-import { Avatar, AvatarSize } from '../avatar/Avatar';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionDropdown } from '../basic/SessionDropdown';
-import { SpacerLG } from '../basic/Text';
-import { MediaItemType } from '../lightbox/LightboxGallery';
-import { MediaGallery } from './media-gallery/MediaGallery';
-import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
-import styled from 'styled-components';
 import {
   useSelectedConversationKey,
   useSelectedDisplayNameInProfile,
@@ -40,6 +31,15 @@ import {
   useSelectedSubscriberCount,
   useSelectedWeAreAdmin,
 } from '../../state/selectors/selectedConversation';
+import { getTimerOptions } from '../../state/selectors/timerOptions';
+import { AttachmentTypeWithPath } from '../../types/Attachment';
+import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
+import { Avatar, AvatarSize } from '../avatar/Avatar';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionDropdown } from '../basic/SessionDropdown';
+import { SpacerLG } from '../basic/Text';
+import { MediaItemType } from '../lightbox/LightboxGallery';
+import { MediaGallery } from './media-gallery/MediaGallery';
 
 async function getMediaGalleryProps(
   conversationId: string

From 77e5e38e46314bf4dc9392609a9a20832c3295ae Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 15:33:11 +1000
Subject: [PATCH 120/178] chore: update lodash types, use prebuilt
 curbe25519-js

---
 package.json                                           |  7 +++----
 ts/curve25519-js.d.ts                                  |  1 -
 ts/receiver/dataMessage.ts                             |  4 +++-
 .../apis/open_group_api/sogsv3/sogsV3Capabilities.ts   |  4 ++--
 ts/session/apis/snode_api/onions.ts                    |  4 +++-
 ts/state/selectors/conversations.ts                    |  2 +-
 yarn.lock                                              | 10 +++++-----
 7 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 ts/curve25519-js.d.ts

diff --git a/package.json b/package.json
index 5cfe48437..b314e32f6 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,7 @@
     "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json",
     "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json",
     "ready": "yarn build-everything && yarn lint-full && yarn test",
-    "postinstall": "yarn patch-package && yarn electron-builder install-app-deps && yarn rebuild-curve25519-js",
-    "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../",
+    "postinstall": "yarn patch-package && yarn electron-builder install-app-deps",
     "update-git-info": "node ./build/updateLocalConfig.js",
     "worker:utils": "webpack  --config=./utils.worker.config.js",
     "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js"
@@ -104,7 +103,7 @@
     "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
@@ -161,7 +160,7 @@
     "@types/fs-extra": "5.0.5",
     "@types/libsodium-wrappers-sumo": "^0.7.5",
     "@types/linkify-it": "2.0.3",
-    "@types/lodash": "4.14.106",
+    "@types/lodash": "^4.14.194",
     "@types/mocha": "5.0.0",
     "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",
diff --git a/ts/curve25519-js.d.ts b/ts/curve25519-js.d.ts
deleted file mode 100644
index ffbbb8aac..000000000
--- a/ts/curve25519-js.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'curve25519-js';
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 57d76bef4..ad28ae03d 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -45,7 +45,9 @@ function cleanAttachments(decrypted: SignalService.DataMessage) {
 
   decrypted.group = null;
 
-  decrypted.attachments = (decrypted.attachments || []).map(cleanAttachment);
+  // when receiving a message we get keys of attachment as buffer, but we override the data with the decrypted string instead.
+  // TODO it would be nice to get rid of that as any here, but not in this PR
+  decrypted.attachments = (decrypted.attachments || []).map(cleanAttachment) as any;
   decrypted.preview = (decrypted.preview || []).map((item: any) => {
     const { image } = item;
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
index 4f535b1f4..d248c7a4b 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
@@ -52,10 +52,10 @@ const capabilitiesFetchForServer = async (
  * @returns the sorted list of capabilities contained in that response, or null
  */
 export function parseCapabilities(body: any): null | Array<string> {
-  if (!body || isEmpty(body) || !isObject(body) || !isArray(body.capabilities)) {
+  if (!body || isEmpty(body) || !isObject(body) || !isArray((body as any).capabilities)) {
     return null;
   }
-  return ((body.capabilities as Array<string>) || []).sort();
+  return (((body as any).capabilities as Array<string>) || []).sort(); // FIXME fix this type
 }
 
 export type ParsedBase64Avatar = {
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index feb869a75..c4577ff22 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -1013,7 +1013,9 @@ const sendOnionRequestNoRetries = async ({
       destCtx = useV4
         ? await encryptOnionV4RequestForPubkey(
             destX25519hex,
-            throwIfInvalidV4RequestInfos(finalDestOptions)
+            throwIfInvalidV4RequestInfos(
+              finalDestOptions as FinalDestSnodeOptions | FinalDestNonSnodeOptions // FIXME fix this type
+            )
           )
         : await encryptForPubKey(destX25519hex, finalDestOptions);
     }
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 30e3b394c..1d3716f15 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -401,7 +401,7 @@ const _getUnreadConversationRequests = (
   sortedConversationRequests: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
   return filter(sortedConversationRequests, conversation => {
-    return conversation && conversation.unreadCount && conversation.unreadCount > 0;
+    return Boolean(conversation && conversation.unreadCount && conversation.unreadCount > 0);
   });
 };
 
diff --git a/yarn.lock b/yarn.lock
index c96295189..8c4660270 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1099,10 +1099,10 @@
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.0.3.tgz#5352a2d7a35d7c77b527483cd6e68da9148bd780"
   integrity sha512-WRj1rJPkj3fyDME63xUkWvcWzq0XjpiqjJGNCH4Y6Fbiv2fVMDCqeIA6ch/UUG3VYrfGq1VNFLsz6Sat6FjsPw==
 
-"@types/lodash@4.14.106":
-  version "4.14.106"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"
-  integrity sha512-tOSvCVrvSqFZ4A/qrqqm6p37GZoawsZtoR0SJhlF7EonNZUgrn8FfT+RNQ11h+NUpMt6QVe36033f3qEKBwfWA==
+"@types/lodash@^4.14.194":
+  version "4.14.194"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
+  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
 
 "@types/long@*", "@types/long@^4.0.1":
   version "4.0.2"
@@ -2854,7 +2854,7 @@ csstype@^3.0.2, csstype@^3.0.6:
 
 "curve25519-js@https://github.com/oxen-io/curve25519-js":
   version "0.0.4"
-  resolved "https://github.com/oxen-io/curve25519-js#f36559e591fec0849166bbf1b22a6a39180b10c8"
+  resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
 
 data-urls@^3.0.1:
   version "3.0.2"

From c42f8280445e3caa10a7bf254e28363e384591f9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 19 May 2023 15:37:48 +1000
Subject: [PATCH 121/178] fix: hide logs when fetched items are sent back on
 saveConversation

---
 ts/node/database_utility.ts | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index af102ef89..428d7754b 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -163,6 +163,9 @@ export function formatRowOfConversation(
   };
 }
 
+/**
+ * Those attributes are the one we are sending to the sql call as we want to save them when saving a conversation row.
+ */
 const allowedKeysOfConversationAttributes = [
   'groupAdmins',
   'members',
@@ -191,6 +194,17 @@ const allowedKeysOfConversationAttributes = [
   'priority',
 ];
 
+/**
+ * Those attributes are the one we know the renderer is sending back but which we do not want to save to the database.
+ * They are fetched when getting the conversation from the DB and in anything returning a SaveConversationReturn
+ */
+const allowedKeysButNotSavedToDb = ['mentionedUs', 'unreadCount'];
+
+/**
+ * This one merges each list together, and must be used for the log statement only.
+ */
+const allowedKeysTogether = [...allowedKeysOfConversationAttributes, ...allowedKeysButNotSavedToDb];
+
 /**
  * assertValidConversationAttributes is used to make sure that only the keys stored in the database are sent from the renderer.
  * We could also add some type checking here to make sure what is sent by the renderer matches what we expect to store in the DB
@@ -198,22 +212,17 @@ const allowedKeysOfConversationAttributes = [
 export function assertValidConversationAttributes(
   data: ConversationAttributes
 ): ConversationAttributes {
-  // first make sure all keys of the object data are expected to be there
-  const foundInAttributesButNotInAllowed = difference(
-    Object.keys(data),
-    allowedKeysOfConversationAttributes
-  );
+  // first make sure all keys of the object data are expected to be there, or expected to not be saved to the DB
+  const foundInAttributesButNotInAllowed = difference(Object.keys(data), allowedKeysTogether);
 
   if (foundInAttributesButNotInAllowed?.length) {
     // tslint:disable-next-line: no-console
     console.error(
       `assertValidConversationAttributes: an invalid key was given in the record: ${foundInAttributesButNotInAllowed}`
     );
-    // throw new Error(
-    //   `assertValidConversationAttributes: found a not allowed key: ${foundInAttributesButNotInAllowed[0]}`
-    // );
   }
 
+  // we only ever want to save the allowedKeysOfConversationAttributes here, not the one part of allowedKeysButNotSavedToDb
   return pick(data, allowedKeysOfConversationAttributes) as ConversationAttributes;
 }
 

From 0cbcecb5085749fa8e69a64e54a053903731148f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 23 May 2023 11:26:09 +1000
Subject: [PATCH 122/178] fix: make avatar download job only take
 conversationId

and not the profileKey+url too as we need the db entry to be in sync
with the config wrapper data (otherwise the next commit would be made
with data out of date from the wrapper side)
---
 .../registration/RegistrationStages.tsx       |   2 +-
 ts/receiver/configMessage.ts                  |  16 +-
 ts/session/profile_manager/ProfileManager.ts  |  42 +++-
 ts/session/utils/job_runners/JobRunner.ts     |  10 -
 ts/session/utils/job_runners/PersistedJob.ts  |   8 +-
 .../job_runners/jobs/AvatarDownloadJob.ts     | 214 +++++++-----------
 6 files changed, 130 insertions(+), 162 deletions(-)

diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx
index a8f422bfe..5a06f87f8 100644
--- a/ts/components/registration/RegistrationStages.tsx
+++ b/ts/components/registration/RegistrationStages.tsx
@@ -128,7 +128,7 @@ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: str
     }, 60000);
     if (displayNameFromNetwork.length) {
       // display name, avatars, groups and contacts should already be handled when this event was triggered.
-      window?.log?.info('We got a displayName from network: ');
+      window?.log?.info(`We got a displayName from network: "${displayNameFromNetwork}"`);
     } else {
       window?.log?.info('Got a config message from network but without a displayName...');
       throw new Error('Got a config message from network but without a displayName...');
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 9bb7b3797..7b2dd6d4b 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -19,7 +19,7 @@ import { getConversationController } from '../session/conversations';
 import { IncomingMessage } from '../session/messages/incoming/IncomingMessage';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
 import { PubKey } from '../session/types';
-import { UserUtils } from '../session/utils';
+import { StringUtils, UserUtils } from '../session/utils';
 import { toHex } from '../session/utils/String';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
@@ -53,6 +53,8 @@ import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions';
 
+const printDumpsForDebugging = false;
+
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
 ) {
@@ -97,6 +99,12 @@ async function mergeConfigsWithIncomingUpdates(
         data: msg.message.data,
         hash: msg.messageHash,
       }));
+      if (printDumpsForDebugging) {
+        window.log.info(
+          `printDumpsForDebugging: before merge of ${variant}:`,
+          StringUtils.toHex(await GenericWrapperActions.dump(variant))
+        );
+      }
       const mergedCount = await GenericWrapperActions.merge(variant, toMerge);
       const needsPush = await GenericWrapperActions.needsPush(variant);
       const needsDump = await GenericWrapperActions.needsDump(variant);
@@ -106,6 +114,12 @@ async function mergeConfigsWithIncomingUpdates(
         `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} `
       );
 
+      if (printDumpsForDebugging) {
+        window.log.info(
+          `printDumpsForDebugging: after merge of ${variant}:`,
+          StringUtils.toHex(await GenericWrapperActions.dump(variant))
+        );
+      }
       const incomingConfResult: IncomingConfResult = {
         needsDump,
         needsPush,
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index de418c279..32ac9bbae 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -1,8 +1,8 @@
 import { isEmpty } from 'lodash';
 import { getConversationController } from '../conversations';
 import { UserUtils } from '../utils';
-import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob';
 import { toHex } from '../utils/String';
+import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob';
 
 /**
  * This can be used to update our conversation display name with the given name right away, and plan an AvatarDownloadJob to retrieve the new avatar if needed to download it
@@ -42,21 +42,45 @@ async function updateProfileOfContact(
     window.log.warn('updateProfileOfContact can only be used for existing and private convos');
     return;
   }
-
+  let changes = false;
   const existingDisplayName = conversation.get('displayNameInProfile');
 
   // avoid setting the display name to an invalid value
   if (existingDisplayName !== displayName && !isEmpty(displayName)) {
     conversation.set('displayNameInProfile', displayName || undefined);
+    changes = true;
+  }
+
+  const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : toHex(profileKey);
+
+  let avatarChanged = false;
+  // trust whatever we get as an update. It either comes from a shared config wrapper or one of that user's message. But in any case we should trust it, even if it gets resetted.
+  const prevPointer = conversation.get('avatarPointer');
+  const prevProfileKey = conversation.get('profileKey');
+
+  // we have to set it right away and not in the async download job, as the next .commit will save it to the
+  // database and wrapper (and we do not want to override anything in the wrapper's content
+  // with what we have locally, so we need the commit to have already the right values in pointer and profileKey)
+  if (prevPointer !== profileUrl || prevProfileKey !== profileKeyHex) {
+    conversation.set({
+      avatarPointer: profileUrl || undefined,
+      profileKey: profileKeyHex || undefined,
+    });
+
+    // if the avatar data we had before is not the same of what we received, we need to schedule a new avatar download job.
+    avatarChanged = true; // allow changes from strings to null/undefined to trigger a AvatarDownloadJob. If that happens, we want to remove the local attachment file.
+  }
+
+  if (changes) {
     await conversation.commit();
   }
-  // add an avatar download job only if needed
-  const profileKeyHex = !profileKey || isEmpty(profileKey) ? null : toHex(profileKey);
-  await AvatarDownload.addAvatarDownloadJobIfNeeded({
-    profileKeyHex,
-    profileUrl,
-    pubkey,
-  });
+
+  if (avatarChanged) {
+    // this call will download the new avatar or reset the local filepath if needed
+    await AvatarDownload.addAvatarDownloadJob({
+      conversationId: pubkey,
+    });
+  }
 }
 
 export const ProfileManager = {
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index 8a63a0c46..ce5fb6bfc 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -98,16 +98,6 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
       return 'type_exists';
     }
 
-    // if addJobCheck returned 'removeJobsFromQueue it means that job logic estimates some jobs have to remove before adding that one.
-    // so let's grab the jobs to remove, remove them, and then add that new job nevertheless
-    if (addJobChecks === 'removeJobsFromQueue') {
-      // fetch all the jobs which we should remove and remove them
-      const toRemove = job.nonRunningJobsToRemove(serializedNonRunningJobs);
-      this.deleteJobsByIdentifier(toRemove.map(m => m.identifier));
-      this.sortJobsList();
-      await this.writeJobsToDB();
-    }
-
     // make sure there is no job with that same identifier already .
 
     window.log.info(`job runner adding type :"${job.persistedData.jobType}" `);
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index a21495289..b266760d9 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -29,8 +29,6 @@ export interface FakeSleepForMultiJobData extends PersistedJobData {
 export interface AvatarDownloadPersistedData extends PersistedJobData {
   jobType: 'AvatarDownloadJobType';
   conversationId: string;
-  profileKeyHex: string | null;
-  profilePictureUrl: string | null;
 }
 
 export interface ConfigurationSyncPersistedData extends PersistedJobData {
@@ -43,11 +41,7 @@ export type TypeOfPersistedData =
   | FakeSleepJobData
   | FakeSleepForMultiJobData;
 
-export type AddJobCheckReturn =
-  | 'skipAddSameJobPresent'
-  | 'removeJobsFromQueue'
-  | 'sameJobDataAlreadyInQueue'
-  | null;
+export type AddJobCheckReturn = 'skipAddSameJobPresent' | 'sameJobDataAlreadyInQueue' | null;
 
 export enum RunJobResult {
   Success = 1,
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index de7398fa2..fb6c5af6d 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -1,4 +1,4 @@
-import { isEmpty, isEqual, isNumber, isString } from 'lodash';
+import { isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
 import { downloadAttachment } from '../../../../receiver/attachments';
@@ -20,18 +20,11 @@ const defaultMsBetweenRetries = 10000;
 const defaultMaxAttemps = 3;
 
 /**
- * Returns true if given those details we should add an Avatar Download Job to the list of jobs to run
+ * Returns true if the provided conversationId is a private chat and that we should add an Avatar Download Job to the list of jobs to run.
+ * Before calling this function, you have to update the related conversation profileKey and avatarPointer fields with the urls which should be downloaded, or reset them if you wanted them reset.
  */
-function shouldAddAvatarDownloadJob({
-  profileKeyHex,
-  profileUrl,
-  pubkey,
-}: {
-  pubkey: string;
-  profileUrl: string | null | undefined;
-  profileKeyHex: string | null | undefined;
-}) {
-  const conversation = getConversationController().get(pubkey);
+export function shouldAddAvatarDownloadJob({ conversationId }: { conversationId: string }) {
+  const conversation = getConversationController().get(conversationId);
   if (!conversation) {
     // return true so we do not retry this task.
     window.log.warn('shouldAddAvatarDownloadJob did not corresponding conversation');
@@ -43,37 +36,24 @@ function shouldAddAvatarDownloadJob({
     return false;
   }
   const prevPointer = conversation.get('avatarPointer');
+  const profileKey = conversation.get('profileKey');
+  const hasNoAvatar = isEmpty(prevPointer) || isEmpty(profileKey);
 
-  if (!isEmpty(profileUrl) && !isEmpty(profileKeyHex) && !isEqual(prevPointer, profileUrl)) {
-    return true;
+  if (hasNoAvatar) {
+    return false;
   }
-  return false;
+
+  return true;
 }
 
-async function addAvatarDownloadJobIfNeeded({
-  profileKeyHex,
-  profileUrl,
-  pubkey,
-}: {
-  pubkey: string;
-  profileUrl: string | null | undefined;
-  profileKeyHex: string | null | undefined;
-}) {
-  if (profileKeyHex && shouldAddAvatarDownloadJob({ pubkey, profileUrl, profileKeyHex })) {
+async function addAvatarDownloadJob({ conversationId }: { conversationId: string }) {
+  if (shouldAddAvatarDownloadJob({ conversationId })) {
     const avatarDownloadJob = new AvatarDownloadJob({
-      conversationId: pubkey,
-      profileKeyHex,
-      profilePictureUrl: profileUrl || null,
+      conversationId,
       nextAttemptTimestamp: Date.now(),
     });
-    window.log.debug(
-      `addAvatarDownloadJobIfNeeded: adding job download for ${pubkey}:${profileUrl}:${profileKeyHex} `
-    );
+    window.log.debug(`addAvatarDownloadJobIfNeeded: adding job download for ${conversationId} `);
     await runners.avatarDownloadRunner.addJob(avatarDownloadJob);
-  } else {
-    // window.log.debug(
-    //   `addAvatarDownloadJobIfNeeded: no download required for ${pubkey}:${profileUrl}:${profileKeyHex} `
-    // );
   }
 }
 
@@ -89,12 +69,9 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     nextAttemptTimestamp,
     maxAttempts,
     currentRetry,
-    profileKeyHex,
-    profilePictureUrl,
     identifier,
-  }: Pick<AvatarDownloadPersistedData, 'profileKeyHex' | 'profilePictureUrl'> & {
-    conversationId: string;
-  } & Partial<
+  }: Pick<AvatarDownloadPersistedData, 'conversationId'> &
+    Partial<
       Pick<
         AvatarDownloadPersistedData,
         | 'nextAttemptTimestamp'
@@ -112,8 +89,6 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
       maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps,
       nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries,
       currentRetry: isNumber(currentRetry) ? currentRetry : 0,
-      profileKeyHex,
-      profilePictureUrl,
     });
   }
 
@@ -142,103 +117,81 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
       return RunJobResult.PermanentFailure;
     }
     let changes = false;
+    const toDownloadPointer = conversation.get('avatarPointer');
+    const toDownloadProfileKey = conversation.get('profileKey');
 
-    const shouldRunJob = shouldAddAvatarDownloadJob({
-      pubkey: convoId,
-      profileKeyHex: this.persistedData.profileKeyHex,
-      profileUrl: this.persistedData.profilePictureUrl,
-    });
-    if (!shouldRunJob) {
-      // return true so we do not retry this task.
-      window.log.warn('AvatarDownloadJob shouldAddAvatarDownloadJob said no');
+    // if there is an avatar and profileKey for that user ('', null and undefined excluded), download, decrypt and save the avatar locally.
+    if (toDownloadPointer && toDownloadProfileKey) {
+      try {
+        window.log.debug(`[profileupdate] starting downloading task for  ${conversation.id}`);
+        const downloaded = await downloadAttachment({
+          url: toDownloadPointer,
+          isRaw: true,
+        });
+        conversation = getConversationController().getOrThrow(convoId);
 
-      return RunJobResult.PermanentFailure;
-    }
+        if (!downloaded.data.byteLength) {
+          window.log.debug(`[profileupdate] downloaded data is empty for  ${conversation.id}`);
+          return RunJobResult.RetryJobIfPossible; // so we retry this job
+        }
 
-    if (this.persistedData.profilePictureUrl && this.persistedData.profileKeyHex) {
-      const prevPointer = conversation.get('avatarPointer');
-      const needsUpdate =
-        !prevPointer || !isEqual(prevPointer, this.persistedData.profilePictureUrl);
+        // null => use placeholder with color and first letter
+        let path = null;
 
-      if (needsUpdate) {
         try {
-          window.log.debug(`[profileupdate] starting downloading task for  ${conversation.id}`);
-          const downloaded = await downloadAttachment({
-            url: this.persistedData.profilePictureUrl,
-            isRaw: true,
-          });
-          conversation = getConversationController().getOrThrow(convoId);
-
-          if (!downloaded.data.byteLength) {
-            window.log.debug(`[profileupdate] downloaded data is empty for  ${conversation.id}`);
-            return RunJobResult.RetryJobIfPossible; // so we retry this job
-          }
-
-          // null => use placeholder with color and first letter
-          let path = null;
-
+          const profileKeyArrayBuffer = fromHexToArray(toDownloadProfileKey);
+          let decryptedData: ArrayBuffer;
           try {
-            const profileKeyArrayBuffer = fromHexToArray(this.persistedData.profileKeyHex);
-            let decryptedData: ArrayBuffer;
-            try {
-              decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
-            } catch (decryptError) {
-              window.log.info(
-                `[profileupdate] failed to decrypt downloaded data ${conversation.id} with provided profileKey`
-              );
-              // if we cannot decrypt the content, there is no need to keep retrying.
-              return RunJobResult.PermanentFailure;
-            }
-
+            decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
+          } catch (decryptError) {
             window.log.info(
-              `[profileupdate] about to auto scale avatar for convo ${conversation.id}`
-            );
-
-            const scaledData = await autoScaleForIncomingAvatar(decryptedData);
-
-            const upgraded = await processNewAttachment({
-              data: await scaledData.blob.arrayBuffer(),
-              contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
-            });
-            conversation = getConversationController().getOrThrow(convoId);
-
-            // Only update the convo if the download and decrypt is a success
-            conversation.set('avatarPointer', this.persistedData.profilePictureUrl);
-            conversation.set('profileKey', this.persistedData.profileKeyHex || undefined);
-            ({ path } = upgraded);
-          } catch (e) {
-            window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`);
-            return RunJobResult.RetryJobIfPossible; // so we retry this job
-          }
-
-          conversation.set({ avatarInProfile: path || undefined });
-
-          changes = true;
-        } catch (e) {
-          if (isString(e.message) && (e.message as string).includes('404')) {
-            window.log.warn(
-              `[profileupdate] Failed to download attachment at ${this.persistedData.profilePictureUrl}. We got 404 error: "${e.message}"`
+              `[profileupdate] failed to decrypt downloaded data ${conversation.id} with provided profileKey`
             );
+            // if we got content, but cannot decrypt it with the provided profileKey, there is no need to keep retrying.
             return RunJobResult.PermanentFailure;
           }
-          window.log.warn(
-            `[profileupdate] Failed to download attachment at ${this.persistedData.profilePictureUrl}. Maybe it expired? ${e.message}`
+
+          window.log.info(
+            `[profileupdate] about to auto scale avatar for convo ${conversation.id}`
           );
-          return RunJobResult.RetryJobIfPossible;
+
+          // we autoscale incoming avatars because our app keeps decrypted avatars in memory and some platforms allows large avatars to be uploaded.
+          const scaledData = await autoScaleForIncomingAvatar(decryptedData);
+
+          const upgraded = await processNewAttachment({
+            data: await scaledData.blob.arrayBuffer(),
+            contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
+          });
+          conversation = getConversationController().getOrThrow(convoId);
+          ({ path } = upgraded);
+        } catch (e) {
+          window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`);
+          return RunJobResult.RetryJobIfPossible; // so we retry this job
         }
+
+        conversation.set({ avatarInProfile: path || undefined });
+
+        changes = true;
+      } catch (e) {
+        // TODO would be nice to throw a specific exception here instead of relying on the error string.
+        if (isString(e.message) && (e.message as string).includes('404')) {
+          window.log.warn(
+            `[profileupdate] Failed to download attachment at ${toDownloadPointer}. We got 404 error: "${e.message}"`
+          );
+          return RunJobResult.PermanentFailure;
+        }
+        window.log.warn(
+          `[profileupdate] Failed to download attachment at ${toDownloadPointer}. Maybe it expired? ${e.message}`
+        );
+        return RunJobResult.RetryJobIfPossible;
       }
     } else {
-      if (
-        conversation.get('avatarInProfile') ||
-        conversation.get('avatarPointer') ||
-        conversation.get('profileKey')
-      ) {
-        changes = true;
+      // there is no valid avatar to download, make sure the local file of the avatar of that user is removed
+      if (conversation.get('avatarInProfile')) {
         conversation.set({
           avatarInProfile: undefined,
-          avatarPointer: undefined,
-          profileKey: undefined,
         });
+        changes = true;
       }
     }
 
@@ -270,27 +223,20 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     return super.serializeBase();
   }
 
-  public nonRunningJobsToRemove(jobs: Array<AvatarDownloadPersistedData>) {
-    // for an avatar download job, we want to remove any job matching the same conversationID.
-    return jobs.filter(j => j.conversationId === this.persistedData.conversationId);
+  public nonRunningJobsToRemove(_jobs: Array<AvatarDownloadPersistedData>) {
+    return [];
   }
 
   public addJobCheck(jobs: Array<AvatarDownloadPersistedData>): AddJobCheckReturn {
     // avoid adding the same job if the exact same one is already planned
     const hasSameJob = jobs.some(j => {
-      return (
-        j.conversationId === this.persistedData.conversationId &&
-        j.profileKeyHex === this.persistedData.profileKeyHex &&
-        j.profilePictureUrl === this.persistedData.profilePictureUrl
-      );
+      return j.conversationId === this.persistedData.conversationId;
     });
 
     if (hasSameJob) {
       return 'skipAddSameJobPresent';
     }
-    if (this.nonRunningJobsToRemove(jobs).length) {
-      return 'removeJobsFromQueue';
-    }
+
     return null;
   }
 
@@ -301,5 +247,5 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
 
 export const AvatarDownload = {
   AvatarDownloadJob,
-  addAvatarDownloadJobIfNeeded,
+  addAvatarDownloadJob,
 };

From 2b3e490ade467c3516b2e4cc91fbbc689728efe1 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 26 May 2023 10:34:24 +1000
Subject: [PATCH 123/178] chore: build workers concurrently and minimize them

---
 libsession.worker.config.js | 2 +-
 package.json                | 2 +-
 utils.worker.config.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsession.worker.config.js b/libsession.worker.config.js
index 627aef7a1..44f78c29d 100644
--- a/libsession.worker.config.js
+++ b/libsession.worker.config.js
@@ -33,6 +33,6 @@ module.exports = {
   },
   target: 'node',
   optimization: {
-    minimize: false,
+    minimize: true,
   },
 };
diff --git a/package.json b/package.json
index b314e32f6..d42c4575b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
     "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
     "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
-    "build:workers": "yarn worker:utils && yarn worker:libsession",
+    "build:workers": "yarn concurrently 'yarn worker:utils' 'yarn worker:libsession'",
     "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
diff --git a/utils.worker.config.js b/utils.worker.config.js
index 79bf25ee5..bb892369a 100644
--- a/utils.worker.config.js
+++ b/utils.worker.config.js
@@ -26,6 +26,6 @@ module.exports = {
   },
   target: 'node',
   optimization: {
-    minimize: false,
+    minimize: true,
   },
 };

From 7b42c64cf3bcc09dff5afb3aabee1a1ac45d66c6 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 26 May 2023 10:51:02 +1000
Subject: [PATCH 124/178] fix: make sure to include the associatedWith to
 handle 421

---
 ts/components/MainViewController.tsx          |  45 ++---
 ts/components/leftpane/ActionsPanel.tsx       |   6 +-
 ts/receiver/configMessage.ts                  |  40 +++--
 ts/session/apis/seed_node_api/SeedNodeAPI.ts  |   2 +-
 ts/session/apis/snode_api/batchRequest.ts     |   4 +-
 ts/session/apis/snode_api/getNetworkTime.ts   |   2 +-
 .../apis/snode_api/getServiceNodesList.ts     |   2 +-
 ts/session/apis/snode_api/onions.ts           |   2 +-
 ts/session/apis/snode_api/onsResolve.ts       |   2 +-
 ts/session/apis/snode_api/retrieveRequest.ts  |   7 +-
 ts/session/apis/snode_api/sessionRpc.ts       |   6 +-
 ts/session/apis/snode_api/snodePool.ts        |  21 ++-
 ts/session/apis/snode_api/swarmPolling.ts     | 158 ++++++++----------
 .../conversations/ConversationController.ts   |   2 +
 ts/session/onions/onionPath.ts                |   2 +-
 ts/session/profile_manager/ProfileManager.ts  |   7 +
 ts/session/sending/MessageSender.ts           |   2 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   1 +
 18 files changed, 176 insertions(+), 135 deletions(-)

diff --git a/ts/components/MainViewController.tsx b/ts/components/MainViewController.tsx
index c96a10458..8a81ce785 100644
--- a/ts/components/MainViewController.tsx
+++ b/ts/components/MainViewController.tsx
@@ -1,25 +1,28 @@
 import React from 'react';
+import { CSSProperties } from 'styled-components';
 
-export class MessageView extends React.Component {
-  public render() {
-    return (
-      <div className="conversation placeholder">
-        <div className="conversation-header" />
-        <div className="container">
-          <div className="content session-full-logo">
-            <img
-              src="images/session/brand.svg"
-              className="session-brand-logo"
-              alt="full-brand-logo"
-            />
-            <img
-              src="images/session/session-text.svg"
-              className="session-text-logo"
-              alt="full-brand-logo"
-            />
-          </div>
+export const MessageView = () => {
+  const noDragStyle = { '-webkit-user-drag': 'none' } as CSSProperties;
+
+  return (
+    <div className="conversation placeholder">
+      <div className="conversation-header" />
+      <div className="container">
+        <div className="content session-full-logo">
+          <img
+            src="images/session/brand.svg"
+            className="session-brand-logo"
+            alt="full-brand-logo"
+            style={noDragStyle}
+          />
+          <img
+            src="images/session/session-text.svg"
+            className="session-text-logo"
+            alt="full-brand-logo"
+            style={noDragStyle}
+          />
         </div>
       </div>
-    );
-  }
-}
+    </div>
+  );
+};
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index d67994ffe..7d4fb90c8 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -40,7 +40,10 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
 import { SettingsKey } from '../../data/settings-key';
 import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
-import { forceRefreshRandomSnodePool } from '../../session/apis/snode_api/snodePool';
+import {
+  forceRefreshRandomSnodePool,
+  getFreshSwarmFor,
+} from '../../session/apis/snode_api/snodePool';
 import { isDarkTheme } from '../../state/selectors/theme';
 import { ThemeStateType } from '../../themes/constants/colors';
 import { switchThemeTo } from '../../themes/switchTheme';
@@ -198,6 +201,7 @@ const doAppStartUp = async () => {
   void triggerSyncIfNeeded();
   void getSwarmPollingInstance().start();
   void loadDefaultRooms();
+  void getFreshSwarmFor(UserUtils.getOurPubKeyStrFromCache()); // refresh our swarm on start to speed up the first message fetching event
 
   // TODOLATER make this a job of the JobRunner
   debounce(triggerAvatarReUploadIfNeeded, 200);
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 7b2dd6d4b..3b250b0c3 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -104,7 +104,18 @@ async function mergeConfigsWithIncomingUpdates(
           `printDumpsForDebugging: before merge of ${variant}:`,
           StringUtils.toHex(await GenericWrapperActions.dump(variant))
         );
+
+        for (let index = 0; index < toMerge.length; index++) {
+          const element = toMerge[index];
+          window.log.info(
+            `printDumpsForDebugging: toMerge of ${index}:${element.hash}:  ${StringUtils.toHex(
+              element.data
+            )} `,
+            StringUtils.toHex(await GenericWrapperActions.dump(variant))
+          );
+        }
       }
+
       const mergedCount = await GenericWrapperActions.merge(variant, toMerge);
       const needsPush = await GenericWrapperActions.needsPush(variant);
       const needsDump = await GenericWrapperActions.needsDump(variant);
@@ -354,17 +365,24 @@ async function handleCommunitiesUpdate() {
     });
   }
 
-  // this call can take quite a long time and should not cause issues to not be awaited
-  void Promise.all(
-    communitiesToJoinInDB.map(async toJoin => {
-      window.log.info('joining community with convoId ', toJoin.fullUrlWithPubkey);
-      return getOpenGroupManager().attemptConnectionV2OneAtATime(
-        toJoin.baseUrl,
-        toJoin.roomCasePreserved,
-        toJoin.pubkeyHex
-      );
-    })
-  );
+  // this call can take quite a long time but must be awaited (as it is async and create the entry in the DB, used as a diff)
+  try {
+    await Promise.all(
+      communitiesToJoinInDB.map(async toJoin => {
+        window.log.info('joining community with convoId ', toJoin.fullUrlWithPubkey);
+        return getOpenGroupManager().attemptConnectionV2OneAtATime(
+          toJoin.baseUrl,
+          toJoin.roomCasePreserved,
+          toJoin.pubkeyHex
+        );
+      })
+    );
+  } catch (e) {
+    window.log.warn(
+      `joining community with failed with one of ${communitiesToJoinInDB}`,
+      e.message
+    );
+  }
 
   // if the convos already exists, make sure to update the fields if needed
   for (let index = 0; index < allCommunitiesInWrapper.length; index++) {
diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
index 6803f6763..0dc51a5fd 100644
--- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts
+++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -303,7 +303,7 @@ async function getSnodesFromSeedUrl(urlObj: URL): Promise<Array<any>> {
     }
     return validNodes;
   } catch (e) {
-    window?.log?.error('Invalid json response');
+    window?.log?.error('Invalid json response. error:', e.message);
     throw new Error(`getSnodesFromSeedUrl: cannot parse content as JSON from ${urlObj.href}`);
   }
 }
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 01affdf87..94ed2b979 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -18,7 +18,7 @@ export async function doSnodeBatchRequest(
   subRequests: Array<SnodeApiSubRequests>,
   targetNode: Snode,
   timeout: number,
-  associatedWith?: string,
+  associatedWith: string | null,
   method: 'batch' | 'sequence' = 'batch'
 ): Promise<NotEmptyArrayOfBatchResults> {
   // console.warn(
@@ -49,7 +49,7 @@ export async function doSnodeBatchRequest(
       await processOnionRequestErrorAtDestination({
         statusCode: resultRow.code,
         body: JSON.stringify(resultRow.body),
-        associatedWith,
+        associatedWith: associatedWith || undefined,
         destinationSnodeEd25519: targetNode.pubkey_ed25519,
       });
     }
diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts
index c35de180a..dfbb6bb5d 100644
--- a/ts/session/apis/snode_api/getNetworkTime.ts
+++ b/ts/session/apis/snode_api/getNetworkTime.ts
@@ -18,7 +18,7 @@ function getNetworkTimeSubRequests(): Array<NetworkTimeSubRequest> {
 // tslint:disable-next-line: variable-name
 const getNetworkTime = async (snode: Snode): Promise<string | number> => {
   const subRequests = getNetworkTimeSubRequests();
-  const result = await doSnodeBatchRequest(subRequests, snode, 4000);
+  const result = await doSnodeBatchRequest(subRequests, snode, 4000, null);
   if (!result || !result.length) {
     window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result);
     throw new Error('getNetworkTime: Invalid result');
diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts
index ffc46c06e..8f35d8288 100644
--- a/ts/session/apis/snode_api/getServiceNodesList.ts
+++ b/ts/session/apis/snode_api/getServiceNodesList.ts
@@ -32,7 +32,7 @@ function buildSnodeListRequests(): Array<GetServiceNodesSubRequest> {
  */
 async function getSnodePoolFromSnode(targetNode: Snode): Promise<Array<Snode>> {
   const requests = buildSnodeListRequests();
-  const results = await doSnodeBatchRequest(requests, targetNode, 4000);
+  const results = await doSnodeBatchRequest(requests, targetNode, 4000, null);
 
   const firstResult = results[0];
 
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index c4577ff22..5bb089b91 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -708,7 +708,7 @@ async function handle421InvalidSwarm({
     if (parsedBody?.snodes?.length) {
       // the snode gave us the new swarm. Save it for the next retry
       window?.log?.warn(
-        'Wrong swarm, now looking at snodes',
+        `Wrong swarm, now looking for pk ${ed25519Str(associatedWith)} at snodes: `,
         parsedBody.snodes.map((s: any) => ed25519Str(s.pubkey_ed25519))
       );
 
diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts
index 4cfc7724e..1643b3f81 100644
--- a/ts/session/apis/snode_api/onsResolve.ts
+++ b/ts/session/apis/snode_api/onsResolve.ts
@@ -41,7 +41,7 @@ async function getSessionIDForOnsName(onsNameCase: string) {
   const promises = range(0, validationCount).map(async () => {
     const targetNode = await getRandomSnode();
 
-    const results = await doSnodeBatchRequest(onsResolveRequests, targetNode, 4000);
+    const results = await doSnodeBatchRequest(onsResolveRequests, targetNode, 4000, null);
     const firstResult = results[0];
     if (!firstResult || firstResult.code !== 200 || !firstResult.body) {
       throw new Error('ONSresolve:Failed to resolve ONS');
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index e148ad8b3..2502d1add 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -124,7 +124,12 @@ async function retrieveNextMessages(
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
 
-  const results = await doSnodeBatchRequest(retrieveRequestsParams, targetNode, 4000);
+  const results = await doSnodeBatchRequest(
+    retrieveRequestsParams,
+    targetNode,
+    4000,
+    associatedWith
+  );
 
   if (!results || !results.length) {
     window?.log?.warn(
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 776908248..3167476c6 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -29,7 +29,7 @@ async function doRequest({
   url: string;
   options: LokiFetchOptions;
   targetNode?: Snode;
-  associatedWith?: string;
+  associatedWith: string | null;
   timeout: number;
 }): Promise<undefined | SnodeResponse> {
   const method = options.method || 'GET';
@@ -52,7 +52,7 @@ async function doRequest({
         targetNode,
         body: fetchOptions.body,
         headers: fetchOptions.headers,
-        associatedWith,
+        associatedWith: associatedWith || undefined,
       });
       if (!fetchResult) {
         return undefined;
@@ -117,7 +117,7 @@ export async function snodeRpc(
     method: string;
     params: Record<string, any> | Array<Record<string, any>>;
     targetNode: Snode;
-    associatedWith?: string;
+    associatedWith: string | null;
     timeout?: number;
   } //the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance
 ): Promise<undefined | SnodeResponse> {
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index 9f69ce9bd..7a31d4589 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -313,12 +313,27 @@ export async function getSwarmFor(pubkey: string): Promise<Array<Snode>> {
     return goodNodes;
   }
 
+  // Request new node list from the network and save it
+  return getSwarmFromNetworkAndSave(pubkey);
+}
+
+/**
+ * Force a request to be made to the network to fetch the swarm of the specificied pubkey, and cache the result.
+ * Note: should not be called directly unless you know what you are doing. Use the cached `getSwarmFor()` function instead
+ * @param pubkey the pubkey to request the swarm for
+ * @returns the fresh swarm, shuffled
+ */
+export async function getFreshSwarmFor(pubkey: string): Promise<Array<Snode>> {
+  return getSwarmFromNetworkAndSave(pubkey);
+}
+
+async function getSwarmFromNetworkAndSave(pubkey: string) {
   // Request new node list from the network
   const swarm = await requestSnodesForPubkeyFromNetwork(pubkey);
-  const mixedSwarm = shuffle(swarm);
+  const shuffledSwarm = shuffle(swarm);
 
-  const edkeys = mixedSwarm.map((n: Snode) => n.pubkey_ed25519);
+  const edkeys = shuffledSwarm.map((n: Snode) => n.pubkey_ed25519);
   await internalUpdateSwarmFor(pubkey, edkeys);
 
-  return mixedSwarm;
+  return shuffledSwarm;
 }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index e1b1ebea8..88da1ef0e 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -6,27 +6,26 @@ import { PubKey } from '../../types';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import * as snodePool from './snodePool';
 
-import pRetry from 'p-retry';
 import { ConversationModel } from '../../../models/conversation';
 import { ConfigMessageHandler } from '../../../receiver/configMessage';
 import { decryptEnvelopeWithOurKey } from '../../../receiver/contentMessage';
 import { EnvelopePlus } from '../../../receiver/types';
 import { updateIsOnline } from '../../../state/ducks/onion';
+import { ReleasedFeatures } from '../../../util/releaseFeature';
+import {
+  GenericWrapperActions,
+  UserGroupsWrapperActions,
+} from '../../../webworker/workers/browser/libsession_worker_interface';
 import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants';
 import { getConversationController } from '../../conversations';
 import { IncomingMessage } from '../../messages/incoming/IncomingMessage';
 import { ed25519Str } from '../../onions/onionPath';
 import { StringUtils, UserUtils } from '../../utils';
 import { perfEnd, perfStart } from '../../utils/Performance';
+import { LibSessionUtil } from '../../utils/libsession/libsession_utils';
 import { SnodeNamespace, SnodeNamespaces } from './namespaces';
 import { SnodeAPIRetrieve } from './retrieveRequest';
 import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types';
-import { ReleasedFeatures } from '../../../util/releaseFeature';
-import { LibSessionUtil } from '../../utils/libsession/libsession_utils';
-import {
-  GenericWrapperActions,
-  UserGroupsWrapperActions,
-} from '../../../webworker/workers/browser/libsession_worker_interface';
 
 export function extractWebSocketContent(
   message: string,
@@ -404,93 +403,80 @@ export class SwarmPolling {
     const pkStr = pubkey.key;
 
     try {
-      return await pRetry(
-        async () => {
-          const prevHashes = await Promise.all(
-            namespaces.map(namespace => this.getLastHash(snodeEdkey, pkStr, namespace))
-          );
-          const configHashesToBump: Array<string> = [];
+      const prevHashes = await Promise.all(
+        namespaces.map(namespace => this.getLastHash(snodeEdkey, pkStr, namespace))
+      );
+      const configHashesToBump: Array<string> = [];
 
-          if (await ReleasedFeatures.checkIsUserConfigFeatureReleased()) {
-            // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers
-            if (isUs) {
-              for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
-                const variant = LibSessionUtil.requiredUserVariants[index];
-                try {
-                  const toBump = await GenericWrapperActions.currentHashes(variant);
-
-                  if (toBump?.length) {
-                    configHashesToBump.push(...toBump);
-                  }
-                } catch (e) {
-                  window.log.warn(`failed to get currentHashes for user variant ${variant}`);
-                }
-              }
-              window.log.debug(`configHashesToBump: ${configHashesToBump}`);
-            }
-          }
-
-          let results = await SnodeAPIRetrieve.retrieveNextMessages(
-            node,
-            prevHashes,
-            pkStr,
-            namespaces,
-            UserUtils.getOurPubKeyStrFromCache(),
-            configHashesToBump
-          );
-
-          if (!results.length) {
-            return [];
-          }
-          // when we asked to extend the expiry of the config messages, exclude it from the list of results as we do not want to mess up the last hash tracking logic
-          if (configHashesToBump.length) {
+      if (await ReleasedFeatures.checkIsUserConfigFeatureReleased()) {
+        // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers
+        if (isUs) {
+          for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) {
+            const variant = LibSessionUtil.requiredUserVariants[index];
             try {
-              const lastResult = results[results.length - 1];
-              if (lastResult?.code !== 200) {
-                // the update expiry of our config messages didn't work.
-                window.log.warn(
-                  `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(
-                    lastResult
-                  )}`
-                );
+              const toBump = await GenericWrapperActions.currentHashes(variant);
+
+              if (toBump?.length) {
+                configHashesToBump.push(...toBump);
               }
             } catch (e) {
-              // nothing to do I suppose here.
+              window.log.warn(`failed to get currentHashes for user variant ${variant}`);
             }
-            results = results.slice(0, results.length - 1);
           }
-
-          const lastMessages = results.map(r => {
-            return last(r.messages.messages);
-          });
-
-          await Promise.all(
-            lastMessages.map(async (lastMessage, index) => {
-              if (!lastMessage) {
-                return;
-              }
-              return this.updateLastHash({
-                edkey: snodeEdkey,
-                pubkey,
-                namespace: namespaces[index],
-                hash: lastMessage.hash,
-                expiration: lastMessage.expiration,
-              });
-            })
-          );
-
-          return results;
-        },
-        {
-          minTimeout: 100,
-          retries: 1,
-          onFailedAttempt: e => {
-            window?.log?.warn(
-              `retrieveNextMessages attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.name}`
-            );
-          },
+          window.log.debug(`configHashesToBump: ${configHashesToBump}`);
         }
+      }
+
+      let results = await SnodeAPIRetrieve.retrieveNextMessages(
+        node,
+        prevHashes,
+        pkStr,
+        namespaces,
+        UserUtils.getOurPubKeyStrFromCache(),
+        configHashesToBump
       );
+
+      if (!results.length) {
+        return [];
+      }
+      // when we asked to extend the expiry of the config messages, exclude it from the list of results as we do not want to mess up the last hash tracking logic
+      if (configHashesToBump.length) {
+        try {
+          const lastResult = results[results.length - 1];
+          if (lastResult?.code !== 200) {
+            // the update expiry of our config messages didn't work.
+            window.log.warn(
+              `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(
+                lastResult
+              )}`
+            );
+          }
+        } catch (e) {
+          // nothing to do I suppose here.
+        }
+        results = results.slice(0, results.length - 1);
+      }
+
+      const lastMessages = results.map(r => {
+        return last(r.messages.messages);
+      });
+
+      await Promise.all(
+        lastMessages.map(async (lastMessage, index) => {
+          if (!lastMessage) {
+            return;
+          }
+          return this.updateLastHash({
+            edkey: snodeEdkey,
+            pubkey,
+            namespace: namespaces[index],
+            hash: lastMessage.hash,
+            expiration: lastMessage.expiration,
+          });
+        })
+      );
+
+      return results;
     } catch (e) {
       if (e.message === ERROR_CODE_NO_CONNECT) {
         if (window.inboxStore?.getState().onionPaths.isOnline) {
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index a9a9d2fad..42c09414b 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -515,6 +515,8 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
     namespace: SnodeNamespaces.ClosedGroupMessage,
     pubkey: PubKey.cast(groupId),
   });
+  // TODO our leaving message might fail to be sent for some specific reason we want to still delete the group.
+  // for instance, if we do not have the encryption keypair anymore, we cannot send our left message, but we should still delete it's content
   if (wasSent) {
     window?.log?.info(
       `Leaving message sent ${groupId}. Removing everything related to this group.`
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 8e1760183..08254af42 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -312,7 +312,7 @@ export async function testGuardNode(snode: Snode) {
     response = await insecureNodeFetch(url, fetchOptions);
   } catch (e) {
     if (e.type === 'request-timeout') {
-      window?.log?.warn('test timeout for node,', ed25519Str(snode.pubkey_ed25519));
+      window?.log?.warn('test :,', ed25519Str(snode.pubkey_ed25519));
     }
     if (e.code === 'ENETUNREACH') {
       window?.log?.warn('no network on node,', snode);
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index 32ac9bbae..c43fae9fc 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -71,6 +71,13 @@ async function updateProfileOfContact(
     avatarChanged = true; // allow changes from strings to null/undefined to trigger a AvatarDownloadJob. If that happens, we want to remove the local attachment file.
   }
 
+  // if we have a local path to an downloaded  avatar, but no corresponding url/key for it, it means that
+  // the avatar was most likely removed so let's remove our link to that file.
+  if ((!profileUrl || !profileKeyHex) && conversation.get('avatarInProfile')) {
+    conversation.set({ avatarInProfile: undefined });
+    changes = true;
+  }
+
   if (changes) {
     await conversation.commit();
   }
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 0830d5ca9..f9b231244 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -236,7 +236,7 @@ async function sendMessagesDataToSnode(
       signedDeleteOldHashesRequest
     );
 
-    if (snode) {
+    if (!isEmpty(storeResults)) {
       window?.log?.info(
         `sendMessagesToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${
           snode.ip
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 48d77bfa3..4513c5cf9 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -223,6 +223,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
         window.log.info(
           `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}`
         );
+        // this might be a 421 error (already handled) so let's retry this request a little bit later
         return RunJobResult.RetryJobIfPossible;
       }
 

From 2068737cdd2f291060233bfc96399aef7f005be8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 26 May 2023 15:51:23 +1000
Subject: [PATCH 125/178] fix: break down deleteContact based on convo type

---
 package.json                                  |   2 +-
 preload.js                                    |   3 +-
 .../dialog/AdminLeaveClosedGroupDialog.tsx    |   3 +-
 ts/components/menu/Menu.tsx                   |  17 +-
 ts/interactions/conversationInteractions.ts   |  18 +-
 ts/receiver/closedGroups.ts                   | 147 ++++------
 ts/receiver/configMessage.ts                  |  25 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |   2 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   2 +-
 .../open_group_api/utils/OpenGroupUtils.ts    |   2 +-
 ts/session/apis/snode_api/swarmPolling.ts     |   6 +-
 .../conversations/ConversationController.ts   | 268 ++++++++++--------
 ts/session/sending/MessageSender.ts           |   1 +
 ts/session/utils/AttachmentsDownload.ts       |   2 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   4 +-
 ts/util/logging.ts                            |   2 +-
 ts/util/privacy.ts                            |   8 +-
 ts/window.d.ts                                |   3 +-
 yarn.lock                                     |   6 +-
 19 files changed, 252 insertions(+), 269 deletions(-)

diff --git a/package.json b/package.json
index d42c4575b..9f166bea7 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.21",
diff --git a/preload.js b/preload.js
index fe8c08818..37d5765e0 100644
--- a/preload.js
+++ b/preload.js
@@ -31,9 +31,10 @@ window.sessionFeatureFlags = {
   useTestNet: Boolean(
     process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('testnet')
   ),
-  useDebugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
   useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
   debug: {
+    debugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
+    debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),
     debugFileServerRequests: false,
     debugNonSnodeRequests: false,
     debugOnionRequests: false,
diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
index 567322b90..d5e7a6f9b 100644
--- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
+++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
@@ -29,8 +29,9 @@ export const AdminLeaveClosedGroupDialog = (props: { conversationId: string }) =
     }
     setLoading(true);
     // we know want to delete a closed group right after we've left it, so we can call the deleteContact which takes care of it all
-    await getConversationController().deleteContact(props.conversationId, {
+    await getConversationController().deleteClosedGroup(props.conversationId, {
       fromSyncMessage: false,
+      sendLeaveMessage: true,
     });
     setLoading(false);
     closeDialog();
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 5617252ca..f9e277815 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -112,7 +112,7 @@ export const DeletePrivateContactMenuItem = () => {
           onClickClose,
           okTheme: SessionButtonColor.Danger,
           onClickOk: async () => {
-            await getConversationController().deleteContact(convoId, {
+            await getConversationController().delete1o1(convoId, {
               fromSyncMessage: false,
               justHidePrivate: false,
             });
@@ -152,9 +152,16 @@ export const DeleteGroupOrCommunityMenuItem = () => {
           onClickClose,
           okTheme: SessionButtonColor.Danger,
           onClickOk: async () => {
-            await getConversationController().deleteContact(convoId, {
-              fromSyncMessage: false,
-            });
+            if (isPublic) {
+              await getConversationController().deleteCommunity(convoId, {
+                fromSyncMessage: false,
+              });
+            } else {
+              await getConversationController().deleteClosedGroup(convoId, {
+                fromSyncMessage: false,
+                sendLeaveMessage: true,
+              });
+            }
           },
         })
       );
@@ -450,7 +457,7 @@ export const DeletePrivateConversationMenuItem = () => {
   return (
     <Item
       onClick={async () => {
-        await getConversationController().deleteContact(convoId, {
+        await getConversationController().delete1o1(convoId, {
           fromSyncMessage: false,
           justHidePrivate: true,
         });
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index eb2b2da3c..6b6c7ca27 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -238,9 +238,10 @@ export function showLeaveGroupByConvoId(conversationId: string) {
     UserUtils.getOurPubKeyStrFromCache()
   );
   const isClosedGroup = conversation.isClosedGroup() || false;
+  const isPublic = conversation.isPublic() || false;
 
-  // if this is not a closed group, or we are not admin, we can just show a confirmation dialog
-  if (!isClosedGroup || (isClosedGroup && !isAdmin)) {
+  // if this is a community, or we legacy group are not admin, we can just show a confirmation dialog
+  if (isPublic || (isClosedGroup && !isAdmin)) {
     const onClickClose = () => {
       window.inboxStore?.dispatch(updateConfirmModal(null));
     };
@@ -249,9 +250,16 @@ export function showLeaveGroupByConvoId(conversationId: string) {
         title,
         message,
         onClickOk: async () => {
-          await getConversationController().deleteContact(conversation.id, {
-            fromSyncMessage: false,
-          });
+          if (isPublic) {
+            await getConversationController().deleteCommunity(conversation.id, {
+              fromSyncMessage: false,
+            });
+          } else {
+            await getConversationController().deleteClosedGroup(conversation.id, {
+              fromSyncMessage: false,
+              sendLeaveMessage: true,
+            });
+          }
           onClickClose();
         },
         onClickClose,
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index b7393741c..9b99a76b3 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -64,7 +64,7 @@ export async function addKeyPairToCacheAndDBIfNeeded(
   return true;
 }
 
-export async function innerRemoveAllClosedGroupEncryptionKeyPairs(groupPubKey: string) {
+export async function removeAllClosedGroupEncryptionKeyPairs(groupPubKey: string) {
   cacheOfClosedGroupKeyPairs.set(groupPubKey, []);
   await Data.removeAllClosedGroupEncryptionKeyPairs(groupPubKey);
 }
@@ -327,26 +327,6 @@ export async function handleNewClosedGroup(
   await queueAllCachedFromSource(groupId);
 }
 
-/**
- *
- * @param isKicked if true, we mark the reason for leaving as a we got kicked
- */
-export async function markGroupAsLeftOrKicked(
-  groupPublicKey: string,
-  groupConvo: ConversationModel,
-  isKicked: boolean
-) {
-  getSwarmPollingInstance().removePubkey(groupPublicKey);
-
-  await innerRemoveAllClosedGroupEncryptionKeyPairs(groupPublicKey);
-
-  if (isKicked) {
-    groupConvo.set('isKickedFromGroup', true);
-  } else {
-    groupConvo.set('left', true);
-  }
-}
-
 /**
  * This function is called when we get a message with the new encryption keypair for a closed group.
  * In this message, we have n-times the same keypair encoded with n being the number of current members.
@@ -681,34 +661,39 @@ async function handleClosedGroupMembersRemoved(
   // • Stop polling for the group
   // • Remove the key pairs associated with the group
   const ourPubKey = UserUtils.getOurPubKeyFromCache();
-  const wasCurrentUserRemoved = !membersAfterUpdate.includes(ourPubKey.key);
-  if (wasCurrentUserRemoved) {
-    await markGroupAsLeftOrKicked(groupPubKey, convo, true);
+  const wasCurrentUserKicked = !membersAfterUpdate.includes(ourPubKey.key);
+  if (wasCurrentUserKicked) {
+    // we now want to remove everything related to a group when we get kicked from it.
+    await getConversationController().deleteClosedGroup(groupPubKey, {
+      fromSyncMessage: false,
+      sendLeaveMessage: false,
+    });
+  } else {
+    // Note: we don't want to send a new encryption keypair when we get a member removed.
+    // this is only happening when the admin gets a MEMBER_LEFT message
+
+    // Only add update message if we have something to show
+    if (membersAfterUpdate.length !== currentMembers.length) {
+      const groupDiff: ClosedGroup.GroupDiff = {
+        kickedMembers: effectivelyRemovedMembers,
+      };
+      await ClosedGroup.addUpdateMessage(
+        convo,
+        groupDiff,
+        envelope.senderIdentity,
+        _.toNumber(envelope.timestamp)
+      );
+      convo.updateLastMessage();
+    }
+
+    // Update the group
+    const zombies = convo.get('zombies').filter(z => membersAfterUpdate.includes(z));
+
+    convo.set({ members: membersAfterUpdate });
+    convo.set({ zombies });
+
+    await convo.commit();
   }
-  // Note: we don't want to send a new encryption keypair when we get a member removed.
-  // this is only happening when the admin gets a MEMBER_LEFT message
-
-  // Only add update message if we have something to show
-  if (membersAfterUpdate.length !== currentMembers.length) {
-    const groupDiff: ClosedGroup.GroupDiff = {
-      kickedMembers: effectivelyRemovedMembers,
-    };
-    await ClosedGroup.addUpdateMessage(
-      convo,
-      groupDiff,
-      envelope.senderIdentity,
-      _.toNumber(envelope.timestamp)
-    );
-    convo.updateLastMessage();
-  }
-
-  // Update the group
-  const zombies = convo.get('zombies').filter(z => membersAfterUpdate.includes(z));
-
-  convo.set({ members: membersAfterUpdate });
-  convo.set({ zombies });
-
-  await convo.commit();
   await removeFromCache(envelope);
 }
 
@@ -758,56 +743,21 @@ function removeMemberFromZombies(
   return true;
 }
 
-async function handleClosedGroupAdminMemberLeft(
-  groupPublicKey: string,
-  isCurrentUserAdmin: boolean,
-  convo: ConversationModel,
-  envelope: EnvelopePlus
-) {
+async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope: EnvelopePlus) {
   // if the admin was remove and we are the admin, it can only be voluntary
-  await markGroupAsLeftOrKicked(groupPublicKey, convo, !isCurrentUserAdmin);
-
-  // everybody left ! this is how we disable a group when the admin left
-  const groupDiff: ClosedGroup.GroupDiff = {
-    kickedMembers: convo.get('members'),
-  };
-  convo.set('members', []);
-
-  await ClosedGroup.addUpdateMessage(
-    convo,
-    groupDiff,
-    envelope.senderIdentity,
-    _.toNumber(envelope.timestamp)
-  );
-  convo.updateLastMessage();
-
-  await convo.commit();
+  await getConversationController().deleteClosedGroup(groupPublicKey, {
+    fromSyncMessage: false,
+    sendLeaveMessage: false,
+  });
   await removeFromCache(envelope);
 }
 
-async function handleClosedGroupLeftOurself(
-  groupPublicKey: string,
-  convo: ConversationModel,
-  envelope: EnvelopePlus
-) {
-  await markGroupAsLeftOrKicked(groupPublicKey, convo, false);
-  const groupDiff: ClosedGroup.GroupDiff = {
-    leavingMembers: [envelope.senderIdentity],
-  };
-  await ClosedGroup.addUpdateMessage(
-    convo,
-    groupDiff,
-    envelope.senderIdentity,
-    _.toNumber(envelope.timestamp)
-  );
-  convo.updateLastMessage();
-  // remove ourself from the list of members
-  convo.set(
-    'members',
-    convo.get('members').filter(m => !UserUtils.isUsFromCache(m))
-  );
-
-  await convo.commit();
+async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopePlus) {
+  // if we ourself left. It can only mean that another of our device left the group and we just synced that message through the swarm
+  await getConversationController().deleteClosedGroup(groupId, {
+    fromSyncMessage: false,
+    sendLeaveMessage: false,
+  });
   await removeFromCache(envelope);
 }
 
@@ -827,18 +777,17 @@ async function handleClosedGroupMemberLeft(envelope: EnvelopePlus, convo: Conver
   }
   const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
 
-  // if the admin leaves, the group is disabled for every members
-  const isCurrentUserAdmin = convo.get('groupAdmins')?.includes(ourPubkey) || false;
+  // if the admin leaves, the group is disabled for everyone
 
   if (didAdminLeave) {
-    await handleClosedGroupAdminMemberLeft(groupPublicKey, isCurrentUserAdmin, convo, envelope);
+    await handleClosedGroupAdminMemberLeft(groupPublicKey, envelope);
     return;
   }
 
   // if we are no longer a member, we LEFT from another device
   if (!newMembers.includes(ourPubkey)) {
-    // stop polling, remove all stored pubkeys and make sure the UI does not let us write messages
-    await handleClosedGroupLeftOurself(groupPublicKey, convo, envelope);
+    // stop polling, remove everything from this closed group and the corresponding conversation
+    await handleClosedGroupLeftOurself(groupPublicKey, envelope);
     return;
   }
 
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 3b250b0c3..b4f2ee228 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -53,8 +53,6 @@ import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions';
 
-const printDumpsForDebugging = false;
-
 function groupByVariant(
   incomingConfigs: Array<IncomingMessage<SignalService.ISharedConfigMessage>>
 ) {
@@ -99,7 +97,7 @@ async function mergeConfigsWithIncomingUpdates(
         data: msg.message.data,
         hash: msg.messageHash,
       }));
-      if (printDumpsForDebugging) {
+      if (window.sessionFeatureFlags.debug.debugLibsessionDumps) {
         window.log.info(
           `printDumpsForDebugging: before merge of ${variant}:`,
           StringUtils.toHex(await GenericWrapperActions.dump(variant))
@@ -125,7 +123,7 @@ async function mergeConfigsWithIncomingUpdates(
         `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} `
       );
 
-      if (printDumpsForDebugging) {
+      if (window.sessionFeatureFlags.debug.debugLibsessionDumps) {
         window.log.info(
           `printDumpsForDebugging: after merge of ${variant}:`,
           StringUtils.toHex(await GenericWrapperActions.dump(variant))
@@ -213,7 +211,7 @@ async function deleteContactsFromDB(contactsToRemove: Array<string>) {
   for (let index = 0; index < contactsToRemove.length; index++) {
     const contactToRemove = contactsToRemove[index];
     try {
-      await getConversationController().deleteContact(contactToRemove, {
+      await getConversationController().delete1o1(contactToRemove, {
         fromSyncMessage: true,
         justHidePrivate: false,
       });
@@ -360,7 +358,7 @@ async function handleCommunitiesUpdate() {
   for (let index = 0; index < communitiesToLeaveInDB.length; index++) {
     const toLeave = communitiesToLeaveInDB[index];
     window.log.info('leaving community with convoId ', toLeave.id);
-    await getConversationController().deleteContact(toLeave.id, {
+    await getConversationController().deleteCommunity(toLeave.id, {
       fromSyncMessage: true,
     });
   }
@@ -442,16 +440,11 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       toLeave.id
     );
     const toLeaveFromDb = getConversationController().get(toLeave.id);
-
-    // if we were kicked from that group, leave it as is until the user manually deletes it
-    // otherwise, completely remove the conversation
-    if (!toLeaveFromDb?.get('isKickedFromGroup')) {
-      window.log.debug(`we were kicked from ${toLeave.id} so we keep it until manually deleted`);
-
-      await getConversationController().deleteContact(toLeave.id, {
-        fromSyncMessage: true,
-      });
-    }
+    // the wrapper told us that this group is not tracked, so even if we left/got kicked from it, remove it from the DB completely
+    await getConversationController().deleteClosedGroup(toLeaveFromDb.id, {
+      fromSyncMessage: true,
+      sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it.
+    });
   }
 
   for (let index = 0; index < legacyGroupsToJoinInDB.length; index++) {
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index e2ad61955..b7b4bd62f 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -82,7 +82,7 @@ async function joinOpenGroupV2(
     // we already have a convo associated with it. Remove everything related to it so we start fresh
     window?.log?.warn('leaving before rejoining open group v2 room', conversationId);
 
-    await getConversationController().deleteContact(conversationId, {
+    await getConversationController().deleteCommunity(conversationId, {
       fromSyncMessage: true,
     });
   }
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 868e0bbb8..b87264de5 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -152,7 +152,7 @@ export class OpenGroupManagerV2 {
 
             await OpenGroupData.removeV2OpenGroupRoom(roomConvoId);
             getOpenGroupManager().removeRoomFromPolledRooms(infos);
-            await getConversationController().deleteContact(roomConvoId, {
+            await getConversationController().deleteCommunity(roomConvoId, {
               fromSyncMessage: false,
             });
           }
diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
index 9fecfeea0..d7b579f24 100644
--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@@ -112,5 +112,5 @@ export function getOpenGroupV2FromConversationId(
  * Check if this conversation id corresponds to an OpenGroupV2 conversation.
  */
 export function isOpenGroupV2(conversationId: string) {
-  return Boolean(conversationId.startsWith(openGroupPrefix));
+  return Boolean(conversationId?.startsWith(openGroupPrefix));
 }
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 88da1ef0e..6797d7178 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -109,8 +109,10 @@ export class SwarmPolling {
 
   public removePubkey(pk: PubKey | string) {
     const pubkey = PubKey.cast(pk);
-    window?.log?.info('Swarm removePubkey: removing pubkey from polling', pubkey.key);
-    this.groupPolling = this.groupPolling.filter(group => !pubkey.isEqual(group.pubkey));
+    if (this.groupPolling.some(group => pubkey.key === group.pubkey.key)) {
+      window?.log?.info('Swarm removePubkey: removing pubkey from polling', pubkey.key);
+      this.groupPolling = this.groupPolling.filter(group => !pubkey.isEqual(group.pubkey));
+    }
   }
 
   /**
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 42c09414b..0dddc0e1a 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -22,13 +22,14 @@ import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_uti
 import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups';
 import { GetNetworkTime } from '../apis/snode_api/getNetworkTime';
 import { getMessageQueue } from '..';
-import { markGroupAsLeftOrKicked } from '../../receiver/closedGroups';
 import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
 import { isEmpty, isNil } from 'lodash';
 import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations';
+import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups';
+import { OpenGroupUtils } from '../apis/open_group_api/utils';
 
 let instance: ConversationController | null;
 
@@ -204,114 +205,88 @@ export class ConversationController {
     await conversation.commit();
   }
 
-  public async deleteContact(
-    id: string,
-    options: { fromSyncMessage: boolean; justHidePrivate?: boolean }
+  public async deleteClosedGroup(
+    groupId: string,
+    options: { fromSyncMessage: boolean; sendLeaveMessage: boolean }
   ) {
-    if (!this._initialFetchComplete) {
-      throw new Error('getConversationController.deleteContact  needs complete initial fetch');
+    const conversation = await this.deleteConvoInitialChecks(groupId, 'LegacyGroup');
+    if (!conversation || !conversation.isClosedGroup()) {
+      return;
+    }
+    window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${options.sendLeaveMessage}`);
+    getSwarmPollingInstance().removePubkey(groupId); // we don't need to keep polling anymore.
+
+    if (options.sendLeaveMessage) {
+      await leaveClosedGroup(groupId, options.fromSyncMessage);
     }
 
-    window.log.info(`deleteContact with ${id}`);
+    // if we were kicked or sent our left message, we have nothing to do more with that group.
+    // Just delete everything related to it, not trying to add update message or send a left message.
+    await this.removeGroupOrCommunityFromDBAndRedux(groupId);
+    await removeLegacyGroupFromWrappers(groupId);
 
-    const conversation = this.conversations.get(id);
-    if (!conversation) {
-      window.log.warn(`deleteContact no such convo ${id}`);
+    if (!options.fromSyncMessage) {
+      await ConfigurationSync.queueNewJobIfNeeded();
+    }
+  }
+
+  public async deleteCommunity(convoId: string, options: { fromSyncMessage: boolean }) {
+    const conversation = await this.deleteConvoInitialChecks(convoId, 'Community');
+    if (!conversation || !conversation.isPublic()) {
       return;
     }
 
-    // those are the stuff to do for all conversation types
-    window.log.info(`deleteContact destroyingMessages: ${id}`);
-    await deleteAllMessagesByConvoIdNoConfirmation(id);
-    window.log.info(`deleteContact messages destroyed: ${id}`);
+    window?.log?.info('leaving community: ', conversation.id);
+    const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
+    if (roomInfos) {
+      getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
+    }
+    await removeCommunityFromWrappers(conversation.id); // this call needs to fetch the pubkey
+    await this.removeGroupOrCommunityFromDBAndRedux(conversation.id);
 
-    const convoType: ConvoVolatileType = conversation.isClosedGroup()
-      ? 'LegacyGroup'
-      : conversation.isPublic()
-      ? 'Community'
-      : '1o1';
+    if (!options.fromSyncMessage) {
+      await ConfigurationSync.queueNewJobIfNeeded();
+    }
+  }
 
-    switch (convoType) {
-      case '1o1':
-        // if this conversation is a private conversation it's in fact a `contact` for desktop.
+  public async delete1o1(
+    id: string,
+    options: { fromSyncMessage: boolean; justHidePrivate?: boolean }
+  ) {
+    const conversation = await this.deleteConvoInitialChecks(id, '1o1');
+    if (!conversation || !conversation.isPrivate()) {
+      return;
+    }
 
-        if (options.justHidePrivate || isNil(options.justHidePrivate) || conversation.isMe()) {
-          // we just set the hidden field to true
-          // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
-          // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
-          window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
-          conversation.set({
-            priority: CONVERSATION_PRIORITIES.hidden,
-          });
-          // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
-          await conversation.commit(); // this updates the wrappers content to reflect the hidden state
-        } else {
-          window.log.info(`deleteContact isPrivate, reset fields and removing from wrapper: ${id}`);
+    if (options.justHidePrivate || isNil(options.justHidePrivate) || conversation.isMe()) {
+      // we just set the hidden field to true
+      // so the conversation still exists (needed for that user's profile in groups) but is not shown on the list of conversation.
+      // We also keep the messages for now, as turning a contact as hidden might just be a temporary thing
+      window.log.info(`deleteContact isPrivate, marking as hidden: ${id}`);
+      conversation.set({
+        priority: CONVERSATION_PRIORITIES.hidden,
+      });
+      // We don't remove entries from the contacts wrapper, so better keep corresponding convo volatile info for now (it will be pruned if needed)
+      await conversation.commit(); // this updates the wrappers content to reflect the hidden state
+    } else {
+      window.log.info(`deleteContact isPrivate, reset fields and removing from wrapper: ${id}`);
 
-          await conversation.setIsApproved(false, false);
-          await conversation.setDidApproveMe(false, false);
-          conversation.set('active_at', 0);
-          await BlockedNumberController.unblockAll([conversation.id]);
-          await conversation.commit(); // first commit to DB so the DB knows about the changes
-          if (SessionUtilContact.isContactToStoreInWrapper(conversation)) {
-            window.log.warn('isContactToStoreInWrapper still true for ', conversation.attributes);
-          }
-          if (conversation.id.startsWith('05')) {
-            // make sure to filter blinded contacts as it will throw otherwise
-            await SessionUtilContact.removeContactFromWrapper(conversation.id); // then remove the entry alltogether from the wrapper
-            await SessionUtilConvoInfoVolatile.removeContactFromWrapper(conversation.id);
-          }
-          if (getCurrentlySelectedConversationOutsideRedux() === conversation.id) {
-            window.inboxStore?.dispatch(resetConversationExternal());
-          }
-        }
-
-        break;
-      case 'Community':
-        window?.log?.info('leaving open group v2', conversation.id);
-
-        try {
-          const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(conversation.id);
-          if (fromWrapper?.fullUrlWithPubkey) {
-            await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
-              conversation.id,
-              fromWrapper.fullUrlWithPubkey
-            );
-          }
-        } catch (e) {
-          window?.log?.info(
-            'SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:',
-            e.message
-          );
-        }
-
-        // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
-        try {
-          await SessionUtilUserGroups.removeCommunityFromWrapper(conversation.id, conversation.id);
-        } catch (e) {
-          window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e);
-        }
-
-        const roomInfos = OpenGroupData.getV2OpenGroupRoom(conversation.id);
-        if (roomInfos) {
-          getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
-        }
-        await this.cleanUpGroupConversation(conversation.id);
-
-        // remove the roomInfos locally for this open group room including the pubkey
-        try {
-          await OpenGroupData.removeV2OpenGroupRoom(conversation.id);
-        } catch (e) {
-          window?.log?.info('removeV2OpenGroupRoom failed:', e);
-        }
-        break;
-      case 'LegacyGroup':
-        window.log.info(`deleteContact ClosedGroup case: ${conversation.id}`);
-        await leaveClosedGroup(conversation.id, options.fromSyncMessage); // this removes the data from the group and convo volatile info
-        await this.cleanUpGroupConversation(conversation.id);
-        break;
-      default:
-        assertUnreachable(convoType, `deleteContact: convoType ${convoType} not handled`);
+      await conversation.setIsApproved(false, false);
+      await conversation.setDidApproveMe(false, false);
+      conversation.set('active_at', 0);
+      await BlockedNumberController.unblockAll([conversation.id]);
+      await conversation.commit(); // first commit to DB so the DB knows about the changes
+      if (SessionUtilContact.isContactToStoreInWrapper(conversation)) {
+        window.log.warn('isContactToStoreInWrapper still true for ', conversation.attributes);
+      }
+      if (conversation.id.startsWith('05')) {
+        // make sure to filter blinded contacts as it will throw otherwise
+        await SessionUtilContact.removeContactFromWrapper(conversation.id); // then remove the entry alltogether from the wrapper
+        await SessionUtilConvoInfoVolatile.removeContactFromWrapper(conversation.id);
+      }
+      if (getCurrentlySelectedConversationOutsideRedux() === conversation.id) {
+        window.inboxStore?.dispatch(resetConversationExternal());
+      }
     }
 
     if (!options.fromSyncMessage) {
@@ -415,32 +390,62 @@ export class ConversationController {
     this.conversations.reset([]);
   }
 
-  private async cleanUpGroupConversation(id: string) {
-    window.log.info(`deleteContact isGroup, removing convo from DB: ${id}`);
-    // not a private conversation, so not a contact for the ContactWrapper
-    await Data.removeConversation(id);
+  private async deleteConvoInitialChecks(convoId: string, deleteType: ConvoVolatileType) {
+    if (!this._initialFetchComplete) {
+      throw new Error(`getConversationController.${deleteType}  needs complete initial fetch`);
+    }
 
-    window.log.info(`deleteContact isGroup, convo removed from DB: ${id}`);
-    const conversation = this.conversations.get(id);
+    window.log.info(`${deleteType} with ${convoId}`);
+
+    const conversation = this.conversations.get(convoId);
+    if (!conversation) {
+      window.log.warn(`${deleteType} no such convo ${convoId}`);
+      return null;
+    }
+
+    // those are the stuff to do for all conversation types
+    window.log.info(`${deleteType} destroyingMessages: ${convoId}`);
+    await deleteAllMessagesByConvoIdNoConfirmation(convoId);
+    window.log.info(`${deleteType} messages destroyed: ${convoId}`);
+    return conversation;
+  }
+
+  private async removeGroupOrCommunityFromDBAndRedux(convoId: string) {
+    window.log.info(`cleanUpGroupConversation, removing convo from DB: ${convoId}`);
+    // not a private conversation, so not a contact for the ContactWrapper
+    await Data.removeConversation(convoId);
+
+    // remove the data from the opengrouprooms table too if needed
+    if (convoId && OpenGroupUtils.isOpenGroupV2(convoId)) {
+      // remove the roomInfos locally for this open group room including the pubkey
+      try {
+        await OpenGroupData.removeV2OpenGroupRoom(convoId);
+      } catch (e) {
+        window?.log?.info('removeV2OpenGroupRoom failed:', e);
+      }
+    }
+
+    window.log.info(`cleanUpGroupConversation, convo removed from DB: ${convoId}`);
+    const conversation = this.conversations.get(convoId);
 
     if (conversation) {
       this.conversations.remove(conversation);
 
       window?.inboxStore?.dispatch(
         conversationActions.conversationChanged({
-          id: id,
+          id: convoId,
           data: conversation.getConversationModelProps(),
         })
       );
     }
-    window.inboxStore?.dispatch(conversationActions.conversationRemoved(id));
+    window.inboxStore?.dispatch(conversationActions.conversationRemoved(convoId));
 
-    window.log.info(`deleteContact NOT private, convo removed from store: ${id}`);
+    window.log.info(`cleanUpGroupConversation, convo removed from store: ${convoId}`);
   }
 }
 
 /**
- * You most likely don't want to call this function directly, but instead use the deleteContact() from the ConversationController as it will take care of more cleaningup.
+ * You most likely don't want to call this function directly, but instead use the deleteLegacyGroup() from the ConversationController as it will take care of more cleaningup.
  *
  * Note: `fromSyncMessage` is used to know if we need to send a leave group message to the group first.
  * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true.
@@ -475,20 +480,12 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
   await convo.updateGroupAdmins(admins, false);
   await convo.commit();
 
-  const source = UserUtils.getOurPubKeyStrFromCache();
   const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
-  const dbMessage = await convo.addSingleOutgoingMessage({
-    group_update: { left: [source] },
-    sent_at: networkTimestamp,
-    expireTimer: 0,
-  });
-
   getSwarmPollingInstance().removePubkey(groupId);
 
   if (fromSyncMessage) {
     // no need to send our leave message as our other device should already have sent it.
-    await cleanUpFullyLeftLegacyGroup(groupId);
     return;
   }
 
@@ -496,7 +493,6 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
   if (!keypair || isEmpty(keypair) || isEmpty(keypair.publicHex) || isEmpty(keypair.privateHex)) {
     // if we do not have a keypair, we won't be able to send our leaving message neither, so just skip sending it.
     // this can happen when getting a group from a broken libsession usergroup wrapper, but not only.
-    await cleanUpFullyLeftLegacyGroup(groupId);
     return;
   }
 
@@ -504,7 +500,6 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
   const ourLeavingMessage = new ClosedGroupMemberLeftMessage({
     timestamp: networkTimestamp,
     groupId,
-    identifier: dbMessage.id as string,
   });
 
   window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
@@ -521,17 +516,42 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) {
     window?.log?.info(
       `Leaving message sent ${groupId}. Removing everything related to this group.`
     );
-    await cleanUpFullyLeftLegacyGroup(groupId);
+  } else {
+    window?.log?.info(
+      `Leaving message failed to be sent for ${groupId}. But still removing everything related to this group....`
+    );
   }
-  // if we failed to send our leaving message, don't remove everything yet as we might want to retry sending our leaving message later.
+  // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()`
 }
 
-async function cleanUpFullyLeftLegacyGroup(groupId: string) {
-  const convo = getConversationController().get(groupId);
+async function removeLegacyGroupFromWrappers(groupId: string) {
+  getSwarmPollingInstance().removePubkey(groupId);
 
   await UserGroupsWrapperActions.eraseLegacyGroup(groupId);
   await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(groupId);
-  if (convo) {
-    await markGroupAsLeftOrKicked(groupId, convo, false);
+  await removeAllClosedGroupEncryptionKeyPairs(groupId);
+}
+
+async function removeCommunityFromWrappers(conversationId: string) {
+  if (!conversationId || !OpenGroupUtils.isOpenGroupV2(conversationId)) {
+    return;
+  }
+  try {
+    const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(conversationId);
+    if (fromWrapper?.fullUrlWithPubkey) {
+      await SessionUtilConvoInfoVolatile.removeCommunityFromWrapper(
+        conversationId,
+        fromWrapper.fullUrlWithPubkey
+      );
+    }
+  } catch (e) {
+    window?.log?.info('SessionUtilConvoInfoVolatile.removeCommunityFromWrapper failed:', e.message);
+  }
+
+  // remove from the wrapper the entries before we remove the roomInfos, as we won't have the required community pubkey afterwards
+  try {
+    await SessionUtilUserGroups.removeCommunityFromWrapper(conversationId, conversationId);
+  } catch (e) {
+    window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e.message);
   }
 }
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index f9b231244..33612d56a 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -404,6 +404,7 @@ async function sendMessagesToSnode(
         retries: 2,
         factor: 1,
         minTimeout: MessageSender.getMinRetryTimeout(),
+        maxTimeout: 1000,
       }
     );
 
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 51b81728f..9838cedb3 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -238,7 +238,7 @@ async function _runJob(job: any) {
     if (currentAttempt >= 3 || was404Error(error)) {
       logger.error(
         `_runJob: ${currentAttempt} failed attempts, marking attachment ${id} from message ${found?.idForLogging()} as permanent error:`,
-        error && error.stack ? error.stack : error
+        error && error.message ? error.message : error
       );
 
       // Make sure to fetch the message from DB here right before writing it.
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 4513c5cf9..587169481 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -19,8 +19,8 @@ import {
 import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { allowOnlyOneAtATime } from '../../Promise';
 
-const defaultMsBetweenRetries = 3000;
-const defaultMaxAttempts = 3;
+const defaultMsBetweenRetries = 30000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s)
+const defaultMaxAttempts = 2;
 
 /**
  * We want to run each of those jobs at least 3seconds apart.
diff --git a/ts/util/logging.ts b/ts/util/logging.ts
index 25269d710..9c7a6d9bf 100644
--- a/ts/util/logging.ts
+++ b/ts/util/logging.ts
@@ -110,7 +110,7 @@ const development = window && window?.getEnvironment && window?.getEnvironment()
 
 // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
 function logAtLevel(level: string, prefix: string, ...args: any) {
-  if (prefix === 'DEBUG' && !window.sessionFeatureFlags.useDebugLogging) {
+  if (prefix === 'DEBUG' && !window.sessionFeatureFlags.debug.debugLogging) {
     return;
   }
   if (development) {
diff --git a/ts/util/privacy.ts b/ts/util/privacy.ts
index 2ab8a5e36..203e08498 100644
--- a/ts/util/privacy.ts
+++ b/ts/util/privacy.ts
@@ -1,8 +1,8 @@
 /* eslint-env node */
 
 // tslint:disable-next-line: no-submodule-imports
+import { escapeRegExp, isEmpty, isRegExp, isString } from 'lodash';
 import { compose } from 'lodash/fp';
-import { escapeRegExp, isNil, isRegExp, isString } from 'lodash';
 import { getAppRootPath } from '../node/getRootPath';
 
 const APP_ROOT_PATH = getAppRootPath();
@@ -99,9 +99,9 @@ const removeNewlines = (text: string) => text.replace(/\r?\n|\r/g, '');
 const redactSensitivePaths = redactPath(APP_ROOT_PATH);
 
 function shouldNotRedactLogs() {
-  // if the env variable `SESSION_NO_REDACT` is set, trust it as a boolean
-  if (!isNil(process.env.SESSION_NO_REDACT)) {
-    return process.env.SESSION_NO_REDACT;
+  // if featureFlag is set to true, trust it
+  if (!isEmpty(process.env.SESSION_DEBUG_DISABLE_REDACTED)) {
+    return true;
   }
   // otherwise we don't want to redact logs when running on the devprod env
   return (process.env.NODE_APP_INSTANCE || '').startsWith('devprod');
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 586a787ed..2d467ccc3 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -38,11 +38,12 @@ declare global {
       useTestNet: boolean;
       useClosedGroupV3: boolean;
       debug: {
+        debugLogging: boolean;
+        debugLibsessionDumps: boolean;
         debugFileServerRequests: boolean;
         debugNonSnodeRequests: boolean;
         debugOnionRequests: boolean;
       };
-      useDebugLogging: boolean;
     };
     SessionSnodeAPI: SessionSnodeAPI;
     onLogin: (pw: string) => Promise<void>;
diff --git a/yarn.lock b/yarn.lock
index 8c4660270..09062071d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz":
-  version "0.1.15"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz#276b878bbd68261009dd1081b97e25ee6769fd62"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz":
+  version "0.1.16"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz#2a526154b7d0f4235895f3a788704a56d6573339"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From db9fa1421374a67d30fb5e57d8a470139529e6e6 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 2 Jun 2023 09:14:50 +1000
Subject: [PATCH 126/178] fix: don't update state on updates already included
 in our syncmessage

---
 ts/data/settings-key.ts                       |   8 +
 ts/receiver/closedGroups.ts                   | 146 +++++++++++++-----
 ts/receiver/configMessage.ts                  |  65 +++++++-
 ts/receiver/contentMessage.ts                 |  49 +++++-
 ts/receiver/dataMessage.ts                    |  36 ++---
 ts/session/apis/snode_api/SNodeAPI.ts         |  21 ++-
 .../apis/snode_api/SnodeRequestTypes.ts       |   1 +
 ts/session/apis/snode_api/namespaces.ts       |   5 +-
 ts/session/apis/snode_api/snodeSignatures.ts  |   8 +-
 ts/session/group/closed-group.ts              |   4 +-
 ts/session/utils/User.ts                      |   1 +
 .../job_runners/jobs/ConfigurationSyncJob.ts  |   6 +
 .../libsession/libsession_utils_contacts.ts   |   1 -
 .../unit/receiving/ClosedGroupUpdates_test.ts |  41 -----
 ts/types/Enums.ts                             |   3 +
 15 files changed, 275 insertions(+), 120 deletions(-)
 delete mode 100644 ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
 create mode 100644 ts/types/Enums.ts

diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts
index 67f2291d1..6fd295133 100644
--- a/ts/data/settings-key.ts
+++ b/ts/data/settings-key.ts
@@ -14,6 +14,11 @@ const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationItem';
 const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
 const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
 
+// user config tracking timestamps (to discard incoming messages which would make a change we reverted in the last config message we merged)
+const latestUserProfileEnvelopeTimestamp = 'latestUserProfileEnvelopeTimestamp';
+const latestUserGroupEnvelopeTimestamp = 'latestUserGroupEnvelopeTimestamp';
+const latestUserContactsEnvelopeTimestamp = 'latestUserContactsEnvelopeTimestamp';
+
 export const SettingsKey = {
   settingsReadReceipt,
   settingsTypingIndicator,
@@ -29,6 +34,9 @@ export const SettingsKey = {
   hasSyncedInitialConfigurationItem,
   lastAvatarUploadTimestamp,
   hasLinkPreviewPopupBeenDisplayed,
+  latestUserProfileEnvelopeTimestamp,
+  latestUserGroupEnvelopeTimestamp,
+  latestUserContactsEnvelopeTimestamp,
 } as const;
 
 export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 9b99a76b3..1e7f0ed73 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -1,25 +1,29 @@
+import { Data } from '../../ts/data/data';
 import { SignalService } from '../protobuf';
-import { removeFromCache } from './cache';
-import { EnvelopePlus } from './types';
-import { PubKey } from '../session/types';
-import { toHex } from '../session/utils/String';
+import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
 import * as ClosedGroup from '../session/group/closed-group';
+import { PubKey } from '../session/types';
+import { toHex } from '../session/utils/String';
 import { BlockedNumberController } from '../util';
-import { getMessageQueue } from '../session';
+import { removeFromCache } from './cache';
 import { decryptWithSessionProtocol } from './contentMessage';
-import { Data } from '../../ts/data/data';
+import { EnvelopePlus } from './types';
 
-import { ECKeyPair, HexKeyPair } from './keypairs';
-import { UserUtils } from '../session/utils';
+import _, { isNumber, toNumber } from 'lodash';
 import { ConversationModel } from '../models/conversation';
-import _ from 'lodash';
-import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
-import { queueAllCachedFromSource } from './receiver';
-import { getSwarmPollingInstance } from '../session/apis/snode_api';
-import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { getSwarmPollingInstance } from '../session/apis/snode_api';
 import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
+import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
+import { UserUtils } from '../session/utils';
+import { perfEnd, perfStart } from '../session/utils/Performance';
+import { ReleasedFeatures } from '../util/releaseFeature';
+import { Storage } from '../util/storage';
+import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
+import { getSettingsKeyFromLibsessionWrapper } from './configMessage';
+import { ECKeyPair, HexKeyPair } from './keypairs';
+import { queueAllCachedFromSource } from './receiver';
 
 export const distributingClosedGroupEncryptionKeyPairs = new Map<string, ECKeyPair>();
 
@@ -113,7 +117,7 @@ export async function handleClosedGroupControlMessage(
       );
       return;
     }
-    await handleNewClosedGroup(envelope, groupUpdate);
+    await handleNewClosedGroup(envelope, groupUpdate, false);
     return;
   }
 
@@ -199,9 +203,48 @@ function sanityCheckNewGroup(
   return true;
 }
 
+/**
+ * If we merged a more recent wrapper, we must not apply the changes from some incoming messages as it would override a change already set in the wrapper.
+ *
+ * This is mostly to take care of the link a device logic, where we apply the changes from a wrapper, and then start polling from our swarm namespace 0.
+ * Some messages on our swarm might unhide a contact which was marked hidden after that message was already received on another device. Same for groups left/joined etc.
+ *
+ * @returns true if the user config release is live AND the latest processed corresponding wrapper is supposed to have already included the changes this message did.
+ * So if that message should not make any changes to the ata tracked in the wrappers (just add messages if needed, but don't set members, unhide contact etc).
+ */
+export async function sentAtMoreRecentThanWrapper(
+  envelopeSentAtMs: number,
+  variant: ConfigWrapperObjectTypes
+): Promise<'unknown' | 'wrapper_more_recent' | 'envelope_more_recent'> {
+  const userConfigReleased = await ReleasedFeatures.checkIsUserConfigFeatureReleased();
+  if (!userConfigReleased) {
+    return 'unknown';
+  }
+
+  const settingsKey = getSettingsKeyFromLibsessionWrapper(variant);
+  if (!settingsKey) {
+    return 'unknown';
+  }
+  const latestProcessedEnvelope = Storage.get(settingsKey);
+  if (!isNumber(latestProcessedEnvelope) || !latestProcessedEnvelope) {
+    // We want to process the message if we do not have valid data in the db.
+    // Also, we DO want to process a message if we DO NOT have a latest processed timestamp for that wrapper yet
+    return 'envelope_more_recent';
+  }
+
+  // this must return true if the message we are considering should have already been handled based on our `latestProcessedEnvelope`.
+  // so if that message was sent before `latestProcessedEnvelope - 2 mins`, we must return true;
+  const latestProcessedEnvelopeLess2Mins = latestProcessedEnvelope - 2 * 60 * 1000;
+
+  return envelopeSentAtMs > latestProcessedEnvelopeLess2Mins
+    ? 'envelope_more_recent'
+    : 'wrapper_more_recent';
+}
+
 export async function handleNewClosedGroup(
   envelope: EnvelopePlus,
-  groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage
+  groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage,
+  fromLegacyConfig: boolean
 ) {
   if (groupUpdate.type !== SignalService.DataMessage.ClosedGroupControlMessage.Type.NEW) {
     return;
@@ -229,10 +272,21 @@ export async function handleNewClosedGroup(
   const groupId = toHex(publicKey);
   const members = membersAsData.map(toHex);
   const admins = adminsAsData.map(toHex);
-  const envelopeTimestamp = _.toNumber(envelope.timestamp);
+  const envelopeTimestamp = toNumber(envelope.timestamp);
   // a type new is sent and received on one to one so do not use envelope.senderIdentity here
   const sender = envelope.source;
 
+  if (
+    !fromLegacyConfig &&
+    (await sentAtMoreRecentThanWrapper(envelopeTimestamp, 'UserGroupsConfig')) ===
+      'wrapper_more_recent'
+  ) {
+    // not from legacy config, so this is a new closed group deposited on our swarm by a user.
+    // we do not want to process it if our wrapper is more recent that that invite to group envelope.
+    window.log.info('dropping invite to legacy group because our wrapper is more recent');
+    return removeFromCache(envelope);
+  }
+
   if (!members.includes(ourNumber.key)) {
     window?.log?.info(
       'Got a new group message but apparently we are not a member of it. Dropping it.'
@@ -276,7 +330,7 @@ export async function handleNewClosedGroup(
     groupConvo.set({
       left: false,
       isKickedFromGroup: false,
-      lastJoinedTimestamp: _.toNumber(envelope.timestamp),
+      lastJoinedTimestamp: toNumber(envelope.timestamp),
       // we just got readded. Consider the zombie list to have been cleared
 
       zombies: [],
@@ -493,7 +547,7 @@ async function performIfValid(
     lastJoinedTimestamp = aYearAgo;
   }
 
-  const envelopeTimestamp = _.toNumber(envelope.timestamp);
+  const envelopeTimestamp = toNumber(envelope.timestamp);
   if (envelopeTimestamp <= lastJoinedTimestamp) {
     window?.log?.warn(
       'Got a group update with an older timestamp than when we joined this group last time. Dropping it.'
@@ -513,26 +567,28 @@ async function performIfValid(
   // make sure the conversation with this user exist (even if it's just hidden)
   await getConversationController().getOrCreateAndWait(sender, ConversationTypeEnum.PRIVATE);
 
+  const moreRecentOrNah = await sentAtMoreRecentThanWrapper(envelopeTimestamp, 'UserGroupsConfig');
+  const shouldNotApplyGroupChange = moreRecentOrNah === 'wrapper_more_recent';
+
   if (groupUpdate.type === Type.NAME_CHANGE) {
-    await handleClosedGroupNameChanged(envelope, groupUpdate, convo);
+    await handleClosedGroupNameChanged(envelope, groupUpdate, convo, shouldNotApplyGroupChange);
   } else if (groupUpdate.type === Type.MEMBERS_ADDED) {
-    await handleClosedGroupMembersAdded(envelope, groupUpdate, convo);
+    await handleClosedGroupMembersAdded(envelope, groupUpdate, convo, shouldNotApplyGroupChange);
   } else if (groupUpdate.type === Type.MEMBERS_REMOVED) {
-    await handleClosedGroupMembersRemoved(envelope, groupUpdate, convo);
+    await handleClosedGroupMembersRemoved(envelope, groupUpdate, convo, shouldNotApplyGroupChange);
   } else if (groupUpdate.type === Type.MEMBER_LEFT) {
-    await handleClosedGroupMemberLeft(envelope, convo);
+    await handleClosedGroupMemberLeft(envelope, convo, shouldNotApplyGroupChange);
   } else if (groupUpdate.type === Type.ENCRYPTION_KEY_PAIR_REQUEST) {
     await removeFromCache(envelope);
   }
   // if you add a case here, remember to add it where performIfValid is called too.
-
-  return true;
 }
 
 async function handleClosedGroupNameChanged(
   envelope: EnvelopePlus,
   groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage,
-  convo: ConversationModel
+  convo: ConversationModel,
+  shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation
 ) {
   // Only add update message if we have something to show
   const newName = groupUpdate.name;
@@ -546,9 +602,11 @@ async function handleClosedGroupNameChanged(
       convo,
       groupDiff,
       envelope.senderIdentity,
-      _.toNumber(envelope.timestamp)
+      toNumber(envelope.timestamp)
     );
-    convo.set({ displayNameInProfile: newName });
+    if (!shouldOnlyAddUpdateMessage) {
+      convo.set({ displayNameInProfile: newName });
+    }
     convo.updateLastMessage();
     await convo.commit();
   }
@@ -559,7 +617,8 @@ async function handleClosedGroupNameChanged(
 async function handleClosedGroupMembersAdded(
   envelope: EnvelopePlus,
   groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage,
-  convo: ConversationModel
+  convo: ConversationModel,
+  shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation
 ) {
   const { members: addedMembersBinary } = groupUpdate;
   const addedMembers = (addedMembersBinary || []).map(toHex);
@@ -602,10 +661,12 @@ async function handleClosedGroupMembersAdded(
     convo,
     groupDiff,
     envelope.senderIdentity,
-    _.toNumber(envelope.timestamp)
+    toNumber(envelope.timestamp)
   );
 
-  convo.set({ members });
+  if (!shouldOnlyAddUpdateMessage) {
+    convo.set({ members });
+  }
 
   convo.updateLastMessage();
   await convo.commit();
@@ -625,7 +686,8 @@ async function areWeAdmin(groupConvo: ConversationModel) {
 async function handleClosedGroupMembersRemoved(
   envelope: EnvelopePlus,
   groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage,
-  convo: ConversationModel
+  convo: ConversationModel,
+  shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation
 ) {
   // Check that the admin wasn't removed
   const currentMembers = convo.get('members');
@@ -681,7 +743,7 @@ async function handleClosedGroupMembersRemoved(
         convo,
         groupDiff,
         envelope.senderIdentity,
-        _.toNumber(envelope.timestamp)
+        toNumber(envelope.timestamp)
       );
       convo.updateLastMessage();
     }
@@ -689,9 +751,10 @@ async function handleClosedGroupMembersRemoved(
     // Update the group
     const zombies = convo.get('zombies').filter(z => membersAfterUpdate.includes(z));
 
-    convo.set({ members: membersAfterUpdate });
-    convo.set({ zombies });
-
+    if (!shouldOnlyAddUpdateMessage) {
+      convo.set({ members: membersAfterUpdate });
+      convo.set({ zombies });
+    }
     await convo.commit();
   }
   await removeFromCache(envelope);
@@ -761,7 +824,11 @@ async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopeP
   await removeFromCache(envelope);
 }
 
-async function handleClosedGroupMemberLeft(envelope: EnvelopePlus, convo: ConversationModel) {
+async function handleClosedGroupMemberLeft(
+  envelope: EnvelopePlus,
+  convo: ConversationModel,
+  shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation
+) {
   const sender = envelope.senderIdentity;
   const groupPublicKey = envelope.source;
   const didAdminLeave = convo.get('groupAdmins')?.includes(sender) || false;
@@ -778,7 +845,6 @@ async function handleClosedGroupMemberLeft(envelope: EnvelopePlus, convo: Conver
   const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
 
   // if the admin leaves, the group is disabled for everyone
-
   if (didAdminLeave) {
     await handleClosedGroupAdminMemberLeft(groupPublicKey, envelope);
     return;
@@ -801,14 +867,16 @@ async function handleClosedGroupMemberLeft(envelope: EnvelopePlus, convo: Conver
     convo,
     groupDiff,
     envelope.senderIdentity,
-    _.toNumber(envelope.timestamp)
+    toNumber(envelope.timestamp)
   );
   convo.updateLastMessage();
   // if a user just left and we are the admin, we remove him right away for everyone by sending a MEMBERS_REMOVED message so no need to add him as a zombie
   if (oldMembers.includes(sender)) {
     addMemberToZombies(envelope, PubKey.cast(sender), convo);
   }
-  convo.set('members', newMembers);
+  if (!shouldOnlyAddUpdateMessage) {
+    convo.set('members', newMembers);
+  }
 
   await convo.commit();
 
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index b4f2ee228..0d814306a 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -146,6 +146,50 @@ async function mergeConfigsWithIncomingUpdates(
   }
 }
 
+export function getSettingsKeyFromLibsessionWrapper(
+  wrapperType: ConfigWrapperObjectTypes
+): string | null {
+  switch (wrapperType) {
+    case 'UserConfig':
+      return SettingsKey.latestUserProfileEnvelopeTimestamp;
+    case 'ContactsConfig':
+      return SettingsKey.latestUserContactsEnvelopeTimestamp;
+    case 'UserGroupsConfig':
+      return SettingsKey.latestUserGroupEnvelopeTimestamp;
+    case 'ConvoInfoVolatileConfig':
+      return null; // we don't really care about the convo info volatile one
+    default:
+      try {
+        assertUnreachable(
+          wrapperType,
+          `getSettingsKeyFromLibsessionWrapper unknown type: ${wrapperType}`
+        );
+      } catch (e) {
+        window.log.warn('assertUnreachable:', e.message);
+      }
+      return null;
+  }
+}
+
+async function updateLibsessionLatestProcessedUserTimestamp(
+  wrapperType: ConfigWrapperObjectTypes,
+  latestEnvelopeTimestamp: number
+) {
+  const settingsKey = getSettingsKeyFromLibsessionWrapper(wrapperType);
+  if (!settingsKey) {
+    return;
+  }
+  const currentLatestEnvelopeProcessed = Storage.get(settingsKey) || 0;
+
+  const newLatestProcessed = Math.max(
+    latestEnvelopeTimestamp,
+    isNumber(currentLatestEnvelopeProcessed) ? currentLatestEnvelopeProcessed : 0
+  );
+  if (newLatestProcessed !== currentLatestEnvelopeProcessed || currentLatestEnvelopeProcessed) {
+    await Storage.put(settingsKey, newLatestProcessed);
+  }
+}
+
 async function handleUserProfileUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   const updateUserInfo = await UserConfigWrapperActions.getUserInfo();
   if (!updateUserInfo) {
@@ -161,6 +205,17 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
     updateUserInfo.priority
   );
 
+  const settingsKey = SettingsKey.latestUserProfileEnvelopeTimestamp;
+  const currentLatestEnvelopeProcessed = Storage.get(settingsKey) || 0;
+
+  const newLatestProcessed = Math.max(
+    result.latestEnvelopeTimestamp,
+    isNumber(currentLatestEnvelopeProcessed) ? currentLatestEnvelopeProcessed : 0
+  );
+  if (newLatestProcessed !== currentLatestEnvelopeProcessed) {
+    await Storage.put(settingsKey, newLatestProcessed);
+  }
+
   return result;
 }
 
@@ -715,6 +770,14 @@ async function processMergingResults(results: Map<ConfigWrapperObjectTypes, Inco
           }
       }
       const variant = LibSessionUtil.kindToVariant(kind);
+      try {
+        await updateLibsessionLatestProcessedUserTimestamp(
+          variant,
+          incomingResult.latestEnvelopeTimestamp
+        );
+      } catch (e) {
+        window.log.error(`updateLibsessionLatestProcessedUserTimestamp failed with "${e.message}"`);
+      }
 
       if (incomingResult.needsDump) {
         // The config data had changes so regenerate the dump and save it
@@ -917,7 +980,7 @@ const handleClosedGroupsFromConfigLegacy = async (
         publicKey: c.publicKey,
       });
       try {
-        await handleNewClosedGroup(envelope, groupUpdate);
+        await handleNewClosedGroup(envelope, groupUpdate, true);
       } catch (e) {
         window?.log?.warn('failed to handle a new closed group from configuration message');
       }
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 3b8bd6dd7..090997623 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -12,7 +12,11 @@ import {
   deleteMessagesFromSwarmAndCompletelyLocally,
   deleteMessagesFromSwarmAndMarkAsDeletedLocally,
 } from '../interactions/conversations/unsendingInteractions';
-import { ConversationTypeEnum, READ_MESSAGE_STATE } from '../models/conversationAttributes';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationTypeEnum,
+  READ_MESSAGE_STATE,
+} from '../models/conversationAttributes';
 import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getConversationController } from '../session/conversations';
 import { concatUInt8Array, getSodiumRenderer } from '../session/crypto';
@@ -26,9 +30,10 @@ import { BlockedNumberController } from '../util';
 import { ReadReceipts } from '../util/readReceipts';
 import { Storage } from '../util/storage';
 import { handleCallMessage } from './callMessage';
-import { getAllCachedECKeyPair } from './closedGroups';
+import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups';
 import { ConfigMessageHandler } from './configMessage';
 import { ECKeyPair } from './keypairs';
+import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
@@ -287,6 +292,38 @@ async function decrypt(envelope: EnvelopePlus): Promise<any> {
   }
 }
 
+async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelope: EnvelopePlus) {
+  // sentAtMoreRecentThanWrapper is going to be true, if the latest contact wrapper we processed was roughly more recent that this message timestamp
+  const moreRecentOrNah = await sentAtMoreRecentThanWrapper(sentAtTimestamp, 'ContactsConfig');
+
+  if (moreRecentOrNah === 'wrapper_more_recent') {
+    // we need to check if that conversation is already in the wrapper, and if yes
+    try {
+      const privateConvoInWrapper = await ContactsWrapperActions.get(envelope.source);
+      if (
+        !privateConvoInWrapper ||
+        privateConvoInWrapper.priority <= CONVERSATION_PRIORITIES.hidden
+      ) {
+        // the wrapper is more recent that this message and there is no such private conversation. Just drop this incoming message.
+        window.log.info(
+          `received message from contact ${envelope.source} which appears to be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. Dropping it`
+        );
+        return true;
+      } else {
+        window.log.info(
+          `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
+        );
+      }
+    } catch (e) {
+      window.log.warn(
+        'ContactsWrapperActions.get in handleSwarmDataMessage failed with',
+        e.message
+      );
+    }
+  }
+  return false;
+}
+
 function shouldDropBlockedUserMessage(
   content: SignalService.Content,
   groupPubkey: string
@@ -373,6 +410,12 @@ export async function innerHandleSwarmContentMessage(
     // if this is a closed group message, envelope.senderIdentity is the sender's pubkey and envelope.source is the closed group's pubkey
     const isPrivateConversationMessage = !envelope.senderIdentity;
 
+    if (isPrivateConversationMessage) {
+      if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope)) {
+        return removeFromCache(envelope);
+      }
+    }
+
     /**
      * For a closed group message, this holds the conversation with that specific user outside of the closed group.
      * For a private conversation message, this is just the conversation with that user
@@ -396,7 +439,7 @@ export async function innerHandleSwarmContentMessage(
 
     if (content.dataMessage) {
       // because typescript is funky with incoming protobufs
-      if (content.dataMessage.profileKey && content.dataMessage.profileKey.length === 0) {
+      if (isEmpty(content.dataMessage.profileKey)) {
         content.dataMessage.profileKey = null;
       }
       perfStart(`handleSwarmDataMessage-${envelope.id}`);
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index ad28ae03d..9f7d1e7ea 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -1,28 +1,28 @@
 import { SignalService } from './../protobuf';
 import { removeFromCache } from './cache';
-import { EnvelopePlus } from './types';
 import { getEnvelopeId } from './common';
+import { EnvelopePlus } from './types';
 
-import { PubKey } from '../session/types';
-import { handleMessageJob, toRegularMessage } from './queuedJob';
 import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash';
-import { StringUtils, UserUtils } from '../session/utils';
-import { getConversationController } from '../session/conversations';
-import { handleClosedGroupControlMessage } from './closedGroups';
 import { Data } from '../../ts/data/data';
 import { ConversationModel } from '../models/conversation';
+import { getConversationController } from '../session/conversations';
+import { PubKey } from '../session/types';
+import { StringUtils, UserUtils } from '../session/utils';
+import { handleClosedGroupControlMessage } from './closedGroups';
+import { handleMessageJob, toRegularMessage } from './queuedJob';
 
+import { ConversationTypeEnum } from '../models/conversationAttributes';
+import { MessageModel } from '../models/message';
 import {
   createSwarmMessageSentFromNotUs,
   createSwarmMessageSentFromUs,
 } from '../models/messageFactory';
-import { MessageModel } from '../models/message';
-import { isUsFromCache } from '../session/utils/User';
-import { toLogFormat } from '../types/attachments/Errors';
-import { ConversationTypeEnum } from '../models/conversationAttributes';
-import { Reactions } from '../util/reactions';
-import { Action, Reaction } from '../types/Reaction';
 import { ProfileManager } from '../session/profile_manager/ProfileManager';
+import { isUsFromCache } from '../session/utils/User';
+import { Action, Reaction } from '../types/Reaction';
+import { toLogFormat } from '../types/attachments/Errors';
+import { Reactions } from '../util/reactions';
 
 function cleanAttachment(attachment: any) {
   return {
@@ -185,8 +185,6 @@ export async function handleSwarmDataMessage(
   if (isSyncedMessage && !isMe) {
     window?.log?.warn('Got a sync message from someone else than me. Dropping it.');
     return removeFromCache(envelope);
-  } else if (isSyncedMessage) {
-    // we should create the synTarget convo but I have no idea how to know if this is a private or closed group convo?
   }
   const convoIdToAddTheMessageTo = PubKey.removeTextSecurePrefixIfNeeded(
     isSyncedMessage ? cleanDataMessage.syncTarget : envelope.source
@@ -201,16 +199,16 @@ export async function handleSwarmDataMessage(
     typeOfConvo = ConversationTypeEnum.GROUP;
   }
 
+  window?.log?.info(
+    `Handle dataMessage about convo ${convoIdToAddTheMessageTo} from user: ${convoIdOfSender}`
+  );
+
+  // remove the prefix from the source object so this is correct for all other
   const convoToAddMessageTo = await getConversationController().getOrCreateAndWait(
     convoIdToAddTheMessageTo,
     typeOfConvo
   );
 
-  window?.log?.info(
-    `Handle dataMessage about convo ${convoIdToAddTheMessageTo} from user: ${convoIdOfSender}`
-  );
-  // remove the prefix from the source object so this is correct for all other
-
   // Check if we need to update any profile names
   if (
     !isMe &&
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index aed7acc4a..19b2773c9 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -25,6 +25,7 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
     return null;
   }
   const method = 'delete_all' as const;
+  const namespace = 'all' as const;
 
   try {
     const maliciousSnodes = await pRetry(
@@ -41,12 +42,12 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
           async () => {
             const signOpts = await SnodeSignature.getSnodeSignatureParams({
               method,
-              namespace: null,
+              namespace,
               pubkey: userX25519PublicKey,
             });
 
             const ret = await doSnodeBatchRequest(
-              [{ method, params: signOpts }],
+              [{ method, params: { ...signOpts, namespace } }],
               snodeToMakeRequestTo,
               10000,
               userX25519PublicKey
@@ -112,12 +113,18 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                     return snodePubkey;
                   }
 
-                  const hashes = snodeJson.deleted as Array<string>;
+                  const deletedObj = snodeJson.deleted as Record<number, Array<string>>;
+                  const hashes: Array<string> = [];
+                  for (const key in deletedObj) {
+                    hashes.push(...deletedObj[key]);
+                  }
+                  const sortedHashes = hashes.sort();
                   const signatureSnode = snodeJson.signature as string;
-                  // The signature format is ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
-                  const dataToVerify = `${userX25519PublicKey}${signOpts.timestamp}${hashes.join(
-                    ''
-                  )}`;
+                  // The signature format is (with sortedHashes) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
+                  const dataToVerify = `${userX25519PublicKey}${
+                    signOpts.timestamp
+                  }${sortedHashes.join('')}`;
+
                   const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8');
                   const isValid = sodium.crypto_sign_verify_detached(
                     fromBase64ToArray(signatureSnode),
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 69a539a84..693fded70 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -101,6 +101,7 @@ export type StoreOnNodeParamsNoSig = Pick<
 
 export type DeleteFromNodeWithTimestampParams = {
   timestamp: string | number;
+  namespace: number | null | 'all';
 } & DeleteSigParameters;
 export type DeleteByHashesFromNodeParams = { messages: Array<string> } & DeleteSigParameters;
 
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 23d60450c..1adb6d5e2 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -1,5 +1,6 @@
 import { last, orderBy } from 'lodash';
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
+import { PickEnum } from '../../../types/Enums';
 
 export enum SnodeNamespaces {
   /**
@@ -36,10 +37,6 @@ export enum SnodeNamespaces {
   // ClosedGroupInfo = 1,
 }
 
-type PickEnum<T, K extends T> = {
-  [P in keyof K]: P extends K ? P : never;
-};
-
 export type SnodeNamespacesGroup = PickEnum<
   SnodeNamespaces,
   SnodeNamespaces.ClosedGroupMessage // | SnodeNamespaces.ClosedGroupInfo
diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts
index dfee91598..0789180d7 100644
--- a/ts/session/apis/snode_api/snodeSignatures.ts
+++ b/ts/session/apis/snode_api/snodeSignatures.ts
@@ -54,7 +54,7 @@ async function getSnodeSignatureByHashesParams({
 
 async function getSnodeSignatureParams(params: {
   pubkey: string;
-  namespace: number | null;
+  namespace: number | null | 'all'; // 'all' can be used to clear all namespaces (during account deletion)
   method: 'retrieve' | 'store' | 'delete_all';
 }): Promise<SnodeSignatureResult> {
   const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
@@ -69,10 +69,12 @@ async function getSnodeSignatureParams(params: {
 
   const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset();
 
+  const withoutNamespace = `${params.method}${signatureTimestamp}`;
+  const withNamespace = `${params.method}${namespace}${signatureTimestamp}`;
   const verificationData =
     namespace === 0
-      ? StringUtils.encode(`${params.method}${signatureTimestamp}`, 'utf8')
-      : StringUtils.encode(`${params.method}${namespace}${signatureTimestamp}`, 'utf8');
+      ? StringUtils.encode(withoutNamespace, 'utf8')
+      : StringUtils.encode(withNamespace, 'utf8');
 
   const message = new Uint8Array(verificationData);
 
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 5c1c07722..230fc2b68 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -393,8 +393,8 @@ async function generateAndSendNewEncryptionKeyPair(
     return;
   }
 
-  const ourNumber = UserUtils.getOurPubKeyFromCache();
-  if (!groupConvo.get('groupAdmins')?.includes(ourNumber.key)) {
+  const ourNumber = UserUtils.getOurPubKeyStrFromCache();
+  if (!groupConvo.get('groupAdmins')?.includes(ourNumber)) {
     window?.log?.warn('generateAndSendNewEncryptionKeyPair: cannot send it as a non admin');
     return;
   }
diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts
index de2d41b6f..2d6540083 100644
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@@ -20,6 +20,7 @@ export type ByteKeyPair = {
 
 /**
  * Check if this pubkey is us, using the cache.
+ * This does not check for us blinded. To check for us or us blinded, use isUsAnySogsFromCache()
  * Throws an error if our pubkey is not set
  */
 export function isUsFromCache(pubKey: string | PubKey | undefined): boolean {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 587169481..f50135a14 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -18,6 +18,7 @@ import {
 } from '../PersistedJob';
 import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { allowOnlyOneAtATime } from '../../Promise';
+import { isSignInByLinking } from '../../../../util/storage';
 
 const defaultMsBetweenRetries = 30000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s)
 const defaultMaxAttempts = 2;
@@ -284,6 +285,11 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
+  if (isSignInByLinking()) {
+    window.log.info('NOT Scheduling ConfSyncJob: as we are linking a device');
+
+    return;
+  }
   if (
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index a7323414b..5dd749564 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -71,7 +71,6 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     priority,
     expirationTimerSeconds,
   });
-
   try {
     window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));
     await ContactsWrapperActions.set(wrapperContact);
diff --git a/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts b/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
deleted file mode 100644
index 26140e9d4..000000000
--- a/ts/test/session/unit/receiving/ClosedGroupUpdates_test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
-import chai from 'chai';
-import { describe } from 'mocha';
-
-import chaiAsPromised from 'chai-as-promised';
-chai.use(chaiAsPromised as any);
-
-// tslint:disable-next-line: max-func-body-length
-describe('ClosedGroupUpdates', () => {
-  // const ourDevice = TestUtils.generateFakePubKey();
-  // const ourNumber = ourDevice.key;
-  // const groupId = TestUtils.generateFakePubKey().key;
-  // const members = TestUtils.generateFakePubKeys(10);
-  // const sender = members[3].key;
-  // const getConvo = sandbox.stub(ConversationController, 'get');
-  // beforeEach(async () => {
-  //   // Utils Stubs
-  //   sandbox.stub(UserUtils, 'getCurrentDevicePubKey').resolves(ourNumber);
-  // });
-  // afterEach(() => {
-  //   sandbox.restore();
-  // });
-  // describe('handleClosedGroupControlMessage', () => {
-  //   describe('performIfValid', () => {
-  //     it('does not perform if convo does not exist', async () => {
-  //       const envelope = generateEnvelopePlusClosedGroup(groupId, sender);
-  //       const groupUpdate = generateGroupUpdateNameChange(groupId);
-  //       getConvo.returns(undefined as any);
-  //       await handleClosedGroupControlMessage(envelope, groupUpdate);
-  //     });
-  //   });
-  //   // describe('handleClosedGroupNameChanged', () => {
-  //   //     it('does not trigger an update of the group if the name is the same', async () => {
-  //   //         const envelope = generateEnvelopePlusClosedGroup(groupId, sender);
-  //   //         const groupUpdate = generateGroupUpdateNameChange(groupId);
-  //   //         await handleClosedGroupControlMessage(envelope, groupUpdate);
-  //   //     });
-  //   // });
-  // });
-});
diff --git a/ts/types/Enums.ts b/ts/types/Enums.ts
new file mode 100644
index 000000000..233af200c
--- /dev/null
+++ b/ts/types/Enums.ts
@@ -0,0 +1,3 @@
+export type PickEnum<T, K extends T> = {
+  [P in keyof K]: P extends K ? P : never;
+};

From 5a5f069cca6f2027a3b90048bd4d648ea9994807 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 2 Jun 2023 14:48:55 +1000
Subject: [PATCH 127/178] fix: add tracking of expiration timer for nts through
 libsession

---
 .github/workflows/build-binaries.yml             |  2 +-
 package.json                                     |  2 +-
 ts/node/migration/sessionMigrations.ts           | 14 ++++++++++----
 ts/receiver/configMessage.ts                     |  6 +++---
 ts/session/apis/snode_api/SNodeAPI.ts            |  8 ++++++--
 ts/session/apis/snode_api/swarmPolling.ts        |  7 +++++++
 .../libsession/libsession_utils_user_profile.ts  | 16 +++++++++++-----
 .../browser/libsession_worker_interface.ts       | 14 ++++++++++----
 yarn.lock                                        |  6 +++---
 9 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index daf07e1ff..844b31730 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Setup node for windows
         if: runner.os == 'Windows'
         run: |
-          npm install --global node-gyp@latest
+          npm install --global yarn node-gyp@latest
           npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
diff --git a/package.json b/package.json
index 9f166bea7..fb49c0701 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.21",
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index be682b929..24cbc14ce 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1625,11 +1625,17 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
       const ourConvoPriority = ourConversation.priority;
+      const ourConvoExpire = ourConversation.expireTimer || 0;
       if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
-        userProfileWrapper.setUserInfo(ourDbName, ourConvoPriority, {
-          url: ourDbProfileUrl,
-          key: ourDbProfileKey,
-        });
+        userProfileWrapper.setUserInfo(
+          ourDbName,
+          ourConvoPriority,
+          {
+            url: ourDbProfileUrl,
+            key: ourDbProfileKey,
+          },
+          ourConvoExpire
+        );
       }
 
       insertContactIntoContactWrapper(
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 0d814306a..8c51c87e8 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -103,10 +103,10 @@ async function mergeConfigsWithIncomingUpdates(
           StringUtils.toHex(await GenericWrapperActions.dump(variant))
         );
 
-        for (let index = 0; index < toMerge.length; index++) {
-          const element = toMerge[index];
+        for (let dumpIndex = 0; dumpIndex < toMerge.length; dumpIndex++) {
+          const element = toMerge[dumpIndex];
           window.log.info(
-            `printDumpsForDebugging: toMerge of ${index}:${element.hash}:  ${StringUtils.toHex(
+            `printDumpsForDebugging: toMerge of ${dumpIndex}:${element.hash}:  ${StringUtils.toHex(
               element.data
             )} `,
             StringUtils.toHex(await GenericWrapperActions.dump(variant))
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index 19b2773c9..c666dd56f 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -115,12 +115,16 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
 
                   const deletedObj = snodeJson.deleted as Record<number, Array<string>>;
                   const hashes: Array<string> = [];
+
+                  // tslint:disable: no-for-in
                   for (const key in deletedObj) {
-                    hashes.push(...deletedObj[key]);
+                    if (deletedObj.hasOwnProperty(key)) {
+                      hashes.push(...deletedObj[key]);
+                    }
                   }
                   const sortedHashes = hashes.sort();
                   const signatureSnode = snodeJson.signature as string;
-                  // The signature format is (with sortedHashes) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
+                  // The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
                   const dataToVerify = `${userX25519PublicKey}${
                     signOpts.timestamp
                   }${sortedHashes.join('')}`;
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index 6797d7178..d2a3ac945 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -64,6 +64,7 @@ export const getSwarmPollingInstance = () => {
 export class SwarmPolling {
   private groupPolling: Array<{ pubkey: PubKey; lastPolledTimestamp: number }>;
   private readonly lastHashes: Record<string, Record<string, Record<number, string>>>;
+  private hasStarted = false;
 
   constructor() {
     this.groupPolling = [];
@@ -71,6 +72,11 @@ export class SwarmPolling {
   }
 
   public async start(waitForFirstPoll = false): Promise<void> {
+    // when restoring from seed we have to start polling before we get on the mainPage, hence this check here to make sure we do not start twice
+    if (this.hasStarted) {
+      return;
+    }
+    this.hasStarted = true;
     this.loadGroupIds();
     if (waitForFirstPoll) {
       await this.pollForAllKeys();
@@ -86,6 +92,7 @@ export class SwarmPolling {
    */
   public resetSwarmPolling() {
     this.groupPolling = [];
+    this.hasStarted = false;
   }
 
   public forcePolledTimestamp(pubkey: PubKey, lastPoll: number) {
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 8a7cfefc5..8faafc275 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -26,13 +26,19 @@ async function insertUserProfileIntoWrapper(convoId: string) {
       { url: dbProfileUrl, key: dbProfileKey }
     )} `
   );
+  const expirySeconds = ourConvo.get('expireTimer') || 0;
   if (dbProfileUrl && !isEmpty(dbProfileKey)) {
-    await UserConfigWrapperActions.setUserInfo(dbName, priority, {
-      url: dbProfileUrl,
-      key: dbProfileKey,
-    });
+    await UserConfigWrapperActions.setUserInfo(
+      dbName,
+      priority,
+      {
+        url: dbProfileUrl,
+        key: dbProfileKey,
+      },
+      expirySeconds
+    );
   } else {
-    await UserConfigWrapperActions.setUserInfo(dbName, priority, null);
+    await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds);
   }
 }
 
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 0d746ea08..0256e9bb9 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -104,11 +104,17 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   setUserInfo: async (
     name: string,
     priority: number,
-    profilePic: { url: string; key: Uint8Array } | null
+    profilePic: { url: string; key: Uint8Array } | null,
+    expireSeconds: number
   ) =>
-    callLibSessionWorker(['UserConfig', 'setUserInfo', name, priority, profilePic]) as Promise<
-      ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>
-    >,
+    callLibSessionWorker([
+      'UserConfig',
+      'setUserInfo',
+      name,
+      priority,
+      profilePic,
+      expireSeconds,
+    ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
 };
 
 export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
diff --git a/yarn.lock b/yarn.lock
index 09062071d..6501a3746 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz":
-  version "0.1.16"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.16/libsession_util_nodejs-v0.1.16.tar.gz#2a526154b7d0f4235895f3a788704a56d6573339"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz":
+  version "0.1.17"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz#e79b8900a62fcf3798a43aeef0e99d5fc52674a2"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From bb68fcb890328b55708502444e95b84e902f2768 Mon Sep 17 00:00:00 2001
From: Kee Jefferys <kee@loki.network>
Date: Wed, 7 Jun 2023 11:13:10 +1000
Subject: [PATCH 128/178] Update Session Desktop screenshot

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a37e03d5f..a8ebd1925 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages offline, and a set of nodes which allow for onion routing functionality obfuscating users IP Addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).
 <br/><br/>
-![DesktopSession](https://i.imgur.com/ZnHvYjo.jpg)
+![DesktopSession](https://i.imgur.com/ydVhH00.png)
 
 ## Want to Contribute? Found a Bug or Have a feature request?
 

From 05a8751555364517fbb4cca694183270d1f7752e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 14 Jun 2023 08:38:23 +0200
Subject: [PATCH 129/178] chore: add unstable to gh actions build and test

---
 .github/workflows/build-binaries.yml | 2 ++
 .github/workflows/pull-request.yml   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 844b31730..1c4a6a217 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -5,9 +5,11 @@ on:
   push:
     branches:
       - clearnet
+      - unstable
   pull_request:
     branches:
       - clearnet
+      - unstable
 
 jobs:
   build:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 8ad02ccd3..c6e775d8f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - clearnet
+      - unstable
 
 jobs:
   build:

From cd14180b63b4da28583bbb6983acf57befceb625 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 14 Jun 2023 08:55:55 +0200
Subject: [PATCH 130/178] chore: fix windows build

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb49c0701..83035fb03 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
     "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
     "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
-    "build:workers": "yarn concurrently 'yarn worker:utils' 'yarn worker:libsession'",
+    "build:workers": "yarn worker:utils && yarn worker:libsession",
     "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",

From d970887caa24e715a83e86e0aa8041c7c0134485 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 15 Jun 2023 10:36:54 +0200
Subject: [PATCH 131/178] fix: bring back notification submenu to both context
 menu

---
 ts/components/menu/ConversationHeaderMenu.tsx | 90 ++-----------------
 .../menu/ConversationListItemContextMenu.tsx  |  3 +
 ts/components/menu/Menu.tsx                   | 84 ++++++++++++++++-
 3 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index bbc3f409c..db95f4bec 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -1,14 +1,8 @@
 import React from 'react';
 import { animation, Item, Menu, Submenu } from 'react-contexify';
 import { useSelector } from 'react-redux';
-import {
-  setDisappearingMessagesByConvoId,
-  setNotificationForConvoId,
-} from '../../interactions/conversationInteractions';
-import {
-  ConversationNotificationSetting,
-  ConversationNotificationSettingType,
-} from '../../models/conversationAttributes';
+import { setDisappearingMessagesByConvoId } from '../../interactions/conversationInteractions';
+import { isSearching } from '../../state/selectors/search';
 import {
   useSelectedConversationKey,
   useSelectedIsActive,
@@ -18,10 +12,9 @@ import {
   useSelectedIsPrivate,
   useSelectedIsPrivateFriend,
   useSelectedIsPublic,
-  useSelectedNotificationSetting,
 } from '../../state/selectors/selectedConversation';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
-import { LocalizerKeys } from '../../types/LocalizerKeys';
+import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 import {
   AddModeratorsMenuItem,
@@ -29,21 +22,20 @@ import {
   BlockMenuItem,
   ChangeNicknameMenuItem,
   ClearNicknameMenuItem,
-  DeletePrivateContactMenuItem,
+  CopyMenuItem,
   DeleteGroupOrCommunityMenuItem,
   DeleteMessagesMenuItem,
+  DeletePrivateContactMenuItem,
+  DeletePrivateConversationMenuItem,
   InviteContactMenuItem,
   LeaveGroupMenuItem,
   MarkAllReadMenuItem,
+  NotificationForConvoMenuItem,
   RemoveModeratorsMenuItem,
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
   UpdateGroupNameMenuItem,
-  DeletePrivateConversationMenuItem,
-  CopyMenuItem,
 } from './Menu';
-import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext';
-import { isSearching } from '../../state/selectors/search';
 
 export type PropsConversationHeaderMenu = {
   triggerId: string;
@@ -145,71 +137,3 @@ const DisappearingMessageMenuItem = (): JSX.Element | null => {
     </Submenu>
   );
 };
-
-/**
- * Only accessible through the triple dots menu on the conversation header. Not on the Conversation list item, because there is too much to check for before showing it
- */
-const NotificationForConvoMenuItem = (): JSX.Element | null => {
-  const selectedConvoId = useSelectedConversationKey();
-
-  const currentNotificationSetting = useSelectedNotificationSetting();
-  const isBlocked = useSelectedIsBlocked();
-  const isActive = useSelectedIsActive();
-  const isLeft = useSelectedIsLeft();
-  const isKickedFromGroup = useSelectedIsKickedFromGroup();
-  const isFriend = useSelectedIsPrivateFriend();
-  const isPrivate = useSelectedIsPrivate();
-
-  if (
-    !selectedConvoId ||
-    isLeft ||
-    isKickedFromGroup ||
-    isBlocked ||
-    !isActive ||
-    (isPrivate && !isFriend)
-  ) {
-    return null;
-  }
-
-  // const isRtlMode = isRtlBody();'
-
-  // exclude mentions_only settings for private chats as this does not make much sense
-  const notificationForConvoOptions = ConversationNotificationSetting.filter(n =>
-    isPrivate ? n !== 'mentions_only' : true
-  ).map((n: ConversationNotificationSettingType) => {
-    // do this separately so typescript's compiler likes it
-    const keyToUse: LocalizerKeys =
-      n === 'all' || !n
-        ? 'notificationForConvo_all'
-        : n === 'disabled'
-        ? 'notificationForConvo_disabled'
-        : 'notificationForConvo_mentions_only';
-    return { value: n, name: window.i18n(keyToUse) };
-  });
-
-  return (
-    // Remove the && false to make context menu work with RTL support
-    <Submenu
-      label={window.i18n('notificationForConvo') as any}
-      // rtl={isRtlMode && false}
-    >
-      {(notificationForConvoOptions || []).map(item => {
-        const disabled = item.value === currentNotificationSetting;
-
-        return (
-          <Item
-            key={item.value}
-            onClick={async () => {
-              await setNotificationForConvoId(selectedConvoId, item.value);
-            }}
-            disabled={disabled}
-          >
-            {item.name}
-          </Item>
-        );
-      })}
-    </Submenu>
-  );
-
-  return null;
-};
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 8b407032c..13450c1a6 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -27,6 +27,7 @@ import {
   ShowUserDetailsMenuItem,
   UnbanMenuItem,
   DeletePrivateConversationMenuItem,
+  NotificationForConvoMenuItem,
 } from './Menu';
 import { isSearching } from '../../state/selectors/search';
 
@@ -51,6 +52,8 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
         <DeclineAndBlockMsgRequestMenuItem />
         {/* Generic actions */}
         <PinConversationMenuItem />
+        <NotificationForConvoMenuItem />
+
         <BlockMenuItem />
         <CopyMenuItem />
         {/* Read state actions */}
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index f9e277815..d1010df93 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Item } from 'react-contexify';
+import { Item, Submenu } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   useAvatarPath,
@@ -25,6 +25,7 @@ import {
   declineConversationWithConfirm,
   deleteAllMessagesByConvoIdWithConfirmation,
   markAllReadByConvoId,
+  setNotificationForConvoId,
   showAddModeratorsByConvoId,
   showBanUserByConvoId,
   showInviteContactByConvoId,
@@ -42,9 +43,23 @@ import {
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
 import { getIsMessageSection } from '../../state/selectors/section';
-import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
+import {
+  useSelectedConversationKey,
+  useSelectedIsActive,
+  useSelectedIsBlocked,
+  useSelectedIsKickedFromGroup,
+  useSelectedIsLeft,
+  useSelectedIsPrivate,
+  useSelectedIsPrivateFriend,
+  useSelectedNotificationSetting,
+} from '../../state/selectors/selectedConversation';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
+import {
+  ConversationNotificationSetting,
+  ConversationNotificationSettingType,
+} from '../../models/conversationAttributes';
+import { LocalizerKeys } from '../../types/LocalizerKeys';
 
 /** Menu items standardized */
 
@@ -539,3 +554,68 @@ export const DeclineAndBlockMsgRequestMenuItem = () => {
   }
   return null;
 };
+
+export const NotificationForConvoMenuItem = (): JSX.Element | null => {
+  const selectedConvoId = useSelectedConversationKey();
+
+  const currentNotificationSetting = useSelectedNotificationSetting();
+  const isBlocked = useSelectedIsBlocked();
+  const isActive = useSelectedIsActive();
+  const isLeft = useSelectedIsLeft();
+  const isKickedFromGroup = useSelectedIsKickedFromGroup();
+  const isFriend = useSelectedIsPrivateFriend();
+  const isPrivate = useSelectedIsPrivate();
+
+  if (
+    !selectedConvoId ||
+    isLeft ||
+    isKickedFromGroup ||
+    isBlocked ||
+    !isActive ||
+    (isPrivate && !isFriend)
+  ) {
+    return null;
+  }
+
+  // const isRtlMode = isRtlBody();'
+
+  // exclude mentions_only settings for private chats as this does not make much sense
+  const notificationForConvoOptions = ConversationNotificationSetting.filter(n =>
+    isPrivate ? n !== 'mentions_only' : true
+  ).map((n: ConversationNotificationSettingType) => {
+    // do this separately so typescript's compiler likes it
+    const keyToUse: LocalizerKeys =
+      n === 'all' || !n
+        ? 'notificationForConvo_all'
+        : n === 'disabled'
+        ? 'notificationForConvo_disabled'
+        : 'notificationForConvo_mentions_only';
+    return { value: n, name: window.i18n(keyToUse) };
+  });
+
+  return (
+    // Remove the && false to make context menu work with RTL support
+    <Submenu
+      label={window.i18n('notificationForConvo') as any}
+      // rtl={isRtlMode && false}
+    >
+      {(notificationForConvoOptions || []).map(item => {
+        const disabled = item.value === currentNotificationSetting;
+
+        return (
+          <Item
+            key={item.value}
+            onClick={async () => {
+              await setNotificationForConvoId(selectedConvoId, item.value);
+            }}
+            disabled={disabled}
+          >
+            {item.name}
+          </Item>
+        );
+      })}
+    </Submenu>
+  );
+
+  return null;
+};

From 461b192f37f6b423a077f3de9a97d8901f3284cf Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 16 Jun 2023 07:17:37 +0200
Subject: [PATCH 132/178] fix: mod and admin actions on message context menu
 for communities

---
 .../message-content/MessageContextMenu.tsx    | 40 ++++++++++---------
 ts/components/dialog/ReactListModal.tsx       |  9 +++--
 ts/hooks/useParamSelector.ts                  |  5 ---
 ts/models/conversation.ts                     |  5 ---
 ts/state/ducks/conversations.ts               |  1 -
 ts/state/ducks/sogsRoomInfo.tsx               |  3 +-
 ts/state/selectors/conversations.ts           |  9 ++---
 ts/state/selectors/selectedConversation.ts    | 21 +++++++++-
 8 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index 8a1c31248..cbdd7534e 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -24,6 +24,13 @@ import {
 } from '../../../../state/ducks/conversations';
 import { StateType } from '../../../../state/reducer';
 import { getMessageContextMenuProps } from '../../../../state/selectors/conversations';
+import {
+  useSelectedConversationKey,
+  useSelectedIsBlocked,
+  useSelectedIsPublic,
+  useSelectedWeAreAdmin,
+  useSelectedWeAreModerator,
+} from '../../../../state/selectors/selectedConversation';
 import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
 import { Reactions } from '../../../../util/reactions';
 import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer';
@@ -34,18 +41,13 @@ export type MessageContextMenuSelectorProps = Pick<
   MessageRenderingProps,
   | 'attachments'
   | 'sender'
-  | 'convoId'
   | 'direction'
   | 'status'
   | 'isDeletable'
-  | 'isPublic'
-  | 'isOpenGroupV2'
-  | 'weAreAdmin'
   | 'isSenderAdmin'
   | 'text'
   | 'serverTimestamp'
   | 'timestamp'
-  | 'isBlocked'
   | 'isDeletableForEveryone'
 >;
 
@@ -80,27 +82,31 @@ export const MessageContextMenu = (props: Props) => {
   const dispatch = useDispatch();
   const { hideAll } = useContextMenu();
 
+  const isSelectedBlocked = useSelectedIsBlocked();
+  const convoId = useSelectedConversationKey();
+  const isPublic = useSelectedIsPublic();
+  const weAreModerator = useSelectedWeAreModerator();
+  const weAreAdmin = useSelectedWeAreAdmin();
+
+  const showAdminActions = weAreAdmin || weAreModerator;
+
   const selected = useSelector((state: StateType) => getMessageContextMenuProps(state, messageId));
 
-  if (!selected) {
+  if (!selected || !convoId) {
     return null;
   }
 
   const {
     attachments,
     sender,
-    convoId,
     direction,
     status,
     isDeletable,
     isDeletableForEveryone,
-    isPublic,
-    weAreAdmin,
     isSenderAdmin,
     text,
     serverTimestamp,
     timestamp,
-    isBlocked,
   } = selected;
 
   const isOutgoing = direction === 'outgoing';
@@ -157,12 +163,12 @@ export const MessageContextMenu = (props: Props) => {
   }, [sender, convoId]);
 
   const onReply = useCallback(() => {
-    if (isBlocked) {
+    if (isSelectedBlocked) {
       pushUnblockToSend();
       return;
     }
     void replyToMessage(messageId);
-  }, [isBlocked, messageId]);
+  }, [isSelectedBlocked, messageId]);
 
   const saveAttachment = useCallback(
     (e: any) => {
@@ -330,14 +336,12 @@ export const MessageContextMenu = (props: Props) => {
               <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>
             </>
           ) : null}
-          {weAreAdmin && isPublic ? <Item onClick={onBan}>{window.i18n('banUser')}</Item> : null}
-          {weAreAdmin && isPublic ? (
-            <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
-          ) : null}
-          {weAreAdmin && isPublic && !isSenderAdmin ? (
+          {showAdminActions ? <Item onClick={onBan}>{window.i18n('banUser')}</Item> : null}
+          {showAdminActions ? <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item> : null}
+          {showAdminActions && !isSenderAdmin ? (
             <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
           ) : null}
-          {weAreAdmin && isPublic && isSenderAdmin ? (
+          {showAdminActions && isSenderAdmin ? (
             <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
           ) : null}
         </Menu>
diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx
index 274ab52de..bcebfa660 100644
--- a/ts/components/dialog/ReactListModal.tsx
+++ b/ts/components/dialog/ReactListModal.tsx
@@ -3,7 +3,7 @@ import React, { ReactElement, useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
-import { useMessageReactsPropsById, useWeAreModerator } from '../../hooks/useParamSelector';
+import { useMessageReactsPropsById } from '../../hooks/useParamSelector';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { UserUtils } from '../../session/utils';
 import {
@@ -11,7 +11,10 @@ import {
   updateReactListModal,
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
-import { useSelectedIsPublic } from '../../state/selectors/selectedConversation';
+import {
+  useSelectedIsPublic,
+  useSelectedWeAreModerator,
+} from '../../state/selectors/selectedConversation';
 import { SortedReactionList } from '../../types/Reaction';
 import { nativeEmojiData } from '../../util/emoji';
 import { Reactions } from '../../util/reactions';
@@ -229,7 +232,7 @@ export const ReactListModal = (props: Props): ReactElement => {
 
   const msgProps = useMessageReactsPropsById(messageId);
   const isPublic = useSelectedIsPublic();
-  const weAreModerator = useWeAreModerator(msgProps?.convoId);
+  const weAreModerator = useSelectedWeAreModerator();
   const me = UserUtils.getOurPubKeyStrFromCache();
 
   // tslint:disable: cyclomatic-complexity
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index df837c162..6a414522b 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -146,11 +146,6 @@ export function useWeAreAdmin(convoId?: string) {
   return Boolean(convoProps && convoProps.weAreAdmin);
 }
 
-export function useWeAreModerator(convoId?: string) {
-  const convoProps = useConversationPropsById(convoId);
-  return Boolean(convoProps && (convoProps.weAreAdmin || convoProps.weAreModerator));
-}
-
 export function useExpireTimer(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
   return convoProps && convoProps.expireTimer;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 81d0425e6..6443020b0 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -269,7 +269,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const avatarPath = this.getAvatarPath();
     const isPrivate = this.isPrivate();
     const weAreAdmin = this.isAdmin(ourNumber);
-    const weAreModerator = this.isModerator(ourNumber); // only used for sogs
 
     const currentNotificationSetting = this.get('triggerNotificationsFor');
     const priorityFromDb = this.get('priority');
@@ -310,10 +309,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       toRet.weAreAdmin = true;
     }
 
-    if (weAreModerator) {
-      toRet.weAreModerator = true;
-    }
-
     if (isPublic) {
       toRet.isPublic = true;
     }
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 8d25b4173..6d01f18a4 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -237,7 +237,6 @@ export interface ReduxConversationType {
   isPublic?: boolean;
   isPrivate?: boolean; // !isPrivate means isGroup (group or community)
   weAreAdmin?: boolean;
-  weAreModerator?: boolean;
   unreadCount?: number;
   mentionedUs?: boolean;
   isSelected?: boolean;
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
index 32612ae79..84e9959c3 100644
--- a/ts/state/ducks/sogsRoomInfo.tsx
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -86,10 +86,11 @@ function setCanWriteOutsideRedux(convoId: string, canWrite: boolean) {
 }
 
 /**
+ * Update the redux slice for that community's moderators list
+ * if we are a moderator that room and the room is blinded, this update needs to contain our unblinded pubkey, NOT the blinded one.
  *
  * @param convoId the convoId of the room to set the moderators
  * @param moderators the updated list of moderators
- * Note: if we are a moderator that room and the room is blinded, this update needs to contain our unblinded pubkey, NOT the blinded one
  */
 function setModeratorsOutsideRedux(convoId: string, moderators: Array<string>) {
   const currentMods = getModeratorsOutsideRedux(convoId);
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 1d3716f15..0829ee743 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -888,6 +888,10 @@ export const useMessageIsDeleted = (messageId: string): boolean => {
   return props?.propsForMessage.isDeleted || false;
 };
 
+/**
+ * TODO probably not something which should be memoized with createSelector as we rememoize it for each message (and override the previous one). Not sure what is the right way to do a lookup. But maybe something like having the messages as a record<id, message> and do a simple lookup to grab the details.
+ * And the the sorting would be done in a memoized selector
+ */
 export const getMessageContextMenuProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageContextMenuSelectorProps
   | undefined => {
@@ -898,18 +902,13 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
   const msgProps: MessageContextMenuSelectorProps = pick(props.propsForMessage, [
     'attachments',
     'sender',
-    'convoId',
     'direction',
     'status',
     'isDeletable',
-    'isPublic',
-    'isOpenGroupV2',
-    'weAreAdmin',
     'isSenderAdmin',
     'text',
     'serverTimestamp',
     'timestamp',
-    'isBlocked',
     'isDeletableForEveryone',
   ]);
 
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 759ab8cbf..a1e186d9c 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -1,9 +1,11 @@
+import { isString } from 'lodash';
 import { useSelector } from 'react-redux';
 import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
+import { PubKey } from '../../session/types';
+import { UserUtils } from '../../session/utils';
 import { ReduxConversationType } from '../ducks/conversations';
 import { StateType } from '../reducer';
-import { getCanWrite, getSubscriberCount } from './sogsRoomInfo';
-import { PubKey } from '../../session/types';
+import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo';
 
 /**
  * Returns the formatted text for notification setting.
@@ -257,3 +259,18 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() {
 export function useSelectedWeAreAdmin() {
   return useSelector((state: StateType) => getSelectedConversation(state)?.weAreAdmin || false);
 }
+
+/**
+ * Only for communities.
+ * @returns true if the selected convo is a community and we are one of the moderators
+ */
+export function useSelectedWeAreModerator() {
+  // TODO might be something to memoize let's see
+  const isPublic = useSelectedIsPublic();
+  const selectedConvoKey = useSelectedConversationKey();
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  const mods = useSelector((state: StateType) => getModerators(state, selectedConvoKey));
+
+  const weAreModerator = mods.includes(us);
+  return isPublic && isString(selectedConvoKey) && weAreModerator;
+}

From f2cddb83c8618f8c59ea933fe3dfa07347e1a784 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 20 Jun 2023 11:28:48 +0200
Subject: [PATCH 133/178] chore: broke apart big Message selectors into smaller
 ones

---
 ts/components/avatar/Avatar.tsx               |  18 +-
 .../message-content/MessageAuthorText.tsx     |  25 +-
 .../message/message-content/MessageAvatar.tsx |  42 ++-
 .../message-content/MessageContent.tsx        |   2 +-
 .../message-content/MessageLinkPreview.tsx    |  17 +-
 .../message/message-content/MessageQuote.tsx  |  10 +-
 .../message/message-content/MessageStatus.tsx |   9 +-
 .../message/message-item/MessageDetail.tsx    |  10 +-
 ts/components/icon/SessionIcon.tsx            |   4 +-
 .../ConversationListItem.tsx                  |   2 +-
 .../menu/ConversationListItemContextMenu.tsx  |   8 +-
 ts/models/conversation.ts                     |  12 +-
 ts/models/message.ts                          |  11 +-
 .../conversations/ConversationController.ts   |   5 +-
 ts/state/ducks/conversations.ts               | 102 +++---
 ts/state/ducks/sogsRoomInfo.tsx               |  17 +-
 ts/state/selectors/conversations.ts           | 293 ++++--------------
 ts/state/selectors/index.ts                   |   2 +
 ts/state/selectors/messages.ts                | 112 +++++++
 ts/state/selectors/search.ts                  |  10 +-
 20 files changed, 307 insertions(+), 404 deletions(-)
 create mode 100644 ts/state/selectors/messages.ts

diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index e073ce270..0318dfedc 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -1,19 +1,18 @@
-import React, { useState } from 'react';
 import classNames from 'classnames';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
-import { isEqual } from 'lodash';
 import {
   useAvatarPath,
   useConversationUsername,
   useIsClosedGroup,
 } from '../../hooks/useParamSelector';
+import { isMessageSelectionMode } from '../../state/selectors/conversations';
+import { SessionIcon } from '../icon';
 import { AvatarPlaceHolder } from './AvatarPlaceHolder/AvatarPlaceHolder';
 import { ClosedGroupAvatar } from './AvatarPlaceHolder/ClosedGroupAvatar';
-import { useDisableDrag } from '../../hooks/useDisableDrag';
-import styled from 'styled-components';
-import { SessionIcon } from '../icon';
-import { useSelector } from 'react-redux';
-import { isMessageSelectionMode } from '../../state/selectors/conversations';
 
 export enum AvatarSize {
   XS = 28,
@@ -90,7 +89,7 @@ const AvatarImage = (props: {
   datatestId?: string;
   handleImageError: () => any;
 }) => {
-  const { avatarPath, base64Data, name, imageBroken, datatestId, handleImageError } = props;
+  const { avatarPath, base64Data, imageBroken, datatestId, handleImageError } = props;
 
   const disableDrag = useDisableDrag();
 
@@ -103,7 +102,6 @@ const AvatarImage = (props: {
     <img
       onError={handleImageError}
       onDragStart={disableDrag}
-      alt={window.i18n('contactAvatarAlt', [name || 'avatar'])}
       src={dataToDisplay}
       data-testid={datatestId}
     />
@@ -173,4 +171,4 @@ const AvatarInner = (props: Props) => {
   );
 };
 
-export const Avatar = React.memo(AvatarInner, isEqual);
+export const Avatar = AvatarInner;
diff --git a/ts/components/conversation/message/message-content/MessageAuthorText.tsx b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
index b7a390507..a77d8342d 100644
--- a/ts/components/conversation/message/message-content/MessageAuthorText.tsx
+++ b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
@@ -1,9 +1,13 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import styled from 'styled-components';
-import { MessageRenderingProps } from '../../../../models/messageType';
 import { PubKey } from '../../../../session/types';
-import { getMessageAuthorProps } from '../../../../state/selectors/conversations';
+import {
+  useAuthorName,
+  useAuthorProfileName,
+  useFirstMessageOfSeries,
+  useMessageAuthor,
+  useMessageDirection,
+} from '../../../../state/selectors';
 import {
   useSelectedIsGroup,
   useSelectedIsPublic,
@@ -11,11 +15,6 @@ import {
 import { Flex } from '../../../basic/Flex';
 import { ContactName } from '../../ContactName';
 
-export type MessageAuthorSelectorProps = Pick<
-  MessageRenderingProps,
-  'authorName' | 'authorProfileName' | 'sender' | 'direction' | 'firstMessageOfSeries'
->;
-
 type Props = {
   messageId: string;
 };
@@ -25,15 +24,17 @@ const StyledAuthorContainer = styled(Flex)`
 `;
 
 export const MessageAuthorText = (props: Props) => {
-  const selected = useSelector(state => getMessageAuthorProps(state as any, props.messageId));
-
   const isPublic = useSelectedIsPublic();
   const isGroup = useSelectedIsGroup();
+  const authorProfileName = useAuthorProfileName(props.messageId);
+  const authorName = useAuthorName(props.messageId);
+  const sender = useMessageAuthor(props.messageId);
+  const direction = useMessageDirection(props.messageId);
+  const firstMessageOfSeries = useFirstMessageOfSeries(props.messageId);
 
-  if (!selected) {
+  if (!props.messageId || !sender || !direction) {
     return null;
   }
-  const { authorName, sender, authorProfileName, direction, firstMessageOfSeries } = selected;
 
   const title = authorName ? authorName : sender;
 
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 378f99813..87f183983 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -9,10 +9,18 @@ import { getSodiumRenderer } from '../../../../session/crypto';
 import { PubKey } from '../../../../session/types';
 import { openConversationWithMessages } from '../../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../../state/ducks/modalDialog';
-import { getMessageAvatarProps } from '../../../../state/selectors/conversations';
+import {
+  useAuthorAvatarPath,
+  useAuthorName,
+  useAuthorProfileName,
+  useLastMessageOfSeries,
+  useMessageAuthor,
+  useMessageSenderIsAdmin,
+} from '../../../../state/selectors/';
 import {
   getSelectedCanWrite,
   useSelectedConversationKey,
+  useSelectedIsPublic,
 } from '../../../../state/selectors/selectedConversation';
 import { Avatar, AvatarSize, CrownIcon } from '../../../avatar/Avatar';
 // tslint:disable: use-simple-attributes
@@ -26,13 +34,7 @@ const StyledAvatar = styled.div`
 
 export type MessageAvatarSelectorProps = Pick<
   MessageRenderingProps,
-  | 'authorAvatarPath'
-  | 'authorName'
-  | 'sender'
-  | 'authorProfileName'
-  | 'isSenderAdmin'
-  | 'isPublic'
-  | 'lastMessageOfSeries'
+  'sender' | 'isSenderAdmin' | 'lastMessageOfSeries'
 >;
 
 type Props = { messageId: string; noAvatar: boolean };
@@ -41,26 +43,18 @@ export const MessageAvatar = (props: Props) => {
   const { messageId, noAvatar } = props;
 
   const dispatch = useDispatch();
-  const avatarProps = useSelector(state => getMessageAvatarProps(state as any, messageId));
   const selectedConvoKey = useSelectedConversationKey();
 
   const isTypingEnabled = useSelector(getSelectedCanWrite);
+  const isPublic = useSelectedIsPublic();
+  const authorName = useAuthorName(messageId);
+  const authorProfileName = useAuthorProfileName(messageId);
+  const authorAvatarPath = useAuthorAvatarPath(messageId);
+  const sender = useMessageAuthor(messageId);
+  const lastMessageOfSeries = useLastMessageOfSeries(messageId);
+  const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 
-  if (!avatarProps) {
-    return null;
-  }
-
-  const {
-    authorAvatarPath,
-    authorName,
-    sender,
-    authorProfileName,
-    isSenderAdmin,
-    lastMessageOfSeries,
-    isPublic,
-  } = avatarProps;
-
-  if (noAvatar) {
+  if (noAvatar || !sender) {
     return null;
   }
 
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index 13f23cc23..35dc7e646 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -10,8 +10,8 @@ import {
   getMessageContentSelectorProps,
   getQuotedMessageToAnimate,
   getShouldHighlightMessage,
-  useMessageIsDeleted,
 } from '../../../../state/selectors/conversations';
+import { useMessageIsDeleted } from '../../../../state/selectors';
 import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
 import { MessageAttachment } from './MessageAttachment';
 import { MessageLinkPreview } from './MessageLinkPreview';
diff --git a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
index 6243ee330..164721ca2 100644
--- a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
+++ b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
@@ -4,12 +4,14 @@ import { isImageAttachment } from '../../../../types/Attachment';
 import { Image } from '../../Image';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  getIsMessageSelectionMode,
-  getMessageLinkPreviewProps,
-} from '../../../../state/selectors/conversations';
+import { getIsMessageSelectionMode } from '../../../../state/selectors/conversations';
 import { SessionIcon } from '../../../icon';
 import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
+import {
+  useMessageAttachments,
+  useMessageDirection,
+  useMessageLinkPreview,
+} from '../../../../state/selectors';
 
 export type MessageLinkPreviewSelectorProps = Pick<
   MessageRenderingProps,
@@ -24,14 +26,15 @@ type Props = {
 const linkPreviewsImageSize = 100;
 
 export const MessageLinkPreview = (props: Props) => {
-  const selected = useSelector(state => getMessageLinkPreviewProps(state as any, props.messageId));
   const dispatch = useDispatch();
+  const direction = useMessageDirection(props.messageId);
+  const attachments = useMessageAttachments(props.messageId);
+  const previews = useMessageLinkPreview(props.messageId);
   const isMessageSelectionMode = useSelector(getIsMessageSelectionMode);
 
-  if (!selected) {
+  if (!props.messageId) {
     return null;
   }
-  const { direction, attachments, previews } = selected;
 
   // Attachments take precedence over Link Previews
   if (attachments && attachments.length) {
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index 82c1d73d7..31991c690 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -5,7 +5,6 @@ import { MessageRenderingProps } from '../../../../models/messageType';
 import { PubKey } from '../../../../session/types';
 import { openConversationToSpecificMessage } from '../../../../state/ducks/conversations';
 import {
-  getMessageQuoteProps,
   isMessageDetailView,
   isMessageSelectionMode,
 } from '../../../../state/selectors/conversations';
@@ -13,6 +12,7 @@ import { Quote } from './Quote';
 import { ToastUtils } from '../../../../session/utils';
 import { Data } from '../../../../data/data';
 import { MessageModel } from '../../../../models/message';
+import { useMessageDirection, useMessageQuote } from '../../../../state/selectors';
 
 // tslint:disable: use-simple-attributes
 
@@ -23,13 +23,11 @@ type Props = {
 export type MessageQuoteSelectorProps = Pick<MessageRenderingProps, 'quote' | 'direction'>;
 
 export const MessageQuote = (props: Props) => {
-  const selected = useSelector(state => getMessageQuoteProps(state as any, props.messageId));
+  const quote = useMessageQuote(props.messageId);
+  const direction = useMessageDirection(props.messageId);
   const multiSelectMode = useSelector(isMessageSelectionMode);
   const isMessageDetailViewMode = useSelector(isMessageDetailView);
 
-  const quote = selected ? selected.quote : undefined;
-  const direction = selected ? selected.direction : undefined;
-
   const onQuoteClick = useCallback(
     async (event: React.MouseEvent<HTMLDivElement>) => {
       event.preventDefault();
@@ -76,7 +74,7 @@ export const MessageQuote = (props: Props) => {
     },
     [quote, multiSelectMode, props.messageId]
   );
-  if (!selected) {
+  if (!props.messageId) {
     return null;
   }
 
diff --git a/ts/components/conversation/message/message-content/MessageStatus.tsx b/ts/components/conversation/message/message-content/MessageStatus.tsx
index be2182514..9ff95f502 100644
--- a/ts/components/conversation/message/message-content/MessageStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageStatus.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import { MessageRenderingProps } from '../../../../models/messageType';
-import { getMessageStatusProps } from '../../../../state/selectors/conversations';
 import { OutgoingMessageStatus } from './OutgoingMessageStatus';
+import { useMessageDirection, useMessageStatus } from '../../../../state/selectors';
 
 type Props = {
   isCorrectSide: boolean;
@@ -14,12 +13,12 @@ export type MessageStatusSelectorProps = Pick<MessageRenderingProps, 'direction'
 
 export const MessageStatus = (props: Props) => {
   const { isCorrectSide, dataTestId } = props;
+  const direction = useMessageDirection(props.messageId);
+  const status = useMessageStatus(props.messageId);
 
-  const selected = useSelector(state => getMessageStatusProps(state as any, props.messageId));
-  if (!selected) {
+  if (!props.messageId) {
     return null;
   }
-  const { status, direction } = selected;
 
   if (!isCorrectSide) {
     return null;
diff --git a/ts/components/conversation/message/message-item/MessageDetail.tsx b/ts/components/conversation/message/message-item/MessageDetail.tsx
index eb1f9b33c..4933ad74a 100644
--- a/ts/components/conversation/message/message-item/MessageDetail.tsx
+++ b/ts/components/conversation/message/message-item/MessageDetail.tsx
@@ -10,14 +10,12 @@ import {
   closeMessageDetailsView,
   ContactPropsMessageDetail,
 } from '../../../../state/ducks/conversations';
-import {
-  getMessageDetailsViewProps,
-  getMessageIsDeletable,
-} from '../../../../state/selectors/conversations';
+import { getMessageDetailsViewProps } from '../../../../state/selectors/conversations';
 import { ContactName } from '../../ContactName';
 // tslint:disable-next-line: no-submodule-imports
 import useKey from 'react-use/lib/useKey';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
+import { useMessageIsDeletable } from '../../../../state/selectors';
 
 const AvatarItem = (props: { pubkey: string }) => {
   const { pubkey } = props;
@@ -98,9 +96,7 @@ export const MessageDetail = () => {
   const { i18n } = window;
 
   const messageDetailProps = useSelector(getMessageDetailsViewProps);
-  const isDeletable = useSelector(state =>
-    getMessageIsDeletable(state as any, messageDetailProps?.messageId || '')
-  );
+  const isDeletable = useMessageIsDeletable(messageDetailProps?.messageId);
 
   const dispatch = useDispatch();
 
diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx
index dda4a5741..967d69d03 100644
--- a/ts/components/icon/SessionIcon.tsx
+++ b/ts/components/icon/SessionIcon.tsx
@@ -122,7 +122,7 @@ const animation = (props: {
 };
 
 //tslint:disable no-unnecessary-callback-wrapper
-const Svg = React.memo(styled.svg<StyledSvgProps>`
+const Svg = styled.svg<StyledSvgProps>`
   width: ${props => props.width};
   transform: ${props => `rotate(${props.iconRotation}deg)`};
   animation: ${props => animation(props)};
@@ -134,7 +134,7 @@ const Svg = React.memo(styled.svg<StyledSvgProps>`
   fill: ${props => (props.iconColor ? props.iconColor : '--button-icon-stroke-color')};
   padding: ${props => (props.iconPadding ? props.iconPadding : '')};
   transition: inherit;
-`);
+`;
 // tslint:enable no-unnecessary-callback-wrapper
 
 const SessionSvg = (props: {
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index ccd66c89e..b200ef693 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -140,4 +140,4 @@ const ConversationListItem = (props: Props) => {
   );
 };
 
-export const MemoConversationListItemWithDetails = React.memo(ConversationListItem, _.isEqual);
+export const MemoConversationListItemWithDetails = ConversationListItem;
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index 13450c1a6..c5ac79725 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -77,13 +77,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
   );
 };
 
-function propsAreEqual(prev: PropsContextConversationItem, next: PropsContextConversationItem) {
-  return _.isEqual(prev, next);
-}
-export const MemoConversationListItemContextMenu = React.memo(
-  ConversationListItemContextMenu,
-  propsAreEqual
-);
+export const MemoConversationListItemContextMenu = ConversationListItemContextMenu;
 
 export const PinConversationMenuItem = (): JSX.Element | null => {
   const conversationId = useConvoIdFromContext();
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 6443020b0..0b58d801d 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -12,6 +12,7 @@ import {
   sortBy,
   throttle,
   uniq,
+  xor,
 } from 'lodash';
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
@@ -41,7 +42,6 @@ import { toHex } from '../session/utils/String';
 import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import {
   actions as conversationActions,
-  conversationChanged,
   conversationsChanged,
   markConversationFullyRead,
   MessageModelPropsWithoutConvoProps,
@@ -163,9 +163,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     this.typingRefreshTimer = null;
     this.typingPauseTimer = null;
-    window.inboxStore?.dispatch(
-      conversationChanged({ id: this.id, data: this.getConversationModelProps() })
-    );
+    window.inboxStore?.dispatch(conversationsChanged([this.getConversationModelProps()]));
   }
 
   public idForLogging() {
@@ -394,13 +392,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    * @returns true if the groupAdmins where not the same (and thus updated)
    */
   public async updateGroupAdmins(groupAdmins: Array<string>, shouldCommit: boolean) {
-    const sortedExistingAdmins = uniq(sortBy(this.getGroupAdmins()));
     const sortedNewAdmins = uniq(sortBy(groupAdmins));
 
-    if (isEqual(sortedExistingAdmins, sortedNewAdmins)) {
+    // check if there is any difference betwewen the two, if yes, override it with what we got.
+    if (!xor(this.getGroupAdmins(), groupAdmins).length) {
       return false;
     }
-    this.set({ groupAdmins });
+    this.set({ groupAdmins: sortedNewAdmins });
     if (shouldCommit) {
       await this.commit();
     }
diff --git a/ts/models/message.ts b/ts/models/message.ts
index c0281c84a..850a2ea67 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -77,6 +77,7 @@ import {
   PropsForGroupUpdateLeft,
   PropsForGroupUpdateName,
   PropsForMessageWithoutConvoProps,
+  ReduxQuoteType,
 } from '../state/ducks/conversations';
 import { AttachmentTypeWithPath, isVoiceMessage } from '../types/Attachment';
 import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata';
@@ -615,15 +616,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     }
 
     const firstAttachment = quote.attachments && quote.attachments[0];
-    const quoteProps: {
-      referencedMessageNotFound?: boolean;
-      sender: string;
-      messageId: string;
-      authorName: string;
-      text?: string;
-      attachment?: any;
-      isFromMe?: boolean;
-    } = {
+    const quoteProps: ReduxQuoteType = {
       sender: author,
       messageId: id,
       authorName: authorName || 'Unknown',
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 0dddc0e1a..602954e4d 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -432,10 +432,7 @@ export class ConversationController {
       this.conversations.remove(conversation);
 
       window?.inboxStore?.dispatch(
-        conversationActions.conversationChanged({
-          id: convoId,
-          data: conversation.getConversationModelProps(),
-        })
+        conversationActions.conversationsChanged([conversation.getConversationModelProps()])
       );
     }
     window.inboxStore?.dispatch(conversationActions.conversationRemoved(convoId));
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 6d01f18a4..08ef82769 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -161,6 +161,17 @@ export type PropsForAttachment = {
   } | null;
 };
 
+export type ReduxQuoteType = {
+  text?: string;
+  attachment?: QuotedAttachmentType;
+  isFromMe?: boolean;
+  sender: string;
+  authorProfileName?: string;
+  authorName?: string;
+  messageId?: string;
+  referencedMessageNotFound?: boolean;
+} | null;
+
 export type PropsForMessageWithoutConvoProps = {
   id: string; // messageId
   direction: MessageModelType;
@@ -177,16 +188,7 @@ export type PropsForMessageWithoutConvoProps = {
   reacts?: ReactionList;
   reactsIndex?: number;
   previews?: Array<any>;
-  quote?: {
-    text?: string;
-    attachment?: QuotedAttachmentType;
-    isFromMe?: boolean;
-    sender: string;
-    authorProfileName?: string;
-    authorName?: string;
-    messageId?: string;
-    referencedMessageNotFound?: boolean;
-  } | null;
+  quote?: ReduxQuoteType;
   messageHash?: string;
   isDeleted?: boolean;
   isUnread?: boolean;
@@ -197,12 +199,8 @@ export type PropsForMessageWithoutConvoProps = {
 };
 
 export type PropsForMessageWithConvoProps = PropsForMessageWithoutConvoProps & {
-  authorName: string | null;
-  authorProfileName: string | null;
   conversationType: ConversationTypeEnum;
-  authorAvatarPath: string | null;
   isPublic: boolean;
-  isOpenGroupV2: boolean;
   isKickedFromGroup: boolean;
   weAreAdmin: boolean;
   isSenderAdmin: boolean;
@@ -634,16 +632,7 @@ const conversationsSlice = createSlice({
         },
       };
     },
-    conversationChanged(
-      state: ConversationsStateType,
-      action: PayloadAction<{
-        id: string;
-        data: ReduxConversationType;
-      }>
-    ) {
-      const { payload } = action;
-      return applyConversationChanged(state, payload);
-    },
+
     conversationsChanged(
       state: ConversationsStateType,
       action: PayloadAction<Array<ReduxConversationType>>
@@ -652,12 +641,7 @@ const conversationsSlice = createSlice({
 
       let updatedState = state;
       if (payload.length) {
-        payload.forEach(convoProps => {
-          updatedState = applyConversationChanged(updatedState, {
-            id: convoProps.id,
-            data: convoProps,
-          });
-        });
+        updatedState = applyConversationsChanged(updatedState, payload);
       }
 
       return updatedState;
@@ -972,47 +956,47 @@ const conversationsSlice = createSlice({
   },
 });
 
-function applyConversationChanged(
+function applyConversationsChanged(
   state: ConversationsStateType,
-  payload: { id: string; data: ReduxConversationType }
+  payload: Array<ReduxConversationType>
 ) {
-  const { id, data } = payload;
   const { conversationLookup, selectedConversation } = state;
 
-  const existing = conversationLookup[id];
-  // In the change case we only modify the lookup if we already had that conversation
-  if (!existing) {
-    return state;
+  for (let index = 0; index < payload.length; index++) {
+    const convoProps = payload[index];
+    const { id } = convoProps;
+    // In the `change` case we only modify the lookup if we already had that conversation
+    const existing = conversationLookup[id];
+
+    if (!existing) {
+      continue;
+    }
+
+    if (
+      state.selectedConversation &&
+      convoProps.isPrivate &&
+      convoProps.id === selectedConversation &&
+      convoProps.priority &&
+      convoProps.priority < CONVERSATION_PRIORITIES.default
+    ) {
+      // A private conversation hidden cannot be a selected.
+      // When opening a hidden conversation, we unhide it so it can be selected again.
+      state.selectedConversation = undefined;
+    }
+
+    state.conversationLookup[id] = {
+      ...convoProps,
+      isInitialFetchingInProgress: existing.isInitialFetchingInProgress,
+    };
   }
 
-  let selected = selectedConversation;
-  if (
-    data &&
-    data.isPrivate &&
-    data.id === selectedConversation &&
-    data.priority &&
-    data.priority < CONVERSATION_PRIORITIES.default
-  ) {
-    // A private conversation hidden cannot be a selected.
-    // When opening a hidden conversation, we unhide it so it can be selected again.
-    selected = undefined;
-  }
-
-  return {
-    ...state,
-    selectedConversation: selected,
-    conversationLookup: {
-      ...conversationLookup,
-      [id]: { ...data, isInitialFetchingInProgress: existing.isInitialFetchingInProgress },
-    },
-  };
+  return state;
 }
 
 export const { actions, reducer } = conversationsSlice;
 export const {
   // conversation and messages list
   conversationAdded,
-  conversationChanged,
   conversationsChanged,
   conversationRemoved,
   removeAllConversations,
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
index 84e9959c3..c1f915c09 100644
--- a/ts/state/ducks/sogsRoomInfo.tsx
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -1,9 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { sortBy, uniq } from 'lodash';
+import { sortBy, uniq, xor } from 'lodash';
 import {
   getCanWriteOutsideRedux,
   getCurrentSubscriberCountOutsideRedux,
-  getModeratorsOutsideRedux,
 } from '../selectors/sogsRoomInfo';
 
 type RoomInfo = {
@@ -53,8 +52,16 @@ const sogsRoomInfosSlice = createSlice({
     },
     setModerators(state, action: PayloadAction<{ convoId: string; moderators: Array<string> }>) {
       addEmptyEntryIfNeeded(state, action.payload.convoId);
+      const existing = state.rooms[action.payload.convoId].moderators;
+      const newMods = sortBy(uniq(action.payload.moderators));
 
-      state.rooms[action.payload.convoId].moderators = sortBy(uniq(action.payload.moderators));
+      // check if there is any changes (order excluded) between those two arrays
+      const xord = xor(existing, newMods);
+      if (!xord.length) {
+        return state;
+      }
+
+      state.rooms[action.payload.convoId].moderators = newMods;
 
       return state;
     },
@@ -93,10 +100,6 @@ function setCanWriteOutsideRedux(convoId: string, canWrite: boolean) {
  * @param moderators the updated list of moderators
  */
 function setModeratorsOutsideRedux(convoId: string, moderators: Array<string>) {
-  const currentMods = getModeratorsOutsideRedux(convoId);
-  if (sortBy(uniq(currentMods)) === sortBy(uniq(moderators))) {
-    return;
-  }
   window.inboxStore?.dispatch(
     setModerators({
       convoId,
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 0829ee743..172469c4e 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -14,14 +14,9 @@ import { StateType } from '../reducer';
 
 import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox';
 import { MessageAttachmentSelectorProps } from '../../components/conversation/message/message-content/MessageAttachment';
-import { MessageAuthorSelectorProps } from '../../components/conversation/message/message-content/MessageAuthorText';
-import { MessageAvatarSelectorProps } from '../../components/conversation/message/message-content/MessageAvatar';
 import { MessageContentSelectorProps } from '../../components/conversation/message/message-content/MessageContent';
 import { MessageContentWithStatusSelectorProps } from '../../components/conversation/message/message-content/MessageContentWithStatus';
 import { MessageContextMenuSelectorProps } from '../../components/conversation/message/message-content/MessageContextMenu';
-import { MessageLinkPreviewSelectorProps } from '../../components/conversation/message/message-content/MessageLinkPreview';
-import { MessageQuoteSelectorProps } from '../../components/conversation/message/message-content/MessageQuote';
-import { MessageStatusSelectorProps } from '../../components/conversation/message/message-content/MessageStatus';
 import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText';
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
@@ -40,21 +35,17 @@ import { getIntl } from './user';
 
 import { filter, isEmpty, isNumber, pick, sortBy } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
-import { getModeratorsOutsideRedux } from './sogsRoomInfo';
 import { getSelectedConversation, getSelectedConversationKey } from './selectedConversation';
-import { useSelector } from 'react-redux';
+import { getModeratorsOutsideRedux } from './sogsRoomInfo';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
-export const getConversationLookup = createSelector(
-  getConversations,
-  (state: ConversationsStateType): ConversationLookupType => {
-    return state.conversationLookup;
-  }
-);
+export const getConversationLookup = (state: StateType): ConversationLookupType => {
+  return state.conversations.conversationLookup;
+};
 
 export const getConversationsCount = createSelector(getConversationLookup, (state): number => {
-  return Object.values(state).length;
+  return Object.keys(state).length;
 });
 
 export const getOurPrimaryConversation = createSelector(
@@ -63,10 +54,9 @@ export const getOurPrimaryConversation = createSelector(
     state.conversationLookup[Storage.get('primaryDevicePubKey') as string]
 );
 
-const getMessagesOfSelectedConversation = createSelector(
-  getConversations,
-  (state: ConversationsStateType): Array<MessageModelPropsWithoutConvoProps> => state.messages
-);
+const getMessagesOfSelectedConversation = (
+  state: StateType
+): Array<MessageModelPropsWithoutConvoProps> => state.conversations.messages;
 
 // Redux recommends to do filtered and deriving state in a selector rather than ourself
 export const getSortedMessagesOfSelectedConversation = createSelector(
@@ -97,12 +87,9 @@ export const hasSelectedConversationIncomingMessages = createSelector(
   }
 );
 
-export const getFirstUnreadMessageId = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | undefined => {
-    return state.firstUnreadMessageId;
-  }
-);
+export const getFirstUnreadMessageId = (state: StateType): string | undefined => {
+  return state.conversations.firstUnreadMessageId;
+};
 
 export type MessagePropsType =
   | 'group-notification'
@@ -489,76 +476,47 @@ export const getGlobalUnreadMessageCount = createSelector(getLeftPaneLists, (sta
   return state.globalUnreadCount;
 });
 
-export const isMessageDetailView = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean => state.messageDetailProps !== undefined
-);
+export const isMessageDetailView = (state: StateType): boolean =>
+  state.conversations.messageDetailProps !== undefined;
 
-export const getMessageDetailsViewProps = createSelector(
-  getConversations,
-  (state: ConversationsStateType): MessagePropsDetails | undefined => state.messageDetailProps
-);
+export const getMessageDetailsViewProps = (state: StateType): MessagePropsDetails | undefined =>
+  state.conversations.messageDetailProps;
 
-export const isRightPanelShowing = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean => state.showRightPanel
-);
+export const isRightPanelShowing = (state: StateType): boolean =>
+  state.conversations.showRightPanel;
 
-export const isMessageSelectionMode = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean => Boolean(state.selectedMessageIds.length > 0)
-);
+export const isMessageSelectionMode = (state: StateType): boolean =>
+  state.conversations.selectedMessageIds.length > 0;
 
-export const getSelectedMessageIds = createSelector(
-  getConversations,
-  (state: ConversationsStateType): Array<string> => state.selectedMessageIds
-);
+export const getSelectedMessageIds = (state: StateType): Array<string> =>
+  state.conversations.selectedMessageIds;
 
-export const getIsMessageSelectionMode = createSelector(
-  getSelectedMessageIds,
-  (state: Array<string>): boolean => Boolean(state.length)
-);
+export const getIsMessageSelectionMode = (state: StateType): boolean =>
+  Boolean(getSelectedMessageIds(state).length);
 
-export const getLightBoxOptions = createSelector(
-  getConversations,
-  (state: ConversationsStateType): LightBoxOptions | undefined => state.lightBox
-);
+export const getLightBoxOptions = (state: StateType): LightBoxOptions | undefined =>
+  state.conversations.lightBox;
 
-export const getQuotedMessage = createSelector(
-  getConversations,
-  (state: ConversationsStateType): ReplyingToMessageProps | undefined => state.quotedMessage
-);
+export const getQuotedMessage = (state: StateType): ReplyingToMessageProps | undefined =>
+  state.conversations.quotedMessage;
 
-export const areMoreMessagesBeingFetched = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean => state.areMoreMessagesBeingFetched || false
-);
+export const areMoreMessagesBeingFetched = (state: StateType): boolean =>
+  state.conversations.areMoreMessagesBeingFetched || false;
 
-export const getShowScrollButton = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean => state.showScrollButton || false
-);
+export const getShowScrollButton = (state: StateType): boolean =>
+  state.conversations.showScrollButton || false;
 
-export const getQuotedMessageToAnimate = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | undefined => state.animateQuotedMessageId || undefined
-);
+export const getQuotedMessageToAnimate = (state: StateType): string | undefined =>
+  state.conversations.animateQuotedMessageId || undefined;
 
-export const getShouldHighlightMessage = createSelector(
-  getConversations,
-  (state: ConversationsStateType): boolean =>
-    Boolean(state.animateQuotedMessageId && state.shouldHighlightMessage)
-);
+export const getShouldHighlightMessage = (state: StateType): boolean =>
+  Boolean(state.conversations.animateQuotedMessageId && state.conversations.shouldHighlightMessage);
 
-export const getNextMessageToPlayId = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | undefined => state.nextMessageToPlayId || undefined
-);
+export const getNextMessageToPlayId = (state: StateType): string | undefined =>
+  state.conversations.nextMessageToPlayId || undefined;
 
-export const getMentionsInput = createSelector(
-  getConversations,
-  (state: ConversationsStateType): MentionsMembersType => state.mentionMembers
-);
+export const getMentionsInput = (state: StateType): MentionsMembersType =>
+  state.conversations.mentionMembers;
 
 /// Those calls are just related to ordering messages in the redux store.
 
@@ -621,12 +579,9 @@ function sortMessages(
  * This returns the most recent message id in the database. This is not the most recent message shown,
  * but the most recent one, which could still not be loaded.
  */
-export const getMostRecentMessageId = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | null => {
-    return state.mostRecentMessageId;
-  }
-);
+export const getMostRecentMessageId = (state: StateType): string | null => {
+  return state.conversations.mostRecentMessageId;
+};
 
 export const getOldestMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
@@ -674,20 +629,22 @@ export const isFirstUnreadMessageIdAbove = createSelector(
   }
 );
 
-const getMessageId = (_whatever: any, id: string) => id;
+const getMessageId = (_whatever: any, id: string | undefined) => id;
 
 // tslint:disable: cyclomatic-complexity
 
 export const getMessagePropsByMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
-  getConversationLookup,
+  getSelectedConversation,
   getMessageId,
-
   (
     messages: Array<SortedMessageModelProps>,
-    conversations,
+    selectedConvo,
     id
   ): MessageModelPropsWithConvoProps | undefined => {
+    if (!id) {
+      return undefined;
+    }
     const foundMessageProps: SortedMessageModelProps | undefined = messages?.find(
       m => m?.propsForMessage?.id === id
     );
@@ -697,27 +654,20 @@ export const getMessagePropsByMessageId = createSelector(
     }
     const sender = foundMessageProps?.propsForMessage?.sender;
 
-    // foundMessageConversation is the conversation this message is
-    const foundMessageConversation = conversations[foundMessageProps.propsForMessage.convoId];
-    if (!foundMessageConversation || !sender) {
-      return undefined;
-    }
-
-    const foundSenderConversation = conversations[sender];
-    if (!foundSenderConversation) {
+    // we can only show messages when the convo is selected.
+    if (!selectedConvo || !sender) {
       return undefined;
     }
 
     const ourPubkey = UserUtils.getOurPubKeyStrFromCache();
-    const isGroup = !foundMessageConversation.isPrivate;
-    const isPublic = foundMessageConversation.isPublic;
+    const isGroup = !selectedConvo.isPrivate;
+    const isPublic = selectedConvo.isPublic;
 
-    const groupAdmins = (isGroup && foundMessageConversation.groupAdmins) || [];
+    const groupAdmins = (isGroup && selectedConvo.groupAdmins) || [];
     const weAreAdmin = groupAdmins.includes(ourPubkey) || false;
 
     const weAreModerator =
-      (isPublic && getModeratorsOutsideRedux(foundMessageConversation.id).includes(ourPubkey)) ||
-      false;
+      (isPublic && getModeratorsOutsideRedux(selectedConvo.id).includes(ourPubkey)) || false;
     // A message is deletable if
     // either we sent it,
     // or the convo is not a public one (in this case, we will only be able to delete for us)
@@ -732,33 +682,20 @@ export const getMessagePropsByMessageId = createSelector(
       sender === ourPubkey || (isPublic && (weAreAdmin || weAreModerator)) || false;
 
     const isSenderAdmin = groupAdmins.includes(sender);
-    const senderIsUs = sender === ourPubkey;
-
-    const authorName =
-      foundSenderConversation.nickname || foundSenderConversation.displayNameInProfile || null;
-    const authorProfileName = senderIsUs
-      ? window.i18n('you')
-      : foundSenderConversation.nickname ||
-        foundSenderConversation.displayNameInProfile ||
-        window.i18n('anonymous');
 
     const messageProps: MessageModelPropsWithConvoProps = {
       ...foundMessageProps,
       propsForMessage: {
         ...foundMessageProps.propsForMessage,
-        isBlocked: !!foundMessageConversation.isBlocked,
+        isBlocked: !!selectedConvo.isBlocked,
         isPublic: !!isPublic,
-        isOpenGroupV2: !!isPublic,
         isSenderAdmin,
         isDeletable,
         isDeletableForEveryone,
         weAreAdmin,
-        conversationType: foundMessageConversation.type,
+        conversationType: selectedConvo.type,
         sender,
-        authorAvatarPath: foundSenderConversation.avatarPath || null,
-        isKickedFromGroup: foundMessageConversation.isKickedFromGroup || false,
-        authorProfileName: authorProfileName || 'Unknown',
-        authorName,
+        isKickedFromGroup: selectedConvo.isKickedFromGroup || false,
       },
     };
 
@@ -766,30 +703,6 @@ export const getMessagePropsByMessageId = createSelector(
   }
 );
 
-export const getMessageAvatarProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageAvatarSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const messageAvatarProps: MessageAvatarSelectorProps = {
-    lastMessageOfSeries: props.lastMessageOfSeries,
-    ...pick(props.propsForMessage, [
-      'authorAvatarPath',
-      'authorName',
-      'sender',
-      'authorProfileName',
-      'conversationType',
-      'direction',
-      'isPublic',
-      'isSenderAdmin',
-    ]),
-  };
-
-  return messageAvatarProps;
-});
-
 export const getMessageReactsProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageReactsSelectorProps
   | undefined => {
@@ -800,7 +713,6 @@ export const getMessageReactsProps = createSelector(getMessagePropsByMessageId,
   const msgProps: MessageReactsSelectorProps = pick(props.propsForMessage, [
     'convoId',
     'conversationType',
-    'isPublic',
     'reacts',
     'serverId',
   ]);
@@ -825,46 +737,6 @@ export const getMessageReactsProps = createSelector(getMessagePropsByMessageId,
   return msgProps;
 });
 
-export const getMessageLinkPreviewProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageLinkPreviewSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageLinkPreviewSelectorProps = pick(props.propsForMessage, [
-    'direction',
-    'attachments',
-    'previews',
-  ]);
-
-  return msgProps;
-});
-
-export const getMessageQuoteProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageQuoteSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageQuoteSelectorProps = pick(props.propsForMessage, ['direction', 'quote']);
-
-  return msgProps;
-});
-
-export const getMessageStatusProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageStatusSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageStatusSelectorProps = pick(props.propsForMessage, ['direction', 'status']);
-
-  return msgProps;
-});
-
 export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageTextSelectorProps
   | undefined => {
@@ -883,11 +755,6 @@ export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (p
   return msgProps;
 });
 
-export const useMessageIsDeleted = (messageId: string): boolean => {
-  const props = useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId));
-  return props?.propsForMessage.isDeleted || false;
-};
-
 /**
  * TODO probably not something which should be memoized with createSelector as we rememoize it for each message (and override the previous one). Not sure what is the right way to do a lookup. But maybe something like having the messages as a record<id, message> and do a simple lookup to grab the details.
  * And the the sorting would be done in a memoized selector
@@ -915,32 +782,6 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
   return msgProps;
 });
 
-export const getMessageAuthorProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageAuthorSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageAuthorSelectorProps = {
-    firstMessageOfSeries: props.firstMessageOfSeries,
-    ...pick(props.propsForMessage, ['authorName', 'sender', 'authorProfileName', 'direction']),
-  };
-
-  return msgProps;
-});
-
-export const getMessageIsDeletable = createSelector(
-  getMessagePropsByMessageId,
-  (props): boolean => {
-    if (!props || isEmpty(props)) {
-      return false;
-    }
-
-    return props.propsForMessage.isDeletable;
-  }
-);
-
 export const getMessageAttachmentProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageAttachmentSelectorProps
   | undefined => {
@@ -1038,22 +879,14 @@ export const getGenericReadableMessageSelectorProps = createSelector(
   }
 );
 
-export const getOldTopMessageId = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | null => state.oldTopMessageId || null
-);
+export const getOldTopMessageId = (state: StateType): string | null =>
+  state.conversations.oldTopMessageId || null;
 
-// TODOLATER get rid of all the unneeded createSelector calls
+export const getOldBottomMessageId = (state: StateType): string | null =>
+  state.conversations.oldBottomMessageId || null;
 
-export const getOldBottomMessageId = createSelector(
-  getConversations,
-  (state: ConversationsStateType): string | null => state.oldBottomMessageId || null
-);
-
-export const getIsSelectedConvoInitialLoadingInProgress = createSelector(
-  getSelectedConversation,
-  (convo: ReduxConversationType | undefined): boolean => Boolean(convo?.isInitialFetchingInProgress)
-);
+export const getIsSelectedConvoInitialLoadingInProgress = (state: StateType): boolean =>
+  Boolean(getSelectedConversation(state)?.isInitialFetchingInProgress);
 
 export function getCurrentlySelectedConversationOutsideRedux() {
   return window?.inboxStore?.getState().conversations.selectedConversation as string | undefined;
diff --git a/ts/state/selectors/index.ts b/ts/state/selectors/index.ts
index 42b6bfca9..304e6986a 100644
--- a/ts/state/selectors/index.ts
+++ b/ts/state/selectors/index.ts
@@ -25,3 +25,5 @@ export {
   UserConfigSelectors,
   UserSelectors,
 };
+
+export * from './messages';
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
new file mode 100644
index 000000000..5f4618f8b
--- /dev/null
+++ b/ts/state/selectors/messages.ts
@@ -0,0 +1,112 @@
+import { useSelector } from 'react-redux';
+import { UserUtils } from '../../session/utils';
+import {
+  MessageModelPropsWithConvoProps,
+  ReduxConversationType,
+  PropsForAttachment,
+  ReduxQuoteType,
+  LastMessageStatusType,
+} from '../ducks/conversations';
+import { StateType } from '../reducer';
+import { getMessagePropsByMessageId } from './conversations';
+
+const useMessageIdProps = (messageId: string | undefined) => {
+  return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId));
+};
+
+const useSenderConvoProps = (
+  msgProps: MessageModelPropsWithConvoProps | undefined
+): ReduxConversationType | undefined => {
+  return useSelector((state: StateType) => {
+    const sender = msgProps?.propsForMessage.sender;
+    if (!sender) {
+      return undefined;
+    }
+    return state.conversations.conversationLookup[sender] || undefined;
+  });
+};
+
+export const useAuthorProfileName = (messageId: string): string | null => {
+  const msg = useMessageIdProps(messageId);
+  const senderProps = useSenderConvoProps(msg);
+  if (!msg || !senderProps) {
+    return null;
+  }
+
+  const senderIsUs = msg.propsForMessage.sender === UserUtils.getOurPubKeyStrFromCache();
+
+  const authorProfileName = senderIsUs
+    ? window.i18n('you')
+    : senderProps.nickname || senderProps.displayNameInProfile || window.i18n('anonymous');
+  return authorProfileName || window.i18n('unknown');
+};
+
+export const useAuthorName = (messageId: string): string | null => {
+  const msg = useMessageIdProps(messageId);
+  const senderProps = useSenderConvoProps(msg);
+  if (!msg || !senderProps) {
+    return null;
+  }
+
+  const authorName = senderProps.nickname || senderProps.displayNameInProfile || null;
+  return authorName;
+};
+
+export const useAuthorAvatarPath = (messageId: string): string | null => {
+  const msg = useMessageIdProps(messageId);
+  const senderProps = useSenderConvoProps(msg);
+  if (!msg || !senderProps) {
+    return null;
+  }
+
+  return senderProps.avatarPath || null;
+};
+
+export const useMessageIsDeleted = (messageId: string): boolean => {
+  const props = useMessageIdProps(messageId);
+  return props?.propsForMessage.isDeleted || false;
+};
+
+export const useFirstMessageOfSeries = (messageId: string | undefined): boolean => {
+  return useMessageIdProps(messageId)?.firstMessageOfSeries || false;
+};
+
+export const useLastMessageOfSeries = (messageId: string | undefined): boolean => {
+  return useMessageIdProps(messageId)?.lastMessageOfSeries || false;
+};
+
+export const useMessageAuthor = (messageId: string | undefined): string | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.sender;
+};
+
+export const useMessageDirection = (messageId: string | undefined): string | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.direction;
+};
+
+export const useMessageLinkPreview = (messageId: string | undefined): any[] | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.previews;
+};
+
+export const useMessageAttachments = (
+  messageId: string | undefined
+): Array<PropsForAttachment> | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.attachments;
+};
+
+export const useMessageSenderIsAdmin = (messageId: string | undefined): boolean => {
+  return useMessageIdProps(messageId)?.propsForMessage.isSenderAdmin || false;
+};
+
+export const useMessageIsDeletable = (messageId: string | undefined): boolean => {
+  return useMessageIdProps(messageId)?.propsForMessage.isDeletable || false;
+};
+
+export const useMessageQuote = (messageId: string | undefined): ReduxQuoteType | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.quote;
+};
+
+export const useMessageStatus = (
+  messageId: string | undefined
+): LastMessageStatusType | undefined => {
+  return useMessageIdProps(messageId)?.propsForMessage.status;
+};
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index 45206f698..c0758fed2 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -10,13 +10,11 @@ import { getSelectedConversationKey } from './selectedConversation';
 
 export const getSearch = (state: StateType): SearchStateType => state.search;
 
-export const getQuery = createSelector(getSearch, (state: SearchStateType): string => state.query);
+export const getQuery = (state: StateType): string => getSearch(state).query;
 
-export const isSearching = createSelector(getSearch, (state: SearchStateType) => {
-  const { query } = state;
-
-  return Boolean(query && query.trim().length > 1);
-});
+export const isSearching = (state: StateType) => {
+  return !!getSearch(state)?.query?.trim();
+};
 
 export const getSearchResults = createSelector(
   [getSearch, getConversationLookup, getSelectedConversationKey],

From 3eb629e33eaa1f5d1f272696a99f82241c8be6be Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 22 Jun 2023 08:25:04 +0200
Subject: [PATCH 134/178] fix: cleanup convo selectors to hope to improve
 performances

---
 ts/components/dialog/InviteContactsDialog.tsx |   6 +-
 ts/components/leftpane/LeftPane.tsx           |   5 +-
 .../leftpane/LeftPaneMessageSection.tsx       |  29 ++---
 ts/node/sql.ts                                |   7 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |   2 +-
 .../conversations/ConversationController.ts   |   8 +-
 .../libsession_utils_user_groups.ts           |  50 ++------
 ts/state/ducks/conversations.ts               |   1 -
 ts/state/ducks/search.ts                      |  12 +-
 ts/state/selectors/conversations.ts           | 117 +++++++++---------
 ts/state/selectors/search.ts                  |  42 +++----
 .../unit/selectors/conversations_test.ts      |  10 --
 ts/types/MessageAttachment.ts                 |   1 -
 ts/util/attachmentsUtil.ts                    |   4 +-
 14 files changed, 111 insertions(+), 183 deletions(-)

diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index 6ec80e31d..f2d97abe3 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -23,13 +23,13 @@ type Props = {
   conversationId: string;
 };
 
-function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
+async function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
   const convo = getConversationController().get(convoId);
   if (!convo || !convo.isPublic()) {
     throw new Error('submitForOpenGroup group not found');
   }
   try {
-    const roomDetails = SessionUtilUserGroups.getCommunityByConvoIdCached(convo.id);
+    const roomDetails = await SessionUtilUserGroups.getCommunityByConvoIdNotCached(convo.id);
     if (!roomDetails) {
       throw new Error(`getCommunityByFullUrl returned no result for ${convo.id}`);
     }
@@ -133,7 +133,7 @@ const InviteContactsDialogInner = (props: Props) => {
   const onClickOK = () => {
     if (selectedContacts.length > 0) {
       if (isPublicConvo) {
-        submitForOpenGroup(conversationId, selectedContacts);
+        void submitForOpenGroup(conversationId, selectedContacts);
       } else {
         void submitForClosedGroup(conversationId, selectedContacts);
       }
diff --git a/ts/components/leftpane/LeftPane.tsx b/ts/components/leftpane/LeftPane.tsx
index ff2c91347..04366b481 100644
--- a/ts/components/leftpane/LeftPane.tsx
+++ b/ts/components/leftpane/LeftPane.tsx
@@ -26,14 +26,13 @@ const InnerLeftPaneMessageSection = () => {
 
   const searchResults = showSearch ? useSelector(getSearchResults) : undefined;
 
-  const lists = showSearch ? undefined : useSelector(getLeftPaneLists);
+  const conversations = showSearch ? undefined : useSelector(getLeftPaneLists);
   const overlayMode = useSelector(getOverlayMode);
 
   return (
     // tslint:disable-next-line: use-simple-attributes
     <LeftPaneMessageSection
-      conversations={lists?.conversations || []}
-      contacts={lists?.contacts || []}
+      conversations={conversations || []}
       searchResults={searchResults}
       overlayMode={overlayMode}
     />
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index b46507888..fbc72ca61 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -1,30 +1,27 @@
+import autoBind from 'auto-bind';
 import React from 'react';
 import { AutoSizer, List, ListRowProps } from 'react-virtualized';
+import { SearchResults, SearchResultsProps } from '../search/SearchResults';
+import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
+import { MessageRequestsBanner } from './MessageRequestsBanner';
 import {
   ConversationListItemProps,
   MemoConversationListItemWithDetails,
 } from './conversation-list-item/ConversationListItem';
-import { ReduxConversationType } from '../../state/ducks/conversations';
-import { SearchResults, SearchResultsProps } from '../search/SearchResults';
-import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
-import autoBind from 'auto-bind';
-import _ from 'lodash';
-import { MessageRequestsBanner } from './MessageRequestsBanner';
 
-import { SessionSearchInput } from '../SessionSearchInput';
-import { OverlayCommunity } from './overlay/OverlayCommunity';
-import { OverlayMessageRequest } from './overlay/OverlayMessageRequest';
-import { OverlayMessage } from './overlay/OverlayMessage';
-import { OverlayClosedGroup } from './overlay/OverlayClosedGroup';
-import { OverlayMode, setOverlayMode } from '../../state/ducks/section';
-import { OverlayChooseAction } from './overlay/choose-action/OverlayChooseAction';
-import styled from 'styled-components';
 import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+import { OverlayMode, setOverlayMode } from '../../state/ducks/section';
 import { getOverlayMode } from '../../state/selectors/section';
+import { SessionSearchInput } from '../SessionSearchInput';
 import { StyledLeftPaneList } from './LeftPaneList';
+import { OverlayClosedGroup } from './overlay/OverlayClosedGroup';
+import { OverlayCommunity } from './overlay/OverlayCommunity';
+import { OverlayMessage } from './overlay/OverlayMessage';
+import { OverlayMessageRequest } from './overlay/OverlayMessageRequest';
+import { OverlayChooseAction } from './overlay/choose-action/OverlayChooseAction';
 
 export interface Props {
-  contacts: Array<ReduxConversationType>;
   conversations?: Array<ConversationListItemProps>;
   searchResults?: SearchResultsProps;
   overlayMode: OverlayMode | undefined;
@@ -84,7 +81,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
       throw new Error('renderRow: conversations selector returned element containing falsy value.');
     }
 
-    return <MemoConversationListItemWithDetails key={key} style={style} {...conversation} />; // TODO there should not be a need for the ...conversation here?
+    return <MemoConversationListItemWithDetails key={key} style={style} id={conversation.id} />; // TODO there should not be a need for the ...conversation here?
   };
 
   public renderList(): JSX.Element {
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 4e3fb2f8a..5772dcd58 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -73,6 +73,7 @@ import {
 } from './sqlInstance';
 import { configDumpData } from './sql_calls/config_dump';
 import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
+import { sleepFor } from '../session/utils/Promise';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -184,17 +185,21 @@ async function initializeSql({
     // At this point we can allow general access to the database
     initDbInstanceWith(db);
 
+    await sleepFor(10);
     console.info('total message count before cleaning: ', getMessageCount());
     console.info('total conversation count before cleaning: ', getConversationCount());
+    await sleepFor(10);
     cleanUpOldOpengroupsOnStart();
     cleanUpUnusedNodeForKeyEntriesOnStart();
+    await sleepFor(10);
     printDbStats();
 
     console.info('total message count after cleaning: ', getMessageCount());
     console.info('total conversation count after cleaning: ', getConversationCount());
-
+    await sleepFor(10);
     // Clear any already deleted db entries on each app start.
     vacuumDatabase(db);
+    await sleepFor(10);
   } catch (error) {
     console.error('error', error);
     if (passwordAttempt) {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index b87264de5..bbf8614df 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -130,7 +130,7 @@ export class OpenGroupManagerV2 {
       return;
     }
 
-    const inWrapperCommunities = SessionUtilUserGroups.getAllCommunitiesCached();
+    const inWrapperCommunities = await SessionUtilUserGroups.getAllCommunitiesNotCached();
 
     const inWrapperIds = inWrapperCommunities.map(m =>
       getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 602954e4d..6257b5599 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -312,6 +312,7 @@ export class ConversationController {
     const load = async () => {
       try {
         const startLoad = Date.now();
+
         const convoModels = await Data.getAllConversations();
         this.conversations.add(convoModels);
 
@@ -324,18 +325,13 @@ export class ConversationController {
 
             switch (variant) {
               case 'UserConfig':
+              case 'UserGroupsConfig':
                 break;
               case 'ContactsConfig':
                 if (SessionUtilContact.isContactToStoreInWrapper(convo)) {
                   await SessionUtilContact.refreshMappedValue(convo.id, true);
                 }
                 break;
-              case 'UserGroupsConfig':
-                if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
-                  await SessionUtilUserGroups.refreshCachedUserGroup(convo.id, true);
-                }
-                break;
-
               case 'ConvoInfoVolatileConfig':
                 if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
                   await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 5000cdf2b..695ced8ff 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -8,14 +8,8 @@ import {
   getLegacyGroupInfoFromDBValues,
 } from '../../../types/sqlSharedTypes';
 import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
-import { OpenGroupUtils } from '../../apis/open_group_api/utils';
 import { getConversationController } from '../../conversations';
 
-/**
- * The key of this map is the convoId as stored in the database.
- */
-const mappedCommunityWrapperValues = new Map<string, CommunityInfo>();
-
 /**
  * Returns true if that conversation is an active group
  */
@@ -106,7 +100,6 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
           wrapperComm.fullUrl,
           wrapperComm.priority
         );
-        await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
         // we still let this go through
@@ -134,7 +127,6 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         );
         // this does the create or the update of the matching existing legacy group
         await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);
-        await refreshCachedUserGroup(convoId);
       } catch (e) {
         window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`);
         // we still let this go through
@@ -149,44 +141,18 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
   }
 }
 
-/**
- * @param duringAppStart set this to true if we should just fetch the cached value but not trigger a UI refresh of the corresponding conversation
- */
-async function refreshCachedUserGroup(convoId: string, duringAppStart = false) {
-  try {
-    let refreshed = false;
-    if (OpenGroupUtils.isOpenGroupV2(convoId)) {
-      const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
-      if (fromWrapper && fromWrapper.fullUrlWithPubkey) {
-        mappedCommunityWrapperValues.set(convoId, fromWrapper);
-      }
-      refreshed = true;
-    }
-
-    if (refreshed && !duringAppStart) {
-      getConversationController()
-        .get(convoId)
-        ?.triggerUIRefresh();
-    }
-  } catch (e) {
-    window.log.info(`refreshMappedValue: not an opengroup convoID: ${convoId}`, e);
-  }
-
-  // TODOLATER handle the new closed groups once we got them ready
+async function getCommunityByConvoIdNotCached(convoId: string) {
+  return UserGroupsWrapperActions.getCommunityByFullUrl(convoId);
 }
 
-function getCommunityByConvoIdCached(convoId: string) {
-  return mappedCommunityWrapperValues.get(convoId);
-}
-
-function getAllCommunitiesCached(): Array<CommunityInfo> {
-  return [...mappedCommunityWrapperValues.values()];
+async function getAllCommunitiesNotCached(): Promise<Array<CommunityInfo>> {
+  return UserGroupsWrapperActions.getAllCommunities();
 }
 
 /**
  * Removes the matching community from the wrapper and from the cached list of communities
  */
-async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutPubkey: string) {
+async function removeCommunityFromWrapper(_convoId: string, fullUrlWithOrWithoutPubkey: string) {
   const fromWrapper = await UserGroupsWrapperActions.getCommunityByFullUrl(
     fullUrlWithOrWithoutPubkey
   );
@@ -194,7 +160,6 @@ async function removeCommunityFromWrapper(convoId: string, fullUrlWithOrWithoutP
   if (fromWrapper) {
     await UserGroupsWrapperActions.eraseCommunityByFullUrl(fromWrapper.fullUrlWithPubkey);
   }
-  mappedCommunityWrapperValues.delete(convoId);
 }
 
 /**
@@ -226,13 +191,12 @@ export const SessionUtilUserGroups = {
   // shared
   isUserGroupToStoreInWrapper,
   insertGroupsFromDBIntoWrapperAndRefresh,
-  refreshCachedUserGroup,
   getUserGroupTypes,
 
   // communities
   isCommunityToStoreInWrapper,
-  getAllCommunitiesCached,
-  getCommunityByConvoIdCached,
+  getAllCommunitiesNotCached,
+  getCommunityByConvoIdNotCached,
   removeCommunityFromWrapper,
 
   // legacy group
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 08ef82769..cae47150a 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -237,7 +237,6 @@ export interface ReduxConversationType {
   weAreAdmin?: boolean;
   unreadCount?: number;
   mentionedUs?: boolean;
-  isSelected?: boolean;
   expireTimer?: number;
 
   isTyping?: boolean;
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index 3aa337335..d31bcea10 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -82,17 +82,7 @@ async function doSearch(query: string): Promise<SearchResultsPayloadType> {
   const { conversations, contacts } = discussions;
   const contactsAndGroups = _.uniq([...conversations, ...contacts]);
   const filteredMessages = _.compact(messages);
-  // if (isAdvancedQuery) {
-  //   const senderFilterQuery =
-  //     advancedSearchOptions.from && advancedSearchOptions.from.length > 0
-  //       ? await queryConversationsAndContacts(advancedSearchOptions.from, options)
-  //       : undefined;
-  //   filteredMessages = advancedFilterMessages(
-  //     filteredMessages,
-  //     advancedSearchOptions,
-  //     senderFilterQuery?.contacts || []
-  //   );
-  // }
+
   return {
     query,
     normalizedPhoneNumber: PubKey.normalize(query),
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 172469c4e..68de73d4b 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -21,11 +21,7 @@ import { MessageTextSelectorProps } from '../../components/conversation/message/
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
 import { hasValidIncomingRequestValues } from '../../models/conversation';
-import {
-  CONVERSATION_PRIORITIES,
-  ConversationTypeEnum,
-  isOpenOrClosedGroup,
-} from '../../models/conversationAttributes';
+import { CONVERSATION_PRIORITIES, isOpenOrClosedGroup } from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
 import { UserUtils } from '../../session/utils';
 import { LocalizerType } from '../../types/Util';
@@ -252,29 +248,60 @@ export const getConversationComparator = createSelector(getIntl, _getConversatio
 // tslint:disable-next-line: cyclomatic-complexity
 const _getLeftPaneLists = (
   sortedConversations: Array<ReduxConversationType>
-): {
-  conversations: Array<ReduxConversationType>;
-  contacts: Array<ReduxConversationType>;
-  globalUnreadCount: number;
-} => {
-  const conversations: Array<ReduxConversationType> = [];
-  const directConversations: Array<ReduxConversationType> = [];
+): Array<ReduxConversationType> => {
+  return sortedConversations.filter(conversation => {
+    if (conversation.isBlocked) return false;
 
+    // a private conversation not approved is a message request. Exclude them from the left pane lists
+
+    if (conversation.isPrivate && !conversation.isApproved) {
+      return false;
+    }
+
+    const isPrivateButHidden =
+      conversation.isPrivate &&
+      conversation.priority &&
+      conversation.priority <= CONVERSATION_PRIORITIES.default;
+
+    /**
+     * When getting a contact from a linked device, before he sent a message, the approved field is false, but a createdAt is used as activeAt
+     */
+    const isPrivateUnapprovedButActive =
+      conversation.isPrivate && !conversation.isApproved && !conversation.activeAt;
+
+    if (
+      isPrivateUnapprovedButActive ||
+      isPrivateButHidden // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+    ) {
+      // dont increase unread counter, don't push to convo list.
+      return false;
+    }
+    return true;
+  });
+};
+
+// tslint:disable-next-line: cyclomatic-complexity
+const _getPrivateFriendsConversations = (
+  sortedConversations: Array<ReduxConversationType>
+): Array<ReduxConversationType> => {
+  return sortedConversations.filter(convo => {
+    convo.isPrivate &&
+      !convo.isMe &&
+      !convo.isBlocked &&
+      convo.isApproved &&
+      convo.didApproveMe &&
+      convo.activeAt !== undefined;
+  });
+};
+
+// tslint:disable-next-line: cyclomatic-complexity
+const _getGlobalUnreadCount = (sortedConversations: Array<ReduxConversationType>): number => {
   let globalUnreadCount = 0;
   for (const conversation of sortedConversations) {
     // Blocked conversation are now only visible from the settings, not in the conversation list, so don't add it neither to the contacts list nor the conversation list
     if (conversation.isBlocked) {
       continue;
     }
-    // a contact is a private conversation that is approved by us and active
-    if (
-      conversation.activeAt !== undefined &&
-      conversation.type === ConversationTypeEnum.PRIVATE &&
-      conversation.isApproved
-      // we want to keep the hidden conversation in the direct contact list, so we don't filter based on priority
-    ) {
-      directConversations.push(conversation);
-    }
 
     // a private conversation not approved is a message request. Exclude them from the left pane lists
     if (conversation.isPrivate && !conversation.isApproved) {
@@ -309,21 +336,14 @@ const _getLeftPaneLists = (
     ) {
       globalUnreadCount += conversation.unreadCount;
     }
-
-    conversations.push(conversation);
   }
 
-  return {
-    conversations,
-    contacts: directConversations,
-    globalUnreadCount,
-  };
+  return globalUnreadCount;
 };
 
 export const _getSortedConversations = (
   lookup: ConversationLookupType,
-  comparator: (left: ReduxConversationType, right: ReduxConversationType) => number,
-  selectedConversation?: string
+  comparator: (left: ReduxConversationType, right: ReduxConversationType) => number
 ): Array<ReduxConversationType> => {
   const values = Object.values(lookup);
   const sorted = values.sort(comparator);
@@ -338,11 +358,9 @@ export const _getSortedConversations = (
     }
 
     const isBlocked = BlockedNumberController.isBlocked(conversation.id);
-    const isSelected = selectedConversation === conversation.id;
 
     sortedConversations.push({
       ...conversation,
-      isSelected: isSelected || undefined,
       isBlocked: isBlocked || undefined,
     });
   }
@@ -397,21 +415,6 @@ export const getUnreadConversationRequests = createSelector(
   _getUnreadConversationRequests
 );
 
-const _getPrivateContactsPubkeys = (
-  sortedConversations: Array<ReduxConversationType>
-): Array<string> => {
-  return filter(sortedConversations, conversation => {
-    return !!(
-      conversation.isPrivate &&
-      !conversation.isBlocked &&
-      !conversation.isMe &&
-      conversation.didApproveMe &&
-      conversation.isApproved &&
-      conversation.activeAt
-    );
-  }).map(convo => convo.id);
-};
-
 /**
  * Returns all the conversation ids of private conversations which are
  * - private
@@ -420,20 +423,15 @@ const _getPrivateContactsPubkeys = (
  * - approved (or message requests are disabled)
  * - active_at is set to something truthy
  */
-export const getPrivateContactsPubkeys = createSelector(
-  getSortedConversations,
-  _getPrivateContactsPubkeys
+export const getPrivateContactsPubkeys = createSelector(_getPrivateFriendsConversations, state =>
+  state.map(m => m.id)
 );
 
 export const getLeftPaneLists = createSelector(getSortedConversations, _getLeftPaneLists);
 
 export const getDirectContacts = createSelector(
-  getLeftPaneLists,
-  (state: {
-    conversations: Array<ReduxConversationType>;
-    contacts: Array<ReduxConversationType>;
-    globalUnreadCount: number;
-  }) => state.contacts
+  getSortedConversations,
+  _getPrivateFriendsConversations
 );
 
 export const getDirectContactsCount = createSelector(
@@ -472,9 +470,10 @@ export const getDirectContactsByName = createSelector(
   }
 );
 
-export const getGlobalUnreadMessageCount = createSelector(getLeftPaneLists, (state): number => {
-  return state.globalUnreadCount;
-});
+export const getGlobalUnreadMessageCount = createSelector(
+  getSortedConversations,
+  _getGlobalUnreadCount
+);
 
 export const isMessageDetailView = (state: StateType): boolean =>
   state.conversations.messageDetailProps !== undefined;
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index c0758fed2..a3344bdf0 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -1,12 +1,11 @@
-import { compact } from 'lodash';
 import { createSelector } from '@reduxjs/toolkit';
+import { compact } from 'lodash';
 
 import { StateType } from '../reducer';
 
+import { ConversationLookupType } from '../ducks/conversations';
 import { SearchStateType } from '../ducks/search';
 import { getConversationLookup } from './conversations';
-import { ConversationLookupType } from '../ducks/conversations';
-import { getSelectedConversationKey } from './selectedConversation';
 
 export const getSearch = (state: StateType): SearchStateType => state.search;
 
@@ -17,33 +16,24 @@ export const isSearching = (state: StateType) => {
 };
 
 export const getSearchResults = createSelector(
-  [getSearch, getConversationLookup, getSelectedConversationKey],
-  (searchState: SearchStateType, lookup: ConversationLookupType, selectedConversation?: string) => {
+  [getSearch, getConversationLookup],
+  (searchState: SearchStateType, lookup: ConversationLookupType) => {
     return {
       contactsAndGroups: compact(
-        searchState.contactsAndGroups.map(id => {
-          const value = lookup[id];
+        searchState.contactsAndGroups
+          .filter(id => {
+            const value = lookup[id];
 
-          // on some edges cases, we have an id but no corresponding convo because it matches a query but the conversation was removed.
-          if (!value) {
-            return null;
-          }
+            // on some edges cases, we have an id but no corresponding convo because it matches a query but the conversation was removed.
+            // Don't return anything when activeAt is unset (i.e. no current conversations with this user)
+            if (!value || value.activeAt === undefined || value.activeAt === 0) {
+              //activeAt can be 0 when linking device
+              return false;
+            }
 
-          // Don't return anything when activeAt is unset (i.e. no current conversations with this user)
-          if (value.activeAt === undefined || value.activeAt === 0) {
-            //activeAt can be 0 when linking device
-            return null;
-          }
-
-          if (value && id === selectedConversation) {
-            return {
-              ...value,
-              isSelected: true,
-            };
-          }
-
-          return value;
-        })
+            return true;
+          })
+          .map(id => lookup[id])
       ),
       messages: compact(searchState.messages),
       searchTerm: searchState.query,
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index e51606c9a..96954ff96 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -24,7 +24,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -49,7 +48,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -73,7 +71,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -97,7 +94,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -121,7 +117,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -163,7 +158,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -189,7 +183,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -215,7 +208,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -241,7 +233,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
@@ -266,7 +257,6 @@ describe('state/selectors/conversations', () => {
           isMe: false,
           unreadCount: 1,
           mentionedUs: false,
-          isSelected: false,
           isTyping: false,
           isBlocked: false,
           isKickedFromGroup: false,
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index be00c445a..bea00fe83 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -152,7 +152,6 @@ export const processNewAttachment = async (attachment: {
   const rotatedData = await autoOrientJPEGAttachment(attachment);
 
   const onDiskAttachmentPath = await migrateDataToFileSystem(rotatedData.data);
-
   const attachmentWithoutData = omit({ ...attachment, fileName, path: onDiskAttachmentPath }, [
     'data',
   ]);
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index d6763c0fa..46812f53a 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -157,6 +157,7 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
   width?: number;
   height?: number;
 }> {
+  const start = Date.now();
   const { contentType, blob } = attachment;
   if (contentType.split('/')[0] !== 'image' || contentType === IMAGE_TIFF) {
     // nothing to do
@@ -238,7 +239,6 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
   let quality = 0.95;
   const startI = 4;
   let i = startI;
-  // const start = Date.now();
   do {
     i -= 1;
     if (DEBUG_ATTACHMENTS_SCALE) {
@@ -260,7 +260,7 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
   if (readAndResizedBlob.size > maxSize) {
     throw new Error('Cannot add this attachment even after trying to scale it down.');
   }
-  // window.log.debug(`[perf] autoscale took ${Date.now() - start}ms `);
+  window.log.debug(`[perf] autoscale took ${Date.now() - start}ms `);
 
   return {
     contentType: attachment.contentType,

From 32498717b4df1d08f743a548bf219ec1b9592413 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 22 Jun 2023 11:08:54 +0200
Subject: [PATCH 135/178] chore: bump libsession-nodejs version

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 83035fb03..4d9ce5ae0 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index 6501a3746..ddd9ce735 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz":
-  version "0.1.17"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.17/libsession_util_nodejs-v0.1.17.tar.gz#e79b8900a62fcf3798a43aeef0e99d5fc52674a2"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz":
+  version "0.1.18"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz#2580c8b4d6c58da4c22108f88e13dd0cb2da54dc"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From bec667ebee22f9324f690adb64fb7b8f5db915f2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 22 Jun 2023 14:12:30 +0200
Subject: [PATCH 136/178] fix: remove row_number ordering when looking up
 message

---
 ts/components/avatar/Avatar.tsx               |  1 +
 .../leftpane/LeftPaneMessageSection.tsx       |  3 +-
 ts/node/sql.ts                                | 65 ++++++++++++-------
 ts/state/selectors/conversations.ts           | 10 ++-
 ts/state/selectors/messages.ts                |  2 +-
 5 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index 0318dfedc..c441b759e 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -98,6 +98,7 @@ const AvatarImage = (props: {
   }
   const dataToDisplay = base64Data ? `data:image/jpeg;base64,${base64Data}` : avatarPath;
 
+  // tslint:disable: react-a11y-img-has-alt
   return (
     <img
       onError={handleImageError}
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index fbc72ca61..ec0f529fa 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -100,14 +100,13 @@ export class LeftPaneMessageSection extends React.Component<Props> {
     // Note: conversations is not a known prop for List, but it is required to ensure that
     //   it re-renders when our conversations data changes. Otherwise it would just render
     //   on startup and scroll.
-
+    // TODO do need that `conversations` prop? I again don't see why it is needed. Especially because the list item use hook to fetch their details.
     return (
       <StyledLeftPaneList key={0}>
         <AutoSizer>
           {({ height, width }) => (
             <List
               className="module-left-pane__virtual-list"
-              conversations={conversations}
               height={height}
               rowCount={length}
               rowHeight={64}
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 5772dcd58..7078cd289 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1241,34 +1241,49 @@ function getMessagesByConversation(conversationId: string, { messageId = null }
     const messageFound = getMessageById(messageId || firstUnread);
 
     if (messageFound && messageFound.conversationId === conversationId) {
-      // tslint:disable-next-line: no-shadowed-variable
-      const rows = assertGlobalInstance()
+      // tslint:disable-next-li ne: no-shadowed-variable
+      const start = Date.now();
+      const msgTimestamp =
+        messageFound.serverTimestamp || messageFound.sent_at || messageFound.received_at;
+
+      const commonArgs = {
+        conversationId,
+        msgTimestamp,
+        limit:
+          numberOfMessagesInConvo < floorLoadAllMessagesInConvo
+            ? floorLoadAllMessagesInConvo
+            : absLimit,
+      };
+
+      const messagesBefore = assertGlobalInstance()
         .prepare(
-          `WITH cte AS (
-            SELECT id, conversationId, json, row_number() OVER (${orderByClause}) as row_number
-              FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId
-          ), current AS (
-          SELECT row_number
-            FROM cte
-          WHERE id = $messageId
-
+          `SELECT id, conversationId, json
+            FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND COALESCE(serverTimestamp, sent_at, received_at) <= $msgTimestamp
+            ${orderByClause}
+            LIMIT $limit`
         )
-        SELECT cte.*
-          FROM cte, current
-            WHERE ABS(cte.row_number - current.row_number) <= $limit
-          ORDER BY cte.row_number;
-          `
-        )
-        .all({
-          conversationId,
-          messageId: messageId || firstUnread,
-          limit:
-            numberOfMessagesInConvo < floorLoadAllMessagesInConvo
-              ? floorLoadAllMessagesInConvo
-              : absLimit,
-        });
+        .all(commonArgs);
 
-      return map(rows, row => jsonToObject(row.json));
+      const messagesAfter = assertGlobalInstance()
+        .prepare(
+          `SELECT id, conversationId, json
+            FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND COALESCE(serverTimestamp, sent_at, received_at) > $msgTimestamp
+            ${orderByClauseASC}
+            LIMIT $limit`
+        )
+        .all(commonArgs);
+
+      console.info(`getMessagesByConversation around took ${Date.now() - start}ms `);
+
+      // sorting is made in redux already when rendered, but some things are made outside of redux, so let's make sure the order is right
+      return map([...messagesBefore, ...messagesAfter], row => jsonToObject(row.json)).sort(
+        (a, b) => {
+          return (
+            (b.serverTimestamp || b.sent_at || b.received_at) -
+            (a.serverTimestamp || a.sent_at || a.received_at)
+          );
+        }
+      );
     }
     console.info(
       `getMessagesByConversation: Could not find messageId ${messageId} in db with conversationId: ${conversationId}. Just fetching the convo as usual.`
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 68de73d4b..b6c4dfab1 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -250,7 +250,9 @@ const _getLeftPaneLists = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
   return sortedConversations.filter(conversation => {
-    if (conversation.isBlocked) return false;
+    if (conversation.isBlocked) {
+      return false;
+    }
 
     // a private conversation not approved is a message request. Exclude them from the left pane lists
 
@@ -285,12 +287,14 @@ const _getPrivateFriendsConversations = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
   return sortedConversations.filter(convo => {
-    convo.isPrivate &&
+    return (
+      convo.isPrivate &&
       !convo.isMe &&
       !convo.isBlocked &&
       convo.isApproved &&
       convo.didApproveMe &&
-      convo.activeAt !== undefined;
+      convo.activeAt !== undefined
+    );
   });
 };
 
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
index 5f4618f8b..2c3fe68c4 100644
--- a/ts/state/selectors/messages.ts
+++ b/ts/state/selectors/messages.ts
@@ -83,7 +83,7 @@ export const useMessageDirection = (messageId: string | undefined): string | und
   return useMessageIdProps(messageId)?.propsForMessage.direction;
 };
 
-export const useMessageLinkPreview = (messageId: string | undefined): any[] | undefined => {
+export const useMessageLinkPreview = (messageId: string | undefined): Array<any> | undefined => {
   return useMessageIdProps(messageId)?.propsForMessage.previews;
 };
 

From 0e18bf464052c6f6851d0becc642aaab8f9893f7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 23 Jun 2023 07:58:52 +0200
Subject: [PATCH 137/178] fix: disable expire timer tracking for all libsession
 logic

this will need to be turned on when the disappearing branch is merged
---
 package.json                                  |  2 +-
 ts/node/migration/sessionMigrations.ts        | 16 +++++-----
 ts/receiver/configMessage.ts                  | 30 +++++++++----------
 .../libsession/libsession_utils_contacts.ts   |  5 ++--
 .../libsession_utils_user_groups.ts           |  2 +-
 .../libsession_utils_user_profile.ts          |  8 ++---
 ts/types/sqlSharedTypes.ts                    | 28 ++++++++---------
 .../browser/libsession_worker_interface.ts    |  6 ++--
 yarn.lock                                     |  6 ++--
 9 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index 4d9ce5ae0..514b4e3a8 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.21",
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 24cbc14ce..b32222312 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1223,7 +1223,7 @@ function insertContactIntoContactWrapper(
     const dbApprovedMe = !!contact.didApproveMe || false;
     const dbBlocked = blockedNumbers.includes(contact.id);
     const priority = contact.priority || CONVERSATION_PRIORITIES.default;
-    const expirationTimerSeconds = contact.expireTimer || 0;
+    // const expirationTimerSeconds = contact.expireTimer || 0;
 
     const wrapperContact = getContactInfoFromDBValues({
       id: contact.id,
@@ -1235,7 +1235,7 @@ function insertContactIntoContactWrapper(
       dbProfileKey: contact.profileKey || undefined,
       dbProfileUrl: contact.avatarPointer || undefined,
       priority,
-      expirationTimerSeconds,
+      // expirationTimerSeconds,
     });
 
     try {
@@ -1259,7 +1259,7 @@ function insertContactIntoContactWrapper(
             dbProfileKey: undefined,
             dbProfileUrl: undefined,
             priority: CONVERSATION_PRIORITIES.default,
-            expirationTimerSeconds: 0,
+            // expirationTimerSeconds: 0,
           })
         );
       } catch (e) {
@@ -1373,7 +1373,7 @@ function insertCommunityIntoWrapper(
 function insertLegacyGroupIntoWrapper(
   legacyGroup: Pick<
     ConversationAttributes,
-    'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' | 'lastJoinedTimestamp'
+    'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' // | 'expireTimer'
   > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
   userGroupConfigWrapper: UserGroupsWrapperNode,
   volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode,
@@ -1382,7 +1382,7 @@ function insertLegacyGroupIntoWrapper(
   const {
     priority,
     id,
-    expireTimer,
+    // expireTimer,
     groupAdmins,
     members,
     displayNameInProfile,
@@ -1397,7 +1397,7 @@ function insertLegacyGroupIntoWrapper(
   const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
     id,
     priority,
-    expireTimer,
+    // expireTimer,
     groupAdmins,
     members,
     displayNameInProfile,
@@ -1625,7 +1625,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       const ourDbProfileUrl = ourConversation.avatarPointer || '';
       const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
       const ourConvoPriority = ourConversation.priority;
-      const ourConvoExpire = ourConversation.expireTimer || 0;
+      // const ourConvoExpire = ourConversation.expireTimer || 0;
       if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
         userProfileWrapper.setUserInfo(
           ourDbName,
@@ -1634,7 +1634,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
             url: ourDbProfileUrl,
             key: ourDbProfileKey,
           },
-          ourConvoExpire
+          // ourConvoExpire
         );
       }
 
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 8c51c87e8..e68e6476a 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -330,10 +330,10 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         changes = true;
       }
 
-      if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
-        await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
-        changes = true;
-      }
+      // if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
+      //   await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
+      //   changes = true;
+      // }
 
       // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
       if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
@@ -558,17 +558,17 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
       changes = true;
     }
 
-    if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
-      await legacyGroupConvo.updateExpireTimer(
-        fromWrapper.disappearingTimerSeconds,
-        undefined,
-        latestEnvelopeTimestamp,
-        {
-          fromSync: true,
-        }
-      );
-      changes = true;
-    }
+    // if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
+    //   await legacyGroupConvo.updateExpireTimer(
+    //     fromWrapper.disappearingTimerSeconds,
+    //     undefined,
+    //     latestEnvelopeTimestamp,
+    //     {
+    //       fromSync: true,
+    //     }
+    //   );
+    //   changes = true;
+    // }
     // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead
     if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) {
       getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex));
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 5dd749564..a960352ae 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -57,7 +57,8 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
   const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
   const dbBlocked = !!foundConvo.isBlocked() || false;
   const priority = foundConvo.get('priority') || 0;
-  const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
+  // expiration timer is not tracked currently but will be once disappearing message is merged into userconfig
+  // const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
 
   const wrapperContact = getContactInfoFromDBValues({
     id,
@@ -69,7 +70,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     dbProfileKey,
     dbProfileUrl,
     priority,
-    expirationTimerSeconds,
+    // expirationTimerSeconds,
   });
   try {
     window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 695ced8ff..0a129c637 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -113,7 +113,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
         priority: foundConvo.get('priority'),
         members: foundConvo.get('members') || [],
         groupAdmins: foundConvo.get('groupAdmins') || [],
-        expireTimer: foundConvo.get('expireTimer'),
+        // expireTimer: foundConvo.get('expireTimer'),
         displayNameInProfile: foundConvo.get('displayNameInProfile'),
         encPubkeyHex: encryptionKeyPair?.publicHex || '',
         encSeckeyHex: encryptionKeyPair?.privateHex || '',
diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts
index 8faafc275..96c3948ef 100644
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@@ -26,7 +26,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
       { url: dbProfileUrl, key: dbProfileKey }
     )} `
   );
-  const expirySeconds = ourConvo.get('expireTimer') || 0;
+  // const expirySeconds = ourConvo.get('expireTimer') || 0;
   if (dbProfileUrl && !isEmpty(dbProfileKey)) {
     await UserConfigWrapperActions.setUserInfo(
       dbName,
@@ -34,11 +34,11 @@ async function insertUserProfileIntoWrapper(convoId: string) {
       {
         url: dbProfileUrl,
         key: dbProfileKey,
-      },
-      expirySeconds
+      }
+      // expirySeconds
     );
   } else {
-    await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds);
+    await UserConfigWrapperActions.setUserInfo(dbName, priority, null); // expirySeconds
   }
 }
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 8653c89bf..56b976c35 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -115,8 +115,8 @@ export function getContactInfoFromDBValues({
   priority,
   dbProfileUrl,
   dbProfileKey,
-  expirationTimerSeconds,
-}: {
+}: // expirationTimerSeconds,
+{
   id: string;
   dbApproved: boolean;
   dbApprovedMe: boolean;
@@ -126,7 +126,7 @@ export function getContactInfoFromDBValues({
   priority: number;
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
-  expirationTimerSeconds: number | undefined;
+  // expirationTimerSeconds: number | undefined;
 }): ContactInfoSet {
   const wrapperContact: ContactInfoSet = {
     id,
@@ -136,14 +136,14 @@ export function getContactInfoFromDBValues({
     priority,
     nickname: dbNickname,
     name: dbName,
-    expirationTimerSeconds:
-      !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
-        ? expirationTimerSeconds
-        : 0, // TODOLATER add the expiration mode handling
-    expirationMode:
-      !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
-        ? 'disappearAfterSend'
-        : 'off',
+    // expirationTimerSeconds:
+    //   !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
+    //     ? expirationTimerSeconds
+    //     : 0, // TODOLATER add the expiration mode handling
+    // expirationMode:
+    //   !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
+    //     ? 'disappearAfterSend'
+    //     : 'off',
   };
 
   if (
@@ -199,14 +199,14 @@ export function getLegacyGroupInfoFromDBValues({
   priority,
   members: maybeMembers,
   displayNameInProfile,
-  expireTimer,
+  // expireTimer,
   encPubkeyHex,
   encSeckeyHex,
   groupAdmins: maybeAdmins,
   lastJoinedTimestamp,
 }: Pick<
   ConversationAttributes,
-  'id' | 'priority' | 'displayNameInProfile' | 'expireTimer' | 'lastJoinedTimestamp'
+  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer'
 > & {
   encPubkeyHex: string;
   encSeckeyHex: string;
@@ -224,7 +224,7 @@ export function getLegacyGroupInfoFromDBValues({
   });
   const legacyGroup: LegacyGroupInfo = {
     pubkeyHex: id,
-    disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
+    // disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
     name: displayNameInProfile || '',
     priority: priority || 0,
     members: wrappedMembers,
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index 0256e9bb9..fb2555e9a 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -104,8 +104,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
   setUserInfo: async (
     name: string,
     priority: number,
-    profilePic: { url: string; key: Uint8Array } | null,
-    expireSeconds: number
+    profilePic: { url: string; key: Uint8Array } | null
+    // expireSeconds: number
   ) =>
     callLibSessionWorker([
       'UserConfig',
@@ -113,7 +113,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
       name,
       priority,
       profilePic,
-      expireSeconds,
+      // expireSeconds,
     ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
 };
 
diff --git a/yarn.lock b/yarn.lock
index ddd9ce735..84fe9eff7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz":
-  version "0.1.18"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.18/libsession_util_nodejs-v0.1.18.tar.gz#2580c8b4d6c58da4c22108f88e13dd0cb2da54dc"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz":
+  version "0.1.19"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz#294c6e8ea6b767d375a9c0249bef98b65f3ae252"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From fed58161a0098db73636a5f15d204f03a1b94ab2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 23 Jun 2023 14:03:52 +0200
Subject: [PATCH 138/178] fix: address PR reviews and optimize search results

---
 ts/components/avatar/Avatar.tsx               | 27 +++---
 .../message-content/MessageContextMenu.tsx    | 17 ++--
 ts/components/icon/SessionIcon.tsx            |  4 +-
 ts/components/leftpane/LeftPane.tsx           | 12 +--
 .../leftpane/LeftPaneMessageSection.tsx       | 35 ++++----
 .../ConversationListItem.tsx                  | 16 ++--
 .../leftpane/overlay/OverlayClosedGroup.tsx   | 16 +---
 .../overlay/OverlayMessageRequest.tsx         | 22 ++---
 ts/components/search/SearchResults.tsx        | 19 ++--
 ts/node/migration/sessionMigrations.ts        |  2 +-
 ts/node/sql.ts                                |  6 --
 ts/state/selectors/conversations.ts           | 90 +++++++++----------
 ts/state/selectors/search.ts                  | 13 ++-
 13 files changed, 131 insertions(+), 148 deletions(-)

diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index c441b759e..e85ee2a89 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -13,6 +13,7 @@ import { isMessageSelectionMode } from '../../state/selectors/conversations';
 import { SessionIcon } from '../icon';
 import { AvatarPlaceHolder } from './AvatarPlaceHolder/AvatarPlaceHolder';
 import { ClosedGroupAvatar } from './AvatarPlaceHolder/ClosedGroupAvatar';
+import { isEqual } from 'lodash';
 
 export enum AvatarSize {
   XS = 28,
@@ -33,7 +34,7 @@ type Props = {
   dataTestId?: string;
 };
 
-const Identicon = (props: Props) => {
+const Identicon = (props: Pick<Props, 'forcedName' | 'pubkey' | 'size'>) => {
   const { size, forcedName, pubkey } = props;
   const displayName = useConversationUsername(pubkey);
   const userName = forcedName || displayName || '0';
@@ -81,15 +82,15 @@ const NoImage = (
   return <Identicon size={size} forcedName={forcedName} pubkey={pubkey} />;
 };
 
-const AvatarImage = (props: {
-  avatarPath?: string;
-  base64Data?: string;
-  name?: string; // display name, profileName or pubkey, whatever is set first
-  imageBroken: boolean;
-  datatestId?: string;
-  handleImageError: () => any;
-}) => {
-  const { avatarPath, base64Data, imageBroken, datatestId, handleImageError } = props;
+const AvatarImage = (
+  props: Pick<Props, 'base64Data' | 'dataTestId'> & {
+    avatarPath?: string;
+    name?: string; // display name, profileName or pubkey, whatever is set first
+    imageBroken: boolean;
+    handleImageError: () => any;
+  }
+) => {
+  const { avatarPath, base64Data, imageBroken, dataTestId, handleImageError } = props;
 
   const disableDrag = useDisableDrag();
 
@@ -104,7 +105,7 @@ const AvatarImage = (props: {
       onError={handleImageError}
       onDragStart={disableDrag}
       src={dataToDisplay}
-      data-testid={datatestId}
+      data-testid={dataTestId}
     />
   );
 };
@@ -163,7 +164,7 @@ const AvatarInner = (props: Props) => {
           imageBroken={imageBroken}
           name={forcedName || name}
           handleImageError={handleImageError}
-          datatestId={dataTestId ? `img-${dataTestId}` : undefined}
+          dataTestId={dataTestId ? `img-${dataTestId}` : undefined}
         />
       ) : (
         <NoImage {...props} isClosedGroup={isClosedGroupAvatar} />
@@ -172,4 +173,4 @@ const AvatarInner = (props: Props) => {
   );
 };
 
-export const Avatar = AvatarInner;
+export const Avatar = React.memo(AvatarInner, isEqual);
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index cbdd7534e..7e8c70b1a 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -336,13 +336,16 @@ export const MessageContextMenu = (props: Props) => {
               <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>
             </>
           ) : null}
-          {showAdminActions ? <Item onClick={onBan}>{window.i18n('banUser')}</Item> : null}
-          {showAdminActions ? <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item> : null}
-          {showAdminActions && !isSenderAdmin ? (
-            <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
-          ) : null}
-          {showAdminActions && isSenderAdmin ? (
-            <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
+          {showAdminActions ? (
+            <>
+              <Item onClick={onBan}>{window.i18n('banUser')}</Item>
+              <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
+              {isSenderAdmin ? (
+                <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
+              ) : (
+                <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
+              )}
+            </>
           ) : null}
         </Menu>
       </SessionContextMenuContainer>
diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx
index 967d69d03..dda4a5741 100644
--- a/ts/components/icon/SessionIcon.tsx
+++ b/ts/components/icon/SessionIcon.tsx
@@ -122,7 +122,7 @@ const animation = (props: {
 };
 
 //tslint:disable no-unnecessary-callback-wrapper
-const Svg = styled.svg<StyledSvgProps>`
+const Svg = React.memo(styled.svg<StyledSvgProps>`
   width: ${props => props.width};
   transform: ${props => `rotate(${props.iconRotation}deg)`};
   animation: ${props => animation(props)};
@@ -134,7 +134,7 @@ const Svg = styled.svg<StyledSvgProps>`
   fill: ${props => (props.iconColor ? props.iconColor : '--button-icon-stroke-color')};
   padding: ${props => (props.iconPadding ? props.iconPadding : '')};
   transition: inherit;
-`;
+`);
 // tslint:enable no-unnecessary-callback-wrapper
 
 const SessionSvg = (props: {
diff --git a/ts/components/leftpane/LeftPane.tsx b/ts/components/leftpane/LeftPane.tsx
index 04366b481..f113fa594 100644
--- a/ts/components/leftpane/LeftPane.tsx
+++ b/ts/components/leftpane/LeftPane.tsx
@@ -3,8 +3,8 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { SectionType } from '../../state/ducks/section';
-import { getLeftPaneLists } from '../../state/selectors/conversations';
-import { getSearchResults, isSearching } from '../../state/selectors/search';
+import { getLeftPaneConversationIds } from '../../state/selectors/conversations';
+import { getSearchResultsIdsOnly, isSearching } from '../../state/selectors/search';
 import { getFocusedSection, getOverlayMode } from '../../state/selectors/section';
 import { SessionTheme } from '../../themes/SessionTheme';
 import { SessionToastContainer } from '../SessionToastContainer';
@@ -24,16 +24,16 @@ const StyledLeftPane = styled.div`
 const InnerLeftPaneMessageSection = () => {
   const showSearch = useSelector(isSearching);
 
-  const searchResults = showSearch ? useSelector(getSearchResults) : undefined;
+  const searchResults = useSelector(getSearchResultsIdsOnly);
 
-  const conversations = showSearch ? undefined : useSelector(getLeftPaneLists);
+  const conversationIds = useSelector(getLeftPaneConversationIds);
   const overlayMode = useSelector(getOverlayMode);
 
   return (
     // tslint:disable-next-line: use-simple-attributes
     <LeftPaneMessageSection
-      conversations={conversations || []}
-      searchResults={searchResults}
+      conversationIds={showSearch ? undefined : conversationIds || []}
+      searchResults={showSearch ? searchResults : undefined}
       overlayMode={overlayMode}
     />
   );
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index ec0f529fa..98504cd85 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -4,10 +4,6 @@ import { AutoSizer, List, ListRowProps } from 'react-virtualized';
 import { SearchResults, SearchResultsProps } from '../search/SearchResults';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 import { MessageRequestsBanner } from './MessageRequestsBanner';
-import {
-  ConversationListItemProps,
-  MemoConversationListItemWithDetails,
-} from './conversation-list-item/ConversationListItem';
 
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
@@ -20,9 +16,11 @@ import { OverlayCommunity } from './overlay/OverlayCommunity';
 import { OverlayMessage } from './overlay/OverlayMessage';
 import { OverlayMessageRequest } from './overlay/OverlayMessageRequest';
 import { OverlayChooseAction } from './overlay/choose-action/OverlayChooseAction';
+import { ConversationListItem } from './conversation-list-item/ConversationListItem';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export interface Props {
-  conversations?: Array<ConversationListItemProps>;
+  conversationIds?: Array<string>;
   searchResults?: SearchResultsProps;
   overlayMode: OverlayMode | undefined;
 }
@@ -57,8 +55,13 @@ const ClosableOverlay = () => {
       return <OverlayMessage />;
     case 'message-requests':
       return <OverlayMessageRequest />;
-    default:
+    case undefined:
       return null;
+    default:
+      return assertUnreachable(
+        overlayMode,
+        `ClosableOverlay: overlayMode case not handled "${overlayMode}"`
+      );
   }
 };
 
@@ -69,38 +72,34 @@ export class LeftPaneMessageSection extends React.Component<Props> {
   }
 
   public renderRow = ({ index, key, style }: ListRowProps): JSX.Element | null => {
-    const { conversations } = this.props;
+    const { conversationIds } = this.props;
 
     //assume conversations that have been marked unapproved should be filtered out by selector.
-    if (!conversations) {
+    if (!conversationIds) {
       throw new Error('renderRow: Tried to render without conversations');
     }
 
-    const conversation = conversations[index];
-    if (!conversation) {
+    const conversationId = conversationIds[index];
+    if (!conversationId) {
       throw new Error('renderRow: conversations selector returned element containing falsy value.');
     }
 
-    return <MemoConversationListItemWithDetails key={key} style={style} id={conversation.id} />; // TODO there should not be a need for the ...conversation here?
+    return <ConversationListItem key={key} style={style} conversationId={conversationId} />;
   };
 
   public renderList(): JSX.Element {
-    const { conversations, searchResults } = this.props;
+    const { conversationIds, searchResults } = this.props;
 
     if (searchResults) {
       return <SearchResults {...searchResults} />;
     }
 
-    if (!conversations) {
+    if (!conversationIds) {
       throw new Error('render: must provided conversations if no search results are provided');
     }
 
-    const length = conversations.length;
+    const length = conversationIds.length;
 
-    // Note: conversations is not a known prop for List, but it is required to ensure that
-    //   it re-renders when our conversations data changes. Otherwise it would just render
-    //   on startup and scroll.
-    // TODO do need that `conversations` prop? I again don't see why it is needed. Especially because the list item use hook to fetch their details.
     return (
       <StyledLeftPaneList key={0}>
         <AutoSizer>
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index b200ef693..cc67146a9 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -6,10 +6,7 @@ import { Avatar, AvatarSize } from '../../avatar/Avatar';
 
 import { createPortal } from 'react-dom';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  ReduxConversationType,
-  openConversationWithMessages,
-} from '../../../state/ducks/conversations';
+import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
 import _, { isNil } from 'lodash';
@@ -28,15 +25,12 @@ import { ContextConversationProvider, useConvoIdFromContext } from './ConvoIdCon
 import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
 
-// tslint:disable-next-line: no-empty-interface
-export type ConversationListItemProps = Pick<ReduxConversationType, 'id'>;
-
 type PropsHousekeeping = {
   style?: Object;
 };
 // tslint:disable: use-simple-attributes
 
-type Props = ConversationListItemProps & PropsHousekeeping;
+type Props = { conversationId: string } & PropsHousekeeping;
 
 const Portal = ({ children }: { children: any }) => {
   return createPortal(children, document.querySelector('.inbox.index') as Element);
@@ -70,8 +64,8 @@ const AvatarItem = () => {
   );
 };
 
-const ConversationListItem = (props: Props) => {
-  const { id: conversationId, style } = props;
+const ConversationListItemInner = (props: Props) => {
+  const { conversationId, style } = props;
   const key = `conversation-item-${conversationId}`;
 
   const hasUnread = useHasUnread(conversationId);
@@ -140,4 +134,4 @@ const ConversationListItem = (props: Props) => {
   );
 };
 
-export const MemoConversationListItemWithDetails = ConversationListItem;
+export const ConversationListItem = ConversationListItemInner;
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index a6ca63040..c283de734 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -15,7 +15,7 @@ import { SpacerLG } from '../../basic/Text';
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { SessionSearchInput } from '../../SessionSearchInput';
-import { getSearchResults, isSearching } from '../../../state/selectors/search';
+import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search';
 import { useSet } from '../../../hooks/useSet';
 import { VALIDATION } from '../../../session/constants';
 import { ToastUtils } from '../../../session/utils';
@@ -96,6 +96,8 @@ export const OverlayClosedGroup = () => {
     addTo: addToSelected,
     removeFrom: removeFromSelected,
   } = useSet<string>([]);
+  const isSearch = useSelector(isSearching);
+  const searchResultContactsOnly = useSelector(getSearchResultsContactOnly);
 
   function closeOverlay() {
     dispatch(resetOverlayMode());
@@ -124,17 +126,7 @@ export const OverlayClosedGroup = () => {
 
   const noContactsForClosedGroup = privateContactsPubkeys.length === 0;
 
-  const isSearch = useSelector(isSearching);
-  const searchResultsSelected = useSelector(getSearchResults);
-  const searchResults = isSearch ? searchResultsSelected : undefined;
-  let sharedWithResults: Array<string> = [];
-
-  if (searchResults && searchResults.contactsAndGroups.length) {
-    sharedWithResults = searchResults.contactsAndGroups
-      .filter(convo => convo.isPrivate)
-      .map(convo => convo.id);
-  }
-  const contactsToRender = isSearch ? sharedWithResults : privateContactsPubkeys;
+  const contactsToRender = isSearch ? searchResultContactsOnly : privateContactsPubkeys;
 
   const disableCreateButton = !selectedMemberIds.length && !groupName.length;
 
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index 9f1360b25..d016e448c 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -8,11 +8,11 @@ import { declineConversationWithoutConfirm } from '../../../interactions/convers
 import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
 import { updateConfirmModal } from '../../../state/ducks/modalDialog';
 import { resetOverlayMode } from '../../../state/ducks/section';
-import { getConversationRequests } from '../../../state/selectors/conversations';
+import { getConversationRequestsIds } from '../../../state/selectors/conversations';
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
 import { SpacerLG } from '../../basic/Text';
-import { MemoConversationListItemWithDetails } from '../conversation-list-item/ConversationListItem';
+import { ConversationListItem } from '../conversation-list-item/ConversationListItem';
 
 const MessageRequestListPlaceholder = styled.div`
   color: var(--conversation-tab-text-color);
@@ -30,11 +30,11 @@ const MessageRequestListContainer = styled.div`
  * @returns List of message request items
  */
 const MessageRequestList = () => {
-  const conversationRequests = useSelector(getConversationRequests);
+  const conversationRequests = useSelector(getConversationRequestsIds);
   return (
     <MessageRequestListContainer>
-      {conversationRequests.map(conversation => {
-        return <MemoConversationListItemWithDetails key={conversation.id} {...conversation} />; // TODO there should not be a need for the ...conversation here?
+      {conversationRequests.map(conversationId => {
+        return <ConversationListItem key={conversationId} conversationId={conversationId} />;
       })}
     </MessageRequestListContainer>
   );
@@ -48,8 +48,8 @@ export const OverlayMessageRequest = () => {
   }
 
   const currentlySelectedConvo = useSelectedConversationKey();
-  const convoRequestCount = useSelector(getConversationRequests).length;
-  const messageRequests = useSelector(getConversationRequests);
+  const messageRequests = useSelector(getConversationRequestsIds);
+  const hasRequests = messageRequests.length;
 
   const buttonText = window.i18n('clearAll');
 
@@ -70,16 +70,16 @@ export const OverlayMessageRequest = () => {
         onClose,
         onClickOk: async () => {
           window?.log?.info('Blocking all message requests');
-          if (!messageRequests) {
+          if (!hasRequests) {
             window?.log?.info('No conversation requests to block.');
             return;
           }
 
           for (let index = 0; index < messageRequests.length; index++) {
-            const convo = messageRequests[index];
+            const convoId = messageRequests[index];
             await declineConversationWithoutConfirm({
               blockContact: false,
-              conversationId: convo.id,
+              conversationId: convoId,
               currentlySelectedConvo,
               syncToDevices: false,
             });
@@ -93,7 +93,7 @@ export const OverlayMessageRequest = () => {
 
   return (
     <div className="module-left-pane-overlay">
-      {convoRequestCount ? (
+      {hasRequests ? (
         <>
           <MessageRequestList />
           <SpacerLG />
diff --git a/ts/components/search/SearchResults.tsx b/ts/components/search/SearchResults.tsx
index be7aea4a3..894a03759 100644
--- a/ts/components/search/SearchResults.tsx
+++ b/ts/components/search/SearchResults.tsx
@@ -1,13 +1,10 @@
 import React from 'react';
 import styled from 'styled-components';
-import {
-  ConversationListItemProps,
-  MemoConversationListItemWithDetails,
-} from '../leftpane/conversation-list-item/ConversationListItem';
+import { ConversationListItem } from '../leftpane/conversation-list-item/ConversationListItem';
 import { MessageResultProps, MessageSearchResult } from './MessageSearchResults';
 
 export type SearchResultsProps = {
-  contactsAndGroups: Array<ConversationListItemProps>;
+  contactsAndGroupsIds: Array<string>;
   messages: Array<MessageResultProps>;
   searchTerm: string;
 };
@@ -39,9 +36,9 @@ const NoResults = styled.div`
 `;
 
 export const SearchResults = (props: SearchResultsProps) => {
-  const { contactsAndGroups, messages, searchTerm } = props;
+  const { contactsAndGroupsIds, messages, searchTerm } = props;
 
-  const haveContactsAndGroup = Boolean(contactsAndGroups?.length);
+  const haveContactsAndGroup = Boolean(contactsAndGroupsIds?.length);
   const haveMessages = Boolean(messages?.length);
   const noResults = !haveContactsAndGroup && !haveMessages;
 
@@ -51,10 +48,10 @@ export const SearchResults = (props: SearchResultsProps) => {
       {haveContactsAndGroup ? (
         <>
           <StyledSeparatorSection>{window.i18n('conversationsHeader')}</StyledSeparatorSection>
-          {contactsAndGroups.map(contactOrGroup => (
-            <MemoConversationListItemWithDetails
-              {...contactOrGroup}
-              key={`search-result-convo-${contactOrGroup.id}`}
+          {contactsAndGroupsIds.map(conversationId => (
+            <ConversationListItem
+              conversationId={conversationId}
+              key={`search-result-convo-${conversationId}`}
             />
           ))}
         </>
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index b32222312..1471ad499 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1633,7 +1633,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
           {
             url: ourDbProfileUrl,
             key: ourDbProfileKey,
-          },
+          }
           // ourConvoExpire
         );
       }
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 7078cd289..863f29e6e 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -73,7 +73,6 @@ import {
 } from './sqlInstance';
 import { configDumpData } from './sql_calls/config_dump';
 import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
-import { sleepFor } from '../session/utils/Promise';
 
 // tslint:disable: no-console function-name non-literal-fs-path
 
@@ -185,21 +184,16 @@ async function initializeSql({
     // At this point we can allow general access to the database
     initDbInstanceWith(db);
 
-    await sleepFor(10);
     console.info('total message count before cleaning: ', getMessageCount());
     console.info('total conversation count before cleaning: ', getConversationCount());
-    await sleepFor(10);
     cleanUpOldOpengroupsOnStart();
     cleanUpUnusedNodeForKeyEntriesOnStart();
-    await sleepFor(10);
     printDbStats();
 
     console.info('total message count after cleaning: ', getMessageCount());
     console.info('total conversation count after cleaning: ', getConversationCount());
-    await sleepFor(10);
     // Clear any already deleted db entries on each app start.
     vacuumDatabase(db);
-    await sleepFor(10);
   } catch (error) {
     console.error('error', error);
     if (passwordAttempt) {
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index b6c4dfab1..f9d4245e2 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -245,41 +245,33 @@ export const _getConversationComparator = (testingi18n?: LocalizerType) => {
 
 export const getConversationComparator = createSelector(getIntl, _getConversationComparator);
 
-// tslint:disable-next-line: cyclomatic-complexity
-const _getLeftPaneLists = (
+const _getLeftPaneConversationIds = (
   sortedConversations: Array<ReduxConversationType>
-): Array<ReduxConversationType> => {
-  return sortedConversations.filter(conversation => {
-    if (conversation.isBlocked) {
-      return false;
-    }
+): Array<string> => {
+  return sortedConversations
+    .filter(conversation => {
+      if (conversation.isBlocked) {
+        return false;
+      }
 
-    // a private conversation not approved is a message request. Exclude them from the left pane lists
+      // a non private conversation is always returned here
+      if (!conversation.isPrivate) {
+        return true;
+      }
 
-    if (conversation.isPrivate && !conversation.isApproved) {
-      return false;
-    }
+      // a private conversation not approved is a message request. Exclude them from the left pane lists
+      if (!conversation.isApproved) {
+        return false;
+      }
 
-    const isPrivateButHidden =
-      conversation.isPrivate &&
-      conversation.priority &&
-      conversation.priority <= CONVERSATION_PRIORITIES.default;
+      // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+      if (conversation.priority && conversation.priority <= CONVERSATION_PRIORITIES.default) {
+        return false;
+      }
 
-    /**
-     * When getting a contact from a linked device, before he sent a message, the approved field is false, but a createdAt is used as activeAt
-     */
-    const isPrivateUnapprovedButActive =
-      conversation.isPrivate && !conversation.isApproved && !conversation.activeAt;
-
-    if (
-      isPrivateUnapprovedButActive ||
-      isPrivateButHidden // a hidden contact conversation is only visible from the contact list, not from the global conversation list
-    ) {
-      // dont increase unread counter, don't push to convo list.
-      return false;
-    }
-    return true;
-  });
+      return true;
+    })
+    .map(m => m.id);
 };
 
 // tslint:disable-next-line: cyclomatic-complexity
@@ -307,25 +299,16 @@ const _getGlobalUnreadCount = (sortedConversations: Array<ReduxConversationType>
       continue;
     }
 
-    // a private conversation not approved is a message request. Exclude them from the left pane lists
+    // a private conversation not approved is a message request. Exclude them from the unread count
     if (conversation.isPrivate && !conversation.isApproved) {
       continue;
     }
 
-    const isPrivateButHidden =
+    // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+    if (
       conversation.isPrivate &&
       conversation.priority &&
-      conversation.priority <= CONVERSATION_PRIORITIES.default;
-
-    /**
-     * When getting a contact from a linked device, before he sent a message, the approved field is false, but a createdAt is used as activeAt
-     */
-    const isPrivateUnapprovedButActive =
-      conversation.isPrivate && !conversation.isApproved && !conversation.activeAt;
-
-    if (
-      isPrivateUnapprovedButActive ||
-      isPrivateButHidden // a hidden contact conversation is only visible from the contact list, not from the global conversation list
+      conversation.priority <= CONVERSATION_PRIORITIES.default
     ) {
       // dont increase unread counter, don't push to convo list.
       continue;
@@ -406,6 +389,14 @@ export const getConversationRequests = createSelector(
   _getConversationRequests
 );
 
+export const getConversationRequestsIds = createSelector(getConversationRequests, requests =>
+  requests.map(m => m.id)
+);
+
+export const hasConversationRequests = (state: StateType) => {
+  return !!getConversationRequests(state).length;
+};
+
 const _getUnreadConversationRequests = (
   sortedConversationRequests: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
@@ -427,15 +418,16 @@ export const getUnreadConversationRequests = createSelector(
  * - approved (or message requests are disabled)
  * - active_at is set to something truthy
  */
-export const getPrivateContactsPubkeys = createSelector(_getPrivateFriendsConversations, state =>
-  state.map(m => m.id)
+
+export const getLeftPaneConversationIds = createSelector(
+  getSortedConversations,
+  _getLeftPaneConversationIds
 );
 
-export const getLeftPaneLists = createSelector(getSortedConversations, _getLeftPaneLists);
+const getDirectContacts = createSelector(getSortedConversations, _getPrivateFriendsConversations);
 
-export const getDirectContacts = createSelector(
-  getSortedConversations,
-  _getPrivateFriendsConversations
+export const getPrivateContactsPubkeys = createSelector(getDirectContacts, state =>
+  state.map(m => m.id)
 );
 
 export const getDirectContactsCount = createSelector(
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index a3344bdf0..b05e06cbf 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -15,7 +15,7 @@ export const isSearching = (state: StateType) => {
   return !!getSearch(state)?.query?.trim();
 };
 
-export const getSearchResults = createSelector(
+const getSearchResults = createSelector(
   [getSearch, getConversationLookup],
   (searchState: SearchStateType, lookup: ConversationLookupType) => {
     return {
@@ -40,3 +40,14 @@ export const getSearchResults = createSelector(
     };
   }
 );
+
+export const getSearchResultsIdsOnly = createSelector([getSearchResults], searchState => {
+  return {
+    ...searchState,
+    contactsAndGroupsIds: searchState.contactsAndGroups.map(m => m.id),
+  };
+});
+
+export const getSearchResultsContactOnly = createSelector([getSearchResults], searchState => {
+  return searchState.contactsAndGroups.filter(m => m.isPrivate).map(m => m.id);
+});

From 4280d83ba8546d82b6b79f325dd0414651450424 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 26 Jun 2023 14:07:44 +0200
Subject: [PATCH 139/178] fix: bump libsession to allow createdAt to be given
 during migration

---
 package.json                                             | 2 +-
 ts/node/migration/sessionMigrations.ts                   | 5 ++++-
 ts/session/utils/libsession/libsession_utils_contacts.ts | 1 +
 ts/types/sqlSharedTypes.ts                               | 3 +++
 yarn.lock                                                | 6 +++---
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 514b4e3a8..8f496c186 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "^4.17.21",
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 1471ad499..6f3efd3ea 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1235,6 +1235,8 @@ function insertContactIntoContactWrapper(
       dbProfileKey: contact.profileKey || undefined,
       dbProfileUrl: contact.avatarPointer || undefined,
       priority,
+      dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
+
       // expirationTimerSeconds,
     });
 
@@ -1259,6 +1261,7 @@ function insertContactIntoContactWrapper(
             dbProfileKey: undefined,
             dbProfileUrl: undefined,
             priority: CONVERSATION_PRIORITIES.default,
+            dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
             // expirationTimerSeconds: 0,
           })
         );
@@ -1308,7 +1311,7 @@ function insertCommunityIntoWrapper(
   const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
 
   const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
-  hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community);
+  // hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community);
 
   if (
     !roomDetails ||
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index a960352ae..a5d16d5df 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -70,6 +70,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
     dbProfileKey,
     dbProfileUrl,
     priority,
+    dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet.
     // expirationTimerSeconds,
   });
   try {
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 56b976c35..a3d3cf5f8 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -115,6 +115,7 @@ export function getContactInfoFromDBValues({
   priority,
   dbProfileUrl,
   dbProfileKey,
+  dbCreatedAtSeconds,
 }: // expirationTimerSeconds,
 {
   id: string;
@@ -124,6 +125,7 @@ export function getContactInfoFromDBValues({
   dbNickname: string | undefined;
   dbName: string | undefined;
   priority: number;
+  dbCreatedAtSeconds: number;
   dbProfileUrl: string | undefined;
   dbProfileKey: string | undefined;
   // expirationTimerSeconds: number | undefined;
@@ -136,6 +138,7 @@ export function getContactInfoFromDBValues({
     priority,
     nickname: dbNickname,
     name: dbName,
+    createdAtSeconds: dbCreatedAtSeconds,
     // expirationTimerSeconds:
     //   !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
     //     ? expirationTimerSeconds
diff --git a/yarn.lock b/yarn.lock
index 84fe9eff7..97425bef0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz":
-  version "0.1.19"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.19/libsession_util_nodejs-v0.1.19.tar.gz#294c6e8ea6b767d375a9c0249bef98b65f3ae252"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz":
+  version "0.1.20"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz#4ff8331e4efb1725cf8bba0ef1af7496ebd8533d"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From 524debb307184fbe803f3ee3fb620cc518ce53ef Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 27 Jun 2023 07:52:25 +0200
Subject: [PATCH 140/178] fix: improve delete messages perfs and search logic

---
 ts/data/data.ts                               | 45 +++++++++++--------
 ts/node/database_utility.ts                   | 18 ++++----
 ts/node/migration/sessionMigrations.ts        | 28 +++++++++++-
 ts/node/migration/signalMigrations.ts         |  4 +-
 ts/node/sql.ts                                | 25 +++++------
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  4 +-
 6 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/ts/data/data.ts b/ts/data/data.ts
index d4e9ab035..07acd7a16 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -497,27 +497,36 @@ async function getSeenMessagesByHashList(hashes: Array<string>): Promise<any> {
 }
 
 async function removeAllMessagesInConversation(conversationId: string): Promise<void> {
-  let messages;
-  do {
-    // Yes, we really want the await in the loop. We're deleting 500 at a
-    //   time so we don't use too much memory.
-    // eslint-disable-next-line no-await-in-loop
-    messages = await getLastMessagesByConversation(conversationId, 500, false);
-    if (!messages.length) {
-      return;
-    }
+  let start = Date.now();
+  const messages = await getLastMessagesByConversation(conversationId, 50, false);
+  window.log.info(
+    `removeAllMessagesInConversation ${conversationId} ${messages.length} took ${Date.now() -
+      start}`
+  );
+  if (!messages.length) {
+    return;
+  }
 
-    const ids = messages.map(message => message.id);
+  // Note: It's very important that these models are fully hydrated because
+  //   we need to delete all associated on-disk files along with the database delete.
+  // eslint-disable-next-line no-await-in-loop
 
-    // Note: It's very important that these models are fully hydrated because
-    //   we need to delete all associated on-disk files along with the database delete.
-    // eslint-disable-next-line no-await-in-loop
+  start = Date.now();
+  for (let index = 0; index < messages.length; index++) {
+    const message = messages.at(index);
+    await message.cleanup();
+  }
+  window.log.info(
+    `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${Date.now() -
+      start}ms`
+  );
+  start = Date.now();
 
-    await Promise.all(messages.map(message => message.cleanup()));
-
-    // eslint-disable-next-line no-await-in-loop
-    await channels.removeMessagesByIds(ids);
-  } while (messages.length > 0);
+  // eslint-disable-next-line no-await-in-loop
+  await channels.removeAllMessagesInConversation(conversationId);
+  window.log.info(
+    `removeAllMessagesInConversation: ${conversationId} took ${Date.now() - start}ms`
+  );
 }
 
 async function getMessagesBySentAt(sentAt: number): Promise<MessageCollection> {
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 428d7754b..f36f15135 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -242,29 +242,29 @@ export function rebuildFtsTable(db: BetterSqlite3.Database) {
   db.exec(`
           -- Then we create our full-text search table and populate it
           CREATE VIRTUAL TABLE ${MESSAGES_FTS_TABLE}
-            USING fts5(id UNINDEXED, body);
-          INSERT INTO ${MESSAGES_FTS_TABLE}(id, body)
-            SELECT id, body FROM ${MESSAGES_TABLE};
+            USING fts5(body);
+          INSERT INTO ${MESSAGES_FTS_TABLE}(rowid, body)
+            SELECT rowid, body FROM ${MESSAGES_TABLE};
           -- Then we set up triggers to keep the full-text search table up to date
           CREATE TRIGGER messages_on_insert AFTER INSERT ON ${MESSAGES_TABLE} BEGIN
             INSERT INTO ${MESSAGES_FTS_TABLE} (
-              id,
+              rowid,
               body
             ) VALUES (
-              new.id,
+              new.rowid,
               new.body
             );
           END;
           CREATE TRIGGER messages_on_delete AFTER DELETE ON ${MESSAGES_TABLE} BEGIN
-            DELETE FROM ${MESSAGES_FTS_TABLE} WHERE id = old.id;
+            DELETE FROM ${MESSAGES_FTS_TABLE} WHERE rowid = old.rowid;
           END;
           CREATE TRIGGER messages_on_update AFTER UPDATE ON ${MESSAGES_TABLE} WHEN new.body <> old.body BEGIN
-            DELETE FROM ${MESSAGES_FTS_TABLE} WHERE id = old.id;
+            DELETE FROM ${MESSAGES_FTS_TABLE} WHERE rowid = old.rowid;
             INSERT INTO ${MESSAGES_FTS_TABLE}(
-              id,
+              rowid,
               body
             ) VALUES (
-              new.id,
+              new.rowid,
               new.body
             );
           END;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 6f3efd3ea..9c25bf3f4 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -33,6 +33,7 @@ import {
 } from '../database_utility';
 
 import { getIdentityKeys, sqlNode } from '../sql';
+import { sleepFor } from '../../session/utils/Promise';
 
 const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG);
 
@@ -100,6 +101,7 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToSessionSchemaVersion29,
   updateToSessionSchemaVersion30,
   updateToSessionSchemaVersion31,
+  updateToSessionSchemaVersion32,
 ];
 
 function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
@@ -1204,7 +1206,6 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
       conversationId
     );`);
     rebuildFtsTable(db);
-    // Keeping this empty migration because some people updated to this already, even if it is not needed anymore
     writeSessionSchemaVersion(targetVersion, db);
   })();
 
@@ -1835,6 +1836,26 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
   })();
 }
 
+function updateToSessionSchemaVersion32(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 32;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
+
+  db.transaction(() => {
+    db.exec(`CREATE INDEX messages_conversationId ON ${MESSAGES_TABLE} (
+      conversationId
+    );`);
+    dropFtsAndTriggers(db);
+    rebuildFtsTable(db);
+    writeSessionSchemaVersion(targetVersion, db);
+  })();
+
+  console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
+}
+
 export function printTableColumns(table: string, db: BetterSqlite3.Database) {
   console.info(db.pragma(`table_info('${table}');`));
 }
@@ -1849,7 +1870,7 @@ function writeSessionSchemaVersion(newVersion: number, db: BetterSqlite3.Databas
   ).run({ newVersion });
 }
 
-export function updateSessionSchema(db: BetterSqlite3.Database) {
+export async function updateSessionSchema(db: BetterSqlite3.Database) {
   const result = db
     .prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name='loki_schema';`)
     .get();
@@ -1866,5 +1887,8 @@ export function updateSessionSchema(db: BetterSqlite3.Database) {
   for (let index = 0, max = LOKI_SCHEMA_VERSIONS.length; index < max; index += 1) {
     const runSchemaUpdate = LOKI_SCHEMA_VERSIONS[index];
     runSchemaUpdate(lokiSchemaVersion, db);
+    if (index > lokiSchemaVersion) {
+      await sleepFor(200); // give some time for the UI to not freeze between 2 migrations
+    }
   }
 }
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index 0c23a7258..ff4caed75 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -527,7 +527,7 @@ const SCHEMA_VERSIONS = [
   updateToSchemaVersion11,
 ];
 
-export function updateSchema(db: BetterSqlite3.Database) {
+export async function updateSchema(db: BetterSqlite3.Database) {
   const sqliteVersion = getSQLiteVersion(db);
   const sqlcipherVersion = getSQLCipherVersion(db);
   const userVersion = getUserVersion(db);
@@ -545,7 +545,7 @@ export function updateSchema(db: BetterSqlite3.Database) {
     const runSchemaUpdate = SCHEMA_VERSIONS[index];
     runSchemaUpdate(schemaVersion, db);
   }
-  updateSessionSchema(db);
+  await updateSessionSchema(db);
 }
 
 function migrateSchemaVersion(db: BetterSqlite3.Database) {
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 863f29e6e..6b227126e 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -28,7 +28,6 @@ import {
   ATTACHMENT_DOWNLOADS_TABLE,
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
   CONVERSATIONS_TABLE,
-  dropFtsAndTriggers,
   formatRowOfConversation,
   GUARD_NODE_TABLE,
   HEX_KEY,
@@ -41,7 +40,6 @@ import {
   NODES_FOR_PUBKEY_TABLE,
   objectToJSON,
   OPEN_GROUP_ROOMS_V2_TABLE,
-  rebuildFtsTable,
   toSqliteBoolean,
 } from './database_utility';
 import { LocaleMessagesType } from './locale'; // checked - only node
@@ -166,7 +164,7 @@ async function initializeSql({
     if (!db) {
       throw new Error('db is not set');
     }
-    updateSchema(db);
+    await updateSchema(db);
 
     // test database
 
@@ -698,9 +696,9 @@ function searchMessages(query: string, limit: number) {
       ${MESSAGES_TABLE}.json,
       snippet(${MESSAGES_FTS_TABLE}, -1, '<<left>>', '<<right>>', '...', 5) as snippet
     FROM ${MESSAGES_FTS_TABLE}
-    INNER JOIN ${MESSAGES_TABLE} on ${MESSAGES_FTS_TABLE}.id = ${MESSAGES_TABLE}.id
+    INNER JOIN ${MESSAGES_TABLE} on ${MESSAGES_FTS_TABLE}.rowid = ${MESSAGES_TABLE}.rowid
     WHERE
-     ${MESSAGES_FTS_TABLE} match $query
+     ${MESSAGES_FTS_TABLE}.body match $query
     ${orderByMessageCoalesceClause}
     LIMIT $limit;`
     )
@@ -958,11 +956,13 @@ function removeMessagesByIds(ids: Array<string>, instance?: BetterSqlite3.Databa
   if (!ids.length) {
     throw new Error('removeMessagesByIds: No ids to delete!');
   }
+  const start = Date.now();
 
-  // Our node interface doesn't seem to allow you to replace one single ? with an array
+  // TODO we might need to do the same thing as
   assertGlobalInstanceOrInstance(instance)
     .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE id IN ( ${ids.map(() => '?').join(', ')} );`)
     .run(ids);
+  console.log(`removeMessagesByIds of length ${ids.length} took ${Date.now() - start}ms`);
 }
 
 function removeAllMessagesInConversation(
@@ -972,11 +972,13 @@ function removeAllMessagesInConversation(
   if (!conversationId) {
     return;
   }
+  const inst = assertGlobalInstanceOrInstance(instance);
 
-  // Our node interface doesn't seem to allow you to replace one single ? with an array
-  assertGlobalInstanceOrInstance(instance)
-    .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId`)
-    .run({ conversationId });
+  inst.transaction(() => {
+    inst
+      .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId`)
+      .run({ conversationId });
+  })();
 }
 
 function getMessageIdsFromServerIds(serverIds: Array<string | number>, conversationId: string) {
@@ -2233,7 +2235,6 @@ function cleanUpOldOpengroupsOnStart() {
   // first remove very old messages for each opengroups
   const db = assertGlobalInstance();
   db.transaction(() => {
-    dropFtsAndTriggers(db);
     v2ConvosIds.forEach(convoId => {
       const messagesInConvoBefore = getMessagesCountByConversation(convoId);
 
@@ -2316,8 +2317,6 @@ function cleanUpOldOpengroupsOnStart() {
     }
 
     cleanUpMessagesJson();
-
-    rebuildFtsTable(db);
   })();
 }
 
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index f50135a14..0cef20c86 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -294,7 +294,7 @@ async function queueNewJobIfNeeded() {
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
   ) {
-    window.log.debug('Scheduling ConfSyncJob: ASAP');
+    // window.log.debug('Scheduling ConfSyncJob: ASAP');
     // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first
     // this call will make sure that there is only one configuration sync job at all times
     await runners.configurationSyncRunner.addJob(
@@ -305,7 +305,7 @@ async function queueNewJobIfNeeded() {
     const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0);
     // but we want to run every 30, so what we need is actually `30-10` from now = 20
     const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000);
-    window.log.debug('Scheduling ConfSyncJob: LATER');
+    // window.log.debug('Scheduling ConfSyncJob: LATER');
 
     await runners.configurationSyncRunner.addJob(
       new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick })

From dc3e8450e9a45e4f1b80ff326fa03f978366f0fa Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 27 Jun 2023 11:08:00 +0200
Subject: [PATCH 141/178] fix: memoize selected conversation props to avoid
 unneeded rerenders

---
 package.json                                  |  1 +
 password_preload.js                           |  8 ---
 .../SessionMessagesListContainer.tsx          |  6 +-
 .../composition/CompositionBox.tsx            |  7 ++-
 ts/data/data.ts                               | 62 ++++++++++++-------
 ts/node/sql.ts                                |  9 +--
 ts/state/selectors/conversations.ts           | 13 +++-
 ts/state/selectors/selectedConversation.ts    |  7 +--
 ts/state/smart/SessionConversation.ts         |  6 +-
 9 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 8f496c186..9dcd755e4 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
   },
   "scripts": {
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
+    "start-dev": "cross-env NODE_ENV=development NODE_APP_INSTANCE=devprod$MULTI electron .",
     "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
     "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
     "build:workers": "yarn worker:utils && yarn worker:libsession",
diff --git a/password_preload.js b/password_preload.js
index 18e3aad60..7463ad9b0 100644
--- a/password_preload.js
+++ b/password_preload.js
@@ -20,14 +20,6 @@ window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
 window.getAppInstance = () => config.appInstance;
 
-const { SessionPasswordPrompt } = require('./ts/components/SessionPasswordPrompt');
-
-window.Signal = {
-  Components: {
-    SessionPasswordPrompt,
-  },
-};
-
 window.clearLocalData = async () => {
   window.log.info('reset database');
   ipcRenderer.send('resetDatabase');
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index fccacbddf..efadb4958 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -17,12 +17,10 @@ import {
 import { StateType } from '../../state/reducer';
 import {
   getQuotedMessageToAnimate,
+  getSelectedConversation,
   getSortedMessagesOfSelectedConversation,
 } from '../../state/selectors/conversations';
-import {
-  getSelectedConversation,
-  getSelectedConversationKey,
-} from '../../state/selectors/selectedConversation';
+import { getSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { SessionMessagesList } from './SessionMessagesList';
 import { TypingBubble } from './TypingBubble';
 import { ConversationMessageRequestButtons } from './MessageRequestButtons';
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 7a0547e5e..a01548740 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -31,7 +31,11 @@ import { ToastUtils } from '../../../session/utils';
 import { ReduxConversationType } from '../../../state/ducks/conversations';
 import { removeAllStagedAttachmentsInConversation } from '../../../state/ducks/stagedAttachments';
 import { StateType } from '../../../state/reducer';
-import { getMentionsInput, getQuotedMessage } from '../../../state/selectors/conversations';
+import {
+  getMentionsInput,
+  getQuotedMessage,
+  getSelectedConversation,
+} from '../../../state/selectors/conversations';
 import { AttachmentUtil } from '../../../util';
 import { Flex } from '../../basic/Flex';
 import { CaptionEditor } from '../../CaptionEditor';
@@ -53,7 +57,6 @@ import styled from 'styled-components';
 import { FixedBaseEmoji } from '../../../types/Reaction';
 import {
   getSelectedCanWrite,
-  getSelectedConversation,
   getSelectedConversationKey,
 } from '../../../state/selectors/selectedConversation';
 import { SettingsKey } from '../../../data/settings-key';
diff --git a/ts/data/data.ts b/ts/data/data.ts
index 07acd7a16..6ecbfe3bd 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -497,35 +497,51 @@ async function getSeenMessagesByHashList(hashes: Array<string>): Promise<any> {
 }
 
 async function removeAllMessagesInConversation(conversationId: string): Promise<void> {
+  const startFunction = Date.now();
   let start = Date.now();
-  const messages = await getLastMessagesByConversation(conversationId, 50, false);
-  window.log.info(
-    `removeAllMessagesInConversation ${conversationId} ${messages.length} took ${Date.now() -
-      start}`
-  );
-  if (!messages.length) {
-    return;
-  }
 
-  // Note: It's very important that these models are fully hydrated because
-  //   we need to delete all associated on-disk files along with the database delete.
-  // eslint-disable-next-line no-await-in-loop
+  let messages;
+  do {
+    // Yes, we really want the await in the loop. We're deleting 500 at a
+    //   time so we don't use too much memory.
+    // eslint-disable-next-line no-await-in-loop
+    messages = await getLastMessagesByConversation(conversationId, 1000, false);
+    if (!messages.length) {
+      return;
+    }
+    window.log.info(
+      `removeAllMessagesInConversation getLastMessagesByConversation ${conversationId} ${
+        messages.length
+      } took ${Date.now() - start}ms`
+    );
 
-  start = Date.now();
-  for (let index = 0; index < messages.length; index++) {
-    const message = messages.at(index);
-    await message.cleanup();
-  }
-  window.log.info(
-    `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${Date.now() -
-      start}ms`
-  );
-  start = Date.now();
+    // Note: It's very important that these models are fully hydrated because
+    //   we need to delete all associated on-disk files along with the database delete.
+    const ids = messages.map(message => message.id);
+    start = Date.now();
+    for (let index = 0; index < messages.length; index++) {
+      const message = messages.at(index);
+      // eslint-disable-next-line no-await-in-loop
+      await message.cleanup();
+    }
+    window.log.info(
+      `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${Date.now() -
+        start}ms`
+    );
+    start = Date.now();
+
+    // eslint-disable-next-line no-await-in-loop
+    await channels.removeMessagesByIds(ids);
+    window.log.info(
+      `removeAllMessagesInConversation: removeMessagesByIds ${conversationId} took ${Date.now() -
+        start}ms`
+    );
+  } while (messages.length);
 
-  // eslint-disable-next-line no-await-in-loop
   await channels.removeAllMessagesInConversation(conversationId);
   window.log.info(
-    `removeAllMessagesInConversation: ${conversationId} took ${Date.now() - start}ms`
+    `removeAllMessagesInConversation: complete time ${conversationId} took ${Date.now() -
+      startFunction}ms`
   );
 }
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 6b227126e..47d40da65 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -958,7 +958,6 @@ function removeMessagesByIds(ids: Array<string>, instance?: BetterSqlite3.Databa
   }
   const start = Date.now();
 
-  // TODO we might need to do the same thing as
   assertGlobalInstanceOrInstance(instance)
     .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE id IN ( ${ids.map(() => '?').join(', ')} );`)
     .run(ids);
@@ -974,11 +973,9 @@ function removeAllMessagesInConversation(
   }
   const inst = assertGlobalInstanceOrInstance(instance);
 
-  inst.transaction(() => {
-    inst
-      .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId`)
-      .run({ conversationId });
-  })();
+  inst
+    .prepare(`DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId`)
+    .run({ conversationId });
 }
 
 function getMessageIdsFromServerIds(serverIds: Array<string | number>, conversationId: string) {
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index f9d4245e2..c9c44fa9e 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -31,7 +31,7 @@ import { getIntl } from './user';
 
 import { filter, isEmpty, isNumber, pick, sortBy } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
-import { getSelectedConversation, getSelectedConversationKey } from './selectedConversation';
+import { getSelectedConversationKey } from './selectedConversation';
 import { getModeratorsOutsideRedux } from './sogsRoomInfo';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
@@ -626,6 +626,17 @@ export const isFirstUnreadMessageIdAbove = createSelector(
 
 const getMessageId = (_whatever: any, id: string | undefined) => id;
 
+/**
+ * A lot of our UI changes on the main panel need to happen quickly (composition box).
+ */
+export const getSelectedConversation = createSelector(
+  getConversationLookup,
+  getSelectedConversationKey,
+  (lookup, selectedConvo) => {
+    return selectedConvo ? lookup[selectedConvo] : undefined;
+  }
+);
+
 // tslint:disable: cyclomatic-complexity
 
 export const getMessagePropsByMessageId = createSelector(
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index a1e186d9c..31523151f 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -3,9 +3,9 @@ import { useSelector } from 'react-redux';
 import { ConversationTypeEnum, isOpenOrClosedGroup } from '../../models/conversationAttributes';
 import { PubKey } from '../../session/types';
 import { UserUtils } from '../../session/utils';
-import { ReduxConversationType } from '../ducks/conversations';
 import { StateType } from '../reducer';
 import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo';
+import { getSelectedConversation } from './conversations';
 
 /**
  * Returns the formatted text for notification setting.
@@ -58,11 +58,6 @@ export const getSelectedConversationKey = (state: StateType): string | undefined
   return state.conversations.selectedConversation;
 };
 
-export const getSelectedConversation = (state: StateType): ReduxConversationType | undefined => {
-  const selected = getSelectedConversationKey(state);
-  return selected ? state.conversations.conversationLookup[selected] : undefined;
-};
-
 /**
  * Returns true if the current conversation selected is a public group and false otherwise.
  */
diff --git a/ts/state/smart/SessionConversation.ts b/ts/state/smart/SessionConversation.ts
index c5850f2f1..6b40c2549 100644
--- a/ts/state/smart/SessionConversation.ts
+++ b/ts/state/smart/SessionConversation.ts
@@ -6,15 +6,13 @@ import { getHasOngoingCallWithFocusedConvo } from '../selectors/call';
 import {
   getIsSelectedConvoInitialLoadingInProgress,
   getLightBoxOptions,
+  getSelectedConversation,
   getSelectedMessageIds,
   getSortedMessagesOfSelectedConversation,
   isMessageDetailView,
   isRightPanelShowing,
 } from '../selectors/conversations';
-import {
-  getSelectedConversation,
-  getSelectedConversationKey,
-} from '../selectors/selectedConversation';
+import { getSelectedConversationKey } from '../selectors/selectedConversation';
 import { getStagedAttachmentsForCurrentConversation } from '../selectors/stagedAttachments';
 import { getTheme } from '../selectors/theme';
 import { getOurNumber } from '../selectors/user';

From 43badfa1343625fe96cd924a3a2793aafe4f243e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 28 Jun 2023 13:41:40 +0200
Subject: [PATCH 142/178] fix: virtualize list of search result so input typing
 is fast

---
 _locales/en/messages.json                     |  3 +-
 package.json                                  |  4 +-
 ts/components/leftpane/LeftPane.tsx           | 12 +--
 .../leftpane/LeftPaneMessageSection.tsx       | 10 +-
 ts/components/search/MessageSearchResults.tsx |  8 +-
 ts/components/search/SearchResults.tsx        | 94 ++++++++++++-------
 ts/state/selectors/search.ts                  | 33 ++++++-
 ts/types/LocalizerKeys.ts                     |  1 +
 yarn.lock                                     | 32 +++++--
 9 files changed, 133 insertions(+), 64 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 35e26b3f4..9c76d2416 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -70,9 +70,10 @@
   "show": "Show",
   "sessionMessenger": "Session",
   "noSearchResults": "No results found for \"$searchTerm$\"",
-  "conversationsHeader": "Contacts and Groups",
+  "conversationsHeader": "Contacts and Groups: $count$",
   "contactsHeader": "Contacts",
   "messagesHeader": "Conversations",
+  "searchMessagesHeader": "Messages: $count$",
   "settingsHeader": "Settings",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
diff --git a/package.json b/package.json
index 9dcd755e4..68aa9af6f 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
     "@reduxjs/toolkit": "1.8.5",
+    "@types/react-mentions": "^4.1.8",
     "abort-controller": "3.0.0",
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
@@ -122,7 +123,7 @@
     "react-draggable": "^4.4.4",
     "react-h5-audio-player": "^3.2.0",
     "react-intersection-observer": "^8.30.3",
-    "react-mentions": "^4.2.0",
+    "react-mentions": "^4.4.9",
     "react-portal": "^4.2.0",
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
@@ -169,7 +170,6 @@
     "@types/rc-slider": "^8.6.5",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
-    "@types/react-mentions": "^4.1.1",
     "@types/react-mic": "^12.4.1",
     "@types/react-portal": "^4.0.2",
     "@types/react-redux": "^7.1.24",
diff --git a/ts/components/leftpane/LeftPane.tsx b/ts/components/leftpane/LeftPane.tsx
index f113fa594..e02c069a6 100644
--- a/ts/components/leftpane/LeftPane.tsx
+++ b/ts/components/leftpane/LeftPane.tsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { SectionType } from '../../state/ducks/section';
 import { getLeftPaneConversationIds } from '../../state/selectors/conversations';
-import { getSearchResultsIdsOnly, isSearching } from '../../state/selectors/search';
+import { getHasSearchResults } from '../../state/selectors/search';
 import { getFocusedSection, getOverlayMode } from '../../state/selectors/section';
 import { SessionTheme } from '../../themes/SessionTheme';
 import { SessionToastContainer } from '../SessionToastContainer';
@@ -22,18 +22,14 @@ const StyledLeftPane = styled.div`
 `;
 
 const InnerLeftPaneMessageSection = () => {
-  const showSearch = useSelector(isSearching);
-
-  const searchResults = useSelector(getSearchResultsIdsOnly);
-
+  const hasSearchResults = useSelector(getHasSearchResults);
   const conversationIds = useSelector(getLeftPaneConversationIds);
   const overlayMode = useSelector(getOverlayMode);
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <LeftPaneMessageSection
-      conversationIds={showSearch ? undefined : conversationIds || []}
-      searchResults={showSearch ? searchResults : undefined}
+      hasSearchResults={hasSearchResults}
+      conversationIds={conversationIds}
       overlayMode={overlayMode}
     />
   );
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index 98504cd85..95ef19647 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -1,7 +1,7 @@
 import autoBind from 'auto-bind';
 import React from 'react';
 import { AutoSizer, List, ListRowProps } from 'react-virtualized';
-import { SearchResults, SearchResultsProps } from '../search/SearchResults';
+import { SearchResults } from '../search/SearchResults';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 import { MessageRequestsBanner } from './MessageRequestsBanner';
 
@@ -21,7 +21,7 @@ import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export interface Props {
   conversationIds?: Array<string>;
-  searchResults?: SearchResultsProps;
+  hasSearchResults: boolean;
   overlayMode: OverlayMode | undefined;
 }
 
@@ -88,10 +88,10 @@ export class LeftPaneMessageSection extends React.Component<Props> {
   };
 
   public renderList(): JSX.Element {
-    const { conversationIds, searchResults } = this.props;
+    const { conversationIds, hasSearchResults } = this.props;
 
-    if (searchResults) {
-      return <SearchResults {...searchResults} />;
+    if (hasSearchResults) {
+      return <SearchResults />;
     }
 
     if (!conversationIds) {
diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx
index b53a34e69..79f0df58f 100644
--- a/ts/components/search/MessageSearchResults.tsx
+++ b/ts/components/search/MessageSearchResults.tsx
@@ -6,7 +6,7 @@ import { ContactName } from '../conversation/ContactName';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { Timestamp } from '../conversation/Timestamp';
 import { MessageBodyHighlight } from '../basic/MessageBodyHighlight';
-import styled from 'styled-components';
+import styled, { CSSProperties } from 'styled-components';
 import { MessageAttributes } from '../../models/messageType';
 import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector';
 import { UserUtils } from '../../session/utils';
@@ -172,7 +172,9 @@ const StyledTimestampContaimer = styled.div`
   color: var(--conversation-tab-text-color);
 `;
 
-export const MessageSearchResult = (props: MessageResultProps) => {
+type MessageSearchResultProps = MessageResultProps & { style: CSSProperties };
+
+export const MessageSearchResult = (props: MessageSearchResultProps) => {
   const {
     id,
     conversationId,
@@ -183,6 +185,7 @@ export const MessageSearchResult = (props: MessageResultProps) => {
     serverTimestamp,
     timestamp,
     direction,
+    style,
   } = props;
 
   /** destination is only used for search results (showing the `from:` and `to`)
@@ -210,6 +213,7 @@ export const MessageSearchResult = (props: MessageResultProps) => {
   return (
     <StyledSearchResults
       key={`div-msg-searchresult-${id}`}
+      style={style}
       role="button"
       onClick={() => {
         void openConversationToSpecificMessage({
diff --git a/ts/components/search/SearchResults.tsx b/ts/components/search/SearchResults.tsx
index 894a03759..2b39a07b1 100644
--- a/ts/components/search/SearchResults.tsx
+++ b/ts/components/search/SearchResults.tsx
@@ -1,13 +1,16 @@
 import React from 'react';
-import styled from 'styled-components';
+import styled, { CSSProperties } from 'styled-components';
 import { ConversationListItem } from '../leftpane/conversation-list-item/ConversationListItem';
-import { MessageResultProps, MessageSearchResult } from './MessageSearchResults';
-
-export type SearchResultsProps = {
-  contactsAndGroupsIds: Array<string>;
-  messages: Array<MessageResultProps>;
-  searchTerm: string;
-};
+import { MessageSearchResult } from './MessageSearchResults';
+import { AutoSizer, List } from 'react-virtualized';
+import { useSelector } from 'react-redux';
+import {
+  SearchResultsMergedListItem,
+  getHasSearchResults,
+  getSearchResultsList,
+  getSearchTerm,
+} from '../../state/selectors/search';
+import { isString } from 'lodash';
 
 const StyledSeparatorSection = styled.div`
   height: 36px;
@@ -35,37 +38,58 @@ const NoResults = styled.div`
   text-align: center;
 `;
 
-export const SearchResults = (props: SearchResultsProps) => {
-  const { contactsAndGroupsIds, messages, searchTerm } = props;
+const SectionHeader = ({ title, style }: { title: string; style: CSSProperties }) => {
+  return <StyledSeparatorSection style={style}>{title}</StyledSeparatorSection>;
+};
 
-  const haveContactsAndGroup = Boolean(contactsAndGroupsIds?.length);
-  const haveMessages = Boolean(messages?.length);
-  const noResults = !haveContactsAndGroup && !haveMessages;
+function isContact(item: SearchResultsMergedListItem): item is { contactConvoId: string } {
+  return (item as any).contactConvoId !== undefined;
+}
+
+const VirtualizedList = () => {
+  const searchResultList = useSelector(getSearchResultsList);
+  return (
+    <AutoSizer>
+      {({ height, width }) => (
+        <List
+          height={height}
+          rowCount={searchResultList.length}
+          rowHeight={rowPos => {
+            return isString(searchResultList[rowPos.index]) ? 36 : 64;
+          }}
+          rowRenderer={({ index, key, style }) => {
+            const row = searchResultList[index];
+            if (!row) {
+              return null;
+            }
+            if (isString(row)) {
+              return <SectionHeader title={row} style={style} key={key} />;
+            }
+            if (isContact(row)) {
+              return (
+                <ConversationListItem conversationId={row.contactConvoId} style={style} key={key} />
+              );
+            }
+            return <MessageSearchResult style={style} key={key} {...row} />;
+          }}
+          width={width}
+          autoHeight={false}
+        />
+      )}
+    </AutoSizer>
+  );
+};
+
+export const SearchResults = () => {
+  const searchTerm = useSelector(getSearchTerm);
+  const hasSearchResults = useSelector(getHasSearchResults);
 
   return (
     <SearchResultsContainer>
-      {noResults ? <NoResults>{window.i18n('noSearchResults', [searchTerm])}</NoResults> : null}
-      {haveContactsAndGroup ? (
-        <>
-          <StyledSeparatorSection>{window.i18n('conversationsHeader')}</StyledSeparatorSection>
-          {contactsAndGroupsIds.map(conversationId => (
-            <ConversationListItem
-              conversationId={conversationId}
-              key={`search-result-convo-${conversationId}`}
-            />
-          ))}
-        </>
-      ) : null}
-
-      {haveMessages && (
-        <>
-          <StyledSeparatorSection>
-            {`${window.i18n('messagesHeader')}: ${messages.length}`}
-          </StyledSeparatorSection>
-          {messages.map(message => (
-            <MessageSearchResult key={`search-result-message-${message.id}`} {...message} />
-          ))}
-        </>
+      {!hasSearchResults ? (
+        <NoResults>{window.i18n('noSearchResults', [searchTerm])}</NoResults>
+      ) : (
+        <VirtualizedList />
       )}
     </SearchResultsContainer>
   );
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index b05e06cbf..6238742b8 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -1,11 +1,12 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { compact } from 'lodash';
+import { compact, isEmpty } from 'lodash';
 
 import { StateType } from '../reducer';
 
 import { ConversationLookupType } from '../ducks/conversations';
 import { SearchStateType } from '../ducks/search';
 import { getConversationLookup } from './conversations';
+import { MessageResultProps } from '../../components/search/MessageSearchResults';
 
 export const getSearch = (state: StateType): SearchStateType => state.search;
 
@@ -41,6 +42,10 @@ const getSearchResults = createSelector(
   }
 );
 
+export const getSearchTerm = createSelector([getSearchResults], searchResult => {
+  return searchResult.searchTerm;
+});
+
 export const getSearchResultsIdsOnly = createSelector([getSearchResults], searchState => {
   return {
     ...searchState,
@@ -48,6 +53,32 @@ export const getSearchResultsIdsOnly = createSelector([getSearchResults], search
   };
 });
 
+export const getHasSearchResults = createSelector([getSearchResults], searchState => {
+  return !isEmpty(searchState.contactsAndGroups) || !isEmpty(searchState.messages);
+});
+
 export const getSearchResultsContactOnly = createSelector([getSearchResults], searchState => {
   return searchState.contactsAndGroups.filter(m => m.isPrivate).map(m => m.id);
 });
+
+/**
+ *
+ * When type is string, we render a sectionHeader.
+ * When type just has a conversationId field, we render a ConversationListItem.
+ * When type is MessageResultProps we render a MessageSearchResult
+ */
+export type SearchResultsMergedListItem = string | { contactConvoId: string } | MessageResultProps;
+
+export const getSearchResultsList = createSelector([getSearchResults], searchState => {
+  const { contactsAndGroups, messages } = searchState;
+  const builtList: Array<SearchResultsMergedListItem> = [];
+  if (contactsAndGroups.length) {
+    builtList.push(window.i18n('conversationsHeader', [`${contactsAndGroups.length}`]));
+    builtList.push(...contactsAndGroups.map(m => ({ contactConvoId: m.id })));
+  }
+  if (messages.length) {
+    builtList.push(window.i18n('searchMessagesHeader', [`${messages.length}`]));
+    builtList.push(...messages);
+  }
+  return builtList;
+});
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index 1c7f7a0e0..7401354a6 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -73,6 +73,7 @@ export type LocalizerKeys =
   | 'conversationsHeader'
   | 'contactsHeader'
   | 'messagesHeader'
+  | 'searchMessagesHeader'
   | 'settingsHeader'
   | 'typingAlt'
   | 'contactAvatarAlt'
diff --git a/yarn.lock b/yarn.lock
index 97425bef0..2b8c5284f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -411,13 +411,20 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
   integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.3.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/template@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
@@ -1192,10 +1199,10 @@
   dependencies:
     "@types/react" "^17"
 
-"@types/react-mentions@^4.1.1":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.6.tgz#0ecdb61785c22edbf9c7d6718505d4814ad3a65c"
-  integrity sha512-f4/BdnjlMxT47q+WqlcYYwFABbBMVQrDoFFeMeljtFC5nnR9/x8TOFmN18BJKgNuWMgivy9uE5EKtsjlay751w==
+"@types/react-mentions@^4.1.8":
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.8.tgz#4bebe54c5c74181d8eedf1e613a208d03b4a8d7e"
+  integrity sha512-Go86ozdnh0FTNbiGiDPAcNqYqtab9iGzLOgZPYUKrnhI4539jGzfJtP6rFHcXgi9Koe58yhkeyKYib6Ucul/sQ==
   dependencies:
     "@types/react" "*"
 
@@ -6551,10 +6558,10 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-mentions@^4.2.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.3.2.tgz#93a2a674648f31d2b40e8c90d30b94c377cbb582"
-  integrity sha512-NV8ixuE5W9zuvBNWLpPlO+f4QYEkR+p6mR3Jfpfcbytrqqn2nbVb27YXE/M4qSP8N8C+ktgeMUV4jVhm86gt1A==
+react-mentions@^4.4.9:
+  version "4.4.9"
+  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.9.tgz#5f68c7978c107518646c5c34c47515c30259e23a"
+  integrity sha512-CUDt8GOVbAmo3o+a8l1UxcJ/gJMdFdqeiJM3U5+krcNoUwyKv7Zcy67WfFZQJfChpJ8LTiD0FtCSRoyEzC6Ysw==
   dependencies:
     "@babel/runtime" "7.4.5"
     invariant "^2.2.4"
@@ -6759,7 +6766,12 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
+regenerator-runtime@^0.13.4:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==

From dcdbc0719586349af618bacd0cfe23ccfe2a5c87 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 3 Jul 2023 07:51:59 +0200
Subject: [PATCH 143/178] fix: delete actions for admins on communities

---
 ts/models/conversation.ts              |  5 +++++
 ts/node/migration/sessionMigrations.ts | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 0b58d801d..5c4a66b43 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -343,6 +343,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
     if (this.isClosedGroup()) {
       toRet.members = this.get('members') || [];
+    }
+
+    // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
+    if (this.isClosedGroup() || this.isPublic()) {
+      // for public, this value always comes from the DB
       toRet.groupAdmins = this.getGroupAdmins();
     }
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 9c25bf3f4..382cf9c18 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1887,7 +1887,16 @@ export async function updateSessionSchema(db: BetterSqlite3.Database) {
   for (let index = 0, max = LOKI_SCHEMA_VERSIONS.length; index < max; index += 1) {
     const runSchemaUpdate = LOKI_SCHEMA_VERSIONS[index];
     runSchemaUpdate(lokiSchemaVersion, db);
-    if (index > lokiSchemaVersion) {
+    if (index > lokiSchemaVersion && index - lokiSchemaVersion <= 3) {
+      /** When running migrations, we block the node process.
+       * This causes the app to be in a Not responding state when we have a lot of data.
+       * To avoid this, we add a `sleep` between the run of the last 3 migrations.
+       * This "only for the last 3 migrations" serves 2 purposes:
+       * - we don't wait for `200ms * total number of migrations` when starting from schemaVersion 0
+       * - we do have some time between the last 3 migrations, at most.
+       *
+       * This means that this sleepFor will only sleep for at most 600ms, even if we need to run 30 migrations.
+       */
       await sleepFor(200); // give some time for the UI to not freeze between 2 migrations
     }
   }

From 4966cf91924d7b24ce3b8f1ff80ae7a932fa8cee Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 5 Jul 2023 06:13:25 +0200
Subject: [PATCH 144/178] fix: a few integration tests broken with latest
 changes

---
 ts/components/basic/SessionDropdown.tsx           | 6 ++++--
 ts/components/basic/SessionDropdownItem.tsx       | 4 +++-
 ts/components/conversation/SessionRightPanel.tsx  | 1 +
 ts/test/automation/disappearing_messages.spec.ts  | 6 ++++--
 ts/test/automation/linked_device_requests.spec.ts | 2 +-
 ts/test/automation/linked_device_user.spec.ts     | 3 ++-
 ts/test/automation/message_requests.spec.ts       | 2 ++
 ts/test/automation/setup/new_user.ts              | 3 ++-
 ts/test/automation/utilities/utils.ts             | 5 +++--
 9 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ts/components/basic/SessionDropdown.tsx b/ts/components/basic/SessionDropdown.tsx
index 0b27a90da..eb00a1f42 100644
--- a/ts/components/basic/SessionDropdown.tsx
+++ b/ts/components/basic/SessionDropdown.tsx
@@ -17,15 +17,16 @@ type Props = {
     active?: boolean;
     onClick?: any;
   }>;
+  dataTestId?: string;
 };
 
 export const SessionDropdown = (props: Props) => {
-  const { label, options } = props;
+  const { label, options, dataTestId } = props;
   const [expanded, setExpanded] = useState(!!props.expanded);
   const chevronOrientation = expanded ? 180 : 0;
 
   return (
-    <div className="session-dropdown">
+    <div className="session-dropdown" data-testid={dataTestId}>
       <div
         className="session-dropdown__label"
         onClick={() => {
@@ -43,6 +44,7 @@ export const SessionDropdown = (props: Props) => {
             return (
               <SessionDropdownItem
                 key={item.content}
+                dataTestId={`dropdownitem-${item.content.replace(' ', '-')}`}
                 content={item.content}
                 icon={item.icon}
                 type={item.type}
diff --git a/ts/components/basic/SessionDropdownItem.tsx b/ts/components/basic/SessionDropdownItem.tsx
index 3ef0ccc4f..c6588da41 100644
--- a/ts/components/basic/SessionDropdownItem.tsx
+++ b/ts/components/basic/SessionDropdownItem.tsx
@@ -13,6 +13,7 @@ type Props = {
   icon: SessionIconType | null;
   active: boolean;
   onClick: any;
+  dataTestId?: string;
 };
 
 export const SessionDropdownItem = (props: Props) => {
@@ -23,7 +24,7 @@ export const SessionDropdownItem = (props: Props) => {
     }
   };
 
-  const { content, type, icon, active } = props;
+  const { content, type, icon, active, dataTestId } = props;
 
   return (
     <div
@@ -34,6 +35,7 @@ export const SessionDropdownItem = (props: Props) => {
       )}
       role="button"
       onClick={clickHandler}
+      data-testid={dataTestId}
     >
       {icon ? <SessionIcon iconType={icon} iconSize="small" /> : ''}
       <div className="item-content">{content}</div>
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 6f15fe3f7..f98632661 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -354,6 +354,7 @@ export const SessionRightPanelWithDetails = () => {
         <SessionDropdown
           label={window.i18n('disappearingMessages')}
           options={disappearingMessagesOptions}
+          dataTestId="disappearing-messages-dropdown"
         />
       )}
 
diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index 1e88e4d37..35a218d65 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -23,10 +23,12 @@ sessionTestTwoWindows('Disappearing messages', async ([windowA, windowB]) => {
   await createContact(windowA, windowB, userA, userB);
   // Click on user's avatar to open conversation options
   await clickOnTestIdWithText(windowA, 'conversation-options-avatar');
+  await waitForMatchingText(windowA, 'Your message request has been accepted');
   // Select disappearing messages drop down
-  await clickOnMatchingText(windowA, 'Disappearing messages');
+  await clickOnTestIdWithText(windowA, 'disappearing-messages-dropdown', 'Disappearing messages');
   // Select 5 seconds
-  await clickOnMatchingText(windowA, '5 seconds');
+  await sleepFor(200);
+  await clickOnTestIdWithText(windowA, 'dropdownitem-5-seconds', '5 seconds');
   // Click chevron to close menu
   await clickOnTestIdWithText(windowA, 'back-button-conversation-options');
   // Check config message
diff --git a/ts/test/automation/linked_device_requests.spec.ts b/ts/test/automation/linked_device_requests.spec.ts
index 9a9adbab4..4f63ce95d 100644
--- a/ts/test/automation/linked_device_requests.spec.ts
+++ b/ts/test/automation/linked_device_requests.spec.ts
@@ -41,7 +41,7 @@ sessionTestTwoWindows('Decline request syncs', async ([windowA, windowB]) => {
 
   const testMessage = `${userA.userName} sending message request to ${userB.userName}`;
   await sendNewMessage(windowA, userB.sessionid, testMessage);
-  // Accept request in windowB
+  // Decline request in windowB
   await clickOnTestIdWithText(windowB, 'message-request-banner');
   await clickOnTestIdWithText(windowB, 'module-conversation__user__profile-name', userA.userName);
   await clickOnTestIdWithText(windowC, 'message-request-banner');
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index 6b1690202..bad40ede9 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -166,7 +166,8 @@ test('Check blocked user syncs', async () => {
   // Check linked device for blocked contact in settings screen
   await clickOnTestIdWithText(windowB, 'settings-section');
   await clickOnTestIdWithText(windowB, 'conversations-settings-menu-item');
-  await clickOnTestIdWithText(windowB, 'reveal-blocked-user-settings');
+  // a conf sync job can take 30s (if the last one failed) +  10s polling to show a change on a linked device.
+  await clickOnTestIdWithText(windowB, 'reveal-blocked-user-settings', undefined, undefined, 50000);
   // Check if user B is in blocked contact list
   await waitForMatchingText(windowB, userB.userName);
 });
diff --git a/ts/test/automation/message_requests.spec.ts b/ts/test/automation/message_requests.spec.ts
index a9a0cd104..fa711f74c 100644
--- a/ts/test/automation/message_requests.spec.ts
+++ b/ts/test/automation/message_requests.spec.ts
@@ -84,6 +84,8 @@ test.describe('Message requests', () => {
     await clickOnTestIdWithText(windowB, 'session-confirm-ok-button', 'OK');
     // Navigate back to message request folder to check
     await clickOnTestIdWithText(windowB, 'settings-section');
+
+    await clickOnTestIdWithText(windowB, 'message-requests-settings-menu-item', 'Message Requests');
     // Check config message of message request acceptance
     await waitForMatchingText(windowB, 'No pending message requests');
   });
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index e57cebba1..7ddf1536d 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -1,12 +1,13 @@
 import { Page } from '@playwright/test';
 import { User } from '../types/testing';
 import { clickOnMatchingText, typeIntoInput } from '../utilities/utils';
+import { sleepFor } from '../../../session/utils/Promise';
 // tslint:disable: no-console
 export const newUser = async (window: Page, userName: string): Promise<User> => {
   // Create User
   await clickOnMatchingText(window, 'Create Session ID');
   // Wait for animation for finish creating ID
-  await window.waitForTimeout(1500);
+  await sleepFor(2500);
   //Save session ID to a variable
   const sessionid = await window.inputValue('[data-testid=session-id-signup]');
   await clickOnMatchingText(window, 'Continue');
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 39ed571bd..06d5a022d 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -111,7 +111,8 @@ export async function clickOnTestIdWithText(
   window: Page,
   dataTestId: string,
   text?: string,
-  rightButton?: boolean
+  rightButton?: boolean,
+  maxWait?: number
 ) {
   console.info(`clickOnTestIdWithText with testId:${dataTestId} and text:${text ? text : 'none'}`);
 
@@ -119,7 +120,7 @@ export async function clickOnTestIdWithText(
     ? `css=[data-testid=${dataTestId}]`
     : `css=[data-testid=${dataTestId}]:has-text("${text}")`;
 
-  await window.waitForSelector(builtSelector);
+  await window.waitForSelector(builtSelector, { timeout: maxWait });
   return window.click(builtSelector, rightButton ? { button: 'right' } : undefined);
 }
 

From 83a8adf0332a09561121cd86c74983fd15d308f9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 5 Jul 2023 09:14:04 +0200
Subject: [PATCH 145/178] fix: decrease retry timer of confsyncjob to 15s

- we need a rather long duration so we don't add a new job while was is
already planned to be runned, and they end up both running at the same
time.
- we also need a not too long duration for integration tests and UX
  experience, as a change could take the retry timeout to happen+polling
timer to happen, which used to be 40s total.

This brings that time to worse time change from 40 to 25s
---
 ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 0cef20c86..5fc60cbf9 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -20,7 +20,7 @@ import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { allowOnlyOneAtATime } from '../../Promise';
 import { isSignInByLinking } from '../../../../util/storage';
 
-const defaultMsBetweenRetries = 30000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s)
+const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s)
 const defaultMaxAttempts = 2;
 
 /**

From 62c5ebb1fc5c942cec1567ca2ffe4de6d239ef30 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Wed, 5 Jul 2023 15:40:32 +1000
Subject: [PATCH 146/178] fix: processQuoteAttachments correctly updates
 attachment thumbnails when downloading them

---
 ts/receiver/attachments.ts | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index c7a58dc26..969ec3578 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -218,27 +218,27 @@ async function processQuoteAttachments(
   const isOpenGroupV2 = convo.isOpenGroupV2();
   const openGroupV2Details = (isOpenGroupV2 && convo.toOpenGroupV2()) || undefined;
 
-  quote.attachments = await Promise.all(
-    quote.attachments.map(async (item: any, index: any) => {
-      // If we already have a path, then we copied this image from the quoted
-      //    message and we don't need to download the attachment.
-      if (!item.thumbnail || item.thumbnail.path) {
-        return item;
-      }
+  for (let index = 0; index < quote.attachments.length - 1; index++) {
+    // If we already have a path, then we copied this image from the quoted
+    // message and we don't need to download the attachment.
+    const attachment = quote.attachments[index];
 
-      addedCount += 1;
+    if (!attachment.thumbnail || attachment.thumbnail.path) {
+      continue;
+    }
 
-      const thumbnail = await AttachmentDownloads.addJob(item.thumbnail, {
-        messageId: message.id,
-        type: 'quote',
-        index,
-        isOpenGroupV2,
-        openGroupV2Details,
-      });
+    addedCount += 1;
 
-      return { ...item, thumbnail };
-    })
-  );
+    const thumbnail = await AttachmentDownloads.addJob(attachment.thumbnail, {
+      messageId: message.id,
+      type: 'quote',
+      index,
+      isOpenGroupV2,
+      openGroupV2Details,
+    });
+
+    quote.attachments[index] = { ...attachment, thumbnail };
+  }
 
   message.set({ quote });
 

From 41b488a71e2b0579d3c54c8e145de38e7f7082e6 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Wed, 5 Jul 2023 15:51:48 +1000
Subject: [PATCH 147/178] feat: dont show your pubkey in community quotes

---
 .../message/message-content/quote/QuoteAuthor.tsx      |  4 ++--
 ts/hooks/useParamSelector.ts                           | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ts/components/conversation/message/message-content/quote/QuoteAuthor.tsx b/ts/components/conversation/message/message-content/quote/QuoteAuthor.tsx
index d724b1203..cb5ede16e 100644
--- a/ts/components/conversation/message/message-content/quote/QuoteAuthor.tsx
+++ b/ts/components/conversation/message/message-content/quote/QuoteAuthor.tsx
@@ -29,7 +29,7 @@ export const QuoteAuthor = (props: QuoteAuthorProps) => {
   const { author, isIncoming } = props;
 
   const isPublic = useSelectedIsPublic();
-  const authorName = useQuoteAuthorName(author);
+  const { authorName, isMe } = useQuoteAuthorName(author);
 
   if (!author || !authorName) {
     return null;
@@ -41,7 +41,7 @@ export const QuoteAuthor = (props: QuoteAuthorProps) => {
         pubkey={PubKey.shorten(author)}
         name={authorName}
         compact={true}
-        shouldShowPubkey={Boolean(authorName && isPublic)}
+        shouldShowPubkey={Boolean(authorName && !isMe && isPublic)}
       />
     </StyledQuoteAuthor>
   );
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 59e4411bf..a46bc4776 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -264,11 +264,17 @@ export function useIsTyping(conversationId?: string): boolean {
   return useConversationPropsById(conversationId)?.isTyping || false;
 }
 
-export function useQuoteAuthorName(authorId?: string) {
+export function useQuoteAuthorName(
+  authorId?: string
+): { authorName: string | undefined; isMe: boolean } {
   const convoProps = useConversationPropsById(authorId);
-  return authorId && isUsAnySogsFromCache(authorId)
+
+  const isMe = Boolean(authorId && isUsAnySogsFromCache(authorId));
+  const authorName = isMe
     ? window.i18n('you')
     : convoProps?.nickname || convoProps?.isPrivate
     ? convoProps?.displayNameInProfile
     : undefined;
+
+  return { authorName, isMe };
 }

From 1c7a26b65ea84f235be5ef85a42edce0d2fbb2b5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 5 Jul 2023 09:28:17 +0200
Subject: [PATCH 148/178] fix: index typo in loop for thumbnail download

---
 ts/receiver/attachments.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index 969ec3578..d4c16f52c 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -218,7 +218,7 @@ async function processQuoteAttachments(
   const isOpenGroupV2 = convo.isOpenGroupV2();
   const openGroupV2Details = (isOpenGroupV2 && convo.toOpenGroupV2()) || undefined;
 
-  for (let index = 0; index < quote.attachments.length - 1; index++) {
+  for (let index = 0; index < quote.attachments.length; index++) {
     // If we already have a path, then we copied this image from the quoted
     // message and we don't need to download the attachment.
     const attachment = quote.attachments[index];

From 5d323fa1551839885a5b09ca486203c0d2914db7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 5 Jul 2023 09:28:46 +0200
Subject: [PATCH 149/178] fix: give conversationId to convo list so the order
 is tracked

otherwise, a change of pinned conversation does not retrigger a render,
and the pinned conversation does not get pushed to the top
---
 ts/components/leftpane/LeftPaneMessageSection.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index 95ef19647..1af354f24 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -112,6 +112,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
               rowRenderer={this.renderRow}
               width={width}
               autoHeight={false}
+              conversationIds={conversationIds}
             />
           )}
         </AutoSizer>

From de41988215e4e8a3ff4c07840fd82d5154238cb2 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 5 Jul 2023 09:43:19 +0200
Subject: [PATCH 150/178] fix: typo on no audio output on speaker toggle

---
 ts/components/calling/CallButtons.tsx | 2 +-
 ts/session/utils/Toast.tsx            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index 6817e307f..32eedce9e 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -328,7 +328,7 @@ const handleSpeakerToggle = async (
   isAudioOutputMuted: boolean
 ) => {
   if (!currentConnectedAudioOutputs.length) {
-    ToastUtils.pushNoAudioInputFound();
+    ToastUtils.pushNoAudioOutputFound();
 
     return;
   }
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index 4170dc64d..0de25cbaa 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -267,7 +267,7 @@ export function pushNoAudioInputFound() {
 }
 
 export function pushNoAudioOutputFound() {
-  pushToastWarning('noAudioInputFound', window.i18n('noAudioOutputFound'));
+  pushToastWarning('noAudioOutputFound', window.i18n('noAudioOutputFound'));
 }
 
 export function pushNoMediaUntilApproved() {

From 01ae43d7d06360670e3b59d824790a1ea4764a7d Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 6 Jul 2023 16:51:39 +1000
Subject: [PATCH 151/178] feat: moved H5AudioPlayer SASS to styled components

---
 stylesheets/_modules.scss                    |   3 +
 stylesheets/_session_conversation.scss       | 132 -------------------
 ts/components/conversation/H5AudioPlayer.tsx | 124 ++++++++++++++++-
 3 files changed, 126 insertions(+), 133 deletions(-)

diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 1a751325e..7f05611e0 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1048,6 +1048,9 @@
 }
 
 // Module H5AudioPlayer
+$rhap_background-color: var(--transparent-color) !default;
+$rhap_font-family: inherit !default;
+
 .module-message__container--outgoing {
   .rhap_container {
     background-color: var(--message-bubbles-sent-background-color);
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 491bc2083..c73fb99d7 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -254,135 +254,3 @@
     }
   }
 }
-
-/* ************ */
-/* AUDIO PLAYER */
-/* ************ */
-$rhap_background-color: var(--transparent-color) !default;
-$rhap_font-family: inherit !default;
-
-.rhap_container,
-.rhap_container button,
-.rhap_progress-container {
-  outline: none;
-}
-
-.rhap_progress-container {
-  margin: 0 0 0 calc(10px + 1%);
-}
-
-.rhap_container {
-  min-width: 220px;
-  padding: 0px;
-  background-color: transparent;
-  box-shadow: none;
-  padding: var(--padding-message-content);
-  border-radius: var(--border-radius-message-box);
-
-  svg {
-    transition: fill var(--default-duration);
-  }
-}
-
-.rhap_total-time {
-  display: none;
-}
-
-.rhap_current-time {
-  margin: 0 5px 0 4px;
-  flex-shrink: 0;
-}
-
-.rhap_play-pause-button {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.rhap_volume-bar {
-  display: none;
-}
-
-.rhap_volume-button {
-  .module-message__container--incoming & {
-    color: var(--message-bubbles-received-text-color);
-  }
-  .module-message__container--outgoing & {
-    color: var(--message-bubbles-sent-text-color);
-  }
-}
-
-.rhap_volume-container div[role='progressbar'] {
-  display: none;
-}
-
-.rhap_time {
-  .module-message__container--incoming & {
-    color: var(--message-bubbles-received-text-color);
-  }
-  .module-message__container--outgoing & {
-    color: var(--message-bubbles-sent-text-color);
-  }
-
-  font-size: 12px;
-}
-
-.rhap_progress-bar {
-  box-sizing: border-box;
-  position: relative;
-  z-index: 0;
-  width: 100%;
-  height: 5px;
-  border-radius: 2px;
-}
-
-.rhap_progress-filled {
-  padding-left: 5px;
-}
-
-.rhap_download-progress {
-  height: 100%;
-  position: absolute;
-  z-index: 1;
-  border-radius: 2px;
-}
-
-.rhap_progress-indicator {
-  z-index: 3;
-  width: 15px;
-  height: 15px;
-  top: -5px;
-  margin-left: -10px;
-  box-shadow: rgba(0, 0, 0, 0.5) 0 0 5px !important;
-}
-
-.rhap_controls-section {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.rhap_additional-controls {
-  display: none;
-}
-
-.rhap_play-pause-button {
-  width: unset;
-  height: unset;
-}
-
-.rhap_controls-section {
-  flex: unset;
-  justify-content: flex-start;
-}
-
-.rhap_volume-button {
-  font-size: 20px;
-  width: 20px;
-  height: 20px;
-  margin-right: 0px;
-}
-
-/* **************** */
-/* END AUDIO PLAYER */
-/* **************** */
diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx
index c6c5fc291..fa0151ae3 100644
--- a/ts/components/conversation/H5AudioPlayer.tsx
+++ b/ts/components/conversation/H5AudioPlayer.tsx
@@ -25,6 +25,128 @@ const StyledSpeedButton = styled.div`
   }
 `;
 
+export const StyledH5AudioPlayer = styled(H5AudioPlayer)`
+  &.rhap_container {
+    min-width: 220px;
+    padding: 0px;
+    outline: none;
+    padding: var(--padding-message-content);
+    border-radius: var(--border-radius-message-box);
+
+    svg {
+      transition: fill var(--default-duration);
+    }
+
+    button {
+      outline: none;
+    }
+  }
+
+  .rhap_progress-container {
+    margin: 0 0 0 calc(10px + 1%);
+    outline: none;
+  }
+
+  .rhap_total-time {
+    display: none;
+  }
+
+  .rhap_current-time {
+    margin: 0 5px 0 4px;
+    flex-shrink: 0;
+  }
+
+  .rhap_play-pause-button {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .rhap_volume-bar {
+    display: none;
+  }
+
+  .rhap_volume-button {
+    .module-message__container--incoming & {
+      color: var(--message-bubbles-received-text-color);
+    }
+    .module-message__container--outgoing & {
+      color: var(--message-bubbles-sent-text-color);
+    }
+  }
+
+  .rhap_volume-container div[role='progressbar'] {
+    display: none;
+  }
+
+  .rhap_time {
+    .module-message__container--incoming & {
+      color: var(--message-bubbles-received-text-color);
+    }
+    .module-message__container--outgoing & {
+      color: var(--message-bubbles-sent-text-color);
+    }
+
+    font-size: 12px;
+  }
+
+  .rhap_progress-bar {
+    box-sizing: border-box;
+    position: relative;
+    z-index: 0;
+    width: 100%;
+    height: 5px;
+    border-radius: 2px;
+  }
+
+  .rhap_progress-filled {
+    padding-left: 5px;
+  }
+
+  .rhap_download-progress {
+    height: 100%;
+    position: absolute;
+    z-index: 1;
+    border-radius: 2px;
+  }
+
+  .rhap_progress-indicator {
+    z-index: 3;
+    width: 15px;
+    height: 15px;
+    top: -5px;
+    margin-left: -10px;
+    box-shadow: rgba(0, 0, 0, 0.5) 0 0 5px !important;
+  }
+
+  .rhap_controls-section {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .rhap_additional-controls {
+    display: none;
+  }
+
+  .rhap_play-pause-button {
+    width: unset;
+    height: unset;
+  }
+
+  .rhap_controls-section {
+    flex: unset;
+    justify-content: flex-start;
+  }
+
+  .rhap_volume-button {
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+    margin-right: 0px;
+  }
+`;
+
 export const AudioPlayerWithEncryptedFile = (props: {
   src: string;
   contentType: string;
@@ -98,7 +220,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
   };
 
   return (
-    <H5AudioPlayer
+    <StyledH5AudioPlayer
       src={urlToLoad}
       preload="metadata"
       style={{ pointerEvents: multiSelectMode ? 'none' : 'inherit' }}

From d888999543c5b9ab0253354faf4bb28196ec5eb0 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 6 Jul 2023 16:53:35 +1000
Subject: [PATCH 152/178] fix: use StyledMessageHighlighter in
 MessageAttachment only when it is rendered

---
 .../message-content/MessageAttachment.tsx     | 37 ++++++++++++-------
 .../message-content/MessageContent.tsx        | 15 ++++----
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx
index 95b773b6a..764abe9cb 100644
--- a/ts/components/conversation/message/message-content/MessageAttachment.tsx
+++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx
@@ -31,6 +31,7 @@ import { LightBoxOptions } from '../../SessionConversation';
 import { ClickToTrustSender } from './ClickToTrustSender';
 import styled from 'styled-components';
 import classNames from 'classnames';
+import { StyledMessageHighlighter } from './MessageContent';
 
 export type MessageAttachmentSelectorProps = Pick<
   MessageRenderingProps,
@@ -48,10 +49,13 @@ type Props = {
   messageId: string;
   imageBroken: boolean;
   handleImageError: () => void;
+  highlight?: boolean;
 };
 // tslint:disable: use-simple-attributes
 
-const StyledAttachmentContainer = styled.div<{ messageDirection: MessageModelType }>`
+const StyledAttachmentContainer = styled.div<{
+  messageDirection: MessageModelType;
+}>`
   text-align: center;
   position: relative;
   overflow: hidden;
@@ -61,10 +65,11 @@ const StyledAttachmentContainer = styled.div<{ messageDirection: MessageModelTyp
 
 // tslint:disable-next-line max-func-body-length cyclomatic-complexity
 export const MessageAttachment = (props: Props) => {
-  const { messageId, imageBroken, handleImageError } = props;
+  const { messageId, imageBroken, handleImageError, highlight = false } = props;
 
   const dispatch = useDispatch();
   const attachmentProps = useSelector(state => getMessageAttachmentProps(state as any, messageId));
+
   const multiSelectMode = useSelector(isMessageSelectionMode);
   const onClickOnImageGrid = useCallback(
     (attachment: AttachmentTypeWithPath | AttachmentType) => {
@@ -116,6 +121,7 @@ export const MessageAttachment = (props: Props) => {
   if (!attachments || !attachments[0]) {
     return null;
   }
+
   const firstAttachment = attachments[0];
   const displayImage = canDisplayImage(attachments);
 
@@ -130,18 +136,22 @@ export const MessageAttachment = (props: Props) => {
       (isVideo(attachments) && hasVideoScreenshot(attachments)))
   ) {
     return (
-      <StyledAttachmentContainer messageDirection={direction}>
-        <ImageGrid
-          attachments={attachments}
-          onError={handleImageError}
-          onClickAttachment={onClickOnImageGrid}
-        />
-      </StyledAttachmentContainer>
+      <StyledMessageHighlighter highlight={highlight}>
+        <StyledAttachmentContainer messageDirection={direction}>
+          <ImageGrid
+            attachments={attachments}
+            onError={handleImageError}
+            onClickAttachment={onClickOnImageGrid}
+          />
+        </StyledAttachmentContainer>
+      </StyledMessageHighlighter>
     );
   }
+
   if (!firstAttachment.pending && !firstAttachment.error && isAudio(attachments)) {
     return (
-      <div
+      <StyledMessageHighlighter
+        highlight={highlight}
         role="main"
         onClick={(e: any) => {
           if (multiSelectMode) {
@@ -150,21 +160,20 @@ export const MessageAttachment = (props: Props) => {
           e.stopPropagation();
           e.preventDefault();
         }}
-        style={{ padding: 'var(--margins-xs) 0px' }}
       >
         <AudioPlayerWithEncryptedFile
           src={firstAttachment.url}
           contentType={firstAttachment.contentType}
           messageId={messageId}
         />
-      </div>
+      </StyledMessageHighlighter>
     );
   }
   const { pending, fileName, fileSize, contentType } = firstAttachment;
   const extension = getExtensionForDisplay({ contentType, fileName });
 
   return (
-    <div className="module-message__generic-attachment">
+    <StyledMessageHighlighter highlight={highlight} className="module-message__generic-attachment">
       {pending ? (
         <div className="module-message__generic-attachment__spinner-container">
           <Spinner size="small" />
@@ -200,7 +209,7 @@ export const MessageAttachment = (props: Props) => {
           {fileSize}
         </div>
       </div>
-    </div>
+    </StyledMessageHighlighter>
   );
 };
 
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index 5a45f2478..b9f84062e 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -62,7 +62,7 @@ const opacityAnimation = keyframes`
     }
 `;
 
-const StyledMessageHighlighter = styled.div<{
+export const StyledMessageHighlighter = styled.div<{
   highlight: boolean;
 }>`
   ${props =>
@@ -187,13 +187,12 @@ export const MessageContent = (props: Props) => {
             </StyledMessageOpaqueContent>
           )}
           {!isDeleted && (
-            <StyledMessageHighlighter highlight={highlight}>
-              <MessageAttachment
-                messageId={props.messageId}
-                imageBroken={imageBroken}
-                handleImageError={handleImageError}
-              />
-            </StyledMessageHighlighter>
+            <MessageAttachment
+              messageId={props.messageId}
+              imageBroken={imageBroken}
+              handleImageError={handleImageError}
+              highlight={highlight}
+            />
           )}
         </IsMessageVisibleContext.Provider>
       </InView>

From e232eadf9196a83d44095e658d7d2e88b4fcb182 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 6 Jul 2023 18:07:28 +1000
Subject: [PATCH 153/178] fix: message spacing after fixing audio message
 shadow

---
 .../message/message-content/MessageReactions.tsx            | 6 +++++-
 .../message/message-item/GenericReadableMessage.tsx         | 6 ++++++
 ts/themes/globals.tsx                                       | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ts/components/conversation/message/message-content/MessageReactions.tsx b/ts/components/conversation/message/message-content/MessageReactions.tsx
index 7bf262a0f..8a417c9bc 100644
--- a/ts/components/conversation/message/message-content/MessageReactions.tsx
+++ b/ts/components/conversation/message/message-content/MessageReactions.tsx
@@ -14,7 +14,11 @@ import { StyledPopupContainer } from '../reactions/ReactionPopup';
 export const popupXDefault = -81;
 export const popupYDefault = -90;
 
-const StyledMessageReactionsContainer = styled(Flex)<{ x: number; y: number; noAvatar: boolean }>`
+export const StyledMessageReactionsContainer = styled(Flex)<{
+  x: number;
+  y: number;
+  noAvatar: boolean;
+}>`
   ${StyledPopupContainer} {
     position: absolute;
     top: ${props => `${props.y}px;`};
diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index b4b8dc0d1..307023e3e 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -21,6 +21,7 @@ import { MessageContentWithStatuses } from '../message-content/MessageContentWit
 import { ReadableMessage } from './ReadableMessage';
 import styled, { keyframes } from 'styled-components';
 import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
+import { StyledMessageReactionsContainer } from '../message-content/MessageReactions';
 
 export type GenericReadableMessageSelectorProps = Pick<
   MessageRenderingProps,
@@ -118,11 +119,16 @@ const StyledReadableMessage = styled(ReadableMessage)<{
   width: 100%;
   letter-spacing: 0.03rem;
   padding: var(--margins-xs) var(--margins-lg) 0;
+  margin: var(--margins-xxs) 0;
 
   &.message-highlighted {
     animation: ${highlightedMessageAnimation} 1s ease-in-out;
   }
 
+  ${StyledMessageReactionsContainer} {
+    margin-top: var(--margins-xs);
+  }
+
   ${props =>
     props.isRightClicked &&
     `
diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx
index f1fc40cbc..e0018ea0f 100644
--- a/ts/themes/globals.tsx
+++ b/ts/themes/globals.tsx
@@ -17,6 +17,7 @@ export type ThemeGlobals = {
   '--font-size-h4': string;
 
   /* Margins */
+  '--margins-xxs': string;
   '--margins-xs': string;
   '--margins-sm': string;
   '--margins-md': string;
@@ -97,6 +98,7 @@ export const THEME_GLOBALS: ThemeGlobals = {
   '--font-size-h3': '20px',
   '--font-size-h4': '16px',
 
+  '--margins-xxs': '2.5px',
   '--margins-xs': '5px',
   '--margins-sm': '10px',
   '--margins-md': '15px',

From 6be95b717769756579f6d1a1457f021aa3d4e2ae Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 7 Jul 2023 11:52:44 +0200
Subject: [PATCH 154/178] fix: notif settings in list item convoId from
 contextprovider

---
 ts/components/menu/Menu.tsx | 45 +++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index d1010df93..695d0acf9 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -6,6 +6,7 @@ import {
   useAvatarPath,
   useConversationUsername,
   useHasNickname,
+  useIsActive,
   useIsBlinded,
   useIsBlocked,
   useIsIncomingRequest,
@@ -15,6 +16,7 @@ import {
   useIsPrivate,
   useIsPrivateAndFriend,
   useIsPublic,
+  useNotificationSetting,
   useWeAreAdmin,
 } from '../../hooks/useParamSelector';
 import {
@@ -35,6 +37,10 @@ import {
   showUpdateGroupNameByConvoId,
   unblockConvoById,
 } from '../../interactions/conversationInteractions';
+import {
+  ConversationNotificationSetting,
+  ConversationNotificationSettingType,
+} from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
 import { PubKey } from '../../session/types';
 import {
@@ -43,23 +49,10 @@ import {
   updateUserDetailsModal,
 } from '../../state/ducks/modalDialog';
 import { getIsMessageSection } from '../../state/selectors/section';
-import {
-  useSelectedConversationKey,
-  useSelectedIsActive,
-  useSelectedIsBlocked,
-  useSelectedIsKickedFromGroup,
-  useSelectedIsLeft,
-  useSelectedIsPrivate,
-  useSelectedIsPrivateFriend,
-  useSelectedNotificationSetting,
-} from '../../state/selectors/selectedConversation';
+import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
+import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
-import {
-  ConversationNotificationSetting,
-  ConversationNotificationSettingType,
-} from '../../models/conversationAttributes';
-import { LocalizerKeys } from '../../types/LocalizerKeys';
 
 /** Menu items standardized */
 
@@ -556,18 +549,20 @@ export const DeclineAndBlockMsgRequestMenuItem = () => {
 };
 
 export const NotificationForConvoMenuItem = (): JSX.Element | null => {
-  const selectedConvoId = useSelectedConversationKey();
+  // Note: this item is used in the header and in the list item, so we need to grab the details
+  // from the convoId from the context itself, not the redux selected state
+  const convoId = useConvoIdFromContext();
 
-  const currentNotificationSetting = useSelectedNotificationSetting();
-  const isBlocked = useSelectedIsBlocked();
-  const isActive = useSelectedIsActive();
-  const isLeft = useSelectedIsLeft();
-  const isKickedFromGroup = useSelectedIsKickedFromGroup();
-  const isFriend = useSelectedIsPrivateFriend();
-  const isPrivate = useSelectedIsPrivate();
+  const currentNotificationSetting = useNotificationSetting(convoId);
+  const isBlocked = useIsBlocked(convoId);
+  const isActive = useIsActive(convoId);
+  const isLeft = useIsLeft(convoId);
+  const isKickedFromGroup = useIsKickedFromGroup(convoId);
+  const isFriend = useIsPrivateAndFriend(convoId);
+  const isPrivate = useIsPrivate(convoId);
 
   if (
-    !selectedConvoId ||
+    !convoId ||
     isLeft ||
     isKickedFromGroup ||
     isBlocked ||
@@ -606,7 +601,7 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => {
           <Item
             key={item.value}
             onClick={async () => {
-              await setNotificationForConvoId(selectedConvoId, item.value);
+              await setNotificationForConvoId(convoId, item.value);
             }}
             disabled={disabled}
           >

From c6d86d25d8ad4f66b94572a757230b2e45f47841 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 7 Jul 2023 15:33:03 +0200
Subject: [PATCH 155/178] fix: cleanup closed group avatar logic

---
 ts/components/avatar/Avatar.tsx               | 52 +++++++-----
 .../AvatarPlaceHolder/ClosedGroupAvatar.tsx   | 79 ++++++++++++++-----
 ts/hooks/useMembersAvatars.tsx                | 40 ----------
 ts/hooks/useParamSelector.ts                  | 15 +++-
 ts/state/selectors/selectedConversation.ts    |  4 +-
 5 files changed, 108 insertions(+), 82 deletions(-)
 delete mode 100644 ts/hooks/useMembersAvatars.tsx

diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index e85ee2a89..c5f1a7dff 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -66,21 +66,21 @@ export const CrownIcon = () => {
   );
 };
 
-const NoImage = (
-  props: Pick<Props, 'forcedName' | 'size' | 'pubkey' | 'onAvatarClick'> & {
-    isClosedGroup: boolean;
-  }
-) => {
-  const { forcedName, size, pubkey, isClosedGroup } = props;
-  // if no image but we have conversations set for the group, renders group members avatars
-  if (pubkey && isClosedGroup) {
-    return (
-      <ClosedGroupAvatar size={size} closedGroupId={pubkey} onAvatarClick={props.onAvatarClick} />
-    );
-  }
+const NoImage = React.memo(
+  (
+    props: Pick<Props, 'forcedName' | 'size' | 'pubkey' | 'onAvatarClick'> & {
+      isClosedGroup: boolean;
+    }
+  ) => {
+    const { forcedName, size, pubkey, isClosedGroup, onAvatarClick } = props;
+    // if no image but we have conversations set for the group, renders group members avatars
+    if (pubkey && isClosedGroup) {
+      return <ClosedGroupAvatar size={size} convoId={pubkey} onAvatarClick={onAvatarClick} />;
+    }
 
-  return <Identicon size={size} forcedName={forcedName} pubkey={pubkey} />;
-};
+    return <Identicon size={size} forcedName={forcedName} pubkey={pubkey} />;
+  }
+);
 
 const AvatarImage = (
   props: Pick<Props, 'base64Data' | 'dataTestId'> & {
@@ -111,12 +111,20 @@ const AvatarImage = (
 };
 
 const AvatarInner = (props: Props) => {
-  const { base64Data, size, pubkey, forcedAvatarPath, forcedName, dataTestId } = props;
+  const {
+    base64Data,
+    size,
+    pubkey,
+    forcedAvatarPath,
+    forcedName,
+    dataTestId,
+    onAvatarClick,
+  } = props;
   const [imageBroken, setImageBroken] = useState(false);
 
   const isSelectingMessages = useSelector(isMessageSelectionMode);
 
-  const isClosedGroupAvatar = useIsClosedGroup(pubkey);
+  const isClosedGroup = useIsClosedGroup(pubkey);
   const avatarPath = useAvatarPath(pubkey);
   const name = useConversationUsername(pubkey);
   // contentType is not important
@@ -130,9 +138,9 @@ const AvatarInner = (props: Props) => {
     setImageBroken(true);
   };
 
-  const hasImage = (base64Data || urlToLoad) && !imageBroken && !isClosedGroupAvatar;
+  const hasImage = (base64Data || urlToLoad) && !imageBroken && !isClosedGroup;
 
-  const isClickable = !!props.onAvatarClick;
+  const isClickable = !!onAvatarClick;
   return (
     <div
       className={classNames(
@@ -167,7 +175,13 @@ const AvatarInner = (props: Props) => {
           dataTestId={dataTestId ? `img-${dataTestId}` : undefined}
         />
       ) : (
-        <NoImage {...props} isClosedGroup={isClosedGroupAvatar} />
+        <NoImage
+          pubkey={pubkey}
+          isClosedGroup={isClosedGroup}
+          size={size}
+          forcedName={forcedName}
+          onAvatarClick={onAvatarClick}
+        />
       )}
     </div>
   );
diff --git a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
index ba7525f07..2a11366e9 100644
--- a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
@@ -1,13 +1,9 @@
 import React from 'react';
-import { useMembersAvatars } from '../../../hooks/useMembersAvatars';
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
 import { Avatar, AvatarSize } from '../Avatar';
-
-type Props = {
-  size: number;
-  closedGroupId: string;
-  onAvatarClick?: () => void;
-};
+import { isEmpty } from 'lodash';
+import { useIsClosedGroup, useSortedGroupMembers } from '../../../hooks/useParamSelector';
+import { UserUtils } from '../../../session/utils';
 
 function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
   // Always use the size directly under the one requested
@@ -29,18 +25,61 @@ function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
   }
 }
 
-export const ClosedGroupAvatar = (props: Props) => {
-  const { closedGroupId, size, onAvatarClick } = props;
+/**
+ * Move our pubkey at the end of the list if we are in the list of members.
+ * We do this, as we want to
+ * - show 2 other members when there are enough of them,
+ * - show us as the 2nd member when there are only 2 members
+ * - show us first with a grey avatar as second when there are only us in the group.
+ */
+function moveUsAtTheEnd(members: Array<string>, us: string) {
+  const usAt = members.findIndex(val => val === us);
+  if (us && usAt > -1) {
+    // we need to move us at the end of the array
+    const updated = members.filter(m => m !== us);
+    updated.push(us);
+    return updated;
+  }
+  return members;
+}
 
-  const memberAvatars = useMembersAvatars(closedGroupId);
-  const avatarsDiameter = getClosedGroupAvatarsSize(size);
-  const firstMemberId = memberAvatars?.[0];
-  const secondMemberID = memberAvatars?.[1];
+function sortAndSlice(sortedMembers: Array<string>, us: string) {
+  const usAtTheEndIfNeeded = moveUsAtTheEnd(sortedMembers, us); // make sure we are not one of the first 2 members if there is enough members
+  return usAtTheEndIfNeeded.slice(0, 2); // we render at most 2 avatars for closed groups
+}
 
-  return (
-    <div className="module-avatar__icon-closed">
-      <Avatar size={avatarsDiameter} pubkey={firstMemberId || ''} onAvatarClick={onAvatarClick} />
-      <Avatar size={avatarsDiameter} pubkey={secondMemberID || ''} onAvatarClick={onAvatarClick} />
-    </div>
-  );
-};
+function useGroupMembersAvatars(convoId: string | undefined) {
+  const us = UserUtils.getOurPubKeyStrFromCache();
+  const isClosedGroup = useIsClosedGroup(convoId);
+  const sortedMembers = useSortedGroupMembers(convoId);
+
+  if (!convoId || !isClosedGroup || isEmpty(sortedMembers)) {
+    return undefined;
+  }
+
+  return sortAndSlice(sortedMembers, us);
+}
+
+export const ClosedGroupAvatar = React.memo(
+  ({
+    convoId,
+    size,
+    onAvatarClick,
+  }: {
+    size: number;
+    convoId: string;
+    onAvatarClick?: () => void;
+  }) => {
+    const memberAvatars = useGroupMembersAvatars(convoId);
+    const avatarsDiameter = getClosedGroupAvatarsSize(size);
+    const firstMemberId = memberAvatars?.[0] || '';
+    const secondMemberID = memberAvatars?.[1] || '';
+
+    return (
+      <div className="module-avatar__icon-closed">
+        <Avatar size={avatarsDiameter} pubkey={firstMemberId} onAvatarClick={onAvatarClick} />
+        <Avatar size={avatarsDiameter} pubkey={secondMemberID} onAvatarClick={onAvatarClick} />
+      </div>
+    );
+  }
+);
diff --git a/ts/hooks/useMembersAvatars.tsx b/ts/hooks/useMembersAvatars.tsx
deleted file mode 100644
index 4daa649d5..000000000
--- a/ts/hooks/useMembersAvatars.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { UserUtils } from '../session/utils';
-import * as _ from 'lodash';
-import { useSelector } from 'react-redux';
-import { StateType } from '../state/reducer';
-
-export function useMembersAvatars(closedGroupPubkey: string | undefined) {
-  const ourPrimary = UserUtils.getOurPubKeyStrFromCache();
-
-  return useSelector((state: StateType): Array<string> | undefined => {
-    if (!closedGroupPubkey) {
-      return undefined;
-    }
-    const groupConvo = state.conversations.conversationLookup[closedGroupPubkey];
-
-    if (groupConvo.isPrivate || groupConvo.isPublic) {
-      return undefined;
-    }
-    // this must be a closed group
-    const originalMembers = _.cloneDeep(groupConvo.members);
-    if (!originalMembers || originalMembers.length === 0) {
-      return undefined;
-    }
-    const allMembersSorted = originalMembers.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
-
-    // no need to forward more than 2 conversations for rendering the group avatar
-    const usAtTheEndMaxTwo = _.sortBy(allMembersSorted, a => (a === ourPrimary ? 1 : 0)).slice(
-      0,
-      2
-    );
-    const memberConvos = _.compact(
-      usAtTheEndMaxTwo
-        .map(m => state.conversations.conversationLookup[m])
-        .map(m => {
-          return m?.id || undefined;
-        })
-    );
-
-    return memberConvos && memberConvos.length ? memberConvos : undefined;
-  });
-}
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index a46bc4776..60c3629e2 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,4 +1,4 @@
-import { isEmpty, isNumber } from 'lodash';
+import { compact, isEmpty, isNumber } from 'lodash';
 import { useSelector } from 'react-redux';
 import {
   hasValidIncomingRequestValues,
@@ -278,3 +278,16 @@ export function useQuoteAuthorName(
 
   return { authorName, isMe };
 }
+
+/**
+ * Get the list of members of a closed group or []
+ * @param convoId the closed group id to extract members from
+ */
+export function useSortedGroupMembers(convoId: string | undefined): Array<string> {
+  const convoProps = useConversationPropsById(convoId);
+  if (!convoProps || convoProps.isPrivate || convoProps.isPublic) {
+    return [];
+  }
+  // we need to close it before being able to call sort on it
+  return compact(convoProps.members?.slice()?.sort()) || [];
+}
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 31523151f..de5563aec 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -110,7 +110,7 @@ export const isClosedGroupConversation = (state: StateType): boolean => {
   );
 };
 
-const getGroupMembers = (state: StateType): Array<string> => {
+const getSelectedGroupMembers = (state: StateType): Array<string> => {
   const selected = getSelectedConversation(state);
   if (!selected) {
     return [];
@@ -190,7 +190,7 @@ export function useSelectedisNoteToSelf() {
 }
 
 export function useSelectedMembers() {
-  return useSelector(getGroupMembers);
+  return useSelector(getSelectedGroupMembers);
 }
 
 export function useSelectedSubscriberCount() {

From 8c6f17fc334c67b82b436d1ae32025889cdc7bd7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 7 Jul 2023 15:40:03 +0200
Subject: [PATCH 156/178] fix: single sha512 of pubkey per pubkey for avatars

---
 .../AvatarPlaceHolder/AvatarPlaceHolder.tsx   | 18 +++++---
 .../AvatarPlaceHolder/ClosedGroupAvatar.tsx   | 45 +++++++++----------
 ts/hooks/useParamSelector.ts                  |  2 +-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
index 826bbe962..42319aa57 100644
--- a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { COLORS } from '../../../themes/constants/colors';
 import { getInitials } from '../../../util/getInitials';
+import { allowOnlyOneAtATime } from '../../../session/utils/Promise';
 
 type Props = {
   diameter: number;
@@ -8,13 +9,15 @@ type Props = {
   pubkey: string;
 };
 
-const sha512FromPubkey = async (pubkey: string): Promise<string> => {
-  const buf = await crypto.subtle.digest('SHA-512', new TextEncoder().encode(pubkey));
+const sha512FromPubkeyOneAtAtime = async (pubkey: string) => {
+  return allowOnlyOneAtATime(`sha512FromPubkey-${pubkey}`, async () => {
+    const buf = await crypto.subtle.digest('SHA-512', new TextEncoder().encode(pubkey));
 
-  // tslint:disable: prefer-template restrict-plus-operands
-  return Array.prototype.map
-    .call(new Uint8Array(buf), (x: any) => ('00' + x.toString(16)).slice(-2))
-    .join('');
+    // tslint:disable: prefer-template restrict-plus-operands
+    return Array.prototype.map
+      .call(new Uint8Array(buf), (x: any) => ('00' + x.toString(16)).slice(-2))
+      .join('');
+  });
 };
 
 // do not do this on every avatar, just cache the values so we can reuse them across the app
@@ -46,7 +49,8 @@ function useHashBasedOnPubkey(pubkey: string) {
       }
       return;
     }
-    void sha512FromPubkey(pubkey).then(sha => {
+
+    void sha512FromPubkeyOneAtAtime(pubkey).then(sha => {
       if (isInProgress) {
         setIsLoading(false);
         // Generate the seed simulate the .hashCode as Java
diff --git a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
index 2a11366e9..0979b9528 100644
--- a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
@@ -45,7 +45,8 @@ function moveUsAtTheEnd(members: Array<string>, us: string) {
 
 function sortAndSlice(sortedMembers: Array<string>, us: string) {
   const usAtTheEndIfNeeded = moveUsAtTheEnd(sortedMembers, us); // make sure we are not one of the first 2 members if there is enough members
-  return usAtTheEndIfNeeded.slice(0, 2); // we render at most 2 avatars for closed groups
+  // we render at most 2 avatars for closed groups
+  return { firstMember: usAtTheEndIfNeeded?.[0], secondMember: usAtTheEndIfNeeded?.[1] };
 }
 
 function useGroupMembersAvatars(convoId: string | undefined) {
@@ -60,26 +61,24 @@ function useGroupMembersAvatars(convoId: string | undefined) {
   return sortAndSlice(sortedMembers, us);
 }
 
-export const ClosedGroupAvatar = React.memo(
-  ({
-    convoId,
-    size,
-    onAvatarClick,
-  }: {
-    size: number;
-    convoId: string;
-    onAvatarClick?: () => void;
-  }) => {
-    const memberAvatars = useGroupMembersAvatars(convoId);
-    const avatarsDiameter = getClosedGroupAvatarsSize(size);
-    const firstMemberId = memberAvatars?.[0] || '';
-    const secondMemberID = memberAvatars?.[1] || '';
+export const ClosedGroupAvatar = ({
+  convoId,
+  size,
+  onAvatarClick,
+}: {
+  size: number;
+  convoId: string;
+  onAvatarClick?: () => void;
+}) => {
+  const memberAvatars = useGroupMembersAvatars(convoId);
+  const avatarsDiameter = getClosedGroupAvatarsSize(size);
+  const firstMemberId = memberAvatars?.firstMember || '';
+  const secondMemberID = memberAvatars?.secondMember || '';
 
-    return (
-      <div className="module-avatar__icon-closed">
-        <Avatar size={avatarsDiameter} pubkey={firstMemberId} onAvatarClick={onAvatarClick} />
-        <Avatar size={avatarsDiameter} pubkey={secondMemberID} onAvatarClick={onAvatarClick} />
-      </div>
-    );
-  }
-);
+  return (
+    <div className="module-avatar__icon-closed">
+      <Avatar size={avatarsDiameter} pubkey={firstMemberId} onAvatarClick={onAvatarClick} />
+      <Avatar size={avatarsDiameter} pubkey={secondMemberID} onAvatarClick={onAvatarClick} />
+    </div>
+  );
+};
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 60c3629e2..74ef78556 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -288,6 +288,6 @@ export function useSortedGroupMembers(convoId: string | undefined): Array<string
   if (!convoProps || convoProps.isPrivate || convoProps.isPublic) {
     return [];
   }
-  // we need to close it before being able to call sort on it
+  // we need to clone the array before being able to call sort() it
   return compact(convoProps.members?.slice()?.sort()) || [];
 }

From 07616eb674315792f72dd4869b861e3a0ae943ad Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 10 Jul 2023 09:16:15 +0200
Subject: [PATCH 157/178] fix: avatar placeholder instead of grey circle when
 not enough members

---
 .../AvatarPlaceHolder/AvatarPlaceHolder.tsx   | 19 +++----------------
 .../icon/MemberAvatarPlaceHolder.tsx          | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 ts/components/icon/MemberAvatarPlaceHolder.tsx

diff --git a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
index 42319aa57..b38780c89 100644
--- a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { COLORS } from '../../../themes/constants/colors';
 import { getInitials } from '../../../util/getInitials';
 import { allowOnlyOneAtATime } from '../../../session/utils/Promise';
+import { MemberAvatarPlaceHolder } from '../../icon/MemberAvatarPlaceHolder';
 
 type Props = {
   diameter: number;
@@ -83,22 +84,8 @@ export const AvatarPlaceHolder = (props: Props) => {
   const rWithoutBorder = diameterWithoutBorder / 2;
 
   if (loading || !hash) {
-    // return grey circle
-    return (
-      <svg viewBox={viewBox}>
-        <g id="UrTavla">
-          <circle
-            cx={r}
-            cy={r}
-            r={rWithoutBorder}
-            fill="#d2d2d3"
-            shapeRendering="geometricPrecision"
-            stroke={'var(--avatar-border-color)'}
-            strokeWidth="1"
-          />
-        </g>
-      </svg>
-    );
+    // return avatar placeholder circle
+    return <MemberAvatarPlaceHolder />;
   }
 
   const initials = getInitials(name);
diff --git a/ts/components/icon/MemberAvatarPlaceHolder.tsx b/ts/components/icon/MemberAvatarPlaceHolder.tsx
new file mode 100644
index 000000000..3ef483284
--- /dev/null
+++ b/ts/components/icon/MemberAvatarPlaceHolder.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+// tslint:disable: no-http-string
+
+export const MemberAvatarPlaceHolder = () => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26">
+      <circle fill="var(--primary-color)" cx="13" cy="13" r="13" />
+      <path
+        fill="var(--white-color)"
+        d="M18.9 19.1c-1.5-.9-3-.8-3-.8h-3.6c-2.3 0-3.3 0-4.2.3-.9.3-1.8.8-2.8 2-.5.7-.8 1.4-1 2C6.6 24.7 9.7 26 13 26c3.3 0 6.4-1.3 8.7-3.3-.5-1.6-1.5-2.8-2.8-3.6z"
+      />
+      <ellipse cx="13" cy="10.8" fill="var(--white-color)" rx="5.6" ry="6.1" />
+    </svg>
+  );
+};

From c08dcc7ec6c3bc97158eafe98c55b57b561874a6 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Tue, 11 Jul 2023 11:40:03 +1000
Subject: [PATCH 158/178] fix: when we receive and make a quote message do an
 in-memory lookup before looking in the db

this can fix original message not found  errors when there are lot of unread messages and one of them is quoted
---
 .../message/message-content/MessageQuote.tsx  |  7 ++-
 ts/receiver/queuedJob.ts                      | 51 +++++++++++++++----
 ts/state/ducks/conversations.ts               |  1 +
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index e6889fb2b..fc196f39e 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -64,8 +64,13 @@ export const MessageQuote = (props: Props) => {
 
       // If the quote is not found in memory, we try to find it in the DB
       if (quoteNotFound && quote.id && quote.author) {
+        // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
+        // this will return an array of sent messages by id that we have locally.
         const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
-          { timestamp: toNumber(quote.id), source: quote.author },
+          {
+            timestamp: toNumber(quote.id),
+            source: quote.author,
+          },
         ]);
 
         if (quotedMessagesCollection?.length) {
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 4f7b16610..004f72327 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -16,6 +16,7 @@ import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/user
 import { GoogleChrome } from '../util';
 import { LinkPreviews } from '../util/linkPreviews';
 import { ReleasedFeatures } from '../util/releaseFeature';
+import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations';
 
 function contentTypeSupported(type: string): boolean {
   const Chrome = GoogleChrome;
@@ -48,26 +49,48 @@ async function copyFromQuotedMessage(
 
   const id = _.toNumber(quoteId);
 
-  // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
-  // this will return an array of sent message by id we have locally.
+  // First we try to look for the quote in memory
+  const stateConversations = window.inboxStore?.getState().conversations;
+  const { messages, quotes } = stateConversations;
+  let quotedMessage: PropsForMessageWithoutConvoProps | MessageModel | undefined = lookupQuote(
+    quotes,
+    messages,
+    id,
+    quote.author
+  )?.propsForMessage;
 
-  const collection = await Data.getMessagesBySentAt(id);
-  // we now must make sure this is the sender we expect
-  const found = collection.find(message => {
-    return Boolean(author === message.get('source'));
-  });
+  // If the quote is not found in memory, we try to find it in the DB
+  if (!quotedMessage) {
+    // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
+    // this will return an array of sent messages by id that we have locally.
+    const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
+      {
+        timestamp: id,
+        source: quote.author,
+      },
+    ]);
 
-  if (!found) {
+    if (quotedMessagesCollection?.length) {
+      quotedMessage = quotedMessagesCollection.at(0);
+    }
+  }
+
+  if (!quotedMessage) {
     window?.log?.warn(`We did not found quoted message ${id} with author ${author}.`);
     quoteLocal.referencedMessageNotFound = true;
     msg.set({ quote: quoteLocal });
     return;
   }
 
+  const isMessageModelType = Boolean((quotedMessage as MessageModel).get !== undefined);
+
   window?.log?.info(`Found quoted message id: ${id}`);
   quoteLocal.referencedMessageNotFound = false;
   // NOTE we send the entire body to be consistent with the other platforms
-  quoteLocal.text = found.get('body') || '';
+  quoteLocal.text =
+    (isMessageModelType
+      ? (quotedMessage as MessageModel).get('body')
+      : (quotedMessage as PropsForMessageWithoutConvoProps).text) || '';
 
   // no attachments, just save the quote with the body
   if (
@@ -81,7 +104,10 @@ async function copyFromQuotedMessage(
 
   firstAttachment.thumbnail = null;
 
-  const queryAttachments = found.get('attachments') || [];
+  const queryAttachments =
+    (isMessageModelType
+      ? (quotedMessage as MessageModel).get('attachments')
+      : (quotedMessage as PropsForMessageWithoutConvoProps).attachments) || [];
 
   if (queryAttachments.length > 0) {
     const queryFirst = queryAttachments[0];
@@ -95,7 +121,10 @@ async function copyFromQuotedMessage(
     }
   }
 
-  const queryPreview = found.get('preview') || [];
+  const queryPreview =
+    (isMessageModelType
+      ? (quotedMessage as MessageModel).get('preview')
+      : (quotedMessage as PropsForMessageWithoutConvoProps).previews) || [];
   if (queryPreview.length > 0) {
     const queryFirst = queryPreview[0];
     const { image } = queryFirst;
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index e480a448a..5108cdfd0 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -1161,6 +1161,7 @@ export async function openConversationToSpecificMessage(args: {
 /**
  * Look for quote matching the timestamp and author in the quote lookup map
  * @param quotes - the lookup map of the selected conversations quotes
+ * @param messages - the messages in memory for the selected conversation
  * @param author - the pubkey of the quoted author
  * @param timestamp - usually the id prop on the quote object of a message
  * @returns - the message model if found, undefined otherwise

From 8f58edc63c1f12c8651fde28dea26f59f75568aa Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 12 Jul 2023 06:15:50 +0200
Subject: [PATCH 159/178] chore: update libsession-util-nodejs to latest v0.2.1

---
 package.json | 6 +++---
 yarn.lock    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 45b2e452d..4515bae7d 100644
--- a/package.json
+++ b/package.json
@@ -102,10 +102,10 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
-    "lodash": "^4.17.21",
     "linkify-it": "^4.0.1",
+    "lodash": "^4.17.21",
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
@@ -161,8 +161,8 @@
     "@types/firstline": "^2.0.2",
     "@types/fs-extra": "5.0.5",
     "@types/libsodium-wrappers-sumo": "^0.7.5",
-    "@types/lodash": "^4.14.194",
     "@types/linkify-it": "^3.0.2",
+    "@types/lodash": "^4.14.194",
     "@types/mocha": "5.0.0",
     "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",
diff --git a/yarn.lock b/yarn.lock
index 36871a5c1..3726f8516 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5155,9 +5155,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz":
-  version "0.1.20"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz#4ff8331e4efb1725cf8bba0ef1af7496ebd8533d"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz":
+  version "0.2.1"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz#904a9cbb84a042c5b5db6d041070d892b2b37c04"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From 873a2d5ad54b02d7ce08ebf2aa28dd49ce4991a5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 12 Jul 2023 06:58:48 +0200
Subject: [PATCH 160/178] chore: update libsession util to 0.2.2

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4515bae7d..3ea27b617 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index 3726f8516..228194988 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5155,9 +5155,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz":
-  version "0.2.1"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz#904a9cbb84a042c5b5db6d041070d892b2b37c04"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz":
+  version "0.2.2"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz#129071c4d8f46c2ef25f364351284f76f51379ee"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"

From 97647d4dc79b296c8f01f50873b03b891f3cbe63 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 12 Jul 2023 09:21:49 +0200
Subject: [PATCH 161/178] fix: padding for messagebox + onclick drop while
 selecting msgs

---
 .../SessionMessagesListContainer.tsx          |  1 +
 .../MessageContentWithStatus.tsx              |  2 ++
 .../message-content/MessageLinkPreview.tsx    | 14 +++++++-------
 .../message/message-content/quote/Quote.tsx   | 16 +++++++++++-----
 .../message-item/GenericReadableMessage.tsx   |  3 +--
 .../message/reactions/Reaction.tsx            | 19 ++++++++++++-------
 ts/state/selectors/selectedConversation.ts    |  6 +++++-
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index efadb4958..53401c118 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -54,6 +54,7 @@ type Props = SessionMessageListProps & {
 const StyledMessagesContainer = styled.div<{}>`
   display: flex;
   flex-grow: 1;
+  gap: var(--margins-xxs);
   flex-direction: column-reverse;
   position: relative;
   overflow-x: hidden;
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index d83616b02..9296ee1c9 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -46,6 +46,8 @@ const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' }
 
 const StyledMessageWithAuthor = styled.div<{ isIncoming: boolean }>`
   max-width: ${props => (props.isIncoming ? '100%' : 'calc(100% - 17px)')};
+  display: flex;
+  flex-direction: column;
 `;
 
 export const MessageContentWithStatuses = (props: Props) => {
diff --git a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
index 164721ca2..2c55150e5 100644
--- a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
+++ b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx
@@ -1,17 +1,17 @@
 import classNames from 'classnames';
 import React from 'react';
-import { isImageAttachment } from '../../../../types/Attachment';
-import { Image } from '../../Image';
+import { useDispatch } from 'react-redux';
 import { MessageRenderingProps } from '../../../../models/messageType';
-import { useDispatch, useSelector } from 'react-redux';
-import { getIsMessageSelectionMode } from '../../../../state/selectors/conversations';
-import { SessionIcon } from '../../../icon';
-import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
 import {
   useMessageAttachments,
   useMessageDirection,
   useMessageLinkPreview,
 } from '../../../../state/selectors';
+import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation';
+import { isImageAttachment } from '../../../../types/Attachment';
+import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
+import { SessionIcon } from '../../../icon';
+import { Image } from '../../Image';
 
 export type MessageLinkPreviewSelectorProps = Pick<
   MessageRenderingProps,
@@ -30,7 +30,7 @@ export const MessageLinkPreview = (props: Props) => {
   const direction = useMessageDirection(props.messageId);
   const attachments = useMessageAttachments(props.messageId);
   const previews = useMessageLinkPreview(props.messageId);
-  const isMessageSelectionMode = useSelector(getIsMessageSelectionMode);
+  const isMessageSelectionMode = useIsMessageSelectionMode();
 
   if (!props.messageId) {
     return null;
diff --git a/ts/components/conversation/message/message-content/quote/Quote.tsx b/ts/components/conversation/message/message-content/quote/Quote.tsx
index 079fc6500..76ddbe79c 100644
--- a/ts/components/conversation/message/message-content/quote/Quote.tsx
+++ b/ts/components/conversation/message/message-content/quote/Quote.tsx
@@ -2,11 +2,12 @@ import React, { MouseEvent, useState } from 'react';
 
 import * as MIME from '../../../../../types/MIME';
 
-import { QuoteAuthor } from './QuoteAuthor';
-import { QuoteText } from './QuoteText';
-import { QuoteIconContainer } from './QuoteIconContainer';
-import styled from 'styled-components';
 import { isEmpty } from 'lodash';
+import styled from 'styled-components';
+import { useIsMessageSelectionMode } from '../../../../../state/selectors/selectedConversation';
+import { QuoteAuthor } from './QuoteAuthor';
+import { QuoteIconContainer } from './QuoteIconContainer';
+import { QuoteText } from './QuoteText';
 
 const StyledQuoteContainer = styled.div`
   min-width: 300px; // if the quoted content is small it doesn't look very good so we set a minimum
@@ -69,6 +70,7 @@ export interface QuotedAttachmentType {
 }
 
 export const Quote = (props: QuoteProps) => {
+  const isSelectionMode = useIsMessageSelectionMode();
   const { isIncoming, attachment, text, referencedMessageNotFound, onClick } = props;
 
   const [imageBroken, setImageBroken] = useState(false);
@@ -81,7 +83,11 @@ export const Quote = (props: QuoteProps) => {
       <StyledQuote
         hasAttachment={Boolean(!isEmpty(attachment))}
         isIncoming={isIncoming}
-        onClick={onClick}
+        onClick={e => {
+          if (onClick && !isSelectionMode) {
+            onClick(e);
+          }
+        }}
       >
         <QuoteIconContainer
           attachment={attachment}
diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index 307023e3e..37acd24d9 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -118,8 +118,7 @@ const StyledReadableMessage = styled(ReadableMessage)<{
   align-items: center;
   width: 100%;
   letter-spacing: 0.03rem;
-  padding: var(--margins-xs) var(--margins-lg) 0;
-  margin: var(--margins-xxs) 0;
+  padding: 0 var(--margins-lg) 0;
 
   &.message-highlighted {
     animation: ${highlightedMessageAnimation} 1s ease-in-out;
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 5f598881e..124e57680 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -1,13 +1,14 @@
 import React, { ReactElement, useRef, useState } from 'react';
-import { SortedReactionList } from '../../../../types/Reaction';
+import { useMouse } from 'react-use';
+import styled from 'styled-components';
+import { isUsAnySogsFromCache } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { UserUtils } from '../../../../session/utils';
+import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation';
+import { SortedReactionList } from '../../../../types/Reaction';
 import { abbreviateNumber } from '../../../../util/abbreviateNumber';
 import { nativeEmojiData } from '../../../../util/emoji';
-import styled from 'styled-components';
-import { useMouse } from 'react-use';
-import { POPUP_WIDTH, ReactionPopup, TipPosition } from './ReactionPopup';
 import { popupXDefault, popupYDefault } from '../message-content/MessageReactions';
-import { isUsAnySogsFromCache } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { POPUP_WIDTH, ReactionPopup, TipPosition } from './ReactionPopup';
 
 const StyledReaction = styled.button<{ selected: boolean; inModal: boolean; showCount: boolean }>`
   display: flex;
@@ -68,6 +69,8 @@ export const Reaction = (props: ReactionProps): ReactElement => {
     handlePopupReaction,
     handlePopupClick,
   } = props;
+
+  const isMessageSelection = useIsMessageSelectionMode();
   const reactionsMap = (reactions && Object.fromEntries(reactions)) || {};
   const senders = reactionsMap[emoji]?.senders || [];
   const count = reactionsMap[emoji]?.count;
@@ -93,7 +96,9 @@ export const Reaction = (props: ReactionProps): ReactElement => {
   };
 
   const handleReactionClick = () => {
-    onClick(emoji);
+    if (!isMessageSelection) {
+      onClick(emoji);
+    }
   };
 
   return (
@@ -104,7 +109,7 @@ export const Reaction = (props: ReactionProps): ReactElement => {
         inModal={inModal}
         onClick={handleReactionClick}
         onMouseEnter={() => {
-          if (inGroup) {
+          if (inGroup && !isMessageSelection) {
             const { innerWidth: windowWidth } = window;
             if (handlePopupReaction) {
               // overflow on far right means we shift left
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index de5563aec..ad79c090f 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -5,7 +5,7 @@ import { PubKey } from '../../session/types';
 import { UserUtils } from '../../session/utils';
 import { StateType } from '../reducer';
 import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo';
-import { getSelectedConversation } from './conversations';
+import { getIsMessageSelectionMode, getSelectedConversation } from './conversations';
 
 /**
  * Returns the formatted text for notification setting.
@@ -269,3 +269,7 @@ export function useSelectedWeAreModerator() {
   const weAreModerator = mods.includes(us);
   return isPublic && isString(selectedConvoKey) && weAreModerator;
 }
+
+export function useIsMessageSelectionMode() {
+  return useSelector(getIsMessageSelectionMode);
+}

From 92614087381cfae76ec7120214bd468f199be161 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 12 Jul 2023 12:53:57 +0200
Subject: [PATCH 162/178] fix: ellipsis when author is too long for quote or
 authortext

---
 ts/components/conversation/ContactName.tsx                    | 4 +++-
 .../message/message-content/MessageAuthorText.tsx             | 1 +
 .../conversation/message/message-content/MessageContent.tsx   | 1 +
 .../message/message-content/MessageContentWithStatus.tsx      | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx
index c5efb6e2d..3ac46d80b 100644
--- a/ts/components/conversation/ContactName.tsx
+++ b/ts/components/conversation/ContactName.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 
 import { Emojify } from './Emojify';
 import { useConversationUsernameOrShorten, useIsPrivate } from '../../hooks/useParamSelector';
+import { CSSProperties } from 'styled-components';
 
 type Props = {
   pubkey: string;
@@ -33,9 +34,10 @@ export const ContactName = (props: Props) => {
       className={classNames(prefix, compact && 'compact')}
       dir="auto"
       data-testid={`${prefix}__profile-name`}
+      style={{ textOverflow: 'inherit' }}
     >
       {shouldShowProfile ? (
-        <span style={styles as any} className={`${prefix}__profile-name`}>
+        <span style={styles as CSSProperties} className={`${prefix}__profile-name`}>
           <Emojify text={textProfile} sizeClass="small" isGroup={!isPrivate} />
         </span>
       ) : null}
diff --git a/ts/components/conversation/message/message-content/MessageAuthorText.tsx b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
index a77d8342d..708fe5692 100644
--- a/ts/components/conversation/message/message-content/MessageAuthorText.tsx
+++ b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
@@ -21,6 +21,7 @@ type Props = {
 
 const StyledAuthorContainer = styled(Flex)`
   color: var(--text-primary-color);
+  text-overflow: ellipsis;
 `;
 
 export const MessageAuthorText = (props: Props) => {
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index b9f84062e..fb64c1772 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -83,6 +83,7 @@ const StyledMessageOpaqueContent = styled(StyledMessageHighlighter)<{
   align-self: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')};
   padding: var(--padding-message-content);
   border-radius: var(--border-radius-message-box);
+  max-width: 100%;
 `;
 
 export const IsMessageVisibleContext = createContext(false);
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index d83616b02..d074347c8 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -46,6 +46,9 @@ const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' }
 
 const StyledMessageWithAuthor = styled.div<{ isIncoming: boolean }>`
   max-width: ${props => (props.isIncoming ? '100%' : 'calc(100% - 17px)')};
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
 `;
 
 export const MessageContentWithStatuses = (props: Props) => {

From 0e5ca3f731c859e946a7bc5a77cb8c0518149c47 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 12 Jul 2023 13:41:49 +0200
Subject: [PATCH 163/178] chore: remove the unblockGroupToSend string as we
 cannot block a group.

---
 _locales/en/messages.json                           |  1 -
 .../conversation/composition/CompositionBox.tsx     | 13 +++----------
 ts/session/utils/Toast.tsx                          |  4 ----
 ts/types/LocalizerKeys.ts                           |  1 -
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e79bc63df..e560f146e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -181,7 +181,6 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
-  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index da63b9c06..e7ea8aa2c 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -472,16 +472,13 @@ class CompositionBoxInner extends React.Component<Props, State> {
       if (left) {
         return i18n('youLeftTheGroup');
       }
-      if (isBlocked && isPrivate) {
+      if (isBlocked) {
         return i18n('unblockToSend');
       }
-      if (isBlocked && !isPrivate) {
-        return i18n('unblockGroupToSend');
-      }
       return i18n('sendMessage');
     };
 
-    const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation;
+    const { isKickedFromGroup, left, isBlocked } = this.props.selectedConversation;
     const messagePlaceHolder = makeMessagePlaceHolderText();
     const { typingEnabled } = this.props;
     const neverMatchingRegex = /($a)/;
@@ -858,14 +855,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
       return;
     }
 
-    if (selectedConversation.isBlocked && selectedConversation.isPrivate) {
+    if (selectedConversation.isBlocked) {
       ToastUtils.pushUnblockToSend();
       return;
     }
-    if (selectedConversation.isBlocked && !selectedConversation.isPrivate) {
-      ToastUtils.pushUnblockToSendGroup();
-      return;
-    }
     // Verify message length
     const msgLen = messagePlaintext?.length || 0;
     if (msgLen === 0 && this.props.stagedAttachments?.length === 0) {
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index 0de25cbaa..1087345ed 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -201,10 +201,6 @@ export function pushUnblockToSend() {
   pushToastInfo('unblockToSend', window.i18n('unblockToSend'));
 }
 
-export function pushUnblockToSendGroup() {
-  pushToastInfo('unblockGroupToSend', window.i18n('unblockGroupToSend'));
-}
-
 export function pushYouLeftTheGroup() {
   pushToastError('youLeftTheGroup', window.i18n('youLeftTheGroup'));
 }
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index d7a9cb14b..eb2123cce 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -181,7 +181,6 @@ export type LocalizerKeys =
   | 'messageBodyMissing'
   | 'messageBody'
   | 'unblockToSend'
-  | 'unblockGroupToSend'
   | 'youChangedTheTimer'
   | 'timerSetOnSync'
   | 'theyChangedTheTimer'

From 77acd1396bc3746cf7ed095fe8ee4a84203b18ef Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 14 Jul 2023 11:38:39 +0200
Subject: [PATCH 164/178] feat: add support for blinded25 receipt of messages
 for later impl

---
 .../message/message-content/MessageAvatar.tsx |  9 ++++++--
 ts/components/menu/Menu.tsx                   |  4 ++--
 ts/hooks/useParamSelector.ts                  |  2 +-
 ts/models/conversation.ts                     | 10 ++++----
 ts/models/message.ts                          |  2 +-
 ts/node/migration/sessionMigrations.ts        |  2 +-
 .../open_group_api/sogsv3/knownBlindedkeys.ts | 22 +++++++++---------
 .../open_group_api/sogsv3/sogsBlinding.ts     |  6 +++--
 .../conversations/ConversationController.ts   |  2 +-
 ts/session/sending/MessageQueue.ts            |  3 ++-
 ts/session/types/PubKey.ts                    | 23 ++++++++++++-------
 .../libsession/libsession_utils_contacts.ts   |  4 +---
 ts/session/utils/sync/syncUtils.ts            |  2 +-
 ts/state/selectors/conversations.ts           |  2 +-
 .../unit/sogsv3/knownBlindedKeys_test.ts      |  2 +-
 ts/webworker/workers/node/util/util.worker.ts |  3 ++-
 16 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 220091961..85e71eb6c 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -6,7 +6,7 @@ import { MessageRenderingProps } from '../../../../models/messageType';
 import { findCachedBlindedMatchOrLookItUp } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 import { getConversationController } from '../../../../session/conversations';
 import { getSodiumRenderer } from '../../../../session/crypto';
-import { PubKey } from '../../../../session/types';
+import { KeyPrefixType, PubKey } from '../../../../session/types';
 import { openConversationWithMessages } from '../../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../../state/ducks/modalDialog';
 import {
@@ -61,7 +61,7 @@ export const MessageAvatar = (props: Props) => {
   const userName = authorName || authorProfileName || sender;
 
   const onMessageAvatarClick = useCallback(async () => {
-    if (isPublic && !PubKey.hasBlindedPrefix(sender)) {
+    if (isPublic && !PubKey.isBlinded(sender)) {
       // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user.
       // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs
       const convoWithSender = getConversationController().get(sender);
@@ -84,6 +84,11 @@ export const MessageAvatar = (props: Props) => {
     }
 
     if (isPublic && selectedConvoKey) {
+      if (sender.startsWith(KeyPrefixType.blinded25)) {
+        window.log.info('onMessageAvatarClick: blinded25 convo click are disabled currently...');
+
+        return;
+      }
       const convoOpen = getConversationController().get(selectedConvoKey);
       const room = OpenGroupData.getV2OpenGroupRoom(convoOpen.id);
       let privateConvoToOpen = sender;
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 695d0acf9..f00ae0b7a 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -357,7 +357,7 @@ export const CopyMenuItem = (): JSX.Element | null => {
 export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const convoId = useConvoIdFromContext();
   const isIncomingRequest = useIsIncomingRequest(convoId);
-  if (!isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) {
+  if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
       <Item onClick={() => markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
     );
@@ -379,7 +379,7 @@ export const BlockMenuItem = (): JSX.Element | null => {
   const isPrivate = useIsPrivate(convoId);
   const isIncomingRequest = useIsIncomingRequest(convoId);
 
-  if (!isMe && isPrivate && !isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) {
+  if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
       ? () => unblockConvoById(convoId)
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 74ef78556..ba26cf208 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -101,7 +101,7 @@ export function useIsBlinded(convoId?: string) {
   if (!convoId) {
     return false;
   }
-  return Boolean(PubKey.hasBlindedPrefix(convoId));
+  return Boolean(PubKey.isBlinded(convoId));
 }
 
 export function useHasNickname(convoId?: string) {
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 9c745ac1f..1e793508e 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -532,8 +532,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       );
       const hasIncomingMessages = incomingMessageCount > 0;
 
-      if (this.id.startsWith('15')) {
-        window.log.info('Sending a blinded message to this user: ', this.id);
+      if (PubKey.isBlinded(this.id)) {
+        window.log.info('Sending a blinded message react to this user: ', this.id);
         await this.sendBlindedMessageRequest(chatMessageParams);
         return;
       }
@@ -1674,7 +1674,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       );
       const hasIncomingMessages = incomingMessageCount > 0;
 
-      if (this.id.startsWith('15')) {
+      if (PubKey.isBlinded(this.id)) {
         window.log.info('Sending a blinded message to this user: ', this.id);
         await this.sendBlindedMessageRequest(chatMessageParams);
         return;
@@ -1778,7 +1778,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes();
     const groupUrl = this.getSogsOriginMessage();
 
-    if (!PubKey.hasBlindedPrefix(this.id)) {
+    if (!PubKey.isBlinded(this.id)) {
       window?.log?.warn('sendBlindedMessageRequest - convo is not a blinded one');
       return;
     }
@@ -1826,7 +1826,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     this.set({ active_at: Date.now(), isApproved: true });
-
+    // TODO we need to add support for sending blinded25 message request in addition to the legacy blinded15
     await getMessageQueue().sendToOpenGroupV2BlindedRequest({
       encryptedContent: encryptedMsg,
       roomInfos: roomInfo,
diff --git a/ts/models/message.ts b/ts/models/message.ts
index f11167efd..592839993 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1279,7 +1279,7 @@ export function findAndFormatContact(pubkey: string): FindAndFormatContactType {
 
   if (
     pubkey === UserUtils.getOurPubKeyStrFromCache() ||
-    (pubkey && pubkey.startsWith('15') && isUsAnySogsFromCache(pubkey))
+    (pubkey && PubKey.isBlinded(pubkey) && isUsAnySogsFromCache(pubkey))
   ) {
     profileName = window.i18n('you');
     isMe = true;
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 382cf9c18..365de0f9d 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1676,7 +1676,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
       // this filter is based on the `isContactToStoreInWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start
       const contactsToWriteInWrapper = db
         .prepare(
-          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND priority <> ${CONVERSATION_PRIORITIES.hidden} AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;`
+          `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND priority <> ${CONVERSATION_PRIORITIES.hidden} AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' AND id NOT LIKE '25%' ;`
         )
         .all({
           us: publicKeyHex,
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index bc23882ce..89297d34d 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -145,8 +145,8 @@ export function tryMatchBlindWithStandardKey(
     throw new Error('standardKey must be a standard key (starting with 05)');
   }
 
-  if (!blindedSessionId.startsWith(KeyPrefixType.blinded)) {
-    throw new Error('blindedKey must be a blinded key (starting with 15)');
+  if (!PubKey.isBlinded(blindedSessionId)) {
+    throw new Error('blindedKey must be a blinded key (starting with 15 or 25)');
   }
 
   // We don't want to stop iterating even if an error happens while looking for a blind/standard match.
@@ -204,7 +204,7 @@ function findNotCachedBlindingMatch(
   // we iterate only over the convos private, approved, and which have an unblinded id.
   const foundConvoMatchingBlindedPubkey = getConversationController()
     .getConversations()
-    .filter(m => m.isPrivate() && m.isApproved() && !PubKey.hasBlindedPrefix(m.id))
+    .filter(m => m.isPrivate() && m.isApproved() && !PubKey.isBlinded(m.id))
     .find(m => {
       return tryMatchBlindWithStandardKey(m.id, blindedId, serverPublicKey, sodium);
     });
@@ -214,13 +214,13 @@ function findNotCachedBlindingMatch(
 
 /**
  * This function returns true if the given blindedId matches our own blinded id on any pysogs.
- * If the given pubkey  is not blinded, it returns true if it is our naked SessionID.
+ * If the given pubkey is not blinded, it returns true if it is our naked SessionID.
  * It can be used to replace mentions with the @You syntax and for the quotes too
  */
 export function isUsAnySogsFromCache(blindedOrNakedId: string): boolean {
   const usUnblinded = UserUtils.getOurPubKeyStrFromCache();
 
-  if (!PubKey.hasBlindedPrefix(blindedOrNakedId)) {
+  if (!PubKey.isBlinded(blindedOrNakedId)) {
     return blindedOrNakedId === usUnblinded;
   }
   const found = assertLoaded().find(
@@ -268,7 +268,7 @@ function findNotCachedBlindedConvoFromUnblindedKey(
   serverPublicKey: string,
   sodium: LibSodiumWrappers
 ): Array<ConversationModel> {
-  if (PubKey.hasBlindedPrefix(unblindedID)) {
+  if (PubKey.isBlinded(unblindedID)) {
     throw new Error(
       'findNotCachedBlindedConvoFromUnblindedKey unblindedID is supposed to be unblinded!'
     );
@@ -279,7 +279,7 @@ function findNotCachedBlindedConvoFromUnblindedKey(
   const foundConvosForThisServerPk =
     getConversationController()
       .getConversations()
-      .filter(m => m.isPrivate() && PubKey.hasBlindedPrefix(m.id) && m.isActive())
+      .filter(m => m.isPrivate() && PubKey.isBlinded(m.id) && m.isActive())
       .filter(m => {
         return tryMatchBlindWithStandardKey(unblindedID, m.id, serverPublicKey, sodium);
       }) || [];
@@ -302,7 +302,7 @@ export async function findCachedBlindedMatchOrLookItUp(
   serverPubKey: string,
   sodium: LibSodiumWrappers
 ): Promise<string | undefined> {
-  if (!PubKey.hasBlindedPrefix(blindedId)) {
+  if (!PubKey.isBlinded(blindedId)) {
     return blindedId;
   }
   const found = getCachedNakedKeyFromBlinded(blindedId, serverPubKey);
@@ -333,7 +333,7 @@ export function findCachedBlindedIdFromUnblinded(
   unblindedId: string,
   serverPubKey: string
 ): string | undefined {
-  if (PubKey.hasBlindedPrefix(unblindedId)) {
+  if (PubKey.isBlinded(unblindedId)) {
     throw new Error('findCachedBlindedIdFromUnblinded needs an unblindedID');
   }
   const found = assertLoaded().find(
@@ -351,7 +351,7 @@ export async function findCachedOurBlindedPubkeyOrLookItUp(
 ): Promise<string> {
   const ourNakedSessionID = UserUtils.getOurPubKeyStrFromCache();
 
-  if (PubKey.hasBlindedPrefix(ourNakedSessionID)) {
+  if (PubKey.isBlinded(ourNakedSessionID)) {
     throw new Error('findCachedBlindedIdFromUnblindedOrLookItUp needs a unblindedID');
   }
   let found = findCachedBlindedIdFromUnblinded(ourNakedSessionID, serverPubKey);
@@ -402,7 +402,7 @@ export function findCachedBlindedMatchOrLookupOnAllServers(
   unblindedId: string,
   sodium: LibSodiumWrappers
 ): Array<ConversationModel> {
-  if (PubKey.hasBlindedPrefix(unblindedId)) {
+  if (PubKey.isBlinded(unblindedId)) {
     throw new Error('findCachedBlindedMatchOrLookupOnAllServers needs an unblindedId');
   }
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
index 8e4aba24e..2f3318a6d 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
@@ -63,7 +63,8 @@ async function getOpenGroupHeaders(data: {
     const blindingValues = getBlindingValues(serverPK, signingKeys, sodium);
     ka = blindingValues.secretKey;
     kA = blindingValues.publicKey;
-    pubkey = `${KeyPrefixType.blinded}${toHex(kA)}`;
+    // TODO we will need to add the support of blinded25 here
+    pubkey = `${KeyPrefixType.blinded15}${toHex(kA)}`;
   } else {
     pubkey = `${KeyPrefixType.unblinded}${toHex(signingKeys.pubKeyBytes)}`;
   }
@@ -151,7 +152,8 @@ const getBlindedPubKey = (
   sodium: LibSodiumWrappers
 ): string => {
   const blindedPubKeyBytes = getBlindingValues(serverPK, signingKeys, sodium);
-  return `${KeyPrefixType.blinded}${to_hex(blindedPubKeyBytes.publicKey)}`;
+  // TODO we will need to add the support of blinded25 here
+  return `${KeyPrefixType.blinded15}${to_hex(blindedPubKeyBytes.publicKey)}`;
 };
 
 const getBlindingValues = (
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 6257b5599..b4b41d294 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -187,7 +187,7 @@ export class ConversationController {
         'getConversationController().deleteBlindedContact() needs complete initial fetch'
       );
     }
-    if (!PubKey.hasBlindedPrefix(blindedId)) {
+    if (!PubKey.isBlinded(blindedId)) {
       throw new Error('deleteBlindedContact allow accepts blinded id');
     }
     window.log.info(`deleteBlindedContact with ${blindedId}`);
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index b7401fb78..af20d5391 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -139,7 +139,8 @@ export class MessageQueue {
     recipientBlindedId: string;
   }) {
     try {
-      if (!PubKey.hasBlindedPrefix(recipientBlindedId)) {
+      // TODO we will need to add the support for blinded25 messages requests
+      if (!PubKey.isBlinded(recipientBlindedId)) {
         throw new Error('sendToOpenGroupV2BlindedRequest needs a blindedId');
       }
       const { serverTimestamp, serverId } = await MessageSender.sendToOpenGroupV2BlindedRequest(
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index 44654ebfb..987250d1c 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -10,9 +10,15 @@ export enum KeyPrefixType {
    */
   standard = '05',
   /**
-   * used for participants in open groups
+   * used for participants in open groups (legacy blinding logic)
    */
-  blinded = '15',
+  blinded15 = '15',
+
+  /**
+   * used for participants in open groups (new blinding logic)
+   */
+  blinded25 = '25',
+
   /**
    * used for participants in open groups
    */
@@ -32,7 +38,7 @@ export class PubKey {
   public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!';
   // prettier-ignore
   private static readonly regex: RegExp = new RegExp(
-    `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$`
+    `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$`
   );
   /**
    * If you want to update this regex. Be sure that those are matches ;
@@ -146,18 +152,19 @@ export class PubKey {
 
   /**
    * @param keyWithOrWithoutPrefix Key with or without prefix
-   * @returns If key is the correct length and has a supported prefix 05 or 15
+   * @returns If key is the correct length and has a supported prefix 05, 15, 25
    */
   public static isValidPrefixAndLength(keyWithOrWithoutPrefix: string): boolean {
     return (
       keyWithOrWithoutPrefix.length === 66 &&
-      (keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded) ||
+      (keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded15) ||
+        keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded25) ||
         keyWithOrWithoutPrefix.startsWith(KeyPrefixType.standard))
     );
   }
 
   /**
-   * This removes the 05 or 15 prefix from a Pubkey which have it and have a length of 66
+   * This removes the 05, 15 or 25 prefix from a Pubkey which have it and have a length of 66
    * @param keyWithOrWithoutPrefix the key with or without the prefix
    */
   public static removePrefixIfNeeded(keyWithOrWithoutPrefix: string): string {
@@ -230,8 +237,8 @@ export class PubKey {
     return fromHexToArray(PubKey.removePrefixIfNeeded(this.key));
   }
 
-  public static hasBlindedPrefix(key: string) {
-    return key.startsWith(KeyPrefixType.blinded);
+  public static isBlinded(key: string) {
+    return key.startsWith(KeyPrefixType.blinded15) || key.startsWith(KeyPrefixType.blinded25);
   }
 
   public static isClosedGroupV3(key: string) {
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index a5d16d5df..00186a241 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -29,9 +29,7 @@ const mappedContactWrapperValues = new Map<string, ContactInfo>();
  * We want to sync the message request status so we need to allow a contact even if it's not approved, did not approve us and is not blocked.
  */
 function isContactToStoreInWrapper(convo: ConversationModel): boolean {
-  return (
-    !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.hasBlindedPrefix(convo.id)
-  );
+  return !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.isBlinded(convo.id);
 }
 
 /**
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index cf0d7f3d9..e1d3ace6c 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -204,7 +204,7 @@ const getValidContacts = (convos: Array<ConversationModel>) => {
       c.getRealSessionUsername() &&
       c.isPrivate() &&
       c.isApproved() &&
-      !PubKey.hasBlindedPrefix(c.get('id'))
+      !PubKey.isBlinded(c.get('id'))
   );
 
   const contacts = contactsModels.map(c => {
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index c7c1a3d61..97a4f4904 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -785,7 +785,7 @@ export const getMessageQuoteProps = createSelector(
     const isFromMe = isUsAnySogsFromCache(author) || false;
 
     // NOTE the quote lookup map always stores our messages using the unblinded pubkey
-    if (isFromMe && PubKey.hasBlindedPrefix(author)) {
+    if (isFromMe && PubKey.isBlinded(author)) {
       author = UserUtils.getOurPubKeyStrFromCache();
     }
 
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 3618c0eb4..022848ae7 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -418,7 +418,7 @@ describe('knownBlindedKeys', () => {
     it('throws if blindedSessionId is not standard', () => {
       expect(() => {
         tryMatchBlindWithStandardKey(realSessionId, realSessionId, serverPublicKey, sodium);
-      }).to.throw('blindedKey must be a blinded key (starting with 15)');
+      }).to.throw('blindedKey must be a blinded key (starting with 15 or 25)');
     });
 
     it('returns true if those keys are not matching blind & naked', () => {
diff --git a/ts/webworker/workers/node/util/util.worker.ts b/ts/webworker/workers/node/util/util.worker.ts
index 54e4daf54..f0ab356e9 100644
--- a/ts/webworker/workers/node/util/util.worker.ts
+++ b/ts/webworker/workers/node/util/util.worker.ts
@@ -141,7 +141,8 @@ async function verifySignature(
     }
     const messageData = fromBase64ToUint8Array(messageBase64);
     const signature = fromBase64ToUint8Array(signatureBase64);
-    const isBlindedSender = senderPubKey.startsWith('15');
+    // blinded15 or blinded25 are the same for the verifySignature logic
+    const isBlindedSender = senderPubKey.startsWith('15') || senderPubKey.startsWith('25');
 
     const pubkeyWithoutPrefix = senderPubKey.slice(2);
     const pubkeyBytes = fromHexToArray(pubkeyWithoutPrefix);

From b4482ec2d4c50825c43e67737ab95549a3531f58 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 14 Jul 2023 12:54:52 +0200
Subject: [PATCH 165/178] fix: enable userconfig release to be 31st July

31st July, 10am Melbourne time
---
 ts/util/releaseFeature.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index ceb98a59b..602f3b553 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -46,10 +46,8 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
       return 1706778000000; // unix 01/02/2024 09:00;
     //   return 1677488400000; // testing:  unix 27/02/2023 09:00
     case 'user_config_libsession':
-      // TODO update to agreed value between platforms for `user_config_libsession`
-      // FIXME once we are done with testing the user config over libsession feature
-      // return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00;
-      return 1677488400000; // testing: unix 27/02/2023 09:00
+      return 1690761600000; // Monday July 31st at 10am Melbourne time
+    // return 1677488400000; // testing: unix 27/02/2023 09:00
 
     default:
       assertUnreachable(featureName, 'case not handled for getFeatureReleaseTimestamp');
@@ -81,8 +79,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise<
   // Is it time to release the feature based on the network timestamp?
   if (
     !featureAlreadyReleased &&
-    (GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName) ||
-      featureName === 'user_config_libsession') // we want to make a build which has user config enabled by default for internal testing // TODO to remove for official build
+    GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName)
   ) {
     window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`);
     await Storage.put(featureStorageItemId(featureName), true);

From 83c7de8b889382a5d86bbb539b98eac663e336c4 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 14 Jul 2023 13:57:57 +0200
Subject: [PATCH 166/178] test: fix test with feature flag userconfig off for
 now

---
 .../unit/swarm_polling/SwarmPolling_test.ts   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index f1be4f069..06a56bc2f 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -207,7 +207,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -219,7 +219,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
     });
 
     describe('legacy group', () => {
@@ -236,7 +236,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -262,7 +262,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         getItemByIdStub.restore();
         getItemByIdStub = TestUtils.stubData('getItemById');
@@ -288,9 +288,9 @@ describe('SwarmPolling', () => {
         await swarmPolling.pollForAllKeys();
 
         expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
       });
 
       it('does run twice if activeAt less than one hour ', async () => {
@@ -307,7 +307,7 @@ describe('SwarmPolling', () => {
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         pollOnceForKeySpy.resetHistory();
         clock.tick(9000);
@@ -322,7 +322,7 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
 
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -352,9 +352,9 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
         // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -379,7 +379,7 @@ describe('SwarmPolling', () => {
         // we should have only one more call here, the one for our direct pubkey fetch
         expect(pollOnceForKeySpy.callCount).to.eq(3);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
       });
 
       describe('multiple runs', () => {
@@ -421,10 +421,10 @@ describe('SwarmPolling', () => {
           // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
           expect(pollOnceForKeySpy.callCount).to.eq(4);
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
 
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
 
@@ -445,9 +445,9 @@ describe('SwarmPolling', () => {
           expect(pollOnceForKeySpy.callCount).to.eq(4);
 
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
       });

From 49955a3947ad25260c621919e5e83bd749f20b8a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 19 Jul 2023 13:35:49 +0200
Subject: [PATCH 167/178] chore: update node version, electron and deps

---
 .github/workflows/build-binaries.yml          |    4 +-
 .github/workflows/pull-request.yml            |    9 +-
 .github/workflows/release.yml                 |    3 +-
 .nvmrc                                        |    2 +-
 INTERNALBUILDS.md                             |    2 +-
 build/notarize.js                             |    2 +-
 package.json                                  |   23 +-
 ts/mains/main_node.ts                         |   12 +-
 ts/node/config.ts                             |   18 +-
 ts/node/database_utility.ts                   |    2 +-
 ts/node/migration/sessionMigrations.ts        |    6 +-
 ts/node/migration/signalMigrations.ts         |    5 +-
 ts/node/sql.ts                                |    2 +-
 ts/node/sqlInstance.ts                        |    2 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |    2 +-
 ts/updater/common.ts                          |    6 +-
 yarn.lock                                     | 1075 +++++++++--------
 17 files changed, 631 insertions(+), 544 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 1c4a6a217..ac803f471 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -10,6 +10,9 @@ on:
     branches:
       - clearnet
       - unstable
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -50,7 +53,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global yarn node-gyp@latest
-          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c6e775d8f..a5529dccb 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -6,6 +6,11 @@ on:
     branches:
       - clearnet
       - unstable
+      - unstable1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -31,7 +36,8 @@ jobs:
 
       - name: Cache Desktop node_modules
         id: cache-desktop-modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
+        if: runner.os != 'Windows'
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -45,7 +51,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global node-gyp@latest
-          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1c59a350d..fd2dde290 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Cache Desktop node_modules
         id: cache-desktop-modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: runner.os != 'Windows'
         with:
           path: node_modules
@@ -45,7 +45,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           npm install --global node-gyp@latest
-          npm config set msvs_version 2022
 
       - name: Install Desktop node_modules
         if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
diff --git a/.nvmrc b/.nvmrc
index 58a4133d9..1e24c0215 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16.13.0
+18.15.0
\ No newline at end of file
diff --git a/INTERNALBUILDS.md b/INTERNALBUILDS.md
index 7d0f77d65..c246e9790 100644
--- a/INTERNALBUILDS.md
+++ b/INTERNALBUILDS.md
@@ -49,7 +49,7 @@ base64 -i certificate.p12 -o encoded.txt
 
 ### Node version
 
-You will need node `16.13.0`.
+You will need node `18.15.0`.
 This can be done by using [nvm](https://github.com/nvm-sh/nvm) and running `nvm use` or you can install it manually.
 Once nvm is installed, just run `nvm install` to install the version from the `.nvmrc` file and then `nvm use` to use it.
 
diff --git a/build/notarize.js b/build/notarize.js
index 7d0879820..ca8551f44 100644
--- a/build/notarize.js
+++ b/build/notarize.js
@@ -1,4 +1,4 @@
-const { notarize } = require('electron-notarize');
+const { notarize } = require('@electron/notarize');
 
 /*
  Pre-requisites: https://github.com/electron/electron-notarize#prerequisites
diff --git a/package.json b/package.json
index 3ea27b617..b54835149 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "lodash": "^4.17.20",
     "ini": "^1.3.6",
     "ejs": "^3.1.7",
-    "electron": "^17.2.0",
     "react": "17.0.2",
     "@types/react": "17.0.2",
     "glob-parent": "^6.0.1",
@@ -75,11 +74,11 @@
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
     "@reduxjs/toolkit": "1.8.5",
+    "@signalapp/better-sqlite3": "^8.4.3",
     "@types/react-mentions": "^4.1.8",
     "abort-controller": "3.0.0",
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
-    "better-sqlite3": "https://github.com/oxen-io/session-better-sqlite3#af47530acea25800d22b5e1ae834b709d2bfca40",
     "blob-util": "2.0.2",
     "blueimp-canvas-to-blob": "^3.29.0",
     "blueimp-load-image": "5.14.0",
@@ -92,7 +91,6 @@
     "country-code-lookup": "^0.0.19",
     "curve25519-js": "https://github.com/oxen-io/curve25519-js",
     "dompurify": "^2.0.7",
-    "electron-is-dev": "^1.1.0",
     "electron-localshortcut": "^3.2.1",
     "electron-updater": "^4.2.2",
     "emoji-mart": "^5.2.2",
@@ -102,7 +100,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
@@ -142,9 +140,9 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
+    "@electron/notarize": "^2.1.0",
     "@playwright/test": "1.16.3",
     "@types/backbone": "1.4.2",
-    "@types/better-sqlite3": "7.4.0",
     "@types/blueimp-load-image": "5.14.4",
     "@types/buffer-crc32": "^0.2.0",
     "@types/bunyan": "^1.8.8",
@@ -190,15 +188,14 @@
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
     "dmg-builder": "23.6.0",
-    "electron": "^17.2.0",
-    "electron-builder": "22.8.0",
-    "electron-notarize": "^0.2.0",
+    "electron": "25.3.0",
+    "electron-builder": "23.0.8",
     "esbuild": "^0.14.29",
     "eslint": "^8.15.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-mocha": "^10.0.4",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-more": "^1.0.5",
     "events": "^3.3.0",
     "jsdom": "^19.0.0",
@@ -230,7 +227,7 @@
     "webpack-cli": "^5.0.1"
   },
   "engines": {
-    "node": "16.13.0"
+    "node": "18.15.0"
   },
   "build": {
     "appId": "com.loki-project.messenger-desktop",
@@ -285,7 +282,7 @@
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [
-      "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "node_modules/@signalapp/better-sqlite3/build/Release/better_sqlite3.node",
       "node_modules/libsession_util_nodejs/build/Release/libsession_util_nodejs.node",
       "ts/webworker/workers/node/libsession/*.node",
       "ts/mains/main_node.js"
diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts
index c19373d52..f1245942f 100644
--- a/ts/mains/main_node.ts
+++ b/ts/mains/main_node.ts
@@ -193,7 +193,7 @@ function prepareURL(pathSegments: Array<string>, moreKeys?: { theme: any }) {
 }
 
 function handleUrl(event: any, target: string) {
-  event.preventDefault();
+  event?.preventDefault();
   const { protocol } = url.parse(target);
   // tslint:disable-next-line: no-http-string
   if (protocol === 'http:' || protocol === 'https:') {
@@ -203,7 +203,11 @@ function handleUrl(event: any, target: string) {
 
 function captureClicks(window: BrowserWindow) {
   window.webContents.on('will-navigate', handleUrl);
-  window.webContents.on('new-window', handleUrl);
+
+  window.webContents.setWindowOpenHandler(({ url: urlToOpen }) => {
+    handleUrl(undefined, urlToOpen);
+    return { action: 'deny' };
+  });
 }
 
 function getDefaultWindowSize() {
@@ -909,9 +913,7 @@ app.on('web-contents-created', (_createEvent, contents) => {
   contents.on('will-attach-webview', attachEvent => {
     attachEvent.preventDefault();
   });
-  contents.on('new-window', newEvent => {
-    newEvent.preventDefault();
-  });
+  contents.setWindowOpenHandler(() => ({ action: 'deny' }));
 });
 
 // Ingested in preload.js via a sendSync call
diff --git a/ts/node/config.ts b/ts/node/config.ts
index 7ce23701e..a4a605b3b 100644
--- a/ts/node/config.ts
+++ b/ts/node/config.ts
@@ -1,15 +1,18 @@
 import path from 'path';
 
-import electronIsDev from 'electron-is-dev';
+import { app } from 'electron';
 // tslint:disable: no-console
 
 let environment;
+const isPackaged = app.isPackaged;
 
 // In production mode, NODE_ENV cannot be customized by the user
-if (electronIsDev) {
-  environment = process.env.NODE_ENV || 'development';
-} else {
+if (isPackaged) {
   environment = 'production';
+  // We could be running against production but still be in dev mode, we need to handle that
+  process.env.NODE_APP_INSTANCE = '';
+} else {
+  environment = process.env.NODE_ENV || 'development';
 }
 
 // Set environment vars to configure node-config before requiring it
@@ -19,15 +22,10 @@ process.env.NODE_CONFIG_DIR = path.join(__dirname, '..', '..', 'config');
 if (environment === 'production') {
   // harden production config against the local env
   process.env.NODE_CONFIG = '';
-  process.env.NODE_CONFIG_STRICT_MODE = `${!electronIsDev}`;
+  process.env.NODE_CONFIG_STRICT_MODE = `${isPackaged ? 1 : 0}`; // we want to force strict mode when we are packaged
   process.env.HOSTNAME = '';
   process.env.ALLOW_CONFIG_MUTATIONS = '';
   process.env.SUPPRESS_NO_CONFIG_WARNING = '';
-
-  // We could be running against production but still be in dev mode, we need to handle that
-  if (!electronIsDev) {
-    process.env.NODE_APP_INSTANCE = '';
-  }
 }
 
 // We load config after we've made our modifications to NODE_ENV
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index f36f15135..290515796 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -5,7 +5,7 @@ import {
   CONVERSATION_PRIORITIES,
 } from '../models/conversationAttributes';
 
-import * as BetterSqlite3 from 'better-sqlite3';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 
 export const CONVERSATIONS_TABLE = 'conversations';
 export const MESSAGES_TABLE = 'messages';
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 365de0f9d..05297e8e3 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,4 +1,4 @@
-import * as BetterSqlite3 from 'better-sqlite3';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import {
   ContactsConfigWrapperNode,
   ConvoInfoVolatileWrapperNode,
@@ -497,8 +497,8 @@ function updateToSessionSchemaVersion15(currentVersion: number, db: BetterSqlite
   db.transaction(() => {
     db.exec(`
         DROP TABLE pairingAuthorisations;
-        DROP TRIGGER messages_on_delete;
-        DROP TRIGGER messages_on_update;
+        DROP TRIGGER IF EXISTS messages_on_delete;
+        DROP TRIGGER IF EXISTS messages_on_update;
       `);
 
     writeSessionSchemaVersion(targetVersion, db);
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index ff4caed75..602e196cf 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -1,4 +1,4 @@
-import * as BetterSqlite3 from 'better-sqlite3';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { isNumber } from 'lodash';
 import path from 'path';
 
@@ -23,6 +23,7 @@ const openDbOptions = {
   nativeBinding: path.join(
     getAppRootPath(),
     'node_modules',
+    '@signalapp',
     'better-sqlite3',
     'build',
     'Release',
@@ -343,7 +344,7 @@ function updateToSchemaVersion7(currentVersion: number, db: BetterSqlite3.Databa
           number
         ) WHERE number IS NOT NULL;
         INSERT INTO sessions(id, number, json)
-      SELECT "+" || id, number, json FROM sessions_old;
+      SELECT id, number, json FROM sessions_old;
         DROP TABLE sessions_old;
       `);
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 505eb1b72..d0d9e3dae 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1,4 +1,4 @@
-import * as BetterSqlite3 from 'better-sqlite3';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { app, clipboard, dialog, Notification } from 'electron';
 import fs from 'fs';
 import path from 'path';
diff --git a/ts/node/sqlInstance.ts b/ts/node/sqlInstance.ts
index 7a3ba12d4..5491c937d 100644
--- a/ts/node/sqlInstance.ts
+++ b/ts/node/sqlInstance.ts
@@ -1,4 +1,4 @@
-import * as BetterSqlite3 from 'better-sqlite3';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 
 let globalInstance: BetterSqlite3.Database | null = null;
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index aee542ede..ea9fcc157 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -338,7 +338,7 @@ const handleMessagesResponseV4 = async (
       }
     }
   } catch (e) {
-    window?.log?.warn('handleNewMessages failed:', e);
+    window?.log?.warn('handleNewMessages failed:', e.message);
   }
 };
 
diff --git a/ts/updater/common.ts b/ts/updater/common.ts
index 1c7e41246..26096ba68 100644
--- a/ts/updater/common.ts
+++ b/ts/updater/common.ts
@@ -22,7 +22,7 @@ export async function showDownloadUpdateDialog(
   const DOWNLOAD_BUTTON = 0;
   const LATER_BUTTON = 1;
   const options = {
-    type: 'info',
+    type: 'info' as const,
     buttons: [messages.autoUpdateDownloadButtonLabel, messages.autoUpdateLaterButtonLabel],
     title: messages.autoUpdateNewVersionTitle,
     message: messages.autoUpdateNewVersionMessage,
@@ -43,7 +43,7 @@ export async function showUpdateDialog(
   const RESTART_BUTTON = 0;
   const LATER_BUTTON = 1;
   const options = {
-    type: 'info',
+    type: 'info' as const,
     buttons: [messages.autoUpdateRestartButtonLabel, messages.autoUpdateLaterButtonLabel],
     title: messages.autoUpdateNewVersionTitle,
     message: messages.autoUpdateDownloadedMessage,
@@ -58,7 +58,7 @@ export async function showUpdateDialog(
 
 export async function showCannotUpdateDialog(mainWindow: BrowserWindow, messages: MessagesType) {
   const options = {
-    type: 'error',
+    type: 'error' as const,
     buttons: [messages.ok],
     title: messages.cannotUpdate,
     message: messages.cannotUpdateDetail,
diff --git a/yarn.lock b/yarn.lock
index 228194988..f5aaaa9ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"7zip-bin@~5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
-  integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
-
 "7zip-bin@~5.1.1":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
@@ -471,21 +466,29 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@electron/get@^1.13.0":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
-  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^2.0.0":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+  integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^9.6.0"
+    got "^11.8.5"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
-    global-tunnel-ng "^2.7.1"
+
+"@electron/notarize@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3"
+  integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==
+  dependencies:
+    debug "^4.1.1"
+    fs-extra "^9.0.1"
+    promise-retry "^2.0.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -786,6 +789,14 @@
     redux-thunk "^2.4.1"
     reselect "^4.1.5"
 
+"@signalapp/better-sqlite3@^8.4.3":
+  version "8.4.3"
+  resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.4.3.tgz#7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b"
+  integrity sha512-6HaN8a90fWHBPIIZRRmSG7wc3BPczLx3Mb9MJ8wsatYqf8C1+2NdFae5AzII8Oe9YE9SSHzCjdPd8ST1m9+Qag==
+  dependencies:
+    bindings "^1.5.0"
+    tar "^6.1.0"
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -847,11 +858,6 @@
     "@types/jquery" "*"
     "@types/underscore" "*"
 
-"@types/better-sqlite3@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@types/better-sqlite3/-/better-sqlite3-7.4.0.tgz#2b88d8474fc3f755617c0a5a8643388252c10aa1"
-  integrity sha512-tmSORlztb2cdWZDy4V81mRDgL+q7bd+ext4pI+Wj8EtJ5EHIZ6v7yiWbJ6A5eKVtoz77EsBEm7amwAzfqR/kAw==
-
 "@types/blueimp-load-image@5.14.4":
   version "5.14.4"
   resolved "https://registry.yarnpkg.com/@types/blueimp-load-image/-/blueimp-load-image-5.14.4.tgz#14a438e88b814b4ede9c79e3b2e68324bd591327"
@@ -935,7 +941,7 @@
   resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0"
   integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ==
 
-"@types/debug@^4.1.5", "@types/debug@^4.1.6":
+"@types/debug@^4.1.6":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
   integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
@@ -1008,7 +1014,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^9.0.1", "@types/fs-extra@^9.0.11":
+"@types/fs-extra@^9.0.11":
   version "9.0.13"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
   integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
@@ -1149,10 +1155,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
   integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
 
-"@types/node@^14.6.2":
-  version "14.18.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.18.tgz#5c9503030df484ccffcbb935ea9a9e1d6fad1a20"
-  integrity sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==
+"@types/node@^18.11.18":
+  version "18.16.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
+  integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1358,13 +1364,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
-"@types/yargs@^15.0.5":
-  version "15.0.15"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158"
-  integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^16.0.0":
   version "16.0.4"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
@@ -1372,6 +1371,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yargs@^17.0.1":
+  version "17.0.24"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
+  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yauzl@^2.9.1":
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
@@ -1709,43 +1715,42 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@3.5.9:
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
-  integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==
-
 app-builder-bin@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.8.0.tgz#342a8976f50ae35cfd07412dbfd4f6c895b32eac"
-  integrity sha512-RGaIRjCUrqkmh6QOGsyekQPEOaVynHfmeh8JZuyUymFYUOFdzBbPamkA2nhBVBTkkgfjRHsxK7LhedFKPzvWEQ==
+app-builder-lib@23.0.8:
+  version "23.0.8"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.8.tgz#06750dac27b564333f4026db813f4987cabd41b1"
+  integrity sha512-IObTdRc/0TQsfGn9IvaEXULE/QacgyFgpz3+vmlpZgHHjQ6V1c/T4pKlzNTsNHGjJBuEg2FvTvYi9ZVFfhyWow==
   dependencies:
-    "7zip-bin" "~5.0.3"
+    "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
+    "@electron/universal" "1.2.1"
+    "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.8.0"
-    builder-util-runtime "8.7.2"
+    builder-util "23.0.8"
+    builder-util-runtime "9.0.2"
     chromium-pickle-js "^0.2.0"
-    debug "^4.1.1"
-    ejs "^3.1.3"
-    electron-publish "22.8.0"
-    fs-extra "^9.0.1"
-    hosted-git-info "^3.0.5"
-    is-ci "^2.0.0"
-    isbinaryfile "^4.0.6"
-    js-yaml "^3.14.0"
-    lazy-val "^1.0.4"
-    minimatch "^3.0.4"
-    normalize-package-data "^2.5.0"
-    read-config-file "6.0.0"
+    debug "^4.3.4"
+    ejs "^3.1.7"
+    electron-osx-sign "^0.6.0"
+    electron-publish "23.0.8"
+    form-data "^4.0.0"
+    fs-extra "^10.1.0"
+    hosted-git-info "^4.1.0"
+    is-ci "^3.0.0"
+    isbinaryfile "^4.0.10"
+    js-yaml "^4.1.0"
+    lazy-val "^1.0.5"
+    minimatch "^3.1.2"
+    read-config-file "6.2.0"
     sanitize-filename "^1.6.3"
-    semver "^7.3.2"
-    temp-file "^3.3.7"
+    semver "^7.3.7"
+    tar "^6.1.11"
+    temp-file "^3.4.0"
 
 app-builder-lib@23.6.0:
   version "23.6.0"
@@ -1816,27 +1821,57 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-includes@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
-  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
+
+array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-    get-intrinsic "^1.1.1"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
-array.prototype.flat@^1.2.5:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
-  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+array.prototype.flat@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
+arraybuffer.prototype.slice@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
+  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 asar@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
@@ -1911,6 +1946,11 @@ auto-bind@^4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 axios@^1.3.2:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646"
@@ -1968,13 +2008,6 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-"better-sqlite3@https://github.com/oxen-io/session-better-sqlite3#af47530acea25800d22b5e1ae834b709d2bfca40":
-  version "7.5.0"
-  resolved "https://github.com/oxen-io/session-better-sqlite3#af47530acea25800d22b5e1ae834b709d2bfca40"
-  dependencies:
-    bindings "^1.5.0"
-    tar "^6.1.0"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -2031,19 +2064,19 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
   integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 
-boxen@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
-  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
+boxen@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
+  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
   dependencies:
     ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
+    camelcase "^6.2.0"
+    chalk "^4.1.0"
+    cli-boxes "^2.2.1"
+    string-width "^4.2.2"
+    type-fest "^0.20.2"
     widest-line "^3.1.0"
+    wrap-ansi "^7.0.0"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2129,14 +2162,6 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-builder-util-runtime@8.7.2:
-  version "8.7.2"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
-  integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
-  dependencies:
-    debug "^4.1.1"
-    sax "^1.2.4"
-
 builder-util-runtime@8.9.2:
   version "8.9.2"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
@@ -2145,6 +2170,14 @@ builder-util-runtime@8.9.2:
     debug "^4.3.2"
     sax "^1.2.4"
 
+builder-util-runtime@9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857"
+  integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA==
+  dependencies:
+    debug "^4.3.4"
+    sax "^1.2.4"
+
 builder-util-runtime@9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60"
@@ -2153,25 +2186,28 @@ builder-util-runtime@9.1.1:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.8.0.tgz#01684085d1f2370b1bd182f69cbd007426f63f64"
-  integrity sha512-H80P1JzVy3TGpi63x81epQDK24XalL034+jAZlrPb5IhLtYmnNNdxCCAVJvg3VjSISd73Y71O+uhqCxWpqbPHw==
+builder-util@23.0.8:
+  version "23.0.8"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.8.tgz#b59af2248f23270ed669cffc4a442418df83a303"
+  integrity sha512-xPpnoLLAEPx5oxxzRFINRnxmLNQDn+FddU7QRvCJDQi0jvUJ7UjdoGoM+UPy9yh+p9O82/nC7MHGuUptJkOXyQ==
   dependencies:
-    "7zip-bin" "~5.0.3"
-    "@types/debug" "^4.1.5"
-    "@types/fs-extra" "^9.0.1"
-    app-builder-bin "3.5.9"
+    "7zip-bin" "~5.1.1"
+    "@types/debug" "^4.1.6"
+    "@types/fs-extra" "^9.0.11"
+    app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "8.7.2"
-    chalk "^4.1.0"
-    debug "^4.1.1"
-    fs-extra "^9.0.1"
-    is-ci "^2.0.0"
-    js-yaml "^3.14.0"
+    builder-util-runtime "9.0.2"
+    chalk "^4.1.1"
+    cross-spawn "^7.0.3"
+    debug "^4.3.4"
+    fs-extra "^10.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-ci "^3.0.0"
+    js-yaml "^4.1.0"
     source-map-support "^0.5.19"
     stat-mode "^1.0.0"
-    temp-file "^3.3.7"
+    temp-file "^3.4.0"
 
 builder-util@23.6.0:
   version "23.6.0"
@@ -2288,7 +2324,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
+camelcase@^6.0.0, camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -2348,14 +2384,6 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -2424,7 +2452,7 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.0:
+cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
@@ -2633,16 +2661,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 concurrently@^7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368"
@@ -2658,14 +2676,6 @@ concurrently@^7.4.0:
     tree-kill "^1.2.2"
     yargs "^17.3.1"
 
-config-chain@^1.1.11:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 config@1.28.1:
   version "1.28.1"
   resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d"
@@ -2720,11 +2730,6 @@ core-util-is@1.0.2:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
 cosmiconfig@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
@@ -2884,7 +2889,7 @@ debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@
   dependencies:
     ms "2.1.2"
 
-debug@^2.6.8, debug@^2.6.9:
+debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2967,6 +2972,14 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -3017,7 +3030,21 @@ dir-compare@^2.4.0:
     commander "2.9.0"
     minimatch "3.0.4"
 
-dmg-builder@22.8.0, dmg-builder@23.6.0:
+dmg-builder@23.0.8:
+  version "23.0.8"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800"
+  integrity sha512-dXguxjekxY70hzgAW+0NPCI7bagQ2ZrLDwYf1bvHSwlVfVizyJ/EC+e71U/NUgiWlXU5nogbWcGC3H74mFu0iw==
+  dependencies:
+    app-builder-lib "23.0.8"
+    builder-util "23.0.8"
+    builder-util-runtime "9.0.2"
+    fs-extra "^10.0.0"
+    iconv-lite "^0.6.2"
+    js-yaml "^4.1.0"
+  optionalDependencies:
+    dmg-license "^1.0.11"
+
+dmg-builder@23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948"
   integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==
@@ -3096,11 +3123,6 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv@^8.2.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
-  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
-
 dotenv@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
@@ -3113,43 +3135,36 @@ dtrace-provider@~0.8:
   dependencies:
     nan "^2.14.0"
 
-ejs@^3.1.3, ejs@^3.1.7:
+ejs@^3.1.7:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
   integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
   dependencies:
     jake "^10.8.5"
 
-electron-builder@22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.8.0.tgz#d2c9fc5438c834e41fd794a271fca200165a3bad"
-  integrity sha512-dUv4F3srJouqxhWivtKqSoQP4Df6vYgjooGdzms+iYMTFi9f0b4LlEbr7kgsPvte8zAglee7VOGOODkCRJDkUQ==
+electron-builder@23.0.8:
+  version "23.0.8"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.8.tgz#7379b91905aa73d4757234550d76dbce3fd17433"
+  integrity sha512-7WxdR4+l+VL4QN/K6NdqRQg7+cbIka4By1+4eN8odMPySSTI5d6nrV8R+SSRt9MXeWVdWlW8RCX5Pk6L0oaRug==
   dependencies:
-    "@types/yargs" "^15.0.5"
-    app-builder-lib "22.8.0"
-    bluebird-lst "^1.0.9"
-    builder-util "22.8.0"
-    builder-util-runtime "8.7.2"
-    chalk "^4.1.0"
-    dmg-builder "22.8.0"
-    fs-extra "^9.0.1"
-    is-ci "^2.0.0"
-    lazy-val "^1.0.4"
-    read-config-file "6.0.0"
-    sanitize-filename "^1.6.3"
-    update-notifier "^4.1.0"
-    yargs "^15.3.1"
+    "@types/yargs" "^17.0.1"
+    app-builder-lib "23.0.8"
+    builder-util "23.0.8"
+    builder-util-runtime "9.0.2"
+    chalk "^4.1.1"
+    dmg-builder "23.0.8"
+    fs-extra "^10.0.0"
+    is-ci "^3.0.0"
+    lazy-val "^1.0.5"
+    read-config-file "6.2.0"
+    update-notifier "^5.1.0"
+    yargs "^17.0.1"
 
 electron-is-accelerator@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
   integrity sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=
 
-electron-is-dev@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e"
-  integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==
-
 electron-localshortcut@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3"
@@ -3160,14 +3175,6 @@ electron-localshortcut@^3.2.1:
     keyboardevent-from-electron-accelerator "^2.0.0"
     keyboardevents-areequal "^0.2.1"
 
-electron-notarize@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz#759e8006decae19134f82996ed910db26d9192cc"
-  integrity sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==
-  dependencies:
-    debug "^4.1.1"
-    fs-extra "^8.1.0"
-
 electron-osx-sign@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
@@ -3180,19 +3187,18 @@ electron-osx-sign@^0.6.0:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-publish@22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.8.0.tgz#7f410fe043abc5d3d896c4ee9eea7a43ea352c7d"
-  integrity sha512-uM0Zdi9hUqqGOrPj478v7toTvV1Kgto1w11rIiI168batiXAJvNLD8VZRfehOrZT0ibUyZlw8FtxoGCrjyHUOw==
+electron-publish@23.0.8:
+  version "23.0.8"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.8.tgz#a55b0c4a9ceec1eadb9b1b19194b9d9f2ae4ec33"
+  integrity sha512-GnqJH7Wh8LnapN4npl1Xs2Er/486/qxE3dV42WxXHX2VeoKAJTOuCzOVWCxpajaR3Msji4SkS0p81R018uK6Mg==
   dependencies:
-    "@types/fs-extra" "^9.0.1"
-    bluebird-lst "^1.0.9"
-    builder-util "22.8.0"
-    builder-util-runtime "8.7.2"
-    chalk "^4.1.0"
-    fs-extra "^9.0.1"
-    lazy-val "^1.0.4"
-    mime "^2.4.6"
+    "@types/fs-extra" "^9.0.11"
+    builder-util "23.0.8"
+    builder-util-runtime "9.0.2"
+    chalk "^4.1.1"
+    fs-extra "^10.0.0"
+    lazy-val "^1.0.5"
+    mime "^2.5.2"
 
 electron-publish@23.6.0:
   version "23.6.0"
@@ -3226,14 +3232,14 @@ electron-updater@^4.2.2:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@*, electron@^17.2.0:
-  version "17.4.10"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.10.tgz#904247a9eed0b09825f4d9f221f2442c7679f9e6"
-  integrity sha512-4v5Xwa4rZjWf0LmpYOaBXG8ZQ1rpPEpww+MCe4uuwenFsx3QSLSXmek720EY7drQa/O1YyvcZ1pr2sDBMIq0mA==
+electron@*, electron@25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.0.tgz#e818ab3ebd3e7a45f8fca0f47e607c9af2dc92c7"
+  integrity sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==
   dependencies:
-    "@electron/get" "^1.13.0"
-    "@types/node" "^14.6.2"
-    extract-zip "^1.0.3"
+    "@electron/get" "^2.0.0"
+    "@types/node" "^18.11.18"
+    extract-zip "^2.0.1"
 
 emoji-mart@^5.2.2:
   version "5.2.2"
@@ -3250,11 +3256,6 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
 encoding@0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -3313,7 +3314,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
   integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
@@ -3342,11 +3343,65 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-abstract@^1.20.4:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
+  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.1"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.1"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.0"
+    safe-array-concat "^1.0.0"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.10"
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
@@ -3541,53 +3596,55 @@ eslint-config-airbnb-base@^15.0.0:
     object.entries "^1.1.5"
     semver "^6.3.0"
 
-eslint-config-prettier@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+eslint-config-prettier@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
 
-eslint-import-resolver-node@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
-  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
+eslint-import-resolver-node@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
   dependencies:
     debug "^3.2.7"
-    resolve "^1.20.0"
+    is-core-module "^2.11.0"
+    resolve "^1.22.1"
 
-eslint-module-utils@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+eslint-module-utils@^2.7.4:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
   dependencies:
     debug "^3.2.7"
-    find-up "^2.1.0"
 
-eslint-plugin-import@^2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
-  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
+eslint-plugin-import@^2.27.5:
+  version "2.27.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
+  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
   dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flat "^1.2.5"
-    debug "^2.6.9"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.1"
+    debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.3"
+    eslint-import-resolver-node "^0.3.7"
+    eslint-module-utils "^2.7.4"
     has "^1.0.3"
-    is-core-module "^2.8.1"
+    is-core-module "^2.11.0"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.5"
-    resolve "^1.22.0"
+    object.values "^1.1.6"
+    resolve "^1.22.1"
+    semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-mocha@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.4.tgz#b129a1aef8312e8ceaf1b35ff0367f93e917d90a"
-  integrity sha512-8wzAeepVY027oBHz/TmBmUr7vhVqoC1KTFeDybFLhbaWKx+aQ7fJJVuUsqcUy+L+G+XvgQBJY+cbAf7hl5DF7Q==
+eslint-plugin-mocha@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz#69325414f875be87fb2cb00b2ef33168d4eb7c8d"
+  integrity sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==
   dependencies:
     eslint-utils "^3.0.0"
-    ramda "^0.28.0"
+    rambda "^7.1.0"
 
 eslint-plugin-more@^1.0.5:
   version "1.0.5"
@@ -3748,16 +3805,6 @@ expect@=27.2.5:
     jest-message-util "^27.2.5"
     jest-regex-util "^27.0.6"
 
-extract-zip@^1.0.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
 extract-zip@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
@@ -3872,13 +3919,6 @@ find-up@5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -3922,6 +3962,13 @@ follow-redirects@^1.15.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
 foreground-child@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
@@ -4037,7 +4084,7 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -4080,6 +4127,16 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -4187,22 +4244,12 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-dirs@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"
-  integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==
+global-dirs@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
+  integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==
   dependencies:
-    ini "1.3.7"
-
-global-tunnel-ng@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
-  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
-  dependencies:
-    encodeurl "^1.0.2"
-    lodash "^4.17.10"
-    npm-conf "^1.1.3"
-    tunnel "^0.0.6"
+    ini "2.0.0"
 
 globals@^11.1.0:
   version "11.12.0"
@@ -4216,13 +4263,20 @@ globals@^13.15.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.1:
+globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
     define-properties "^1.1.3"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 got@^11.8.5, got@^9.6.0:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -4279,6 +4333,11 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -4328,18 +4387,6 @@ hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-
   dependencies:
     react-is "^16.7.0"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-hosted-git-info@^3.0.5:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
-  integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
-  dependencies:
-    lru-cache "^6.0.0"
-
 hosted-git-info@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
@@ -4504,12 +4551,12 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@1.3.7, ini@^1.3.4, ini@^1.3.6, ini@~1.3.0:
+ini@2.0.0, ini@^1.3.6, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -4530,6 +4577,15 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  dependencies:
+    get-intrinsic "^1.2.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 interpret@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
@@ -4559,6 +4615,15 @@ ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
   integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
 
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4591,6 +4656,11 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-callable@^1.1.3, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
@@ -4611,9 +4681,9 @@ is-ci@^3.0.0:
     ci-info "^3.2.0"
 
 is-core-module@^2.11.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
-  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
@@ -4653,13 +4723,13 @@ is-glob@^4.0.0, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
+is-installed-globally@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
   dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
+    global-dirs "^3.0.0"
+    is-path-inside "^3.0.2"
 
 is-lambda@^1.0.1:
   version "1.0.1"
@@ -4671,10 +4741,10 @@ is-negative-zero@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
+is-npm@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
+  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
 
 is-number-object@^1.0.4:
   version "1.0.7"
@@ -4693,7 +4763,7 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-inside@^3.0.1:
+is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -4749,6 +4819,13 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -4788,10 +4865,10 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbinaryfile@^3.0.2:
   version "3.0.3"
@@ -4800,7 +4877,7 @@ isbinaryfile@^3.0.2:
   dependencies:
     buffer-alloc "^1.2.0"
 
-isbinaryfile@^4.0.10, isbinaryfile@^4.0.6:
+isbinaryfile@^4.0.10:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
@@ -4971,7 +5048,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1, js-yaml@^3.14.0:
+js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -5050,7 +5127,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
 json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
 json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.2:
   version "2.2.3"
@@ -5120,7 +5197,7 @@ lamejs@^1.2.0:
   dependencies:
     use-strict "1.0.1"
 
-latest-version@^5.0.0:
+latest-version@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
   integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
@@ -5155,9 +5232,9 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz":
-  version "0.2.2"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz#129071c4d8f46c2ef25f364351284f76f51379ee"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz":
+  version "0.2.5"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz#e1db928eaca58f22c66494c6179e13bdd4e38cd4"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"
@@ -5200,14 +5277,6 @@ loader-utils@^2.0.0, loader-utils@^2.0.4:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -5257,7 +5326,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5500,7 +5569,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -5703,16 +5772,6 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -5723,14 +5782,6 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-conf@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
 npm-run-path@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -5796,6 +5847,11 @@ object-inspect@^1.12.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.1.tgz#28a661153bad7e470e4b01479ef1cb91ce511191"
   integrity sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==
 
+object-inspect@^1.12.3:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -5811,6 +5867,16 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
 object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
@@ -5820,14 +5886,14 @@ object.entries@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -5918,13 +5984,6 @@ p-is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -5939,13 +5998,6 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -5982,11 +6034,6 @@ p-retry@^4.2.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -6053,11 +6100,6 @@ patch-package@^6.4.7:
     slash "^2.0.0"
     tmp "^0.0.33"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -6120,7 +6162,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@3.0.0, pify@^3.0.0:
+pify@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
@@ -6279,11 +6321,6 @@ pretty-format@^27.2.5, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 process-on-spawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.0.0.tgz#95b05a23073d30a17acfdc92a440efd2baefdc93"
@@ -6332,11 +6369,6 @@ proper-lockfile@^4.1.1:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
 protobufjs@^6.11.2:
   version "6.11.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
@@ -6379,7 +6411,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.0.1:
+pupa@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
   integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
@@ -6408,10 +6440,10 @@ raf@^3.4.0:
   dependencies:
     performance-now "^2.1.0"
 
-ramda@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
-  integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
+rambda@^7.1.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe"
+  integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==
 
 randombytes@^2.1.0:
   version "2.1.0"
@@ -6659,17 +6691,6 @@ react@17.0.2, react@^17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-config-file@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
-  integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
-  dependencies:
-    dotenv "^8.2.0"
-    dotenv-expand "^5.1.0"
-    js-yaml "^3.13.1"
-    json5 "^2.1.2"
-    lazy-val "^1.0.4"
-
 read-config-file@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
@@ -6686,19 +6707,6 @@ read-last-lines-ts@^1.2.1:
   resolved "https://registry.yarnpkg.com/read-last-lines-ts/-/read-last-lines-ts-1.2.1.tgz#99e46288c5373c06e16e90e666a46b595dad80a1"
   integrity sha512-1VcCrAU38DILYiF4sbNY13zdrMGwrFqjGQnXJy28G1zLJItvnWtgCbqoAJlnZZSiEICMKdM4Ol7LYvVMEoKrAg==
 
-readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
@@ -6785,6 +6793,15 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexp.prototype.flags@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -6858,16 +6875,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.10.0:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
-  dependencies:
-    is-core-module "^2.11.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2:
+resolve@^1.20.0, resolve@^1.3.2:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6876,6 +6884,15 @@ resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -6952,12 +6969,22 @@ rxjs@^7.0.0:
   dependencies:
     tslib "^2.1.0"
 
+safe-array-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
+  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -6967,6 +6994,15 @@ safe-json-stringify@~1:
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
   integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -7048,7 +7084,7 @@ screenfull@^5.1.0:
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
 semver-diff@^3.1.1:
   version "3.1.1"
@@ -7057,22 +7093,34 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@^6.2.0:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.3.2:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
   integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
@@ -7276,32 +7324,6 @@ spawn-wrap@^2.0.0:
     signal-exit "^3.0.2"
     which "^2.0.1"
 
-spdx-correct@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
-
 sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
@@ -7360,7 +7382,7 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7369,6 +7391,15 @@ stat-mode@^1.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string.prototype.trimend@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
@@ -7378,6 +7409,15 @@ string.prototype.trimend@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string.prototype.trimstart@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
@@ -7387,6 +7427,15 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -7394,13 +7443,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -7539,7 +7581,7 @@ tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-temp-file@^3.3.7, temp-file@^3.4.0:
+temp-file@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7"
   integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==
@@ -7547,11 +7589,6 @@ temp-file@^3.3.7, temp-file@^3.4.0:
     async-exit-hook "^2.0.1"
     fs-extra "^10.0.0"
 
-term-size@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
-  integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
-
 terser-webpack-plugin@^5.1.3:
   version "5.3.6"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
@@ -7750,11 +7787,6 @@ tsutils@^2.13.1, tsutils@^2.29.0:
   dependencies:
     tslib "^1.8.1"
 
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7784,11 +7816,50 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.8.0, type-fest@^0.8.1:
+type-fest@^0.8.0:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -7796,11 +7867,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
 typescript@^4.6.3:
   version "4.6.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
@@ -7870,22 +7936,23 @@ update-browserslist-db@^1.0.9:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-notifier@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
-  integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==
+update-notifier@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
+  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
   dependencies:
-    boxen "^4.2.0"
-    chalk "^3.0.0"
+    boxen "^5.0.0"
+    chalk "^4.1.0"
     configstore "^5.0.1"
     has-yarn "^2.1.0"
     import-lazy "^2.1.0"
     is-ci "^2.0.0"
-    is-installed-globally "^0.3.1"
-    is-npm "^4.0.0"
+    is-installed-globally "^0.4.0"
+    is-npm "^5.0.0"
     is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    pupa "^2.0.1"
+    latest-version "^5.1.0"
+    pupa "^2.1.1"
+    semver "^7.3.4"
     semver-diff "^3.1.1"
     xdg-basedir "^4.0.0"
 
@@ -7916,7 +7983,7 @@ utf8-byte-length@^1.0.1:
   resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
   integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -7931,14 +7998,6 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
 verror@^1.10.0:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
@@ -8101,6 +8160,17 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -8273,7 +8343,7 @@ yargs@16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^15.0.2, yargs@^15.3.1:
+yargs@^15.0.2:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
@@ -8290,6 +8360,19 @@ yargs@^15.0.2, yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^17.0.1:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yargs@^17.3.1, yargs@^17.6.0:
   version "17.7.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"

From d06446441c06bf3e50c11e85f6e926e0907483a0 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 20 Jul 2023 13:37:48 +1000
Subject: [PATCH 168/178] fix: resolved macOS config folder path for
 integration tests

we should use path.join instead of a hard strings for the application support folder
---
 ts/test/automation/setup/beforeEach.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index f47f97418..6ba353549 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -1,5 +1,5 @@
 import { Page } from '@playwright/test';
-import { readdirSync, rmdirSync } from 'fs-extra';
+import { readdirSync, rm } from 'fs-extra';
 import { join } from 'path';
 import { homedir } from 'os';
 import { isLinux, isMacOS } from '../../../OS';
@@ -25,9 +25,9 @@ function cleanUpOtherTest() {
   alreadyCleanedWaiting = true;
 
   const parentFolderOfAllDataPath = isMacOS()
-    ? '~/Library/Application Support/'
+    ? join(homedir(), 'Library', 'Application Support')
     : isLinux()
-    ? `${homedir()}/.config/`
+    ? join(homedir(), '.config')
     : null;
   if (!parentFolderOfAllDataPath) {
     throw new Error('Only macOS is currrently supported ');
@@ -43,7 +43,7 @@ function cleanUpOtherTest() {
 
   allAppDataPath.map(folder => {
     const pathToRemove = join(parentFolderOfAllDataPath, folder);
-    rmdirSync(pathToRemove, { recursive: true });
+    rm(pathToRemove, { recursive: true }, () => pathToRemove);
   });
   console.info('...done');
 }

From 90cf82f795aa33206b70b503c24ed168d3843a34 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 20 Jul 2023 14:22:58 +1000
Subject: [PATCH 169/178] fix: revert rm to rmdirSync so we don't remove config
 files before a test has been completed

---
 ts/test/automation/setup/beforeEach.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index 6ba353549..016cf072d 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -1,5 +1,5 @@
 import { Page } from '@playwright/test';
-import { readdirSync, rm } from 'fs-extra';
+import { readdirSync, rmdirSync } from 'fs-extra';
 import { join } from 'path';
 import { homedir } from 'os';
 import { isLinux, isMacOS } from '../../../OS';
@@ -43,7 +43,7 @@ function cleanUpOtherTest() {
 
   allAppDataPath.map(folder => {
     const pathToRemove = join(parentFolderOfAllDataPath, folder);
-    rm(pathToRemove, { recursive: true }, () => pathToRemove);
+    rmdirSync(pathToRemove, { recursive: true });
   });
   console.info('...done');
 }

From a2a9193561a058324ce7861f1a408f193730a34c Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 24 Jul 2023 11:44:17 +0930
Subject: [PATCH 170/178] Add download link

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a37e03d5f..b0c0e6167 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Session Desktop
 
+[Download at getsession.org](https://getsession.org/download)
+
 ## Summary
 
 Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages offline, and a set of nodes which allow for onion routing functionality obfuscating users IP Addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).

From d43d6abbae51649aad5973cd19bef544fb3f6752 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 26 Jul 2023 11:26:46 +0200
Subject: [PATCH 171/178] chore: replace tslint with eslint and fix linting
 issues

---
 .eslintignore                                 |   3 +-
 .eslintrc.js                                  |  66 +-
 about_preload.js                              |   1 +
 debug_log_preload.js                          |   1 +
 libsession.worker.config.js                   |   1 +
 package.json                                  |  13 +-
 password_preload.js                           |   1 +
 playwright.config.ts                          |   3 +-
 preload.js                                    |   3 +-
 sass.config.js                                |   4 +-
 ts/components/AboutView.tsx                   |   2 +-
 ts/components/CaptionEditor.tsx               |   2 -
 ts/components/DebugLogView.tsx                |   5 +-
 ts/components/MemberListItem.tsx              |   5 +-
 ts/components/SessionInboxView.tsx            |  46 +-
 ts/components/SessionPasswordPrompt.tsx       |  15 +-
 ts/components/SessionToastContainer.tsx       |   1 -
 ts/components/SessionWrapperModal.tsx         |   9 +-
 ts/components/SplitViewContainer.tsx          |   2 +-
 ts/components/avatar/Avatar.tsx               |   5 +-
 .../AvatarPlaceHolder/AvatarPlaceHolder.tsx   |   8 +-
 .../AvatarPlaceHolder/ClosedGroupAvatar.tsx   |   4 +-
 ts/components/basic/Flex.tsx                  |   6 +-
 ts/components/basic/MessageBodyHighlight.tsx  |   1 -
 ts/components/basic/SessionHTMLRenderer.tsx   |  11 +-
 ts/components/basic/SessionIdEditable.tsx     |   4 +-
 ts/components/basic/SessionRadio.tsx          |   4 +-
 ts/components/basic/SessionRadioGroup.tsx     |   8 +-
 ts/components/basic/SessionToast.tsx          |  16 +-
 ts/components/basic/SessionToggle.tsx         |   2 +-
 ts/components/button/MenuButton.tsx           |   1 -
 ts/components/calling/CallButtons.tsx         |  13 +-
 .../calling/CallInFullScreenContainer.tsx     |   4 +-
 .../calling/DraggableCallContainer.tsx        |  13 +-
 .../calling/InConversationCallContainer.tsx   |   8 +-
 ts/components/calling/IncomingCallDialog.tsx  |   6 +-
 ts/components/conversation/AddMentions.tsx    |   4 +-
 ts/components/conversation/ContactName.tsx    |   8 +-
 .../conversation/ConversationHeader.tsx       |   4 +-
 ts/components/conversation/ExpireTimer.tsx    |   5 +-
 ts/components/conversation/H5AudioPlayer.tsx  |   2 +-
 ts/components/conversation/Image.tsx          |   4 +-
 ts/components/conversation/ImageGrid.tsx      |   3 +-
 .../conversation/SessionConversation.tsx      |  16 +-
 .../conversation/SessionEmojiPanel.tsx        |   6 +-
 .../conversation/SessionMessagesList.tsx      |   2 +-
 .../SessionMessagesListContainer.tsx          |   9 +-
 .../SessionQuotedMessageComposition.tsx       |   9 +-
 .../conversation/SessionRecording.tsx         |  14 +-
 .../conversation/SessionRightPanel.tsx        |  40 +-
 .../conversation/SessionStagedLinkPreview.tsx |   6 +-
 .../conversation/StagedLinkPreview.tsx        |   2 +-
 .../StagedPlaceholderAttachment.tsx           |   1 -
 ts/components/conversation/Timestamp.tsx      |   1 -
 ts/components/conversation/TypingBubble.tsx   |   2 +-
 .../composition/CompositionBox.tsx            |  96 +--
 .../composition/CompositionButtons.tsx        |   1 +
 .../composition/EmojiQuickResult.tsx          |   2 +-
 .../media-gallery/DocumentListItem.tsx        |   2 +-
 .../media-gallery/MediaGridItem.tsx           |   4 +-
 .../media-gallery/groupMediaItemsByDate.ts    |  10 +-
 .../message-content/ClickToTrustSender.tsx    |   2 +-
 .../message-content/MessageAttachment.tsx     |  12 +-
 .../message-content/MessageAuthorText.tsx     |   2 +-
 .../message/message-content/MessageAvatar.tsx |  26 +-
 .../message/message-content/MessageBody.tsx   |  35 +-
 .../message-content/MessageContent.tsx        |  18 +-
 .../MessageContentWithStatus.tsx              |  15 +-
 .../message-content/MessageContextMenu.tsx    | 275 +++++----
 .../message/message-content/MessageQuote.tsx  | 103 ++--
 .../message-content/MessageReactBar.tsx       |  14 +-
 .../message/message-content/Quote.tsx         |  12 +-
 .../message/message-content/quote/Quote.tsx   |   3 +-
 .../quote/QuoteIconContainer.tsx              |   7 +-
 .../message-content/quote/QuoteImage.tsx      |   6 +-
 .../message-item/GenericReadableMessage.tsx   |  18 +-
 .../message/message-item/GroupInvitation.tsx  |   7 +-
 .../message-item/GroupUpdateMessage.tsx       |   2 +-
 .../message/message-item/Message.tsx          |   5 +-
 .../message/message-item/MessageDetail.tsx    |  15 +-
 .../message/message-item/ReadableMessage.tsx  |  10 +-
 .../message/reactions/Reaction.tsx            |   1 -
 .../message/reactions/ReactionPopup.tsx       |  17 +-
 ts/components/dialog/BanOrUnbanUserDialog.tsx |  27 +-
 ts/components/dialog/DeleteAccountModal.tsx   |   2 +-
 ts/components/dialog/EditProfileDialog.tsx    |  14 +-
 ts/components/dialog/InviteContactsDialog.tsx |  10 +-
 ts/components/dialog/ModeratorsAddDialog.tsx  |   7 +-
 .../dialog/ModeratorsRemoveDialog.tsx         |  16 +-
 .../dialog/OnionStatusPathDialog.tsx          |  11 +-
 ts/components/dialog/ReactClearAllModal.tsx   |   1 -
 ts/components/dialog/ReactListModal.tsx       |  26 +-
 ts/components/dialog/SessionConfirm.tsx       |  16 +-
 ts/components/dialog/SessionModal.tsx         | 136 -----
 .../dialog/SessionNicknameDialog.tsx          |   5 +-
 .../dialog/SessionPasswordDialog.tsx          |   9 +-
 ts/components/dialog/SessionSeedModal.tsx     |  76 +--
 .../dialog/UpdateGroupMembersDialog.tsx       |  12 +-
 .../dialog/UpdateGroupNameDialog.tsx          |   9 +-
 ts/components/dialog/UserDetailsDialog.tsx    |   2 +-
 .../icon/DropDownAndToggleButton.tsx          |   1 -
 ts/components/icon/Icons.tsx                  |   2 +
 .../icon/MemberAvatarPlaceHolder.tsx          |   1 -
 ts/components/icon/SessionIcon.tsx            |  47 +-
 ts/components/icon/SessionIconButton.tsx      |   8 +-
 ts/components/leftpane/ActionsPanel.tsx       |  45 +-
 ts/components/leftpane/ContactListItem.tsx    |   2 +-
 .../leftpane/LeftPaneMessageSection.tsx       |  10 +-
 .../leftpane/LeftPaneSettingSection.tsx       |   8 +-
 .../ConversationListItem.tsx                  |  15 +-
 .../conversation-list-item/HeaderItem.tsx     |   2 +-
 .../leftpane/overlay/OverlayClosedGroup.tsx   |  11 +-
 .../leftpane/overlay/OverlayCommunity.tsx     |  15 +-
 .../leftpane/overlay/OverlayMessage.tsx       |  26 +-
 .../overlay/OverlayMessageRequest.tsx         |   2 +-
 .../overlay/SessionJoinableDefaultRooms.tsx   |   5 +-
 .../overlay/choose-action/ContactRow.tsx      |   2 +-
 .../choose-action/OverlayChooseAction.tsx     |  43 +-
 ts/components/lightbox/Lightbox.tsx           |  11 +-
 ts/components/lightbox/LightboxGallery.tsx    |  23 +-
 ts/components/menu/ConversationHeaderMenu.tsx |   4 +-
 .../menu/ConversationListItemContextMenu.tsx  |   5 +-
 ts/components/menu/Menu.tsx                   |  32 +-
 .../menu/MessageRequestBannerContextMenu.tsx  |   4 +-
 .../registration/RegistrationStages.tsx       |  17 +-
 .../registration/RegistrationUserDetails.tsx  |   4 -
 ts/components/registration/SignInTab.tsx      |   2 -
 ts/components/registration/SignUpTab.tsx      |   4 +-
 ts/components/search/MessageSearchResults.tsx |   3 +-
 ts/components/search/SearchResults.tsx        |   8 +-
 ts/components/settings/BlockedList.tsx        |   2 -
 .../SessionNotificationGroupSettings.tsx      |   4 +-
 .../settings/SessionSettingListItem.tsx       |   3 +-
 ts/components/settings/SessionSettings.tsx    |  11 +-
 .../settings/SettingsThemeSwitcher.tsx        |  10 +-
 .../settings/ZoomingSessionSlider.tsx         |   3 +-
 .../settings/section/CategoryAppearance.tsx   |   2 +-
 .../section/CategoryConversations.tsx         |   4 +-
 .../settings/section/CategoryPermissions.tsx  |   3 +-
 .../settings/section/CategoryPrivacy.tsx      |   7 +-
 ts/data/configDump/configDump.ts              |   1 +
 ts/data/data.ts                               |  13 +-
 ts/data/dataInit.ts                           |   4 -
 ts/data/dataUtils.ts                          |   4 +-
 ts/data/opengroups.ts                         |   3 +-
 ts/hooks/useAppFocused.ts                     |   2 +-
 ts/hooks/useEncryptedFileFetch.ts             |  25 +-
 ts/hooks/useFocusMount.ts                     |   2 +-
 ts/hooks/useModulo.ts                         |   2 +-
 ts/hooks/useParamSelector.ts                  |   2 +-
 ts/hooks/useSet.ts                            |   1 -
 ts/hooks/useVideoEventListener.ts             |   9 +-
 ts/interactions/conversationInteractions.ts   |  12 +-
 .../conversations/unsendingInteractions.ts    |  34 +-
 ts/interactions/messageInteractions.ts        |   1 -
 ts/mains/about_start.tsx                      |   1 -
 ts/mains/main_node.ts                         |  19 +-
 ts/mains/main_renderer.tsx                    |  30 +-
 ts/mains/password_start.tsx                   |   1 -
 ts/models/conversation.ts                     |  45 +-
 ts/models/message.ts                          |  78 ++-
 ts/models/messageFactory.ts                   |   1 +
 ts/node/attachment_channel.ts                 |   7 +-
 ts/node/config.ts                             |   6 +-
 ts/node/config/base_config.ts                 |   1 -
 ts/node/config/user_config.ts                 |   1 -
 ts/node/database_utility.ts                   |   7 +-
 ts/node/encrypt_attachment_buffer.ts          |   3 -
 ts/node/global_errors.ts                      |   3 +-
 ts/node/locale.ts                             |   1 -
 ts/node/logging.ts                            |   5 +-
 ts/node/menu.ts                               |   8 +-
 ts/node/migration/sessionMigrations.ts        |  29 +-
 ts/node/migration/signalMigrations.ts         |  10 +-
 ts/node/permissions.ts                        |   3 +-
 ts/node/protocol_filter.ts                    |   3 +-
 ts/node/spell_check.ts                        |   2 -
 ts/node/sql.ts                                |  17 +-
 ts/node/sql_calls/config_dump.ts              |   1 +
 ts/node/sql_channel.ts                        |   1 -
 ts/receiver/attachments.ts                    |   3 +-
 ts/receiver/cache.ts                          |   7 +-
 ts/receiver/closedGroups.ts                   |  30 +-
 ts/receiver/configMessage.ts                  |   8 +-
 ts/receiver/contentMessage.ts                 | 108 ++--
 ts/receiver/dataMessage.ts                    |  24 +-
 ts/receiver/queuedJob.ts                      |   8 +-
 ts/receiver/receiver.ts                       |  13 +-
 .../apis/file_server_api/FileServerApi.ts     |   3 +-
 .../open_group_api/opengroupV2/ApiUtil.ts     |   6 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |   7 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |  12 +-
 .../opengroupV2/OpenGroupPollingUtils.ts      |   5 +-
 .../opengroupV2/OpenGroupServerPoller.ts      |   9 +-
 .../opengroupV2/SogsFilterDuplicate.ts        |   2 +-
 .../open_group_api/sogsv3/knownBlindedkeys.ts |   8 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |  17 +-
 .../open_group_api/sogsv3/sogsBlinding.ts     |  14 +-
 .../open_group_api/sogsv3/sogsV3BatchPoll.ts  |   3 +-
 .../sogsv3/sogsV3Capabilities.ts              |   7 +-
 .../sogsv3/sogsV3ClearReaction.ts             |   3 +-
 .../open_group_api/sogsv3/sogsV3FetchFile.ts  |   2 +-
 .../sogsv3/sogsV3MutationCache.ts             |   3 +-
 .../open_group_api/sogsv3/sogsV3RoomInfos.ts  |   2 +-
 .../sogsv3/sogsV3SendMessage.ts               |   2 +-
 .../sogsv3/sogsV3SendReaction.ts              |   1 -
 .../open_group_api/utils/OpenGroupUtils.ts    |   7 +-
 ts/session/apis/seed_node_api/SeedNodeAPI.ts  |  10 +-
 ts/session/apis/snode_api/SNodeAPI.ts         |   6 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |   4 +-
 ts/session/apis/snode_api/batchRequest.ts     |   1 +
 ts/session/apis/snode_api/expire.ts           |   2 +
 ts/session/apis/snode_api/getNetworkTime.ts   |   1 -
 ts/session/apis/snode_api/hfHandling.ts       |   3 +-
 ts/session/apis/snode_api/namespaces.ts       |   2 +
 ts/session/apis/snode_api/onions.ts           |  32 +-
 ts/session/apis/snode_api/onsResolve.ts       |   2 +-
 ts/session/apis/snode_api/sessionRpc.ts       |   8 +-
 ts/session/apis/snode_api/snodePool.ts        |   9 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  11 +-
 ts/session/constants.ts                       |   3 -
 .../conversations/ConversationController.ts   |   7 +-
 ts/session/conversations/createClosedGroup.ts |  76 +--
 ts/session/crypto/BufferPadding.ts            |   4 +-
 .../crypto/DecryptedAttachmentsManager.ts     |  30 +-
 ts/session/crypto/MessageEncrypter.ts         |   5 +-
 ts/session/crypto/index.ts                    |  11 +-
 ts/session/crypto/mnemonic.ts                 |  22 +-
 ts/session/group/closed-group.ts              |   7 +-
 .../messages/incoming/IncomingMessage.ts      |   5 +-
 .../outgoing/controlMessage/CallMessage.ts    |   1 +
 .../DataExtractionNotificationMessage.ts      |   4 +-
 .../controlMessage/MessageRequestResponse.ts  |   1 -
 .../controlMessage/SharedConfigMessage.ts     |   2 +-
 .../group/ClosedGroupAddedMembersMessage.ts   |   1 -
 .../group/ClosedGroupEncryptionPairMessage.ts |   3 +-
 .../ClosedGroupEncryptionPairReplyMessage.ts  |   2 +-
 .../group/ClosedGroupMemberLeftMessage.ts     |   1 -
 .../group/ClosedGroupNameChangeMessage.ts     |   1 -
 .../group/ClosedGroupRemovedMembersMessage.ts |   1 -
 .../ClosedGroupVisibleMessage.ts              |   2 +-
 ts/session/onions/onionPath.ts                |  31 +-
 ts/session/onions/onionSend.ts                |  10 +-
 ts/session/onions/onionv4.ts                  |   2 +-
 ts/session/sending/MessageQueue.ts            |  10 +-
 ts/session/sending/MessageSender.ts           |  16 +-
 ts/session/sending/MessageSentHandler.ts      |   1 -
 ts/session/sending/PendingMessageCache.ts     |  10 +-
 ts/session/tslint.json                        |   7 -
 ts/session/types/PubKey.ts                    |   5 +-
 ts/session/utils/Attachments.ts               |   3 +-
 ts/session/utils/AttachmentsDownload.ts       |  16 +-
 ts/session/utils/AttachmentsV2.ts             |   6 +-
 ts/session/utils/JobQueue.ts                  |   2 +-
 ts/session/utils/Messages.ts                  |   4 +-
 ts/session/utils/Performance.ts               |   2 -
 ts/session/utils/Promise.ts                   |  18 +-
 ts/session/utils/TaskWithTimeout.ts           |   7 +-
 ts/session/utils/User.ts                      |   2 +-
 ts/session/utils/calling/CallManager.ts       |  63 +-
 ts/session/utils/job_runners/JobRunner.ts     |   5 +-
 ts/session/utils/job_runners/PersistedJob.ts  |   1 -
 .../job_runners/jobs/AvatarDownloadJob.ts     |  13 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  46 +-
 .../utils/libsession/libsession_utils.ts      |   5 +
 .../libsession/libsession_utils_contacts.ts   |  14 +-
 .../libsession_utils_convo_info_volatile.ts   |   7 +-
 .../libsession_utils_user_groups.ts           |   9 +-
 ts/session/utils/sync/syncUtils.ts            |   9 +-
 ts/shims/events.ts                            |   1 -
 ts/state/actions.ts                           |   2 +-
 ts/state/createStore.ts                       |  22 +-
 ts/state/ducks/conversations.ts               |  14 +-
 ts/state/ducks/defaultRooms.tsx               |   2 +-
 ts/state/ducks/modalDialog.tsx                |   3 +-
 ts/state/ducks/search.ts                      |   5 +-
 ts/state/ducks/section.tsx                    |   1 +
 ts/state/ducks/settings.tsx                   |   4 +-
 ts/state/ducks/sogsRoomInfo.tsx               |   2 +-
 ts/state/ducks/stagedAttachments.ts           |   2 +-
 ts/state/reducer.ts                           |   1 -
 ts/state/selectors/conversations.ts           |  37 +-
 ts/state/selectors/messages.ts                |  50 +-
 ts/state/selectors/onions.ts                  |   2 +-
 ts/state/selectors/search.ts                  |   2 +-
 ts/test/automation/create_user.spec.ts        |   4 +-
 ts/test/automation/delete_account.spec.ts     |   3 +-
 .../automation/disappearing_messages.spec.ts  |   2 -
 ts/test/automation/linked_device_user.spec.ts |   1 -
 ts/test/automation/message_checks.spec.ts     |   1 +
 ts/test/automation/password.spec.ts           |   1 -
 ts/test/automation/setup/beforeEach.ts        |   3 +-
 ts/test/automation/setup/create_group.ts      |   2 +-
 ts/test/automation/setup/new_user.ts          |   4 +-
 ts/test/automation/setup/open.ts              |   1 -
 .../automation/setup/recovery_using_seed.ts   |   2 +-
 ts/test/automation/setup/sessionTest.ts       |   2 +
 ts/test/automation/setup/test_user.ts         |   2 -
 ts/test/automation/tslint.json                |  10 -
 ts/test/automation/user_actions.spec.ts       |   4 +-
 ts/test/automation/utilities/leave_group.ts   |   2 +-
 ts/test/automation/utilities/linked_device.ts |   1 -
 ts/test/automation/utilities/message.ts       |   3 +-
 ts/test/automation/utilities/rename_group.ts  |   2 +-
 ts/test/automation/utilities/send_message.ts  |   2 +-
 ts/test/automation/utilities/utils.ts         |  14 +-
 .../media-gallery/groupMessagesByDate_test.ts |   1 -
 .../unit/crypto/MessageEncrypter_test.ts      |  11 +-
 .../crypto/OpenGroupAuthentication_test.ts    |  15 +-
 .../decryptedAttachmentsManager_test.ts       |   4 +-
 .../libsession_wrapper_contacts_test.ts       |   3 -
 .../libsession_wrapper_test.ts                |   4 +-
 .../libsession_wrapper_usergroups_test.ts     |   3 -
 .../session/unit/messages/ChatMessage_test.ts |  22 +-
 .../messages/ConfigurationMessage_test.ts     |   1 -
 .../messages/MessageRequestResponse_test.ts   |   2 -
 .../unit/messages/ReceiptMessage_test.ts      |   2 +-
 .../unit/messages/TypingMessage_test.ts       |   2 +-
 .../unit/models/ConversationModels_test.ts    |   3 -
 .../models/formatRowOfConversation_test.ts    |   3 -
 ts/test/session/unit/onion/GuardNodes_test.ts |   9 +-
 .../session/unit/onion/OnionErrors_test.ts    |  29 +-
 ts/test/session/unit/onion/OnionPaths_test.ts |   7 +-
 .../session/unit/onion/SeedNodeAPI_test.ts    |   8 +-
 .../session/unit/onion/SnodeNamespace_test.ts |   1 -
 .../unit/onion/SnodePoolUpdate_test.ts        |   8 +-
 ts/test/session/unit/onion/hfHandling_test.ts |   2 -
 ts/test/session/unit/padding/Padding_test.ts  |   8 +-
 ts/test/session/unit/privacy/Privacy_test.ts  |   3 +-
 .../unit/reactions/ReactionMessage_test.ts    |  12 +-
 .../receiver/opengroup/deduplicate_test.ts    |   3 -
 .../receiving/ConfigurationMessage_test.ts    |   8 +-
 .../unit/selectors/conversations_test.ts      |   2 -
 .../session/unit/sending/MessageQueue_test.ts |  15 +-
 .../unit/sending/MessageSender_test.ts        |   2 -
 .../unit/sending/PendingMessageCache_test.ts  |   6 +-
 ts/test/session/unit/sogsv3/ApiUtil_test.ts   |   3 +-
 .../unit/sogsv3/FetchCapabilities_test.ts     |   3 -
 .../session/unit/sogsv3/MutationCache_test.ts |   4 +-
 .../unit/sogsv3/knownBlindedKeys_test.ts      |   4 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   |   5 -
 ts/test/session/unit/updater/updater_test.ts  |   1 -
 ts/test/session/unit/utils/JobQueue_test.ts   |   5 +-
 ts/test/session/unit/utils/Messages_test.ts   |  19 +-
 .../session/unit/utils/OpenGroupUtils_test.ts |   4 +-
 ts/test/session/unit/utils/Promise_test.ts    |  10 +-
 ts/test/session/unit/utils/RingBuffer_test.ts |   2 -
 ts/test/session/unit/utils/String_test.ts     |  32 +-
 .../unit/utils/TaskWithTimeout_test.ts        |   8 +-
 .../unit/utils/job_runner/JobRunner_test.ts   |  22 +-
 .../stubs/sending/PendingMessageCacheStub.ts  |   5 +-
 ts/test/test-utils/utils/envelope.ts          |   5 +-
 ts/test/test-utils/utils/message.ts           |   3 +-
 ts/test/test-utils/utils/pubkey.ts            |   2 -
 ts/test/test-utils/utils/stubbing.ts          |   9 +-
 ts/test/test-utils/utils/timeout.ts           |   5 +-
 ts/test/tslint.json                           |  12 -
 ts/test/types/Attachment_test.ts              |   1 -
 ts/test/types/Settings_test.ts                |   3 +-
 .../initializeAttachmentMetadata_test.ts      |  52 +-
 ts/test/util/blockedNumberController_test.ts  |   9 +-
 ts/themes/SessionTheme.tsx                    |   2 +-
 ts/themes/constants/colors.tsx                |   1 -
 ts/themes/globals.tsx                         |   1 +
 ts/themes/oceanDark.ts                        |   1 -
 ts/themes/oceanLight.ts                       |   1 -
 ts/themes/variableColors.tsx                  |   5 +-
 ts/types/Attachment.ts                        |   9 +-
 ts/types/MessageAttachment.ts                 |   2 -
 ts/types/attachments/VisualAttachment.ts      |  70 ++-
 ts/types/attachments/migrations.ts            |  21 +-
 .../message/initializeAttachmentMetadata.ts   |   2 +-
 ts/types/sqlSharedTypes.ts                    |   8 +-
 ts/updater/index.ts                           |   4 +-
 ts/updater/updater.ts                         |  16 +-
 ts/util/abbreviateNumber.ts                   |   4 +-
 ts/util/accountManager.ts                     |   6 +-
 ts/util/attachmentsUtil.ts                    |  21 +-
 ts/util/attachments_files.ts                  |   4 -
 ts/util/blockedNumberController.ts            |   2 +-
 ts/util/crypto/attachmentsEncrypter.ts        |  23 +-
 ts/util/crypto/profileEncrypter.ts            |   3 +-
 ts/util/emoji.ts                              |  20 +-
 ts/util/expiringMessages.ts                   |   8 +-
 ts/util/i18n.ts                               |   8 +-
 ts/util/index.ts                              |  10 +-
 ts/util/linkPreviewFetch.ts                   |   1 -
 ts/util/linkPreviews.ts                       |   1 +
 ts/util/makeLookup.ts                         |   9 -
 ts/util/notifications.ts                      |   1 -
 ts/util/privacy.ts                            |   1 -
 ts/util/reactions.ts                          |  39 +-
 ts/util/readReceipts.ts                       |   1 -
 ts/util/releaseFeature.ts                     |   2 +
 ts/util/saveQRCode.ts                         |   1 -
 ts/util/storage.ts                            |   7 +-
 ts/webworker/worker_interface.ts              |   3 +-
 .../browser/libsession_worker_interface.ts    |  10 +-
 .../workers/browser/util_worker_interface.ts  |   2 +-
 ts/webworker/workers/index.ts                 |   1 +
 .../node/libsession/libsession.worker.ts      |   6 +-
 ts/webworker/workers/node/util/util.worker.ts |  10 +-
 ts/window.d.ts                                |   9 +-
 tslint.json                                   |  99 ---
 utils.worker.config.js                        |   1 +
 yarn.lock                                     | 569 +++++++++++++-----
 406 files changed, 2450 insertions(+), 2479 deletions(-)
 delete mode 100644 ts/components/dialog/SessionModal.tsx
 delete mode 100644 ts/session/tslint.json
 delete mode 100644 ts/test/automation/tslint.json
 delete mode 100644 ts/test/tslint.json
 delete mode 100644 ts/util/makeLookup.ts
 delete mode 100644 tslint.json

diff --git a/.eslintignore b/.eslintignore
index 34c660b79..23d7f9589 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 build/**
-components/**
 dist/**
 mnemonic_languages/**
 
@@ -13,3 +12,5 @@ ts/**/*.js
 playwright.config.js
 preload.js
 stylesheets/dist/
+compiled.d.ts
+.eslintrc.js
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
index a01420ef1..27afc3b43 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,13 +1,23 @@
-// For reference: https://github.com/airbnb/javascript
-
 module.exports = {
+  root: true,
   settings: {
     'import/core-modules': ['electron'],
+    react: {
+      version: 'detect',
+    },
   },
 
-  extends: ['airbnb-base', 'prettier'],
+  extends: [
+    'airbnb-base',
+    'prettier',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+  ],
 
-  plugins: ['mocha', 'more'],
+  plugins: ['mocha', 'more', '@typescript-eslint'],
+  parser: '@typescript-eslint/parser',
+  parserOptions: { project: ['tsconfig.json'] },
 
   rules: {
     'comma-dangle': [
@@ -47,10 +57,38 @@ module.exports = {
     'linebreak-style': ['error', 'unix'],
 
     quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }],
+    '@typescript-eslint/no-floating-promises': ['error'],
+    '@typescript-eslint/await-thenable': 'error',
+    '@typescript-eslint/array-type': ['error', { default: 'generic' }],
+    '@typescript-eslint/no-misused-promises': 'error',
 
     // Prettier overrides:
     'arrow-parens': 'off',
+    'no-nested-ternary': 'off',
     'function-paren-newline': 'off',
+
+    'import/prefer-default-export': 'off',
+    'operator-linebreak': 'off',
+    'prefer-destructuring': 'off',
+    'max-classes-per-file': 'off',
+    'lines-between-class-members': 'off',
+    '@typescript-eslint/no-explicit-any': 'off', // to reenable later
+    'arrow-body-style': 'off',
+    'no-plusplus': 'off',
+    'no-continue': 'off',
+    'no-void': 'off',
+    'default-param-last': 'off',
+
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': 'error',
+    'class-methods-use-this': 'off',
+    camelcase: 'off',
+
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    // 'no-unused-expressions': 'off',
+    // '@typescript-eslint/no-unused-expressions': 'error',
+
     'max-len': [
       'error',
       {
@@ -59,10 +97,28 @@ module.exports = {
         // high value as a buffer to let Prettier control the line length:
         code: 999,
         // We still want to limit comments as before:
-        comments: 150,
+        comments: 200,
         ignoreUrls: true,
         ignoreRegExpLiterals: true,
       },
     ],
   },
+  overrides: [
+    {
+      files: ['*_test.ts'],
+      rules: {
+        'no-unused-expressions': 'off',
+        'no-await-in-loop': 'off',
+        'no-empty': 'off',
+      },
+    },
+    {
+      files: ['ts/state/ducks/*.tsx', 'ts/state/ducks/*.ts'],
+      rules: { 'no-param-reassign': ['error', { props: false }] },
+    },
+    {
+      files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
+      rules: { 'no-console': 'off' },
+    },
+  ],
 };
diff --git a/about_preload.js b/about_preload.js
index 6c72bee6d..27f48d231 100644
--- a/about_preload.js
+++ b/about_preload.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 /* global window */
 
 const { ipcRenderer } = require('electron');
diff --git a/debug_log_preload.js b/debug_log_preload.js
index 9321a01a9..d5af17afe 100644
--- a/debug_log_preload.js
+++ b/debug_log_preload.js
@@ -1,4 +1,5 @@
 /* global window */
+/* eslint-disable @typescript-eslint/no-var-requires */
 
 const { ipcRenderer } = require('electron');
 const url = require('url');
diff --git a/libsession.worker.config.js b/libsession.worker.config.js
index 44f78c29d..fe1741bea 100644
--- a/libsession.worker.config.js
+++ b/libsession.worker.config.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 
 module.exports = {
diff --git a/package.json b/package.json
index b54835149..40cae5167 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
-    "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
+    "lint-full": "yarn format-full && eslint .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .",
@@ -178,6 +178,8 @@
     "@types/sinon": "9.0.4",
     "@types/styled-components": "^5.1.4",
     "@types/uuid": "8.3.4",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
     "asar": "3.1.0",
     "buffer": "^6.0.3",
     "chai": "^4.3.4",
@@ -191,12 +193,14 @@
     "electron": "25.3.0",
     "electron-builder": "23.0.8",
     "esbuild": "^0.14.29",
-    "eslint": "^8.15.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-more": "^1.0.5",
+    "eslint-plugin-react": "^7.33.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "events": "^3.3.0",
     "jsdom": "^19.0.0",
     "jsdom-global": "^3.0.2",
@@ -219,10 +223,7 @@
     "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
     "ts-mock-imports": "^1.3.0",
-    "tslint": "5.19.0",
-    "tslint-microsoft-contrib": "6.0.0",
-    "tslint-react": "3.6.0",
-    "typescript": "^4.6.3",
+    "typescript": "^5.1.6",
     "webpack": "^5.76.3",
     "webpack-cli": "^5.0.1"
   },
diff --git a/password_preload.js b/password_preload.js
index 7463ad9b0..ed8262bc3 100644
--- a/password_preload.js
+++ b/password_preload.js
@@ -1,4 +1,5 @@
 /* global window */
+/* eslint-disable @typescript-eslint/no-var-requires */
 
 const { ipcRenderer } = require('electron');
 const url = require('url');
diff --git a/playwright.config.ts b/playwright.config.ts
index dd2a231dd..e5f200855 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,4 +1,5 @@
-// tslint:disable-next-line: no-implicit-dependencies
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable import/no-import-module-exports */
 import { PlaywrightTestConfig } from '@playwright/test';
 import { toNumber } from 'lodash';
 
diff --git a/preload.js b/preload.js
index 37d5765e0..3ddc14cc4 100644
--- a/preload.js
+++ b/preload.js
@@ -1,3 +1,4 @@
+// eslint:disable: no-require-imports no-var-requires
 const { clipboard, ipcRenderer, webFrame } = require('electron/main');
 const { Storage } = require('./ts/util/storage');
 
@@ -15,7 +16,6 @@ if (config.environment !== 'production') {
 if (config.appInstance) {
   title += ` - ${config.appInstance}`;
 }
-// tslint:disable: no-require-imports no-var-requires
 
 window.platform = process.platform;
 window.getTitle = () => title;
@@ -240,7 +240,6 @@ const { getConversationController } = require('./ts/session/conversations/Conver
 window.getConversationController = getConversationController;
 // Linux seems to periodically let the event loop stop, so this is a global workaround
 setInterval(() => {
-  // tslint:disable-next-line: no-empty
   window.nodeSetImmediate(() => {});
 }, 1000);
 
diff --git a/sass.config.js b/sass.config.js
index 9c689eb4e..ff48bd5ec 100644
--- a/sass.config.js
+++ b/sass.config.js
@@ -1,9 +1,9 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable import/no-extraneous-dependencies */
 const path = require('path');
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 const sass = require('sass'); // Prefer `dart-sass`
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx
index bea3ff915..abffacdd1 100644
--- a/ts/components/AboutView.tsx
+++ b/ts/components/AboutView.tsx
@@ -40,7 +40,7 @@ export const AboutView = () => {
         theme: window.theme,
       });
     }
-  }, [window.theme]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/CaptionEditor.tsx b/ts/components/CaptionEditor.tsx
index e3ea2b0bf..20e51b2ce 100644
--- a/ts/components/CaptionEditor.tsx
+++ b/ts/components/CaptionEditor.tsx
@@ -1,5 +1,3 @@
-// tslint:disable:react-a11y-anchors
-
 import React from 'react';
 import * as GoogleChrome from '../util/GoogleChrome';
 
diff --git a/ts/components/DebugLogView.tsx b/ts/components/DebugLogView.tsx
index ee8a87317..3caa50b48 100644
--- a/ts/components/DebugLogView.tsx
+++ b/ts/components/DebugLogView.tsx
@@ -48,7 +48,6 @@ const StyledContent = styled.div`
 `;
 
 const DebugLogTextArea = (props: { content: string }) => {
-  // tslint:disable-next-line: react-a11y-input-elements
   return <textarea spellCheck="false" rows={10} value={props.content} style={{ height: '100%' }} />;
 };
 
@@ -69,7 +68,6 @@ const DebugLogButtons = (props: { content: string }) => {
     </div>
   );
 };
-// tslint:disable: no-console
 
 const DebugLogViewAndSave = () => {
   const [content, setContent] = useState(window.i18n('loading'));
@@ -85,6 +83,7 @@ const DebugLogViewAndSave = () => {
         const debugLogWithSystemInfo = `${operatingSystemInfo} ${commitHashInfo} ${text}`;
         setContent(debugLogWithSystemInfo);
       })
+      // eslint-disable-next-line no-console
       .catch(console.error);
   }, []);
 
@@ -103,7 +102,7 @@ export const DebugLogView = () => {
         theme: window.theme,
       });
     }
-  }, [window.theme]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx
index d7c7aa6ee..cda20a20b 100644
--- a/ts/components/MemberListItem.tsx
+++ b/ts/components/MemberListItem.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import styled from 'styled-components';
+
 import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar';
 import { useConversationUsernameOrShorten } from '../hooks/useParamSelector';
-import styled from 'styled-components';
 import { SessionRadio } from './basic/SessionRadio';
 
 const AvatarContainer = styled.div`
@@ -93,9 +94,9 @@ export const MemberListItem = (props: {
   const memberName = useConversationUsernameOrShorten(pubkey);
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <StyledSessionMemberItem
       onClick={() => {
+        // eslint-disable-next-line no-unused-expressions
         isSelected ? onUnselect?.(pubkey) : onSelect?.(pubkey);
       }}
       style={
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index e357ba7bf..fe3ced550 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -1,10 +1,15 @@
-import React, { useEffect } from 'react';
+import moment from 'moment';
+import React from 'react';
 import { Provider } from 'react-redux';
-import { LeftPane } from './leftpane/LeftPane';
-
-// tslint:disable-next-line: no-submodule-imports
+import styled from 'styled-components';
+import { fromPairs, map } from 'lodash';
 import { persistStore } from 'redux-persist';
 import { PersistGate } from 'redux-persist/integration/react';
+import useUpdate from 'react-use/lib/useUpdate';
+import useMount from 'react-use/lib/useMount';
+
+import { LeftPane } from './leftpane/LeftPane';
+// moment does not support es-419 correctly (and cause white screen on app start)
 import { getConversationController } from '../session/conversations';
 import { UserUtils } from '../session/utils';
 import { createStore } from '../state/createStore';
@@ -24,15 +29,23 @@ import { initialThemeState } from '../state/ducks/theme';
 import { TimerOptionsArray } from '../state/ducks/timerOptions';
 import { initialUserConfigState } from '../state/ducks/userConfig';
 import { StateType } from '../state/reducer';
-import { makeLookup } from '../util';
 import { ExpirationTimerOptions } from '../util/expiringMessages';
 import { SessionMainPanel } from './SessionMainPanel';
 
-// moment does not support es-419 correctly (and cause white screen on app start)
-import moment from 'moment';
-import styled from 'styled-components';
+import { SettingsKey } from '../data/settings-key';
+import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings';
 import { initialSogsRoomInfoState } from '../state/ducks/sogsRoomInfo';
+import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
 import { Storage } from '../util/storage';
+import { NoticeBanner } from './NoticeBanner';
+import { Flex } from './basic/Flex';
+
+function makeLookup<T>(items: Array<T>, key: string): { [key: string]: T } {
+  // Yep, we can't index into item without knowing what it is. True. But we want to.
+  const pairs = map(items, item => [(item as any)[key] as string, item]);
+
+  return fromPairs(pairs);
+}
 
 // Default to the locale from env. It will be overridden if moment
 // does not recognize it with what moment knows which is the closest.
@@ -40,15 +53,6 @@ import { Storage } from '../util/storage';
 // We just need to use what we got from moment in getLocale on the updateLocale below
 moment.locale((window.i18n as any).getLocale());
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-import useUpdate from 'react-use/lib/useUpdate';
-import { SettingsKey } from '../data/settings-key';
-import { NoticeBanner } from './NoticeBanner';
-import { Flex } from './basic/Flex';
-import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
-import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings';
-
 const StyledGutter = styled.div`
   width: 380px !important;
   transition: none;
@@ -99,8 +103,8 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) {
 const SomeDeviceOutdatedSyncingNotice = () => {
   const outdatedBannerShouldBeShown = useHasDeviceOutdatedSyncing();
 
-  const dismiss = async () => {
-    await Storage.put(SettingsKey.someDeviceOutdatedSyncing, false);
+  const dismiss = () => {
+    void Storage.put(SettingsKey.someDeviceOutdatedSyncing, false);
   };
 
   if (!outdatedBannerShouldBeShown) {
@@ -117,9 +121,9 @@ const SomeDeviceOutdatedSyncingNotice = () => {
 export const SessionInboxView = () => {
   const update = useUpdate();
   // run only on mount
-  useEffect(() => {
+  useMount(() => {
     setupLeftPane(update);
-  }, []);
+  });
 
   if (!window.inboxStore) {
     return null;
diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx
index fb590f15c..055fc9aeb 100644
--- a/ts/components/SessionPasswordPrompt.tsx
+++ b/ts/components/SessionPasswordPrompt.tsx
@@ -1,14 +1,14 @@
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
-
+import styled from 'styled-components';
 import autoBind from 'auto-bind';
+import { isString } from 'lodash';
+
 import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton';
 import { SessionSpinner } from './basic/SessionSpinner';
 import { SessionTheme } from '../themes/SessionTheme';
 import { switchThemeTo } from '../themes/switchTheme';
-import styled from 'styled-components';
 import { ToastUtils } from '../session/utils';
-import { isString } from 'lodash';
 import { SessionToastContainer } from './SessionToastContainer';
 import { SessionWrapperModal } from './SessionWrapperModal';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
@@ -20,7 +20,6 @@ interface State {
 }
 
 export const MAX_LOGIN_TRIES = 3;
-// tslint:disable: use-simple-attributes
 
 const TextPleaseWait = (props: { isLoading: boolean }) => {
   if (!props.isLoading) {
@@ -35,7 +34,7 @@ const StyledContent = styled.div`
   width: 100%;
 `;
 
-class SessionPasswordPromptInner extends React.PureComponent<{}, State> {
+class SessionPasswordPromptInner extends React.PureComponent<unknown, State> {
   private inputRef?: any;
 
   constructor(props: any) {
@@ -135,7 +134,9 @@ class SessionPasswordPromptInner extends React.PureComponent<{}, State> {
 
     // this is to make sure a render has the time to happen before we lock the thread with all of the db work
     // this might be removed once we get the db operations to a worker thread
-    global.setTimeout(() => this.onLogin(passPhrase), 100);
+    global.setTimeout(() => {
+      void this.onLogin(passPhrase);
+    }, 100);
   }
 
   private initClearDataView() {
@@ -203,7 +204,7 @@ export const SessionPasswordPrompt = () => {
     if (window.primaryColor) {
       void switchPrimaryColorTo(window.primaryColor);
     }
-  }, [window.theme, window.primaryColor]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/SessionToastContainer.tsx b/ts/components/SessionToastContainer.tsx
index 260f787de..3176237c5 100644
--- a/ts/components/SessionToastContainer.tsx
+++ b/ts/components/SessionToastContainer.tsx
@@ -29,7 +29,6 @@ const SessionToastContainerPrivate = () => {
   );
 };
 
-// tslint:disable-next-line: no-default-export
 export const SessionToastContainer = styled(SessionToastContainerPrivate).attrs({
   // custom props
 })`
diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx
index 36a53ad8e..c75a64c0d 100644
--- a/ts/components/SessionWrapperModal.tsx
+++ b/ts/components/SessionWrapperModal.tsx
@@ -1,10 +1,9 @@
 import React, { useRef } from 'react';
 import classNames from 'classnames';
-
-import { SessionIconButton } from './icon/';
-
-// tslint:disable-next-line: no-submodule-imports
 import useKey from 'react-use/lib/useKey';
+
+import { SessionIconButton } from './icon';
+
 import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton';
 
 export type SessionWrapperModalType = {
@@ -65,7 +64,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
 
   return (
     <div
-      className={classNames('loki-dialog modal', additionalClassName ? additionalClassName : null)}
+      className={classNames('loki-dialog modal', additionalClassName || null)}
       onClick={handleClick}
       role="dialog"
     >
diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx
index 6ba7a7041..c1a001b8f 100644
--- a/ts/components/SplitViewContainer.tsx
+++ b/ts/components/SplitViewContainer.tsx
@@ -52,7 +52,7 @@ const TopSplitViewPanel = ({
   React.useEffect(() => {
     if (topRef.current) {
       if (!topHeight) {
-        setTopHeight(Math.max(MIN_HEIGHT_TOP, topRef.current?.clientHeight / 2));
+        setTopHeight(Math.max(MIN_HEIGHT_TOP, (topRef.current?.clientHeight || 0) / 2));
         return;
       }
 
diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index c5f1a7dff..de2558b25 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -2,6 +2,8 @@ import classNames from 'classnames';
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
+import { isEqual } from 'lodash';
+
 import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import {
@@ -13,7 +15,6 @@ import { isMessageSelectionMode } from '../../state/selectors/conversations';
 import { SessionIcon } from '../icon';
 import { AvatarPlaceHolder } from './AvatarPlaceHolder/AvatarPlaceHolder';
 import { ClosedGroupAvatar } from './AvatarPlaceHolder/ClosedGroupAvatar';
-import { isEqual } from 'lodash';
 
 export enum AvatarSize {
   XS = 28,
@@ -99,7 +100,6 @@ const AvatarImage = (
   }
   const dataToDisplay = base64Data ? `data:image/jpeg;base64,${base64Data}` : avatarPath;
 
-  // tslint:disable: react-a11y-img-has-alt
   return (
     <img
       onError={handleImageError}
@@ -165,7 +165,6 @@ const AvatarInner = (props: Props) => {
       data-testid={dataTestId}
     >
       {hasImage ? (
-        // tslint:disable-next-line: use-simple-attributes
         <AvatarImage
           avatarPath={urlToLoad}
           base64Data={base64Data}
diff --git a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
index b38780c89..eec91e5da 100644
--- a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
@@ -14,9 +14,8 @@ const sha512FromPubkeyOneAtAtime = async (pubkey: string) => {
   return allowOnlyOneAtATime(`sha512FromPubkey-${pubkey}`, async () => {
     const buf = await crypto.subtle.digest('SHA-512', new TextEncoder().encode(pubkey));
 
-    // tslint:disable: prefer-template restrict-plus-operands
     return Array.prototype.map
-      .call(new Uint8Array(buf), (x: any) => ('00' + x.toString(16)).slice(-2))
+      .call(new Uint8Array(buf), (x: any) => `00${x.toString(16)}`.slice(-2))
       .join('');
   });
 };
@@ -37,7 +36,7 @@ function useHashBasedOnPubkey(pubkey: string) {
     if (cachedHash) {
       setHash(cachedHash);
       setIsLoading(false);
-      return;
+      return undefined;
     }
     setIsLoading(true);
     let isInProgress = true;
@@ -48,9 +47,10 @@ function useHashBasedOnPubkey(pubkey: string) {
 
         setHash(undefined);
       }
-      return;
+      return undefined;
     }
 
+    // eslint-disable-next-line more/no-then
     void sha512FromPubkeyOneAtAtime(pubkey).then(sha => {
       if (isInProgress) {
         setIsLoading(false);
diff --git a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
index 0979b9528..0ad21d293 100644
--- a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import { isEmpty } from 'lodash';
+
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
 import { Avatar, AvatarSize } from '../Avatar';
-import { isEmpty } from 'lodash';
 import { useIsClosedGroup, useSortedGroupMembers } from '../../../hooks/useParamSelector';
 import { UserUtils } from '../../../session/utils';
 
@@ -22,6 +23,7 @@ function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
       return AvatarSize.XL;
     default:
       assertUnreachable(size, `Invalid size request for closed group avatar "${size}"`);
+      return AvatarSize.XL; // just to make eslint happy
   }
 }
 
diff --git a/ts/components/basic/Flex.tsx b/ts/components/basic/Flex.tsx
index 18386c20c..f1c50ca47 100644
--- a/ts/components/basic/Flex.tsx
+++ b/ts/components/basic/Flex.tsx
@@ -5,7 +5,7 @@ export interface FlexProps {
   className?: string;
   container?: boolean;
   dataTestId?: string;
-  /****** Container Props ********/
+  // Container Props
   flexDirection?: 'row' | 'column';
   justifyContent?:
     | 'flex-start'
@@ -24,11 +24,11 @@ export interface FlexProps {
     | 'baseline'
     | 'initial'
     | 'inherit';
-  /****** Child Props ********/
+  // Child Props
   flexGrow?: number;
   flexShrink?: number;
   flexBasis?: number;
-  /****** Common Layout Props ********/
+  // Common Layout Props
   padding?: string;
   margin?: string;
   width?: string;
diff --git a/ts/components/basic/MessageBodyHighlight.tsx b/ts/components/basic/MessageBodyHighlight.tsx
index f4e02abf8..fdd7bd5e9 100644
--- a/ts/components/basic/MessageBodyHighlight.tsx
+++ b/ts/components/basic/MessageBodyHighlight.tsx
@@ -85,7 +85,6 @@ export const MessageBodyHighlight = (props: { text: string; isGroup: boolean })
       </SnippetHighlight>
     );
 
-    // @ts-ignore
     last = FIND_BEGIN_END.lastIndex;
     match = FIND_BEGIN_END.exec(text);
   }
diff --git a/ts/components/basic/SessionHTMLRenderer.tsx b/ts/components/basic/SessionHTMLRenderer.tsx
index 225a907f9..7e5280a0b 100644
--- a/ts/components/basic/SessionHTMLRenderer.tsx
+++ b/ts/components/basic/SessionHTMLRenderer.tsx
@@ -1,17 +1,14 @@
 import React from 'react';
 import DOMPurify from 'dompurify';
 
-interface ReceivedProps {
+type ReceivedProps = {
   html: string;
   tag?: string;
   key?: any;
   className?: string;
-}
+};
 
-// Needed because of https://github.com/microsoft/tslint-microsoft-contrib/issues/339
-type Props = ReceivedProps;
-
-export const SessionHtmlRenderer: React.SFC<Props> = ({ tag = 'div', key, html, className }) => {
+export const SessionHtmlRenderer = ({ tag = 'div', key, html, className }: ReceivedProps) => {
   const clean = DOMPurify.sanitize(html, {
     USE_PROFILES: { html: true },
     FORBID_ATTR: ['script'],
@@ -20,7 +17,7 @@ export const SessionHtmlRenderer: React.SFC<Props> = ({ tag = 'div', key, html,
   return React.createElement(tag, {
     key,
     className,
-    // tslint:disable-next-line: react-no-dangerous-html
+
     dangerouslySetInnerHTML: { __html: clean },
   });
 };
diff --git a/ts/components/basic/SessionIdEditable.tsx b/ts/components/basic/SessionIdEditable.tsx
index 7571ba419..bbac3fb8e 100644
--- a/ts/components/basic/SessionIdEditable.tsx
+++ b/ts/components/basic/SessionIdEditable.tsx
@@ -39,8 +39,8 @@ export const SessionIdEditable = (props: Props) => {
   function handleKeyDown(e: KeyboardEvent<HTMLTextAreaElement>) {
     if (editable && e.key === 'Enter') {
       e.preventDefault();
-      // tslint:disable-next-line: no-unused-expression
-      onPressEnter && onPressEnter();
+
+      onPressEnter?.();
     }
   }
 
diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx
index 3bb1b66f4..d45fb6682 100644
--- a/ts/components/basic/SessionRadio.tsx
+++ b/ts/components/basic/SessionRadio.tsx
@@ -1,7 +1,6 @@
 import React, { ChangeEvent } from 'react';
 import styled from 'styled-components';
-import { Flex } from '../basic/Flex';
-// tslint:disable: react-unused-props-and-state
+import { Flex } from './Flex';
 
 type Props = {
   label: string;
@@ -27,7 +26,6 @@ const StyledInput = styled.input<{
     background: ${props => (props.selectedColor ? props.selectedColor : 'var(--primary-color)')};
   }
 `;
-// tslint:disable: use-simple-attributes
 
 const StyledLabel = styled.label<{
   filledSize: number;
diff --git a/ts/components/basic/SessionRadioGroup.tsx b/ts/components/basic/SessionRadioGroup.tsx
index a7259bab7..e07c0b19c 100644
--- a/ts/components/basic/SessionRadioGroup.tsx
+++ b/ts/components/basic/SessionRadioGroup.tsx
@@ -1,10 +1,10 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
+import useMount from 'react-use/lib/useMount';
 import styled, { CSSProperties } from 'styled-components';
 
 import { SessionRadio } from './SessionRadio';
 
 interface Props {
-  // tslint:disable: react-unused-props-and-state
   initialItem: string;
   items: Array<{ value: string; label: string }>;
   group: string;
@@ -32,9 +32,9 @@ export const SessionRadioGroup = (props: Props) => {
   const { items, group, initialItem, style } = props;
   const [activeItem, setActiveItem] = useState('');
 
-  useEffect(() => {
+  useMount(() => {
     setActiveItem(initialItem);
-  }, []);
+  });
 
   return (
     <StyledFieldSet id={group} style={style}>
diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx
index 3473697bd..d1ae11259 100644
--- a/ts/components/basic/SessionToast.tsx
+++ b/ts/components/basic/SessionToast.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
-
-import { Flex } from '../basic/Flex';
-import styled from 'styled-components';
-import { SessionIcon, SessionIconType } from '../icon';
 import { noop } from 'lodash';
+import React from 'react';
+import styled from 'styled-components';
+
+import { Flex } from './Flex';
+
+import { SessionIcon, SessionIconType } from '../icon';
 
 // NOTE We don't change the color strip on the left based on the type. 16/09/2022
 export enum SessionToastType {
@@ -45,12 +46,10 @@ const IconDiv = styled.div`
   margin: 0 var(--margins-xs);
 `;
 
-// tslint:disable: use-simple-attributes
-
 export const SessionToast = (props: Props) => {
   const { title, description, type, icon } = props;
 
-  const toastDesc = description ? description : '';
+  const toastDesc = description || '';
   const toastIconSize = toastDesc ? 'huge' : 'medium';
 
   // Set a custom icon or allow the theme to define the icon
@@ -77,7 +76,6 @@ export const SessionToast = (props: Props) => {
   const onToastClick = props?.onToastClick || noop;
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <Flex
       container={true}
       alignItems="center"
diff --git a/ts/components/basic/SessionToggle.tsx b/ts/components/basic/SessionToggle.tsx
index d0922d7b0..bdbb9e857 100644
--- a/ts/components/basic/SessionToggle.tsx
+++ b/ts/components/basic/SessionToggle.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
+import { updateConfirmModal } from '../../state/ducks/modalDialog';
 
 const StyledKnob = styled.div<{ active: boolean }>`
   position: absolute;
diff --git a/ts/components/button/MenuButton.tsx b/ts/components/button/MenuButton.tsx
index 2cff26532..07852d7d6 100644
--- a/ts/components/button/MenuButton.tsx
+++ b/ts/components/button/MenuButton.tsx
@@ -4,7 +4,6 @@ import styled from 'styled-components';
 import { resetOverlayMode, setOverlayMode } from '../../state/ducks/section';
 import { getOverlayMode } from '../../state/selectors/section';
 import { SessionIcon } from '../icon';
-// tslint:disable: use-simple-attributes
 
 const StyledMenuButton = styled.button`
   position: relative;
diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index 32eedce9e..acb84dae8 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -1,13 +1,14 @@
-import { SessionIconButton } from '../icon';
+import React, { useEffect, useState } from 'react';
 import { animation, contextMenu, Item, Menu } from 'react-contexify';
+import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
+
+import { CallManager, ToastUtils } from '../../session/utils';
 import { InputItem } from '../../session/utils/calling/CallManager';
 import { setFullScreenCall } from '../../state/ducks/call';
-import { CallManager, ToastUtils } from '../../session/utils';
-import React, { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import { getHasOngoingCallWithPubkey } from '../../state/selectors/call';
+import { SessionIconButton } from '../icon';
 import { DropDownAndToggleButton } from '../icon/DropDownAndToggleButton';
-import styled from 'styled-components';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 
 const VideoInputMenu = ({
@@ -281,7 +282,7 @@ export const HangUpButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
         iconType="hangup"
         iconColor="var(--danger-color)"
         borderRadius="50%"
-        onClick={handleEndCall}
+        onClick={() => void handleEndCall()}
         margin="10px"
         dataTestId="end-call"
       />
diff --git a/ts/components/calling/CallInFullScreenContainer.tsx b/ts/components/calling/CallInFullScreenContainer.tsx
index 457376006..952a88e34 100644
--- a/ts/components/calling/CallInFullScreenContainer.tsx
+++ b/ts/components/calling/CallInFullScreenContainer.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { useVideoCallEventsListener } from '../../hooks/useVideoEventListener';
@@ -68,7 +68,7 @@ export const CallInFullScreenContainer = () => {
     if (remoteStreamVideoIsMuted) {
       dispatch(setFullScreenCall(false));
     }
-  }, [remoteStreamVideoIsMuted]);
+  }, [remoteStreamVideoIsMuted, dispatch]);
 
   if (!ongoingCallWithFocused || !hasOngoingCallFullScreen) {
     return null;
diff --git a/ts/components/calling/DraggableCallContainer.tsx b/ts/components/calling/DraggableCallContainer.tsx
index 67564682e..d3a14e361 100644
--- a/ts/components/calling/DraggableCallContainer.tsx
+++ b/ts/components/calling/DraggableCallContainer.tsx
@@ -76,14 +76,13 @@ export const DraggableCallContainer = () => {
   );
   const videoRefRemote = useRef<HTMLVideoElement>(null);
 
-  function onWindowResize() {
-    if (positionY + 50 > window.innerHeight || positionX + 50 > window.innerWidth) {
-      setPositionX(window.innerWidth / 2);
-      setPositionY(window.innerHeight / 2);
-    }
-  }
-
   useEffect(() => {
+    function onWindowResize() {
+      if (positionY + 50 > window.innerHeight || positionX + 50 > window.innerWidth) {
+        setPositionX(window.innerWidth / 2);
+        setPositionY(window.innerHeight / 2);
+      }
+    }
     window.addEventListener('resize', onWindowResize);
 
     return () => {
diff --git a/ts/components/calling/InConversationCallContainer.tsx b/ts/components/calling/InConversationCallContainer.tsx
index bd5cdf630..dfedb85ae 100644
--- a/ts/components/calling/InConversationCallContainer.tsx
+++ b/ts/components/calling/InConversationCallContainer.tsx
@@ -2,6 +2,8 @@ import { useSelector } from 'react-redux';
 import React, { useRef, useState } from 'react';
 
 import styled from 'styled-components';
+import useInterval from 'react-use/lib/useInterval';
+import moment from 'moment';
 import { CallManager, UserUtils } from '../../session/utils';
 import {
   getCallIsInFullScreen,
@@ -18,9 +20,7 @@ import { useVideoCallEventsListener } from '../../hooks/useVideoEventListener';
 import { useModuloWithTripleDots } from '../../hooks/useModuloWithTripleDots';
 import { CallWindowControls } from './CallButtons';
 import { DEVICE_DISABLED_DEVICE_ID } from '../../session/utils/calling/CallManager';
-// tslint:disable-next-line: no-submodule-imports
-import useInterval from 'react-use/lib/useInterval';
-import moment from 'moment';
+
 import { SessionSpinner } from '../basic/SessionSpinner';
 
 const VideoContainer = styled.div`
@@ -112,7 +112,6 @@ const DurationLabel = () => {
   const ms = callDuration * 1000;
   const d = moment.duration(ms);
 
-  // tslint:disable-next-line: restrict-plus-operands
   const dateString = Math.floor(d.asHours()) + moment.utc(ms).format(':mm:ss');
   return <StyledCenteredLabel>{dateString}</StyledCenteredLabel>;
 };
@@ -135,7 +134,6 @@ export const VideoLoadingSpinner = (props: { fullWidth: boolean }) => {
   );
 };
 
-// tslint:disable-next-line: max-func-body-length
 export const InConversationCallContainer = () => {
   const isInFullScreen = useSelector(getCallIsInFullScreen);
 
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index af0b0983b..98dd11908 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -35,14 +35,14 @@ export const IncomingCallDialog = () => {
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     if (incomingCallFromPubkey) {
-      timeout = global.setTimeout(async () => {
+      timeout = global.setTimeout(() => {
         if (incomingCallFromPubkey) {
           window.log.info(
             `call missed with ${ed25519Str(
               incomingCallFromPubkey
             )} as the dialog was not interacted with for ${callTimeoutMs} ms`
           );
-          await CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
+          void CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
         }
       }, callTimeoutMs);
     }
@@ -54,7 +54,7 @@ export const IncomingCallDialog = () => {
     };
   }, [incomingCallFromPubkey]);
 
-  //#region input handlers
+  // #region input handlers
   const handleAcceptIncomingCall = async () => {
     if (incomingCallFromPubkey) {
       await CallManager.USER_acceptIncomingCallRequest(incomingCallFromPubkey);
diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx
index b9ba2e73e..024668326 100644
--- a/ts/components/conversation/AddMentions.tsx
+++ b/ts/components/conversation/AddMentions.tsx
@@ -1,9 +1,9 @@
+import React from 'react';
+import styled from 'styled-components';
 import { RenderTextCallbackType } from '../../types/Util';
 import { PubKey } from '../../session/types';
 import { getConversationController } from '../../session/conversations';
-import React from 'react';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import styled from 'styled-components';
 
 interface MentionProps {
   key: string;
diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx
index c5efb6e2d..9801f2fe6 100644
--- a/ts/components/conversation/ContactName.tsx
+++ b/ts/components/conversation/ContactName.tsx
@@ -9,14 +9,14 @@ type Props = {
   name?: string | null;
   profileName?: string | null;
   module?: string;
-  boldProfileName?: Boolean;
-  compact?: Boolean;
-  shouldShowPubkey: Boolean;
+  boldProfileName?: boolean;
+  compact?: boolean;
+  shouldShowPubkey: boolean;
 };
 
 export const ContactName = (props: Props) => {
   const { pubkey, name, profileName, module, boldProfileName, compact, shouldShowPubkey } = props;
-  const prefix = module ? module : 'module-contact-name';
+  const prefix = module || 'module-contact-name';
 
   const convoName = useConversationUsernameOrShorten(pubkey);
   const isPrivate = useIsPrivate(pubkey);
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 15ee685a0..9bc56ce25 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { Avatar, AvatarSize } from '../avatar/Avatar';
-
 import { contextMenu } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { ConversationNotificationSettingType } from '../../models/conversationAttributes';
+import { Avatar, AvatarSize } from '../avatar/Avatar';
+
 import {
   getSelectedMessageIds,
   isMessageDetailView,
diff --git a/ts/components/conversation/ExpireTimer.tsx b/ts/components/conversation/ExpireTimer.tsx
index ed5f89408..22bae551b 100644
--- a/ts/components/conversation/ExpireTimer.tsx
+++ b/ts/components/conversation/ExpireTimer.tsx
@@ -1,10 +1,9 @@
 import React, { useCallback, useState } from 'react';
 
-import { getTimerBucketIcon } from '../../util/timer';
-
-// tslint:disable-next-line: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
+import { getTimerBucketIcon } from '../../util/timer';
+
 import { SessionIcon } from '../icon/SessionIcon';
 
 type Props = {
diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx
index fa0151ae3..717eb7652 100644
--- a/ts/components/conversation/H5AudioPlayer.tsx
+++ b/ts/components/conversation/H5AudioPlayer.tsx
@@ -175,7 +175,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
 
   useEffect(() => {
     if (messageId !== undefined && messageId === nextMessageToPlayId) {
-      player.current?.audio.current?.play();
+      void player.current?.audio.current?.play();
     }
   }, [messageId, nextMessageToPlayId, player]);
 
diff --git a/ts/components/conversation/Image.tsx b/ts/components/conversation/Image.tsx
index b7bc0622f..44ecab416 100644
--- a/ts/components/conversation/Image.tsx
+++ b/ts/components/conversation/Image.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback } from 'react';
 import classNames from 'classnames';
+import styled from 'styled-components';
 
 import { Spinner } from '../basic/Spinner';
 import { AttachmentType, AttachmentTypeWithPath } from '../../types/Attachment';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import { useDisableDrag } from '../../hooks/useDisableDrag';
-import styled from 'styled-components';
 
 type Props = {
   alt: string;
@@ -41,7 +41,6 @@ const StyledOverlay = styled.div<Pick<Props, 'darkOverlay' | 'softCorners'>>`
     props.darkOverlay ? 'var(--message-link-preview-background-color)' : 'unset'};
 `;
 export const Image = (props: Props) => {
-  // tslint:disable-next-line max-func-body-length cyclomatic-complexity
   const {
     alt,
     attachment,
@@ -64,7 +63,6 @@ export const Image = (props: Props) => {
     if (url && onError) {
       onError();
     }
-    return;
   }, [url, onError]);
   const disableDrag = useDisableDrag();
 
diff --git a/ts/components/conversation/ImageGrid.tsx b/ts/components/conversation/ImageGrid.tsx
index 24e87882b..dc87a6a15 100644
--- a/ts/components/conversation/ImageGrid.tsx
+++ b/ts/components/conversation/ImageGrid.tsx
@@ -1,4 +1,5 @@
 import React, { useContext } from 'react';
+import styled from 'styled-components';
 
 import {
   areAllAttachmentsVisual,
@@ -11,7 +12,6 @@ import {
 
 import { Image } from './Image';
 import { IsMessageVisibleContext } from './message/message-content/MessageContent';
-import styled from 'styled-components';
 import { THUMBNAIL_SIDE } from '../../types/attachments/VisualAttachment';
 
 type Props = {
@@ -26,7 +26,6 @@ const StyledImageGrid = styled.div<{ flexDirection: 'row' | 'column' }>`
   gap: var(--margins-sm);
   flex-direction: ${props => props.flexDirection};
 `;
-// tslint:disable: cyclomatic-complexity max-func-body-length use-simple-attributes
 
 const Row = (
   props: Props & { renderedSize: number; startIndex: number; totalAttachmentsCount: number }
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index e8db1d73a..3f3d0446b 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -2,8 +2,10 @@ import _ from 'lodash';
 import React from 'react';
 
 import autoBind from 'auto-bind';
+import { blobToArrayBuffer } from 'blob-util';
+import loadImage from 'blueimp-load-image';
 import classNames from 'classnames';
-
+import styled from 'styled-components';
 import {
   CompositionBox,
   SendMessageType,
@@ -12,14 +14,10 @@ import {
 
 import { perfEnd, perfStart } from '../../session/utils/Performance';
 
-const DEFAULT_JPEG_QUALITY = 0.85;
-
 import { SessionMessagesListContainer } from './SessionMessagesListContainer';
 
 import { SessionFileDropzone } from './SessionFileDropzone';
 
-import { blobToArrayBuffer } from 'blob-util';
-import loadImage from 'blueimp-load-image';
 import { Data } from '../../data/data';
 import { markAllReadByConvoId } from '../../interactions/conversationInteractions';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
@@ -55,9 +53,9 @@ import { SessionRightPanelWithDetails } from './SessionRightPanel';
 import { NoMessageInConversation } from './SubtleNotification';
 import { MessageDetail } from './message/message-item/MessageDetail';
 
-import styled from 'styled-components';
 import { SessionSpinner } from '../basic/SessionSpinner';
-// tslint:disable: jsx-curly-spacing
+
+const DEFAULT_JPEG_QUALITY = 0.85;
 
 interface State {
   isDraggingFile: boolean;
@@ -289,6 +287,7 @@ export class SessionConversation extends React.Component<Props, State> {
               <CompositionBox
                 sendMessage={this.sendMessageFn}
                 stagedAttachments={this.props.stagedAttachments}
+                // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 onChoseAttachments={this.onChoseAttachments}
               />
             </div>
@@ -360,13 +359,12 @@ export class SessionConversation extends React.Component<Props, State> {
       return;
     }
 
-    // tslint:disable-next-line: prefer-for-of
     for (let i = 0; i < attachmentsFileList.length; i++) {
+      // eslint-disable-next-line no-await-in-loop
       await this.maybeAddAttachment(attachmentsFileList[i]);
     }
   }
 
-  // tslint:disable: max-func-body-length cyclomatic-complexity
   private async maybeAddAttachment(file: any) {
     if (!file) {
       return;
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 315776103..11d0ac9e9 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -1,7 +1,6 @@
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 import styled from 'styled-components';
-// @ts-ignore
 import Picker from '@emoji-mart/react';
 import { useSelector } from 'react-redux';
 import { getTheme, isDarkTheme } from '../../state/selectors/theme';
@@ -12,6 +11,7 @@ import {
   PrimaryColorStateType,
   THEMES,
   ThemeStateType,
+  // eslint-disable-next-line import/extensions
 } from '../../themes/constants/colors.js';
 import { hexColorToRGB } from '../../util/hexColorToRGB';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
@@ -97,6 +97,7 @@ const pickerProps: FixedPickerProps = {
   skinTonePosition: 'preview',
 };
 
+// eslint-disable-next-line react/display-name
 export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props, ref) => {
   const { onEmojiClicked, show, isModal = false, onKeyDown } = props;
   const primaryColor = useSelector(getPrimaryColor);
@@ -109,11 +110,10 @@ export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props
   switch (theme) {
     case 'ocean-dark':
       panelBackgroundRGB = hexColorToRGB(THEMES.OCEAN_DARK.COLOR1);
-      // tslint:disable: no-non-null-assertion
+
       panelTextRGB = hexColorToRGB(THEMES.OCEAN_DARK.COLOR7!);
       break;
     case 'ocean-light':
-      // tslint:disable: no-non-null-assertion
       panelBackgroundRGB = hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR7!);
       panelTextRGB = hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR1);
       break;
diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx
index 457c705d2..1b823f100 100644
--- a/ts/components/conversation/SessionMessagesList.tsx
+++ b/ts/components/conversation/SessionMessagesList.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useKey from 'react-use/lib/useKey';
 import {
   PropsForDataExtractionNotification,
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 53401c118..6fde12df2 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { contextMenu } from 'react-contexify';
-import { SessionScrollButton } from '../SessionScrollButton';
 
 import { connect } from 'react-redux';
 
@@ -14,6 +13,8 @@ import {
   resetOldTopMessageId,
   SortedMessageModelProps,
 } from '../../state/ducks/conversations';
+import { SessionScrollButton } from '../SessionScrollButton';
+
 import { StateType } from '../../state/reducer';
 import {
   getQuotedMessageToAnimate,
@@ -38,7 +39,6 @@ export type ScrollToLoadedReasons =
   | 'load-more-bottom';
 
 export const ScrollToLoadedMessageContext = React.createContext(
-  // tslint:disable-next-line: no-empty
   (_loadedMessageIdToScrollTo: string, _reason: ScrollToLoadedReasons) => {}
 );
 
@@ -51,7 +51,7 @@ type Props = SessionMessageListProps & {
   scrollToNow: () => Promise<void>;
 };
 
-const StyledMessagesContainer = styled.div<{}>`
+const StyledMessagesContainer = styled.div`
   display: flex;
   flex-grow: 1;
   gap: var(--margins-xxs);
@@ -144,7 +144,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
         </ScrollToLoadedMessageContext.Provider>
 
         <SessionScrollButton
-          onClickScrollBottom={this.props.scrollToNow}
+          onClickScrollBottom={() => void this.props.scrollToNow()}
           key="scroll-down-button"
         />
       </StyledMessagesContainer>
@@ -250,7 +250,6 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
       return;
     }
 
-    // tslint:disable-next-line: restrict-plus-operands
     messageContainer.scrollBy({
       top: Math.floor(+messageContainer.clientHeight * 2) / 3,
       behavior: 'smooth',
diff --git a/ts/components/conversation/SessionQuotedMessageComposition.tsx b/ts/components/conversation/SessionQuotedMessageComposition.tsx
index 1ed2366e0..6c54f5f78 100644
--- a/ts/components/conversation/SessionQuotedMessageComposition.tsx
+++ b/ts/components/conversation/SessionQuotedMessageComposition.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
-import { SessionIcon, SessionIconButton } from '../icon';
 import styled from 'styled-components';
 import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import { SessionIcon, SessionIconButton } from '../icon';
+
 import { quoteMessage } from '../../state/ducks/conversations';
 import { getQuotedMessage } from '../../state/selectors/conversations';
 import { getAlt, isAudio } from '../../types/Attachment';
 import { AUDIO_MP3 } from '../../types/MIME';
 import { Flex } from '../basic/Flex';
-import { Image } from '../../../ts/components/conversation/Image';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+import { Image } from './Image';
+
 import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
 import { GoogleChrome } from '../../util';
 import { findAndFormatContact } from '../../models/message';
diff --git a/ts/components/conversation/SessionRecording.tsx b/ts/components/conversation/SessionRecording.tsx
index cedc8d2cb..d2f30b417 100644
--- a/ts/components/conversation/SessionRecording.tsx
+++ b/ts/components/conversation/SessionRecording.tsx
@@ -1,11 +1,12 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
 import classNames from 'classnames';
 import moment from 'moment';
 
-import { SessionIconButton } from '../icon';
 import autoBind from 'auto-bind';
 import MicRecorder from 'mic-recorder-to-mp3';
 import styled from 'styled-components';
+import { SessionIconButton } from '../icon';
 import { Constants } from '../../session';
 import { ToastUtils } from '../../session/utils';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
@@ -88,7 +89,6 @@ export class SessionRecording extends React.Component<Props, State> {
     }
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public render() {
     const { isPlaying, isPaused, isRecording, startTimestamp, nowTimestamp } = this.state;
 
@@ -103,14 +103,12 @@ export class SessionRecording extends React.Component<Props, State> {
     // otherwise display 0
     const displayTimeMs = isRecording
       ? (nowTimestamp - startTimestamp) * 1000
-      : (this.audioElement &&
-          (this.audioElement?.currentTime * 1000 || this.audioElement?.duration)) ||
+      : (this.audioElement?.currentTime &&
+          (this.audioElement.currentTime * 1000 || this.audioElement?.duration)) ||
         0;
 
     const displayTimeString = moment.utc(displayTimeMs).format('m:ss');
-    const recordingDurationMs = this.audioElement?.duration
-      ? this.audioElement?.duration * 1000
-      : 1;
+    const recordingDurationMs = this.audioElement?.duration ? this.audioElement.duration * 1000 : 1;
 
     let remainingTimeString = '';
     if (recordingDurationMs !== undefined) {
@@ -287,6 +285,7 @@ export class SessionRecording extends React.Component<Props, State> {
     this.recorder = new MicRecorder({
       bitRate: 128,
     });
+    // eslint-disable-next-line more/no-then
     this.recorder
       .start()
       .then(() => {
@@ -304,6 +303,7 @@ export class SessionRecording extends React.Component<Props, State> {
     if (!this.recorder) {
       return;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [_, blob] = await this.recorder.stop().getMp3();
     this.recorder = undefined;
 
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index f98632661..9bbb628de 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -1,11 +1,12 @@
-import _ from 'lodash';
+import { compact, flatten } from 'lodash';
 import React, { useEffect, useState } from 'react';
-import { SessionIconButton } from '../icon';
-// tslint:disable-next-line: no-submodule-imports
+
 import { useDispatch, useSelector } from 'react-redux';
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
+import { SessionIconButton } from '../icon';
+
 import {
   deleteAllMessagesByConvoIdWithConfirmation,
   setDisappearingMessagesByConvoId,
@@ -58,7 +59,7 @@ async function getMediaGalleryProps(
     Constants.CONVERSATION.DEFAULT_DOCUMENTS_FETCH_COUNT
   );
 
-  const media = _.flatten(
+  const media = flatten(
     rawMedia.map(attributes => {
       const { attachments, source, id, timestamp, serverTimestamp, received_at } = attributes;
 
@@ -110,7 +111,7 @@ async function getMediaGalleryProps(
 
   return {
     media,
-    documents: _.compact(documents), // remove null
+    documents: compact(documents), // remove null
   };
 }
 
@@ -201,8 +202,6 @@ const StyledName = styled.h4`
   font-size: var(--font-size-md);
 `;
 
-// tslint:disable: cyclomatic-complexity
-// tslint:disable: max-func-body-length
 export const SessionRightPanelWithDetails = () => {
   const [documents, setDocuments] = useState<Array<MediaItemType>>([]);
   const [media, setMedia] = useState<Array<MediaItemType>>([]);
@@ -224,22 +223,17 @@ export const SessionRightPanelWithDetails = () => {
     let isRunning = true;
 
     if (isShowing && selectedConvoKey) {
+      // eslint-disable-next-line more/no-then
       void getMediaGalleryProps(selectedConvoKey).then(results => {
         if (isRunning) {
-          if (!_.isEqual(documents, results.documents)) {
-            setDocuments(results.documents);
-          }
-
-          if (!_.isEqual(media, results.media)) {
-            setMedia(results.media);
-          }
+          setDocuments(results.documents);
+          setMedia(results.media);
         }
       });
     }
 
     return () => {
       isRunning = false;
-      return;
     };
   }, [isShowing, selectedConvoKey]);
 
@@ -253,10 +247,6 @@ export const SessionRightPanelWithDetails = () => {
     }
   }, 10000);
 
-  if (!selectedConvoKey) {
-    return null;
-  }
-
   const showMemberCount = !!(subscriberCount && subscriberCount > 0);
   const commonNoShow = isKickedFromGroup || left || isBlocked || !isActive;
   const hasDisappearingMessages = !isPublic && !commonNoShow;
@@ -270,6 +260,9 @@ export const SessionRightPanelWithDetails = () => {
 
   const timerOptions = useSelector(getTimerOptions).timerOptions;
 
+  if (!selectedConvoKey) {
+    return null;
+  }
   const disappearingMessagesOptions = timerOptions.map(option => {
     return {
       content: option.name,
@@ -308,8 +301,8 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={async () => {
-            await showUpdateGroupNameByConvoId(selectedConvoKey);
+          onClick={() => {
+            void showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -342,8 +335,8 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={async () => {
-            await showUpdateGroupMembersByConvoId(selectedConvoKey);
+          onClick={() => {
+            void showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
@@ -360,7 +353,6 @@ export const SessionRightPanelWithDetails = () => {
 
       <MediaGallery documents={documents} media={media} />
       {isGroup && (
-        // tslint:disable-next-line: use-simple-attributes
         <StyledLeaveButton>
           <SessionButton
             text={leaveGroupString}
diff --git a/ts/components/conversation/SessionStagedLinkPreview.tsx b/ts/components/conversation/SessionStagedLinkPreview.tsx
index bae8cca3e..fc9c8739e 100644
--- a/ts/components/conversation/SessionStagedLinkPreview.tsx
+++ b/ts/components/conversation/SessionStagedLinkPreview.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
-import { StagedLinkPreviewData } from './composition/CompositionBox';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
 import { AbortSignal } from 'abort-controller';
+import { StagedLinkPreviewData } from './composition/CompositionBox';
+
 import { arrayBufferFromFile } from '../../types/Attachment';
 import { AttachmentUtil, LinkPreviewUtil } from '../../util';
 import { fetchLinkPreviewImage } from '../../util/linkPreviewFetch';
@@ -52,7 +54,7 @@ export const getPreview = async (
 
   let image;
   if (imageHref && LinkPreviews.isLinkSafeToPreview(imageHref)) {
-    let objectUrl: void | string;
+    let objectUrl: undefined | string;
     try {
       window?.log?.info('insecureNodeFetch => plaintext for getPreview()');
 
diff --git a/ts/components/conversation/StagedLinkPreview.tsx b/ts/components/conversation/StagedLinkPreview.tsx
index 15f8e75fb..bec1a2db9 100644
--- a/ts/components/conversation/StagedLinkPreview.tsx
+++ b/ts/components/conversation/StagedLinkPreview.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import styled from 'styled-components';
 
 import { Image } from './Image';
 
@@ -6,7 +7,6 @@ import { SessionSpinner } from '../basic/SessionSpinner';
 import { StagedLinkPreviewImage } from './composition/CompositionBox';
 import { isImage } from '../../types/MIME';
 import { fromArrayBufferToBase64 } from '../../session/utils/String';
-import styled from 'styled-components';
 import { Flex } from '../basic/Flex';
 import { SessionIconButton } from '../icon';
 
diff --git a/ts/components/conversation/StagedPlaceholderAttachment.tsx b/ts/components/conversation/StagedPlaceholderAttachment.tsx
index 5d2773647..99b91ff06 100644
--- a/ts/components/conversation/StagedPlaceholderAttachment.tsx
+++ b/ts/components/conversation/StagedPlaceholderAttachment.tsx
@@ -1,6 +1,5 @@
 import React, { MouseEvent } from 'react';
 import styled from 'styled-components';
-// tslint:disable: react-unused-props-and-state
 
 interface Props {
   onClick: (e: MouseEvent<HTMLDivElement>) => void;
diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx
index 87967d177..92c88f606 100644
--- a/ts/components/conversation/Timestamp.tsx
+++ b/ts/components/conversation/Timestamp.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import moment from 'moment';
 
-// tslint:disable-next-line: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
 import useUpdate from 'react-use/lib/useUpdate';
diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index d3dd01360..f622f0233 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
+import styled from 'styled-components';
 
 import { TypingAnimation } from './TypingAnimation';
-import styled from 'styled-components';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { useSelectedIsGroup } from '../../state/selectors/selectedConversation';
 
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index da63b9c06..c4b4eb436 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -1,30 +1,18 @@
-import React from 'react';
 import _, { debounce, isEmpty } from 'lodash';
+import React from 'react';
+import { connect } from 'react-redux';
+import styled from 'styled-components';
 
+import { AbortController } from 'abort-controller';
+import { Mention, MentionsInput, SuggestionDataItem } from 'react-mentions';
+
+import autoBind from 'auto-bind';
 import * as MIME from '../../../types/MIME';
 
 import { SessionEmojiPanel, StyledEmojiPanel } from '../SessionEmojiPanel';
 import { SessionRecording } from '../SessionRecording';
 
-import {
-  getPreview,
-  LINK_PREVIEW_TIMEOUT,
-  SessionStagedLinkPreview,
-} from '../SessionStagedLinkPreview';
-import { AbortController } from 'abort-controller';
-import { SessionQuotedMessageComposition } from '../SessionQuotedMessageComposition';
-import { Mention, MentionsInput, SuggestionDataItem } from 'react-mentions';
-import autoBind from 'auto-bind';
-import { getMediaPermissionsSettings } from '../../settings/SessionSettings';
-import { getDraftForConversation, updateDraftForConversation } from '../SessionConversationDrafts';
-import {
-  AddStagedAttachmentButton,
-  SendMessageButton,
-  StartRecordingButton,
-  ToggleEmojiButton,
-} from './CompositionButtons';
-import { AttachmentType } from '../../../types/Attachment';
-import { connect } from 'react-redux';
+import { SettingsKey } from '../../../data/settings-key';
 import { showLinkSharingConfirmationModalDialog } from '../../../interactions/conversationInteractions';
 import { getConversationController } from '../../../session/conversations';
 import { ToastUtils } from '../../../session/utils';
@@ -36,30 +24,43 @@ import {
   getQuotedMessage,
   getSelectedConversation,
 } from '../../../state/selectors/conversations';
-import { AttachmentUtil } from '../../../util';
-import { Flex } from '../../basic/Flex';
-import { CaptionEditor } from '../../CaptionEditor';
-import { StagedAttachmentList } from '../StagedAttachmentList';
+import {
+  getSelectedCanWrite,
+  getSelectedConversationKey,
+} from '../../../state/selectors/selectedConversation';
+import { AttachmentType } from '../../../types/Attachment';
 import { processNewAttachment } from '../../../types/MessageAttachment';
+import { FixedBaseEmoji } from '../../../types/Reaction';
+import { AttachmentUtil } from '../../../util';
 import {
   StagedAttachmentImportedType,
   StagedPreviewImportedType,
 } from '../../../util/attachmentsUtil';
+import { LinkPreviews } from '../../../util/linkPreviews';
+import { Flex } from '../../basic/Flex';
+import { CaptionEditor } from '../../CaptionEditor';
+import { getMediaPermissionsSettings } from '../../settings/SessionSettings';
+import { getDraftForConversation, updateDraftForConversation } from '../SessionConversationDrafts';
+import { SessionQuotedMessageComposition } from '../SessionQuotedMessageComposition';
+import {
+  getPreview,
+  LINK_PREVIEW_TIMEOUT,
+  SessionStagedLinkPreview,
+} from '../SessionStagedLinkPreview';
+import { StagedAttachmentList } from '../StagedAttachmentList';
+import {
+  AddStagedAttachmentButton,
+  SendMessageButton,
+  StartRecordingButton,
+  ToggleEmojiButton,
+} from './CompositionButtons';
+import { renderEmojiQuickResultRow, searchEmojiForQuery } from './EmojiQuickResult';
 import {
   cleanMentions,
   mentionsRegex,
   renderUserMentionRow,
   styleForCompositionBoxSuggestions,
 } from './UserMentions';
-import { renderEmojiQuickResultRow, searchEmojiForQuery } from './EmojiQuickResult';
-import { LinkPreviews } from '../../../util/linkPreviews';
-import styled from 'styled-components';
-import { FixedBaseEmoji } from '../../../types/Reaction';
-import {
-  getSelectedCanWrite,
-  getSelectedConversationKey,
-} from '../../../state/selectors/selectedConversation';
-import { SettingsKey } from '../../../data/settings-key';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -175,7 +176,7 @@ const getSelectionBasedOnMentions = (draft: string, index: number) => {
     lastMatchEndIndex = currentMatchStartIndex + match.length;
 
     const realLength = displayName.length + 1;
-    lastRealMatchEndIndex = lastRealMatchEndIndex + realLength;
+    lastRealMatchEndIndex += realLength;
 
     // the +1 is for the @
     return {
@@ -348,6 +349,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     }
     const { items } = e.clipboardData;
     let imgBlob = null;
+    // eslint-disable-next-line no-restricted-syntax
     for (const item of items as any) {
       const pasteType = item.type.split('/')[0];
       if (pasteType === 'image') {
@@ -402,7 +404,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     return (
       <SessionRecording
         sendVoiceMessage={this.sendVoiceMessage}
-        onLoadVoiceNoteView={this.onLoadVoiceNoteView}
+        onLoadVoiceNoteView={() => void this.onLoadVoiceNoteView()}
         onExitVoiceNoteView={this.onExitVoiceNoteView}
       />
     );
@@ -422,10 +424,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
           multiple={true}
           ref={this.fileInput}
           type="file"
-          onChange={this.onChoseAttachment}
+          onChange={() => void this.onChoseAttachment()}
         />
 
-        {typingEnabled && <StartRecordingButton onClick={this.onLoadVoiceNoteView} />}
+        {typingEnabled && <StartRecordingButton onClick={() => void this.onLoadVoiceNoteView()} />}
 
         <StyledSendMessageInput
           role="main"
@@ -441,7 +443,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        <SendMessageButton onClick={this.onSendMessage} />
+        <SendMessageButton onClick={() => void this.onSendMessage()} />
 
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button">
@@ -449,7 +451,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
               ref={this.emojiPanel}
               show={showEmojiPanel}
               onEmojiClicked={this.onEmojiClick}
-              onKeyDown={this.onKeyDown}
+              onKeyDown={e => void this.onKeyDown(e)}
             />
           </StyledEmojiPanelContainer>
         )}
@@ -490,8 +492,8 @@ class CompositionBoxInner extends React.Component<Props, State> {
       <MentionsInput
         value={draft}
         onChange={this.onChange}
-        onKeyDown={this.onKeyDown}
-        onKeyUp={this.onKeyUp}
+        onKeyDown={e => void this.onKeyDown(e)}
+        onKeyUp={() => void this.onKeyUp()}
         placeholder={messagePlaceHolder}
         spellCheck={true}
         inputRef={this.textarea}
@@ -554,14 +556,16 @@ class CompositionBoxInner extends React.Component<Props, State> {
       return;
     }
 
+    if (this.props.selectedConversation.isPrivate) {
+      return;
+    }
+
     if (this.props.selectedConversation.isPublic) {
       this.fetchUsersForOpenGroup(overridenQuery, callback);
       return;
     }
-    if (!this.props.selectedConversation.isPrivate) {
-      this.fetchUsersForClosedGroup(overridenQuery, callback);
-      return;
-    }
+    // can only be a closed group here
+    this.fetchUsersForClosedGroup(overridenQuery, callback);
   }
 
   private fetchUsersForClosedGroup(
@@ -675,6 +679,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
       abortController.abort();
     }, LINK_PREVIEW_TIMEOUT);
 
+    // eslint-disable-next-line more/no-then
     getPreview(firstLink, abortController.signal)
       .then(ret => {
         // we finished loading the preview, and checking the abortConrtoller, we are still not aborted.
@@ -843,7 +848,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
     }
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   private async onSendMessage() {
     if (!this.props.selectedConversationKey) {
       throw new Error('selectedConversationKey is needed');
diff --git a/ts/components/conversation/composition/CompositionButtons.tsx b/ts/components/conversation/composition/CompositionButtons.tsx
index fd797f7ac..bd651c3f5 100644
--- a/ts/components/conversation/composition/CompositionButtons.tsx
+++ b/ts/components/conversation/composition/CompositionButtons.tsx
@@ -48,6 +48,7 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
   );
 };
 
+// eslint-disable-next-line react/display-name
 export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: () => void }>(
   (props, ref) => {
     return (
diff --git a/ts/components/conversation/composition/EmojiQuickResult.tsx b/ts/components/conversation/composition/EmojiQuickResult.tsx
index c1c1e3b51..2e8c400f1 100644
--- a/ts/components/conversation/composition/EmojiQuickResult.tsx
+++ b/ts/components/conversation/composition/EmojiQuickResult.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { SuggestionDataItem } from 'react-mentions';
 import styled from 'styled-components';
-// @ts-ignore
 import { SearchIndex } from 'emoji-mart';
+// eslint-disable-next-line import/extensions
 import { searchSync } from '../../../util/emoji.js';
 
 const EmojiQuickResult = styled.span`
diff --git a/ts/components/conversation/media-gallery/DocumentListItem.tsx b/ts/components/conversation/media-gallery/DocumentListItem.tsx
index 20cdfb249..a6f122fe5 100644
--- a/ts/components/conversation/media-gallery/DocumentListItem.tsx
+++ b/ts/components/conversation/media-gallery/DocumentListItem.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import React, { useCallback } from 'react';
 
 import moment from 'moment';
-// tslint:disable-next-line:match-default-export-name
+
 import formatFileSize from 'filesize';
 import { saveAttachmentToDisk } from '../../../util/attachmentsUtil';
 import { MediaItemType } from '../../lightbox/LightboxGallery';
diff --git a/ts/components/conversation/media-gallery/MediaGridItem.tsx b/ts/components/conversation/media-gallery/MediaGridItem.tsx
index 1b295feba..1b4822afa 100644
--- a/ts/components/conversation/media-gallery/MediaGridItem.tsx
+++ b/ts/components/conversation/media-gallery/MediaGridItem.tsx
@@ -28,7 +28,6 @@ const MediaGridItemContent = (props: Props) => {
   const disableDrag = useDisableDrag();
 
   const onImageError = () => {
-    // tslint:disable-next-line no-console
     window.log.info('MediaGridItem: Image failed to load; failing over to placeholder');
     setImageBroken(true);
   };
@@ -58,7 +57,8 @@ const MediaGridItemContent = (props: Props) => {
         onDragStart={disableDrag}
       />
     );
-  } else if (contentType && isVideoTypeSupported(contentType)) {
+  }
+  if (contentType && isVideoTypeSupported(contentType)) {
     if (imageBroken || !srcData) {
       return (
         <div
diff --git a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
index 9bb250151..b01ed751d 100644
--- a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
+++ b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
@@ -45,12 +45,12 @@ const toSection = (
   messagesWithSection: Array<MediaItemWithSection> | undefined
 ): Section | undefined => {
   if (!messagesWithSection || messagesWithSection.length === 0) {
-    return;
+    return undefined;
   }
 
   const firstMediaItemWithSection: MediaItemWithSection = messagesWithSection[0];
   if (!firstMediaItemWithSection) {
-    return;
+    return undefined;
   }
 
   const mediaItems = messagesWithSection.map(messageWithSection => messageWithSection.mediaItem);
@@ -71,11 +71,7 @@ const toSection = (
         mediaItems,
       };
     default:
-      // NOTE: Investigate why we get the following error:
-      // error TS2345: Argument of type 'any' is not assignable to parameter
-      // of type 'never'.
-      // return missingCaseError(firstMediaItemWithSection.type);
-      return;
+      return undefined;
   }
 };
 
diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
index 1d5e7e8ac..88cb65155 100644
--- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
+++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -111,7 +111,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
   };
 
   return (
-    <StyledTrustSenderUI onClick={openConfirmationModal}>
+    <StyledTrustSenderUI onClick={e => void openConfirmationModal(e)}>
       <SessionIcon iconSize="small" iconType="gallery" />
       <ClickToDownload>{window.i18n('clickToTrustContact')}</ClickToDownload>
     </StyledTrustSenderUI>
diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx
index 764abe9cb..18f98c894 100644
--- a/ts/components/conversation/message/message-content/MessageAttachment.tsx
+++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
+import classNames from 'classnames';
 import { clone } from 'lodash';
 import { Data } from '../../../../data/data';
 import { MessageModelType, MessageRenderingProps } from '../../../../models/messageType';
@@ -29,8 +31,6 @@ import { AudioPlayerWithEncryptedFile } from '../../H5AudioPlayer';
 import { ImageGrid } from '../../ImageGrid';
 import { LightBoxOptions } from '../../SessionConversation';
 import { ClickToTrustSender } from './ClickToTrustSender';
-import styled from 'styled-components';
-import classNames from 'classnames';
 import { StyledMessageHighlighter } from './MessageContent';
 
 export type MessageAttachmentSelectorProps = Pick<
@@ -51,7 +51,6 @@ type Props = {
   handleImageError: () => void;
   highlight?: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const StyledAttachmentContainer = styled.div<{
   messageDirection: MessageModelType;
@@ -63,7 +62,6 @@ const StyledAttachmentContainer = styled.div<{
   justify-content: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')};
 `;
 
-// tslint:disable-next-line max-func-body-length cyclomatic-complexity
 export const MessageAttachment = (props: Props) => {
   const { messageId, imageBroken, handleImageError, highlight = false } = props;
 
@@ -82,21 +80,21 @@ export const MessageAttachment = (props: Props) => {
         });
       }
     },
-    [messageId, multiSelectMode]
+    [dispatch, messageId, multiSelectMode]
   );
 
   const onClickOnGenericAttachment = useCallback(
     (e: any) => {
       e.stopPropagation();
       e.preventDefault();
-      if (!attachments?.length) {
+      if (!attachmentProps?.attachments?.length) {
         return;
       }
 
       const messageTimestamp = attachmentProps?.timestamp || attachmentProps?.serverTimestamp || 0;
       if (attachmentProps?.sender && attachmentProps?.convoId) {
         void saveAttachmentToDisk({
-          attachment: attachments[0],
+          attachment: attachmentProps?.attachments[0],
           messageTimestamp,
           messageSender: attachmentProps?.sender,
           conversationId: attachmentProps?.convoId,
diff --git a/ts/components/conversation/message/message-content/MessageAuthorText.tsx b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
index a77d8342d..8ebd3b19b 100644
--- a/ts/components/conversation/message/message-content/MessageAuthorText.tsx
+++ b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
@@ -36,7 +36,7 @@ export const MessageAuthorText = (props: Props) => {
     return null;
   }
 
-  const title = authorName ? authorName : sender;
+  const title = authorName || sender;
 
   if (direction !== 'incoming' || !isGroup || !title || !firstMessageOfSeries) {
     return null;
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 85e71eb6c..0994be253 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -16,14 +16,13 @@ import {
   useLastMessageOfSeries,
   useMessageAuthor,
   useMessageSenderIsAdmin,
-} from '../../../../state/selectors/';
+} from '../../../../state/selectors';
 import {
   getSelectedCanWrite,
   useSelectedConversationKey,
   useSelectedIsPublic,
 } from '../../../../state/selectors/selectedConversation';
 import { Avatar, AvatarSize, CrownIcon } from '../../../avatar/Avatar';
-// tslint:disable: use-simple-attributes
 
 const StyledAvatar = styled.div`
   position: relative;
@@ -54,13 +53,12 @@ export const MessageAvatar = (props: Props) => {
   const lastMessageOfSeries = useLastMessageOfSeries(messageId);
   const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 
-  if (!sender) {
-    return null;
-  }
-
   const userName = authorName || authorProfileName || sender;
 
   const onMessageAvatarClick = useCallback(async () => {
+    if (!sender) {
+      return;
+    }
     if (isPublic && !PubKey.isBlinded(sender)) {
       // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user.
       // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs
@@ -112,15 +110,19 @@ export const MessageAvatar = (props: Props) => {
 
       return;
     }
-    //not public, i.e. closed group. Just open dialog for the user to do what he wants
+    // not public, i.e. closed group. Just open dialog for the user to do what he wants
     dispatch(
       updateUserDetailsModal({
         conversationId: sender,
-        userName,
+        userName: userName || '',
         authorAvatarPath,
       })
     );
-  }, [userName, sender, isPublic, authorAvatarPath, selectedConvoKey]);
+  }, [dispatch, isTypingEnabled, userName, sender, isPublic, authorAvatarPath, selectedConvoKey]);
+
+  if (!sender) {
+    return null;
+  }
 
   if (isPrivate) {
     return null;
@@ -137,7 +139,11 @@ export const MessageAvatar = (props: Props) => {
         visibility: hideAvatar ? 'hidden' : undefined,
       }}
     >
-      <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
+      <Avatar
+        size={AvatarSize.S}
+        onAvatarClick={() => void onMessageAvatarClick()}
+        pubkey={sender}
+      />
       {isSenderAdmin && <CrownIcon />}
     </StyledAvatar>
   );
diff --git a/ts/components/conversation/message/message-content/MessageBody.tsx b/ts/components/conversation/message/message-content/MessageBody.tsx
index ba4c67567..4bd3c2efd 100644
--- a/ts/components/conversation/message/message-content/MessageBody.tsx
+++ b/ts/components/conversation/message/message-content/MessageBody.tsx
@@ -1,15 +1,15 @@
-import React, { useCallback } from 'react';
-import { useDispatch } from 'react-redux';
 import LinkifyIt from 'linkify-it';
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import styled from 'styled-components';
 
 import { RenderTextCallbackType } from '../../../../types/Util';
 import { getEmojiSizeClass, SizeClassType } from '../../../../util/emoji';
+import { LinkPreviews } from '../../../../util/linkPreviews';
+import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
 import { AddMentions } from '../../AddMentions';
 import { AddNewLines } from '../../AddNewLines';
 import { Emojify } from '../../Emojify';
-import { LinkPreviews } from '../../../../util/linkPreviews';
-import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
-import styled from 'styled-components';
 
 const linkify = LinkifyIt();
 
@@ -30,7 +30,6 @@ export const renderTextDefault: RenderTextCallbackType = ({ text }) => <>{text}<
 
 const renderNewLines: RenderTextCallbackType = ({ text: textWithNewLines, key, isGroup }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <AddNewLines
       key={key}
       text={textWithNewLines}
@@ -106,17 +105,6 @@ const Linkify = (props: LinkifyProps): JSX.Element => {
   const matchData = linkify.match(text) || [];
   let last = 0;
 
-  // disable click on <a> elements so clicking a message containing a link doesn't
-  // select the message. The link will still be opened in the browser.
-  const handleClick = useCallback((e: any) => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    const url = e.target.href;
-
-    showLinkVisitWarningDialog(url, dispatch);
-  }, []);
-
   if (matchData.length === 0) {
     return renderNonLink({ text, key: 0, isGroup });
   }
@@ -130,8 +118,19 @@ const Linkify = (props: LinkifyProps): JSX.Element => {
     const { url, text: originalText } = match;
     const isLink = SUPPORTED_PROTOCOLS.test(url) && !LinkPreviews.isLinkSneaky(url);
     if (isLink) {
+      // disable click on <a> elements so clicking a message containing a link doesn't
+      // select the message. The link will still be opened in the browser.
+
       results.push(
-        <a key={count++} href={url} onClick={handleClick}>
+        <a
+          key={count++}
+          href={url}
+          onClick={e => {
+            e.preventDefault();
+            e.stopPropagation();
+            showLinkVisitWarningDialog(url, dispatch);
+          }}
+        >
           {originalText}
         </a>
       );
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index b9f84062e..2d5aaef32 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -28,6 +28,8 @@ type Props = {
   isDetailView?: boolean;
 };
 
+// TODO not too sure what is this doing? It is not preventDefault()
+// or stopPropagation() so I think this is never cancelling a click event?
 function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>) {
   const selection = window.getSelection();
   // Text is being selected
@@ -38,6 +40,7 @@ function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>)
   // User clicked on message body
   const target = event.target as HTMLDivElement;
   if (target.className === 'text-selectable' || window.contextMenuShown) {
+    // eslint-disable-next-line no-useless-return
     return;
   }
 }
@@ -86,7 +89,6 @@ const StyledMessageOpaqueContent = styled(StyledMessageHighlighter)<{
 `;
 
 export const IsMessageVisibleContext = createContext(false);
-// tslint:disable: use-simple-attributes
 
 export const MessageContent = (props: Props) => {
   const [highlight, setHighlight] = useState(false);
@@ -101,7 +103,7 @@ export const MessageContent = (props: Props) => {
 
   const [imageBroken, setImageBroken] = useState(false);
 
-  const onVisible = (inView: boolean | Object) => {
+  const onVisible = (inView: boolean | object) => {
     if (
       inView === true ||
       ((inView as any).type === 'focus' && (inView as any).returnValue === true)
@@ -123,7 +125,7 @@ export const MessageContent = (props: Props) => {
   useLayoutEffect(() => {
     if (isQuotedMessageToAnimate) {
       if (!highlight && !didScroll) {
-        //scroll to me and flash me
+        // scroll to me and flash me
         scrollToLoadedMessage(props.messageId, 'quote-or-search-result');
         setDidScroll(true);
         if (shouldHighlightMessage) {
@@ -139,8 +141,14 @@ export const MessageContent = (props: Props) => {
     if (didScroll) {
       setDidScroll(false);
     }
-    return;
-  });
+  }, [
+    isQuotedMessageToAnimate,
+    highlight,
+    didScroll,
+    scrollToLoadedMessage,
+    props.messageId,
+    shouldHighlightMessage,
+  ]);
 
   if (!contentProps) {
     return null;
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index 9296ee1c9..ad0e1bff9 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -11,7 +11,7 @@ import {
   isMessageSelectionMode,
 } from '../../../../state/selectors/conversations';
 import { Reactions } from '../../../../util/reactions';
-import { MessageAvatar } from '../message-content/MessageAvatar';
+import { MessageAvatar } from './MessageAvatar';
 import { MessageAuthorText } from './MessageAuthorText';
 import { MessageContent } from './MessageContent';
 import { MessageContextMenu } from './MessageContextMenu';
@@ -30,7 +30,6 @@ type Props = {
   dataTestId?: string;
   enableReactions: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' }>`
   display: flex;
@@ -60,13 +59,13 @@ export const MessageContentWithStatuses = (props: Props) => {
 
   const onClickOnMessageOuterContainer = useCallback(
     (event: React.MouseEvent<HTMLDivElement>) => {
-      if (multiSelectMode && messageId) {
+      if (multiSelectMode && props?.messageId) {
         event.preventDefault();
         event.stopPropagation();
-        dispatch(toggleSelectedMessageId(messageId));
+        dispatch(toggleSelectedMessageId(props?.messageId));
       }
     },
-    [window.contextMenuShown, props?.messageId, multiSelectMode, props?.isDetailView]
+    [dispatch, props?.messageId, multiSelectMode]
   );
 
   const onDoubleClickReplyToMessage = (e: React.MouseEvent<HTMLDivElement>) => {
@@ -84,12 +83,12 @@ export const MessageContentWithStatuses = (props: Props) => {
         void replyToMessage(messageId);
         currentSelection?.empty();
         e.preventDefault();
-        return;
       }
     }
   };
 
   const { messageId, ctxMenuID, isDetailView, dataTestId, enableReactions } = props;
+  const [popupReaction, setPopupReaction] = useState('');
 
   if (!contentProps) {
     return null;
@@ -100,8 +99,6 @@ export const MessageContentWithStatuses = (props: Props) => {
   const isPrivate = conversationType === 'private';
   const hideAvatar = isPrivate || direction === 'outgoing';
 
-  const [popupReaction, setPopupReaction] = useState('');
-
   const handleMessageReaction = async (emoji: string) => {
     await Reactions.sendMessageReaction(messageId, emoji);
   };
@@ -150,7 +147,7 @@ export const MessageContentWithStatuses = (props: Props) => {
       {enableReactions && (
         <MessageReactions
           messageId={messageId}
-          onClick={handleMessageReaction}
+          onClick={emoji => void handleMessageReaction(emoji)}
           popupReaction={popupReaction}
           setPopupReaction={setPopupReaction}
           onPopupClick={handlePopupClick}
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index 7e8c70b1a..ec9b45850 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -2,10 +2,11 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { animation, Item, Menu, useContextMenu } from 'react-contexify';
 
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { useClickAway, useMouse } from 'react-use';
 import styled from 'styled-components';
 import { Data } from '../../../../data/data';
+
 import { MessageInteraction } from '../../../../interactions';
 import { replyToMessage } from '../../../../interactions/conversationInteractions';
 import {
@@ -22,8 +23,6 @@ import {
   showMessageDetailsView,
   toggleSelectedMessageId,
 } from '../../../../state/ducks/conversations';
-import { StateType } from '../../../../state/reducer';
-import { getMessageContextMenuProps } from '../../../../state/selectors/conversations';
 import {
   useSelectedConversationKey,
   useSelectedIsBlocked,
@@ -36,10 +35,21 @@ import { Reactions } from '../../../../util/reactions';
 import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer';
 import { SessionEmojiPanel, StyledEmojiPanel } from '../../SessionEmojiPanel';
 import { MessageReactBar } from './MessageReactBar';
+import {
+  useMessageAttachments,
+  useMessageBody,
+  useMessageDirection,
+  useMessageIsDeletable,
+  useMessageIsDeletableForEveryone,
+  useMessageSender,
+  useMessageSenderIsAdmin,
+  useMessageServerTimestamp,
+  useMessageStatus,
+  useMessageTimestamp,
+} from '../../../../state/selectors';
 
 export type MessageContextMenuSelectorProps = Pick<
   MessageRenderingProps,
-  | 'attachments'
   | 'sender'
   | 'direction'
   | 'status'
@@ -48,7 +58,6 @@ export type MessageContextMenuSelectorProps = Pick<
   | 'text'
   | 'serverTimestamp'
   | 'timestamp'
-  | 'isDeletableForEveryone'
 >;
 
 type Props = { messageId: string; contextMenuId: string; enableReactions: boolean };
@@ -76,7 +85,124 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>`
   }
 `;
 
-// tslint:disable: max-func-body-length cyclomatic-complexity
+const DeleteForEveryone = ({ messageId }: { messageId: string }) => {
+  const convoId = useSelectedConversationKey();
+  const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId);
+  if (!convoId || !isDeletableForEveryone) {
+    return null;
+  }
+  const onDeleteForEveryone = () => {
+    void deleteMessagesByIdForEveryone([messageId], convoId);
+  };
+
+  const unsendMessageText = window.i18n('deleteForEveryone');
+
+  return <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>;
+};
+
+type MessageId = { messageId: string };
+
+const SaveAttachment = ({ messageId }: MessageId) => {
+  const convoId = useSelectedConversationKey();
+  const attachments = useMessageAttachments(messageId);
+  const timestamp = useMessageTimestamp(messageId);
+  const serverTimestamp = useMessageServerTimestamp(messageId);
+
+  const sender = useMessageSender(messageId);
+  const saveAttachment = useCallback(
+    (e: any) => {
+      // this is quite dirty but considering that we want the context menu of the message to show on click on the attachment
+      // and the context menu save attachment item to save the right attachment I did not find a better way for now.
+      let targetAttachmentIndex = e.triggerEvent.path[1].getAttribute('data-attachmentindex');
+      e.event.stopPropagation();
+      if (!attachments?.length || !convoId || !sender) {
+        return;
+      }
+
+      if (!targetAttachmentIndex) {
+        targetAttachmentIndex = 0;
+      }
+      if (targetAttachmentIndex > attachments.length) {
+        return;
+      }
+      const messageTimestamp = timestamp || serverTimestamp || 0;
+      void saveAttachmentToDisk({
+        attachment: attachments[targetAttachmentIndex],
+        messageTimestamp,
+        messageSender: sender,
+        conversationId: convoId,
+      });
+    },
+    [convoId, sender, attachments, serverTimestamp, timestamp]
+  );
+
+  if (!convoId) {
+    return null;
+  }
+
+  return attachments?.length ? (
+    <Item onClick={saveAttachment}>{window.i18n('downloadAttachment')}</Item>
+  ) : null;
+};
+
+const AdminActionItems = ({ messageId }: MessageId) => {
+  const convoId = useSelectedConversationKey();
+
+  const weAreModerator = useSelectedWeAreModerator();
+  const weAreAdmin = useSelectedWeAreAdmin();
+  const showAdminActions = weAreAdmin || weAreModerator;
+  const sender = useMessageSender(messageId);
+  const isSenderAdmin = useMessageSenderIsAdmin(messageId);
+
+  if (!convoId || !sender) {
+    return null;
+  }
+
+  const addModerator = () => {
+    void addSenderAsModerator(sender, convoId);
+  };
+
+  const removeModerator = () => {
+    void removeSenderFromModerator(sender, convoId);
+  };
+
+  const onBan = () => {
+    MessageInteraction.banUser(sender, convoId);
+  };
+
+  const onUnban = () => {
+    MessageInteraction.unbanUser(sender, convoId);
+  };
+
+  return showAdminActions ? (
+    <>
+      <Item onClick={onBan}>{window.i18n('banUser')}</Item>
+      <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
+      {isSenderAdmin ? (
+        <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
+      ) : (
+        <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
+      )}
+    </>
+  ) : null;
+};
+
+const RetryItem = ({ messageId }: MessageId) => {
+  const direction = useMessageDirection(messageId);
+
+  const status = useMessageStatus(messageId);
+  const isOutgoing = direction === 'outgoing';
+
+  const showRetry = status === 'error' && isOutgoing;
+  const onRetry = useCallback(async () => {
+    const found = await Data.getMessageById(messageId);
+    if (found) {
+      await found.retrySend();
+    }
+  }, [messageId]);
+  return showRetry ? <Item onClick={() => void onRetry()}>{window.i18n('resend')}</Item> : null;
+};
+
 export const MessageContextMenu = (props: Props) => {
   const { messageId, contextMenuId, enableReactions } = props;
   const dispatch = useDispatch();
@@ -85,32 +211,13 @@ export const MessageContextMenu = (props: Props) => {
   const isSelectedBlocked = useSelectedIsBlocked();
   const convoId = useSelectedConversationKey();
   const isPublic = useSelectedIsPublic();
-  const weAreModerator = useSelectedWeAreModerator();
-  const weAreAdmin = useSelectedWeAreAdmin();
 
-  const showAdminActions = weAreAdmin || weAreModerator;
-
-  const selected = useSelector((state: StateType) => getMessageContextMenuProps(state, messageId));
-
-  if (!selected || !convoId) {
-    return null;
-  }
-
-  const {
-    attachments,
-    sender,
-    direction,
-    status,
-    isDeletable,
-    isDeletableForEveryone,
-    isSenderAdmin,
-    text,
-    serverTimestamp,
-    timestamp,
-  } = selected;
+  const direction = useMessageDirection(messageId);
+  const status = useMessageStatus(messageId);
+  const isDeletable = useMessageIsDeletable(messageId);
+  const text = useMessageBody(messageId);
 
   const isOutgoing = direction === 'outgoing';
-  const showRetry = status === 'error' && isOutgoing;
   const isSent = status === 'sent' || status === 'read'; // a read message should be replyable
 
   const emojiPanelRef = useRef<HTMLDivElement>(null);
@@ -152,15 +259,6 @@ export const MessageContextMenu = (props: Props) => {
 
   const selectMessageText = window.i18n('selectMessage');
   const deleteMessageJustForMeText = window.i18n('deleteJustForMe');
-  const unsendMessageText = window.i18n('deleteForEveryone');
-
-  const addModerator = useCallback(() => {
-    void addSenderAsModerator(sender, convoId);
-  }, [sender, convoId]);
-
-  const removeModerator = useCallback(() => {
-    void removeSenderFromModerator(sender, convoId);
-  }, [sender, convoId]);
 
   const onReply = useCallback(() => {
     if (isSelectedBlocked) {
@@ -170,62 +268,18 @@ export const MessageContextMenu = (props: Props) => {
     void replyToMessage(messageId);
   }, [isSelectedBlocked, messageId]);
 
-  const saveAttachment = useCallback(
-    (e: any) => {
-      // this is quite dirty but considering that we want the context menu of the message to show on click on the attachment
-      // and the context menu save attachment item to save the right attachment I did not find a better way for now.
-      let targetAttachmentIndex = e.triggerEvent.path[1].getAttribute('data-attachmentindex');
-      e.event.stopPropagation();
-      if (!attachments?.length) {
-        return;
-      }
-
-      if (!targetAttachmentIndex) {
-        targetAttachmentIndex = 0;
-      }
-      if (targetAttachmentIndex > attachments.length) {
-        return;
-      }
-      const messageTimestamp = timestamp || serverTimestamp || 0;
-      void saveAttachmentToDisk({
-        attachment: attachments[targetAttachmentIndex],
-        messageTimestamp,
-        messageSender: sender,
-        conversationId: convoId,
-      });
-    },
-    [convoId, sender, timestamp, serverTimestamp, convoId, attachments]
-  );
-
   const copyText = useCallback(() => {
     MessageInteraction.copyBodyToClipboard(text);
   }, [text]);
 
-  const onRetry = useCallback(async () => {
-    const found = await Data.getMessageById(messageId);
-    if (found) {
-      await found.retrySend();
-    }
-  }, [messageId]);
-
-  const onBan = useCallback(() => {
-    MessageInteraction.banUser(sender, convoId);
-  }, [sender, convoId]);
-
-  const onUnban = useCallback(() => {
-    MessageInteraction.unbanUser(sender, convoId);
-  }, [sender, convoId]);
-
   const onSelect = useCallback(() => {
     dispatch(toggleSelectedMessageId(messageId));
-  }, [messageId]);
+  }, [dispatch, messageId]);
 
   const onDelete = useCallback(() => {
-    void deleteMessagesById([messageId], convoId);
-  }, [convoId, messageId]);
-
-  const onDeleteForEveryone = useCallback(() => {
-    void deleteMessagesByIdForEveryone([messageId], convoId);
+    if (convoId) {
+      void deleteMessagesById([messageId], convoId);
+    }
   }, [convoId, messageId]);
 
   const onShowEmoji = () => {
@@ -241,7 +295,7 @@ export const MessageContextMenu = (props: Props) => {
   };
 
   const onEmojiLoseFocus = () => {
-    window.log.info('closed due to lost focus');
+    window.log.debug('closed due to lost focus');
     onCloseEmoji();
   };
 
@@ -262,7 +316,7 @@ export const MessageContextMenu = (props: Props) => {
   });
 
   useEffect(() => {
-    if (emojiPanelRef.current && emojiPanelRef.current) {
+    if (emojiPanelRef.current) {
       const { innerWidth: windowWidth, innerHeight: windowHeight } = window;
 
       if (mouseX + emojiPanelWidth > windowWidth) {
@@ -284,15 +338,18 @@ export const MessageContextMenu = (props: Props) => {
         setMouseY(mouseY - y);
       }
     }
-  }, [emojiPanelRef.current, emojiPanelWidth, emojiPanelHeight, mouseX, mouseY]);
+  }, [emojiPanelWidth, emojiPanelHeight, mouseX, mouseY]);
 
+  if (!convoId) {
+    return null;
+  }
   return (
     <StyledMessageContextMenu ref={contextMenuRef}>
       {enableReactions && showEmojiPanel && (
         <StyledEmojiPanelContainer role="button" x={mouseX} y={mouseY}>
           <SessionEmojiPanel
             ref={emojiPanelRef}
-            onEmojiClicked={onEmojiClick}
+            onEmojiClicked={e => void onEmojiClick(e)}
             show={showEmojiPanel}
             isModal={true}
             onKeyDown={onEmojiKeyDown}
@@ -307,46 +364,24 @@ export const MessageContextMenu = (props: Props) => {
           animation={animation.fade}
         >
           {enableReactions && (
-            <MessageReactBar action={onEmojiClick} additionalAction={onShowEmoji} />
+            <MessageReactBar action={e => void onEmojiClick(e)} additionalAction={onShowEmoji} />
           )}
-          {attachments?.length ? (
-            <Item onClick={saveAttachment}>{window.i18n('downloadAttachment')}</Item>
-          ) : null}
+          <SaveAttachment messageId={messageId} />
 
           <Item onClick={copyText}>{window.i18n('copyMessage')}</Item>
           {(isSent || !isOutgoing) && (
             <Item onClick={onReply}>{window.i18n('replyToMessage')}</Item>
           )}
           {(!isPublic || isOutgoing) && (
-            <Item onClick={onShowDetail}>{window.i18n('moreInformation')}</Item>
+            <Item onClick={() => void onShowDetail()}>{window.i18n('moreInformation')}</Item>
           )}
-          {showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null}
-          {isDeletable ? (
-            <>
-              <Item onClick={onSelect}>{selectMessageText}</Item>
-            </>
-          ) : null}
+          <RetryItem messageId={messageId} />
+          {isDeletable ? <Item onClick={onSelect}>{selectMessageText}</Item> : null}
           {isDeletable && !isPublic ? (
-            <>
-              <Item onClick={onDelete}>{deleteMessageJustForMeText}</Item>
-            </>
-          ) : null}
-          {isDeletableForEveryone ? (
-            <>
-              <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>
-            </>
-          ) : null}
-          {showAdminActions ? (
-            <>
-              <Item onClick={onBan}>{window.i18n('banUser')}</Item>
-              <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
-              {isSenderAdmin ? (
-                <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
-              ) : (
-                <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
-              )}
-            </>
+            <Item onClick={onDelete}>{deleteMessageJustForMeText}</Item>
           ) : null}
+          <DeleteForEveryone messageId={messageId} />
+          <AdminActionItems messageId={messageId} />
         </Menu>
       </SessionContextMenuContainer>
     </StyledMessageContextMenu>
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index fc196f39e..054c9707c 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -1,5 +1,5 @@
 import { isEmpty, toNumber } from 'lodash';
-import React, { useCallback } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { Data } from '../../../../data/data';
 import { MessageRenderingProps } from '../../../../models/messageType';
@@ -10,12 +10,9 @@ import { useMessageDirection } from '../../../../state/selectors';
 import {
   getMessageQuoteProps,
   isMessageDetailView,
-  isMessageSelectionMode,
 } from '../../../../state/selectors/conversations';
 import { Quote } from './quote/Quote';
 
-// tslint:disable: use-simple-attributes
-
 type Props = {
   messageId: string;
 };
@@ -25,7 +22,6 @@ export type MessageQuoteSelectorProps = Pick<MessageRenderingProps, 'quote' | 'd
 export const MessageQuote = (props: Props) => {
   const selected = useSelector((state: StateType) => getMessageQuoteProps(state, props.messageId));
   const direction = useMessageDirection(props.messageId);
-  const multiSelectMode = useSelector(isMessageSelectionMode);
   const isMessageDetailViewMode = useSelector(isMessageDetailView);
 
   if (!selected || isEmpty(selected)) {
@@ -42,70 +38,67 @@ export const MessageQuote = (props: Props) => {
     quote.referencedMessageNotFound || !quote?.author || !quote.id || !quote.convoId
   );
 
-  const onQuoteClick = useCallback(
-    async (event: React.MouseEvent<HTMLDivElement>) => {
-      event.preventDefault();
-      event.stopPropagation();
+  const onQuoteClick = async (event: React.MouseEvent<HTMLDivElement>) => {
+    event.preventDefault();
+    event.stopPropagation();
 
-      if (!quote) {
-        ToastUtils.pushOriginalNotFound();
-        window.log.warn('onQuoteClick: quote not valid');
-        return;
-      }
+    if (!quote) {
+      ToastUtils.pushOriginalNotFound();
+      window.log.warn('onQuoteClick: quote not valid');
+      return;
+    }
 
-      if (isMessageDetailViewMode) {
-        // trying to scroll while in the container while the message detail view is shown has unknown effects
-        return;
-      }
+    if (isMessageDetailViewMode) {
+      // trying to scroll while in the container while the message detail view is shown has unknown effects
+      return;
+    }
 
-      let conversationKey = String(quote.convoId);
-      let messageIdToNavigateTo = String(quote.id);
-      let quoteNotFoundInDB = false;
+    let conversationKey = String(quote.convoId);
+    let messageIdToNavigateTo = String(quote.id);
+    let quoteNotFoundInDB = false;
 
-      // If the quote is not found in memory, we try to find it in the DB
-      if (quoteNotFound && quote.id && quote.author) {
-        // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
-        // this will return an array of sent messages by id that we have locally.
-        const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
-          {
-            timestamp: toNumber(quote.id),
-            source: quote.author,
-          },
-        ]);
+    // If the quote is not found in memory, we try to find it in the DB
+    if (quoteNotFound && quote.id && quote.author) {
+      // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
+      // this will return an array of sent messages by id that we have locally.
+      const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
+        {
+          timestamp: toNumber(quote.id),
+          source: quote.author,
+        },
+      ]);
 
-        if (quotedMessagesCollection?.length) {
-          const quotedMessage = quotedMessagesCollection.at(0);
-          // If found, we navigate to the quoted message which also refreshes the message quote component
-          if (quotedMessage) {
-            conversationKey = String(quotedMessage.get('conversationId'));
-            messageIdToNavigateTo = String(quotedMessage.id);
-          } else {
-            quoteNotFoundInDB = true;
-          }
+      if (quotedMessagesCollection?.length) {
+        const quotedMessage = quotedMessagesCollection.at(0);
+        // If found, we navigate to the quoted message which also refreshes the message quote component
+        if (quotedMessage) {
+          conversationKey = String(quotedMessage.get('conversationId'));
+          messageIdToNavigateTo = String(quotedMessage.id);
         } else {
           quoteNotFoundInDB = true;
         }
+      } else {
+        quoteNotFoundInDB = true;
       }
+    }
 
-      // For simplicity's sake, we show the 'not found' toast no matter what if we were
-      // not able to find the referenced message when the quote was received or if the conversation no longer exists.
-      if (quoteNotFoundInDB) {
-        ToastUtils.pushOriginalNotFound();
-        return;
-      }
+    // For simplicity's sake, we show the 'not found' toast no matter what if we were
+    // not able to find the referenced message when the quote was received or if the conversation no longer exists.
+    if (quoteNotFoundInDB) {
+      ToastUtils.pushOriginalNotFound();
+      return;
+    }
 
-      void openConversationToSpecificMessage({
-        conversationKey,
-        messageIdToNavigateTo,
-        shouldHighlightMessage: true,
-      });
-    },
-    [isMessageDetailViewMode, multiSelectMode, quote, quoteNotFound]
-  );
+    void openConversationToSpecificMessage({
+      conversationKey,
+      messageIdToNavigateTo,
+      shouldHighlightMessage: true,
+    });
+  };
 
   return (
     <Quote
-      onClick={onQuoteClick}
+      onClick={e => void onQuoteClick(e)}
       text={quote?.text}
       attachment={quote?.attachment}
       isIncoming={direction === 'incoming'}
diff --git a/ts/components/conversation/message/message-content/MessageReactBar.tsx b/ts/components/conversation/message/message-content/MessageReactBar.tsx
index 68c2f2c25..34068ef0a 100644
--- a/ts/components/conversation/message/message-content/MessageReactBar.tsx
+++ b/ts/components/conversation/message/message-content/MessageReactBar.tsx
@@ -1,10 +1,12 @@
-import React, { ReactElement, useEffect, useState } from 'react';
+import { isEqual } from 'lodash';
+import React, { ReactElement, useState } from 'react';
+import useMount from 'react-use/lib/useMount';
 import styled from 'styled-components';
+
+import { RecentReactions } from '../../../../types/Reaction';
+import { nativeEmojiData } from '../../../../util/emoji';
 import { getRecentReactions } from '../../../../util/storage';
 import { SessionIconButton } from '../../../icon';
-import { nativeEmojiData } from '../../../../util/emoji';
-import { isEqual } from 'lodash';
-import { RecentReactions } from '../../../../types/Reaction';
 
 type Props = {
   action: (...args: Array<any>) => void;
@@ -53,12 +55,12 @@ export const MessageReactBar = (props: Props): ReactElement => {
   const { action, additionalAction } = props;
   const [recentReactions, setRecentReactions] = useState<RecentReactions>();
 
-  useEffect(() => {
+  useMount(() => {
     const reactions = new RecentReactions(getRecentReactions());
     if (reactions && !isEqual(reactions, recentReactions)) {
       setRecentReactions(reactions);
     }
-  }, []);
+  });
 
   if (!recentReactions) {
     return <></>;
diff --git a/ts/components/conversation/message/message-content/Quote.tsx b/ts/components/conversation/message/message-content/Quote.tsx
index 7b8fb5b14..e2a29d634 100644
--- a/ts/components/conversation/message/message-content/Quote.tsx
+++ b/ts/components/conversation/message/message-content/Quote.tsx
@@ -1,10 +1,10 @@
 import classNames from 'classnames';
 import React, { useState } from 'react';
-
-import * as MIME from '../../../../../ts/types/MIME';
-import * as GoogleChrome from '../../../../../ts/util/GoogleChrome';
-
 import { noop } from 'lodash';
+
+import * as MIME from '../../../../types/MIME';
+import * as GoogleChrome from '../../../../util/GoogleChrome';
+
 import { useDisableDrag } from '../../../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../../../hooks/useEncryptedFileFetch';
 import { PubKey } from '../../../../session/types';
@@ -61,7 +61,7 @@ function getObjectUrl(thumbnail: Attachment | undefined): string | undefined {
     return thumbnail.objectUrl;
   }
 
-  return;
+  return undefined;
 }
 
 function getTypeLabel({
@@ -84,7 +84,7 @@ function getTypeLabel({
     return window.i18n('audio');
   }
 
-  return;
+  return undefined;
 }
 export const QuoteIcon = (props: any) => {
   const { icon } = props;
diff --git a/ts/components/conversation/message/message-content/quote/Quote.tsx b/ts/components/conversation/message/message-content/quote/Quote.tsx
index 76ddbe79c..342ee705c 100644
--- a/ts/components/conversation/message/message-content/quote/Quote.tsx
+++ b/ts/components/conversation/message/message-content/quote/Quote.tsx
@@ -1,13 +1,12 @@
 import React, { MouseEvent, useState } from 'react';
 
-import * as MIME from '../../../../../types/MIME';
-
 import { isEmpty } from 'lodash';
 import styled from 'styled-components';
 import { useIsMessageSelectionMode } from '../../../../../state/selectors/selectedConversation';
 import { QuoteAuthor } from './QuoteAuthor';
 import { QuoteIconContainer } from './QuoteIconContainer';
 import { QuoteText } from './QuoteText';
+import * as MIME from '../../../../../types/MIME';
 
 const StyledQuoteContainer = styled.div`
   min-width: 300px; // if the quoted content is small it doesn't look very good so we set a minimum
diff --git a/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx b/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
index c568aab56..e479a3562 100644
--- a/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
+++ b/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
+import { isEmpty, noop } from 'lodash';
+import styled from 'styled-components';
+
 import { QuotedAttachmentThumbnailType, QuoteProps } from './Quote';
 import { GoogleChrome } from '../../../../../util';
 import { MIME } from '../../../../../types';
 
-import { isEmpty, noop } from 'lodash';
 import { QuoteImage } from './QuoteImage';
-import styled from 'styled-components';
 import { icons, SessionIconType } from '../../../../icon';
 
 function getObjectUrl(thumbnail: QuotedAttachmentThumbnailType | undefined): string | undefined {
@@ -13,7 +14,7 @@ function getObjectUrl(thumbnail: QuotedAttachmentThumbnailType | undefined): str
     return thumbnail.objectUrl;
   }
 
-  return;
+  return undefined;
 }
 
 const StyledQuoteIconContainer = styled.div`
diff --git a/ts/components/conversation/message/message-content/quote/QuoteImage.tsx b/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
index 2eb4b5117..24b29ab54 100644
--- a/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
+++ b/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
+import styled from 'styled-components';
+import { isEmpty } from 'lodash';
+
 import { useDisableDrag } from '../../../../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../../../../hooks/useEncryptedFileFetch';
-import styled from 'styled-components';
+
 import { icons } from '../../../../icon';
-import { isEmpty } from 'lodash';
 import { QuoteIcon } from './QuoteIconContainer';
 
 const StyledQuoteImage = styled.div`
diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index 37acd24d9..775dd84e7 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -2,9 +2,11 @@ import classNames from 'classnames';
 import React, { useCallback, useEffect, useState } from 'react';
 import { contextMenu } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+import styled, { keyframes } from 'styled-components';
+
 import useInterval from 'react-use/lib/useInterval';
-import _ from 'lodash';
+import useMount from 'react-use/lib/useMount';
+
 import { Data } from '../../../../data/data';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { getConversationController } from '../../../../session/conversations';
@@ -17,11 +19,10 @@ import {
 import { getIncrement } from '../../../../util/timer';
 import { ExpireTimer } from '../../ExpireTimer';
 
-import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus';
-import { ReadableMessage } from './ReadableMessage';
-import styled, { keyframes } from 'styled-components';
 import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
+import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus';
 import { StyledMessageReactionsContainer } from '../message-content/MessageReactions';
+import { ReadableMessage } from './ReadableMessage';
 
 export type GenericReadableMessageSelectorProps = Pick<
   MessageRenderingProps,
@@ -81,7 +82,7 @@ function useIsExpired(props: ExpiringProps) {
         convo?.updateLastMessage();
       }
     }
-  }, [expirationTimestamp, expirationLength, isExpired, messageId, convoId]);
+  }, [dispatch, expirationTimestamp, expirationLength, isExpired, messageId, convoId]);
 
   let checkFrequency: number | null = null;
   if (expirationLength) {
@@ -89,9 +90,9 @@ function useIsExpired(props: ExpiringProps) {
     checkFrequency = Math.max(EXPIRATION_CHECK_MINIMUM, increment);
   }
 
-  useEffect(() => {
+  useMount(() => {
     void checkExpired();
-  }, []); // check on mount
+  });
   useInterval(checkExpired, checkFrequency); // check every 2sec or sooner if needed
 
   return { isExpired };
@@ -102,7 +103,6 @@ type Props = {
   ctxMenuID: string;
   isDetailView?: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const highlightedMessageAnimation = keyframes`
   1% {
diff --git a/ts/components/conversation/message/message-item/GroupInvitation.tsx b/ts/components/conversation/message/message-item/GroupInvitation.tsx
index ca11c53fd..efc31b1a1 100644
--- a/ts/components/conversation/message/message-item/GroupInvitation.tsx
+++ b/ts/components/conversation/message/message-item/GroupInvitation.tsx
@@ -1,10 +1,11 @@
-import React from 'react';
 import classNames from 'classnames';
-import { PropsForGroupInvitation } from '../../../../state/ducks/conversations';
+import React from 'react';
+import styled from 'styled-components';
+
 import { acceptOpenGroupInvitation } from '../../../../interactions/messageInteractions';
+import { PropsForGroupInvitation } from '../../../../state/ducks/conversations';
 import { SessionIconButton } from '../../../icon';
 import { ReadableMessage } from './ReadableMessage';
-import styled from 'styled-components';
 
 const StyledIconContainer = styled.div`
   background-color: var(--message-link-preview-background-color);
diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
index 92d6939a3..26761cbfe 100644
--- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
+++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
@@ -50,7 +50,6 @@ const ChangeItemLeft = (left: Array<string>): string => {
   return window.i18n(leftKey, [names.join(', ')]);
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const ChangeItem = (change: PropsForGroupUpdateType): string => {
   const { type } = change;
   switch (type) {
@@ -69,6 +68,7 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => {
       return window.i18n('updatedTheGroup');
     default:
       assertUnreachable(type, `ChangeItem: Missing case error "${type}"`);
+      return '';
   }
 };
 
diff --git a/ts/components/conversation/message/message-item/Message.tsx b/ts/components/conversation/message/message-item/Message.tsx
index bfa0778db..35af3ed0c 100644
--- a/ts/components/conversation/message/message-item/Message.tsx
+++ b/ts/components/conversation/message/message-item/Message.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
 
-import _ from 'lodash';
-import { v4 as uuidv4 } from 'uuid';
 import { useSelector } from 'react-redux';
+import { v4 as uuidv4 } from 'uuid';
 import { getGenericReadableMessageSelectorProps } from '../../../../state/selectors/conversations';
-import { GenericReadableMessage } from './GenericReadableMessage';
 import { THUMBNAIL_SIDE } from '../../../../types/attachments/VisualAttachment';
+import { GenericReadableMessage } from './GenericReadableMessage';
 
 // Same as MIN_WIDTH in ImageGrid.tsx
 export const MINIMUM_LINK_PREVIEW_IMAGE_WIDTH = THUMBNAIL_SIDE;
diff --git a/ts/components/conversation/message/message-item/MessageDetail.tsx b/ts/components/conversation/message/message-item/MessageDetail.tsx
index 4933ad74a..24653ca38 100644
--- a/ts/components/conversation/message/message-item/MessageDetail.tsx
+++ b/ts/components/conversation/message/message-item/MessageDetail.tsx
@@ -1,21 +1,22 @@
-import React from 'react';
 import classNames from 'classnames';
 import moment from 'moment';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
 
 import { Message } from './Message';
-import { useDispatch, useSelector } from 'react-redux';
-import { Avatar, AvatarSize } from '../../../avatar/Avatar';
+
 import { deleteMessagesById } from '../../../../interactions/conversations/unsendingInteractions';
 import {
-  closeMessageDetailsView,
   ContactPropsMessageDetail,
+  closeMessageDetailsView,
 } from '../../../../state/ducks/conversations';
 import { getMessageDetailsViewProps } from '../../../../state/selectors/conversations';
+import { Avatar, AvatarSize } from '../../../avatar/Avatar';
 import { ContactName } from '../../ContactName';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
+
 import { useMessageIsDeletable } from '../../../../state/selectors';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
 
 const AvatarItem = (props: { pubkey: string }) => {
   const { pubkey } = props;
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index f97480dec..b3abc292d 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -13,7 +13,6 @@ import {
 } from '../../../../state/ducks/conversations';
 import {
   areMoreMessagesBeingFetched,
-  getLoadedMessagesLength,
   getMostRecentMessageId,
   getOldestMessageId,
   getQuotedMessageToAnimate,
@@ -64,7 +63,6 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   const dispatch = useDispatch();
 
   const selectedConversationKey = useSelectedConversationKey();
-  const loadedMessagesLength = useSelector(getLoadedMessagesLength);
   const mostRecentMessageId = useSelector(getMostRecentMessageId);
   const oldestMessageId = useSelector(getOldestMessageId);
   const youngestMessageId = useSelector(getYoungestMessageId);
@@ -80,6 +78,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   // if this unread-indicator is rendered,
   // we want to scroll here only if the conversation was not opened to a specific message
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   useLayoutEffect(() => {
     if (
       props.messageId === youngestMessageId &&
@@ -96,8 +95,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   });
 
   const onVisible = useCallback(
-    // tslint:disable-next-line: cyclomatic-complexity
-    async (inView: boolean | Object) => {
+    async (inView: boolean | object) => {
       if (!selectedConversationKey) {
         return;
       }
@@ -160,20 +158,20 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
       }
     },
     [
+      dispatch,
       selectedConversationKey,
       mostRecentMessageId,
       oldestMessageId,
       fetchingMoreInProgress,
       isAppFocused,
-      loadedMessagesLength,
       receivedAt,
       messageId,
       isUnread,
+      youngestMessageId,
     ]
   );
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <InView
       id={`msg-${messageId}`}
       onContextMenu={onContextMenu}
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 124e57680..f0445a8c0 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -52,7 +52,6 @@ export type ReactionProps = {
   handlePopupReaction?: (emoji: string) => void;
   handlePopupClick?: () => void;
 };
-// tslint:disable-next-line: use-simple-attributes
 
 export const Reaction = (props: ReactionProps): ReactElement => {
   const {
diff --git a/ts/components/conversation/message/reactions/ReactionPopup.tsx b/ts/components/conversation/message/reactions/ReactionPopup.tsx
index 23082b095..cefd352cf 100644
--- a/ts/components/conversation/message/reactions/ReactionPopup.tsx
+++ b/ts/components/conversation/message/reactions/ReactionPopup.tsx
@@ -99,8 +99,8 @@ const generateContactsString = async (
 const Contacts = (contacts: Array<string>, count: number) => {
   const darkMode = useSelector(isDarkTheme);
 
-  if (!Boolean(contacts?.length > 0)) {
-    return;
+  if (!(contacts?.length > 0)) {
+    return null;
   }
 
   const reactors = contacts.length;
@@ -118,7 +118,8 @@ const Contacts = (contacts: Array<string>, count: number) => {
         <span>{window.i18n('reactionPopup')}</span>
       </StyledContacts>
     );
-  } else if (reactors > 3) {
+  }
+  if (reactors > 3) {
     return (
       <StyledContacts>
         {window.i18n('reactionPopupMany', [contacts[0], contacts[1], contacts[3]])}{' '}
@@ -128,9 +129,8 @@ const Contacts = (contacts: Array<string>, count: number) => {
         <span>{window.i18n('reactionPopup')}</span>
       </StyledContacts>
     );
-  } else {
-    return null;
   }
+  return null;
 };
 
 type Props = {
@@ -149,6 +149,7 @@ export const ReactionPopup = (props: Props): ReactElement => {
 
   useEffect(() => {
     let isCancelled = false;
+    // eslint-disable-next-line more/no-then
     generateContactsString(messageId, senders)
       .then(async results => {
         if (isCancelled) {
@@ -158,11 +159,7 @@ export const ReactionPopup = (props: Props): ReactElement => {
           setContacts(results);
         }
       })
-      .catch(() => {
-        if (isCancelled) {
-          return;
-        }
-      });
+      .catch(() => {});
 
     return () => {
       isCancelled = true;
diff --git a/ts/components/dialog/BanOrUnbanUserDialog.tsx b/ts/components/dialog/BanOrUnbanUserDialog.tsx
index 02ed38b93..41348238c 100644
--- a/ts/components/dialog/BanOrUnbanUserDialog.tsx
+++ b/ts/components/dialog/BanOrUnbanUserDialog.tsx
@@ -1,25 +1,24 @@
 import React, { useRef, useState } from 'react';
-import { PubKey } from '../../session/types';
-import { ToastUtils } from '../../session/utils';
-import { Flex } from '../basic/Flex';
 import { useDispatch, useSelector } from 'react-redux';
-import { BanType, updateBanOrUnbanUserModal } from '../../state/ducks/modalDialog';
-import { SpacerSM } from '../basic/Text';
-import { getConversationController } from '../../session/conversations/ConversationController';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { SessionSpinner } from '../basic/SessionSpinner';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { ConversationModel } from '../../models/conversation';
+
 import { useFocusMount } from '../../hooks/useFocusMount';
 import { useConversationPropsById } from '../../hooks/useParamSelector';
+import { ConversationModel } from '../../models/conversation';
 import {
   sogsV3BanUser,
   sogsV3UnbanUser,
 } from '../../session/apis/open_group_api/sogsv3/sogsV3BanUnban';
-import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
+import { getConversationController } from '../../session/conversations/ConversationController';
+import { PubKey } from '../../session/types';
+import { ToastUtils } from '../../session/utils';
+import { BanType, updateBanOrUnbanUserModal } from '../../state/ducks/modalDialog';
 import { isDarkTheme } from '../../state/selectors/theme';
-
-// tslint:disable: use-simple-attributes
+import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { Flex } from '../basic/Flex';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionSpinner } from '../basic/SessionSpinner';
+import { SpacerSM } from '../basic/Text';
 
 async function banOrUnBanUserCall(
   convo: ConversationModel,
@@ -45,10 +44,12 @@ async function banOrUnBanUserCall(
     if (!isChangeApplied) {
       window?.log?.warn(`failed to ${banType} user: ${isChangeApplied}`);
 
+      // eslint-disable-next-line no-unused-expressions
       banType === 'ban' ? ToastUtils.pushUserBanFailure() : ToastUtils.pushUserUnbanSuccess();
       return false;
     }
     window?.log?.info(`${pubkey.key} user ${banType}ned successfully...`);
+    // eslint-disable-next-line no-unused-expressions
     banType === 'ban' ? ToastUtils.pushUserBanSuccess() : ToastUtils.pushUserUnbanSuccess();
     return true;
   } catch (e) {
diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index 6a605ebc3..d91829143 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -211,7 +211,7 @@ export const DeleteAccountModal = () => {
    */
   const onClickCancelHandler = useCallback(() => {
     dispatch(updateDeleteAccountModal(null));
-  }, []);
+  }, [dispatch]);
 
   return (
     <SessionWrapperModal
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 34d4947a1..32e4e2d8a 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -1,6 +1,7 @@
+import autoBind from 'auto-bind';
 import React, { ChangeEvent, MouseEvent } from 'react';
 import { QRCode } from 'react-qr-svg';
-
+import styled from 'styled-components';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 
 import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
@@ -8,8 +9,6 @@ import { YourSessionIDPill, YourSessionIDSelectable } from '../basic/YourSession
 
 import { ConversationModel } from '../../models/conversation';
 
-import autoBind from 'auto-bind';
-import styled from 'styled-components';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MAX_USERNAME_BYTES } from '../../session/constants';
@@ -60,10 +59,10 @@ interface State {
   loading: boolean;
 }
 
-export class EditProfileDialog extends React.Component<{}, State> {
+export class EditProfileDialog extends React.Component<object, State> {
   private readonly convo: ConversationModel;
 
-  constructor(props: any) {
+  constructor(props: object) {
     super(props);
 
     autoBind(this);
@@ -164,7 +163,7 @@ export class EditProfileDialog extends React.Component<{}, State> {
             <div
               className="image-upload-section"
               role="button"
-              onClick={this.fireInputEvent}
+              onClick={() => void this.fireInputEvent()}
               data-testid="image-upload-section"
             />
             <div
@@ -303,6 +302,7 @@ export class EditProfileDialog extends React.Component<{}, State> {
           profileName: trimName,
           loading: true,
         },
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         async () => {
           await commitProfileEdits(newName, newAvatarObjectUrl);
           this.setState({
@@ -315,8 +315,6 @@ export class EditProfileDialog extends React.Component<{}, State> {
       );
     } catch (e) {
       ToastUtils.pushToastError('nameTooLong', window.i18n('displayNameTooLong'));
-
-      return;
     }
   }
 
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index f2d97abe3..0d0bedbe7 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import useKey from 'react-use/lib/useKey';
 
 import _ from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
@@ -8,16 +9,15 @@ import { getConversationController } from '../../session/conversations';
 import { ToastUtils, UserUtils } from '../../session/utils';
 import { updateInviteContactModal } from '../../state/ducks/modalDialog';
 import { SpacerLG } from '../basic/Text';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+
 import { useConversationPropsById } from '../../hooks/useParamSelector';
 import { useSet } from '../../hooks/useSet';
 import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
+import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups';
 import { getPrivateContactsPubkeys } from '../../state/selectors/conversations';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { MemberListItem } from '../MemberListItem';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 
 type Props = {
   conversationId: string;
@@ -37,6 +37,7 @@ async function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
       url: roomDetails?.fullUrlWithPubkey,
       name: convo.getNicknameOrRealUsernameOrPlaceholder(),
     };
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     pubkeys.forEach(async pubkeyStr => {
       const privateConvo = await getConversationController().getOrCreateAndWait(
         pubkeyStr,
@@ -96,7 +97,6 @@ const submitForClosedGroup = async (convoId: string, pubkeys: Array<string>) =>
   }
 };
 
-// tslint:disable-next-line: max-func-body-length
 const InviteContactsDialogInner = (props: Props) => {
   const { conversationId } = props;
   const dispatch = useDispatch();
diff --git a/ts/components/dialog/ModeratorsAddDialog.tsx b/ts/components/dialog/ModeratorsAddDialog.tsx
index 0aa694a5f..b8b3b3b35 100644
--- a/ts/components/dialog/ModeratorsAddDialog.tsx
+++ b/ts/components/dialog/ModeratorsAddDialog.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
 import { PubKey } from '../../session/types';
 import { ToastUtils } from '../../session/utils';
 import { Flex } from '../basic/Flex';
 import { getConversationController } from '../../session/conversations';
-import { useDispatch, useSelector } from 'react-redux';
 import { updateAddModeratorsModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
@@ -39,10 +40,10 @@ export const AddModeratorsDialog = (props: Props) => {
 
     try {
       setAddingInProgress(true);
-      let isAdded: any;
+
       // this is a v2 opengroup
       const roomInfos = convo.toOpenGroupV2();
-      isAdded = await sogsV3AddAdmin([pubkey], roomInfos);
+      const isAdded = await sogsV3AddAdmin([pubkey], roomInfos);
 
       if (!isAdded) {
         window?.log?.warn('failed to add moderators:', isAdded);
diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx
index 61a82c50a..7436b0eda 100644
--- a/ts/components/dialog/ModeratorsRemoveDialog.tsx
+++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx
@@ -1,15 +1,17 @@
 import React, { useState } from 'react';
+import { compact } from 'lodash';
+import { useDispatch } from 'react-redux';
+
 import { getConversationController } from '../../session/conversations';
 import { PubKey } from '../../session/types';
 import { ToastUtils } from '../../session/utils';
 import { Flex } from '../basic/Flex';
-import { compact } from 'lodash';
+
 import { updateRemoveModeratorsModal } from '../../state/ducks/modalDialog';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { MemberListItem } from '../MemberListItem';
-import { useDispatch } from 'react-redux';
 import { useConversationPropsById } from '../../hooks/useParamSelector';
 import { sogsV3RemoveAdmins } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods';
 
@@ -25,23 +27,21 @@ async function removeMods(convoId: string, modsToRemove: Array<string>) {
   window?.log?.info(`asked to remove moderators: ${modsToRemove}`);
 
   try {
-    let res;
     const convo = getConversationController().get(convoId);
 
     const roomInfos = convo.toOpenGroupV2();
     const modsToRemovePubkey = compact(modsToRemove.map(m => PubKey.from(m)));
-    res = await sogsV3RemoveAdmins(modsToRemovePubkey, roomInfos);
+    const res = await sogsV3RemoveAdmins(modsToRemovePubkey, roomInfos);
 
     if (!res) {
       window?.log?.warn('failed to remove moderators:', res);
 
       ToastUtils.pushFailedToRemoveFromModerator();
       return false;
-    } else {
-      window?.log?.info(`${modsToRemove} removed from moderators...`);
-      ToastUtils.pushUserRemovedFromModerators();
-      return true;
     }
+    window?.log?.info(`${modsToRemove} removed from moderators...`);
+    ToastUtils.pushUserRemovedFromModerators();
+    return true;
   } catch (e) {
     window?.log?.error('Got error while removing moderator:', e);
     return false;
diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx
index 1566424e7..c966697b9 100644
--- a/ts/components/dialog/OnionStatusPathDialog.tsx
+++ b/ts/components/dialog/OnionStatusPathDialog.tsx
@@ -3,9 +3,11 @@ import React from 'react';
 import { shell } from 'electron';
 
 import { useDispatch, useSelector } from 'react-redux';
+import useHover from 'react-use/lib/useHover';
+import styled from 'styled-components';
 
-import ip2country from 'ip2country';
 import countryLookup from 'country-code-lookup';
+import ip2country from 'ip2country';
 import { Snode } from '../../data/data';
 import { onionPathModal } from '../../state/ducks/modalDialog';
 import {
@@ -15,12 +17,10 @@ import {
   getOnionPathsCount,
 } from '../../state/selectors/onions';
 import { Flex } from '../basic/Flex';
-// tslint:disable-next-line: no-submodule-imports
-import useHover from 'react-use/lib/useHover';
+
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIcon, SessionIconButton } from '../icon';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import styled from 'styled-components';
 
 export type StatusLightType = {
   glowStartDelay: number;
@@ -202,7 +202,7 @@ export const ActionPanelOnionStatusLight = (props: {
 
   // start with red
   let iconColor = errorColor;
-  //if we are not online or the first path is not valid, we keep red as color
+  // if we are not online or the first path is not valid, we keep red as color
   if (isOnline && firstPathLength > 1) {
     iconColor =
       onionPathsCount >= 2 ? defaultColor : onionPathsCount >= 1 ? connectingColor : errorColor;
@@ -230,7 +230,6 @@ export const OnionPathModal = () => {
   };
   const dispatch = useDispatch();
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionWrapperModal
       title={window.i18n('onionPathIndicatorTitle')}
       confirmText={window.i18n('learnMore')}
diff --git a/ts/components/dialog/ReactClearAllModal.tsx b/ts/components/dialog/ReactClearAllModal.tsx
index 94a6d8bd3..fa3a07b6e 100644
--- a/ts/components/dialog/ReactClearAllModal.tsx
+++ b/ts/components/dialog/ReactClearAllModal.tsx
@@ -46,7 +46,6 @@ const StyledReactClearAllContainer = styled(Flex)`
   }
 `;
 
-// tslint:disable-next-line: max-func-body-length
 export const ReactClearAllModal = (props: Props): ReactElement => {
   const { reaction, messageId } = props;
 
diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx
index aa7beb9a6..b6ac1c840 100644
--- a/ts/components/dialog/ReactListModal.tsx
+++ b/ts/components/dialog/ReactListModal.tsx
@@ -1,5 +1,5 @@
 import { isEmpty, isEqual } from 'lodash';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
@@ -136,8 +136,8 @@ const ReactionSenders = (props: ReactionSendersProps) => {
             <Avatar
               size={AvatarSize.XS}
               pubkey={sender}
-              onAvatarClick={async () => {
-                await handleAvatarClick(sender);
+              onAvatarClick={() => {
+                void handleAvatarClick(sender);
               }}
             />
             {sender === me ? (
@@ -154,8 +154,8 @@ const ReactionSenders = (props: ReactionSendersProps) => {
             <SessionIconButton
               iconType="exit"
               iconSize="small"
-              onClick={async () => {
-                await handleRemoveReaction();
+              onClick={() => {
+                void handleRemoveReaction();
               }}
             />
           )}
@@ -174,7 +174,6 @@ const StyledCountText = styled.p`
     color: var(--text-primary);
   }
 `;
-// tslint:disable: use-simple-attributes
 
 const CountText = ({ count, emoji }: { count: number; emoji: string }) => {
   return (
@@ -219,13 +218,12 @@ const handleSenders = (senders: Array<string>, me: string) => {
   return updatedSenders;
 };
 
-// tslint:disable-next-line: max-func-body-length
 export const ReactListModal = (props: Props): ReactElement => {
   const { reaction, messageId } = props;
 
   const dispatch = useDispatch();
   const [reactions, setReactions] = useState<SortedReactionList>([]);
-  const reactionsMap = (reactions && Object.fromEntries(reactions)) || {};
+
   const [currentReact, setCurrentReact] = useState('');
   const [reactAriaLabel, setReactAriaLabel] = useState<string | undefined>();
   const [count, setCount] = useState<number | null>(null);
@@ -236,7 +234,12 @@ export const ReactListModal = (props: Props): ReactElement => {
   const weAreModerator = useSelectedWeAreModerator();
   const me = UserUtils.getOurPubKeyStrFromCache();
 
-  // tslint:disable: cyclomatic-complexity
+  const reactionsMap = useMemo(() => {
+    return (reactions && Object.fromEntries(reactions)) || {};
+  }, [reactions]);
+  const reactionsCount = reactionsMap[currentReact]?.count;
+
+  // TODO we should break down this useEffect, it is hard to read.
   useEffect(() => {
     if (currentReact === '' && currentReact !== reaction) {
       setReactAriaLabel(
@@ -278,7 +281,7 @@ export const ReactListModal = (props: Props): ReactElement => {
       setSenders([]);
     }
 
-    if (reactionsMap[currentReact]?.count && count !== reactionsMap[currentReact]?.count) {
+    if (reactionsCount && count !== reactionsCount) {
       setCount(reactionsMap[currentReact].count);
     }
   }, [
@@ -286,10 +289,11 @@ export const ReactListModal = (props: Props): ReactElement => {
     currentReact,
     me,
     reaction,
-    reactionsMap[currentReact]?.count,
+    reactionsCount,
     msgProps?.sortedReacts,
     reactionsMap,
     senders,
+    reactions,
   ]);
 
   if (!msgProps) {
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index 0169d3f2a..c5987d81f 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -1,14 +1,14 @@
-import React, { useState } from 'react';
-import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
-import { updateConfirmModal } from '../../state/ducks/modalDialog';
-import { SpacerLG } from '../basic/Text';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionSpinner } from '../basic/SessionSpinner';
-import { SessionIcon, SessionIconSize, SessionIconType } from '../icon';
-import { SessionWrapperModal } from '../SessionWrapperModal';
 import { Dispatch } from '@reduxjs/toolkit';
 import { shell } from 'electron';
+import React, { useState } from 'react';
 import { MessageInteraction } from '../../interactions';
+import { updateConfirmModal } from '../../state/ducks/modalDialog';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
+import { SessionSpinner } from '../basic/SessionSpinner';
+import { SpacerLG } from '../basic/Text';
+import { SessionIcon, SessionIconSize, SessionIconType } from '../icon';
 
 export interface SessionConfirmDialogProps {
   message?: string;
diff --git a/ts/components/dialog/SessionModal.tsx b/ts/components/dialog/SessionModal.tsx
deleted file mode 100644
index dafe1f05b..000000000
--- a/ts/components/dialog/SessionModal.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionIconButton, SessionIconType } from '../icon';
-
-interface Props {
-  title: string;
-  onClose: any;
-  showExitIcon?: boolean;
-  showHeader?: boolean;
-  headerReverse?: boolean;
-  //Maximum of two icons or buttons in header
-  headerIconButtons?: Array<{
-    iconType: SessionIconType;
-    iconRotation: number;
-    onClick?: any;
-  }>;
-  headerButtons?: Array<{
-    buttonType: SessionButtonType;
-    buttonColor: SessionButtonColor;
-    text: string;
-    onClick?: any;
-  }>;
-}
-
-interface State {
-  isVisible: boolean;
-}
-
-// NOTE This is currently unused.
-export class SessionModal extends React.PureComponent<Props, State> {
-  public static defaultProps = {
-    showExitIcon: true,
-    showHeader: true,
-    headerReverse: false,
-  };
-
-  private node: HTMLDivElement | null;
-
-  constructor(props: any) {
-    super(props);
-    this.state = {
-      isVisible: true,
-    };
-
-    this.close = this.close.bind(this);
-    this.onKeyUp = this.onKeyUp.bind(this);
-    this.node = null;
-  }
-
-  public componentDidMount() {
-    window.addEventListener('keyup', this.onKeyUp);
-
-    document.addEventListener('mousedown', this.handleClick, false);
-  }
-
-  public componentWillUnmount() {
-    window.removeEventListener('keyup', this.onKeyUp);
-
-    document.removeEventListener('mousedown', this.handleClick, false);
-  }
-
-  public handleClick = (e: any) => {
-    if (this.node && this.node.contains(e.target)) {
-      return;
-    }
-
-    this.close();
-  };
-
-  public render() {
-    const { title, headerIconButtons, showExitIcon, showHeader, headerReverse } = this.props;
-    const { isVisible } = this.state;
-
-    return isVisible ? (
-      <div ref={node => (this.node = node)} className={'session-modal'}>
-        {showHeader ? (
-          <>
-            <div className={classNames('session-modal__header', headerReverse && 'reverse')}>
-              <div className="session-modal__header__close">
-                {showExitIcon ? (
-                  <SessionIconButton
-                    iconType="exit"
-                    iconSize="small"
-                    onClick={this.close}
-                    dataTestId="modal-close-button"
-                  />
-                ) : null}
-              </div>
-              <div className="session-modal__header__title">{title}</div>
-              <div className="session-modal__header__icons">
-                {headerIconButtons
-                  ? headerIconButtons.map((iconItem: any) => {
-                      return (
-                        <SessionIconButton
-                          key={iconItem.iconType}
-                          iconType={iconItem.iconType}
-                          iconSize={'large'}
-                          iconRotation={iconItem.iconRotation}
-                          onClick={iconItem.onClick}
-                        />
-                      );
-                    })
-                  : null}
-              </div>
-            </div>
-          </>
-        ) : null}
-
-        <div className="session-modal__body">{this.props.children}</div>
-      </div>
-    ) : null;
-  }
-
-  public close() {
-    this.setState({
-      isVisible: false,
-    });
-
-    document.removeEventListener('mousedown', this.handleClick, false);
-
-    if (this.props.onClose) {
-      this.props.onClose();
-    }
-  }
-
-  public onKeyUp(event: any) {
-    switch (event.key) {
-      case 'Esc':
-      case 'Escape':
-        this.close();
-        break;
-      default:
-    }
-  }
-}
diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx
index 69f4b65d8..008d34185 100644
--- a/ts/components/dialog/SessionNicknameDialog.tsx
+++ b/ts/components/dialog/SessionNicknameDialog.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
+import _ from 'lodash';
+import { useDispatch } from 'react-redux';
+
 import { getConversationController } from '../../session/conversations';
 
-import _ from 'lodash';
 import { SpacerLG } from '../basic/Text';
-import { useDispatch } from 'react-redux';
 import { changeNickNameModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionWrapperModal } from '../SessionWrapperModal';
diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx
index dcb94b658..1eafcf538 100644
--- a/ts/components/dialog/SessionPasswordDialog.tsx
+++ b/ts/components/dialog/SessionPasswordDialog.tsx
@@ -1,9 +1,10 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
+import autoBind from 'auto-bind';
 
 import { ToastUtils } from '../../session/utils';
 import { Data } from '../../data/data';
 import { SpacerSM } from '../basic/Text';
-import autoBind from 'auto-bind';
 import { sessionPassword } from '../../state/ducks/modalDialog';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
@@ -45,8 +46,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
     document.addEventListener('keyup', this.onEnterPressed);
 
     setTimeout(() => {
-      // tslint:disable-next-line: no-unused-expression
-      this.passportInput && this.passportInput.focus();
+      this.passportInput?.focus();
     }, 1);
   }
 
@@ -270,7 +270,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
   private async onEnterPressed(event: any) {
     if (event.key === 'Enter') {
       event.stopPropagation();
-      return this.setPassword();
+      await this.setPassword();
     }
   }
 
@@ -293,7 +293,6 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
     this.closeDialog();
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   private async setPassword() {
     const { passwordAction } = this.props;
     const {
diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx
index 1b78900db..ba6eba3a0 100644
--- a/ts/components/dialog/SessionSeedModal.tsx
+++ b/ts/components/dialog/SessionSeedModal.tsx
@@ -1,18 +1,21 @@
-import React, { MouseEvent, useEffect, useState } from 'react';
+import React, { MouseEvent, useState } from 'react';
+import { QRCode } from 'react-qr-svg';
+import { useDispatch } from 'react-redux';
+import useMount from 'react-use/lib/useMount';
+import styled from 'styled-components';
 
+import { Data } from '../../data/data';
 import { ToastUtils } from '../../session/utils';
 import { matchesHash } from '../../util/passwordUtils';
-import { Data } from '../../data/data';
-import { QRCode } from 'react-qr-svg';
-import { mn_decode } from '../../session/crypto/mnemonic';
-import { SpacerSM } from '../basic/Text';
+
+import { mnDecode } from '../../session/crypto/mnemonic';
 import { recoveryPhraseModal } from '../../state/ducks/modalDialog';
-import { useDispatch } from 'react-redux';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { getCurrentRecoveryPhrase } from '../../util/storage';
-import styled from 'styled-components';
+import { SpacerSM } from '../basic/Text';
+
 import { saveQRCode } from '../../util/saveQRCode';
+import { getCurrentRecoveryPhrase } from '../../util/storage';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 
 interface PasswordProps {
   setPasswordValid: (val: boolean) => any;
@@ -117,7 +120,7 @@ const Seed = (props: SeedProps) => {
   const fgColor = 'var(--black-color)';
   const dispatch = useDispatch();
 
-  const hexEncodedSeed = mn_decode(recoveryPhrase, 'english');
+  const hexEncodedSeed = mnDecode(recoveryPhrase, 'english');
 
   const copyRecoveryPhrase = (recoveryPhraseToCopy: string) => {
     window.clipboard.writeText(recoveryPhraseToCopy);
@@ -193,43 +196,40 @@ const SessionSeedModalInner = (props: ModalInnerProps) => {
   const [passwordHash, setPasswordHash] = useState('');
   const dispatch = useDispatch();
 
-  useEffect(() => {
+  useMount(() => {
+    async function checkHasPassword() {
+      if (!loadingPassword) {
+        return;
+      }
+
+      const hash = await Data.getPasswordHash();
+      setHasPassword(!!hash);
+      setPasswordHash(hash || '');
+      setLoadingPassword(false);
+    }
+    async function getRecoveryPhrase() {
+      if (recoveryPhrase) {
+        return false;
+      }
+      const newRecoveryPhrase = getCurrentRecoveryPhrase();
+      setRecoveryPhrase(newRecoveryPhrase);
+      setLoadingSeed(false);
+
+      return true;
+    }
+
     setTimeout(() => (document.getElementById('seed-input-password') as any)?.focus(), 100);
     void checkHasPassword();
     void getRecoveryPhrase();
-  }, []);
-
-  const i18n = window.i18n;
+  });
 
   const onClose = () => dispatch(recoveryPhraseModal(null));
 
-  const checkHasPassword = async () => {
-    if (!loadingPassword) {
-      return;
-    }
-
-    const hash = await Data.getPasswordHash();
-    setHasPassword(!!hash);
-    setPasswordHash(hash || '');
-    setLoadingPassword(false);
-  };
-
-  const getRecoveryPhrase = async () => {
-    if (recoveryPhrase) {
-      return false;
-    }
-    const newRecoveryPhrase = getCurrentRecoveryPhrase();
-    setRecoveryPhrase(newRecoveryPhrase);
-    setLoadingSeed(false);
-
-    return true;
-  };
-
   return (
     <>
       {!loadingSeed && (
         <SessionWrapperModal
-          title={i18n('showRecoveryPhrase')}
+          title={window.i18n('showRecoveryPhrase')}
           onClose={onClose}
           showExitIcon={true}
         >
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index b6e59d3c8..070a1c2b0 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -1,21 +1,22 @@
 import React from 'react';
+import _ from 'lodash';
+import { useDispatch } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { ToastUtils, UserUtils } from '../../session/utils';
 
-import _ from 'lodash';
 import { SpacerLG, Text } from '../basic/Text';
 import { updateGroupMembersModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { MemberListItem } from '../MemberListItem';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import { useDispatch } from 'react-redux';
+
 import { useConversationPropsById, useWeAreAdmin } from '../../hooks/useParamSelector';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+
 import { useSet } from '../../hooks/useSet';
 import { getConversationController } from '../../session/conversations';
 import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
-import styled from 'styled-components';
 
 type Props = {
   conversationId: string;
@@ -110,7 +111,6 @@ const ZombiesList = ({ convoId }: { convoId: string }) => {
   );
 };
 
-// tslint:disable-next-line: max-func-body-length
 async function onSubmit(convoId: string, membersAfterUpdate: Array<string>) {
   const convoFound = getConversationController().get(convoId);
   if (!convoFound || !convoFound.isGroup()) {
diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx
index 86e3da014..63b59276f 100644
--- a/ts/components/dialog/UpdateGroupNameDialog.tsx
+++ b/ts/components/dialog/UpdateGroupNameDialog.tsx
@@ -1,10 +1,11 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
 import classNames from 'classnames';
+import autoBind from 'auto-bind';
 
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { SpacerMD } from '../basic/Text';
 import { updateGroupNameModal } from '../../state/ducks/modalDialog';
-import autoBind from 'auto-bind';
 import { ConversationModel } from '../../models/conversation';
 import { getConversationController } from '../../session/conversations';
 import { SessionWrapperModal } from '../SessionWrapperModal';
@@ -91,14 +92,11 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
       this.state.errorDisplayed ? 'error-shown' : 'error-faded'
     );
 
-    const isAdmin = this.convo.isPublic()
-      ? false // disable editing of opengroup rooms as we don't handle them for now
-      : true;
+    const isAdmin = !this.convo.isPublic();
 
     return (
       <SessionWrapperModal
         title={titleText}
-        // tslint:disable-next-line: no-void-expression
         onClose={() => this.closeDialog()}
         additionalClassName="update-group-dialog"
       >
@@ -200,7 +198,6 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
     if (!isPublic) {
       return undefined;
     }
-    // tslint:disable: use-simple-attributes
 
     return (
       <div className="avatar-center">
diff --git a/ts/components/dialog/UserDetailsDialog.tsx b/ts/components/dialog/UserDetailsDialog.tsx
index 5e311e011..87be42e49 100644
--- a/ts/components/dialog/UserDetailsDialog.tsx
+++ b/ts/components/dialog/UserDetailsDialog.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-// tslint:disable no-submodule-imports
 
 import useCopyToClipboard from 'react-use/lib/useCopyToClipboard';
 
@@ -20,6 +19,7 @@ export const UserDetailsDialog = (props: UserDetailsModalState) => {
 
   const size = isEnlargedImageShown ? AvatarSize.HUGE : AvatarSize.XL;
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_, copyToClipboard] = useCopyToClipboard();
 
   function closeDialog() {
diff --git a/ts/components/icon/DropDownAndToggleButton.tsx b/ts/components/icon/DropDownAndToggleButton.tsx
index 587d4ed00..fccb8a3db 100644
--- a/ts/components/icon/DropDownAndToggleButton.tsx
+++ b/ts/components/icon/DropDownAndToggleButton.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import _ from 'lodash';
 import styled from 'styled-components';
 import { contextMenu } from 'react-contexify';
 
diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx
index 9f1f2c6b2..9be3ed3bd 100644
--- a/ts/components/icon/Icons.tsx
+++ b/ts/components/icon/Icons.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable max-len */
+/* eslint-disable no-multi-str */
 export type SessionIconType =
   | 'addUser'
   | 'arrow'
diff --git a/ts/components/icon/MemberAvatarPlaceHolder.tsx b/ts/components/icon/MemberAvatarPlaceHolder.tsx
index 3ef483284..1616ff814 100644
--- a/ts/components/icon/MemberAvatarPlaceHolder.tsx
+++ b/ts/components/icon/MemberAvatarPlaceHolder.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-// tslint:disable: no-http-string
 
 export const MemberAvatarPlaceHolder = () => {
   return (
diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx
index dda4a5741..e47c520bd 100644
--- a/ts/components/icon/SessionIcon.tsx
+++ b/ts/components/icon/SessionIcon.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import { icons, SessionIconSize, SessionIconType } from '../icon';
 import styled, { css, keyframes } from 'styled-components';
 
+import { icons, SessionIconSize, SessionIconType } from '.';
+
 export type SessionIconProps = {
   iconType: SessionIconType;
   iconSize: SessionIconSize | number;
@@ -19,25 +20,24 @@ export type SessionIconProps = {
 const getIconDimensionFromIconSize = (iconSize: SessionIconSize | number) => {
   if (typeof iconSize === 'number') {
     return iconSize;
-  } else {
-    switch (iconSize) {
-      case 'tiny':
-        return 12;
-      case 'small':
-        return 15;
-      case 'medium':
-        return 20;
-      case 'large':
-        return 25;
-      case 'huge':
-        return 30;
-      case 'huge2':
-        return 40;
-      case 'max':
-        return 80;
-      default:
-        return 20;
-    }
+  }
+  switch (iconSize) {
+    case 'tiny':
+      return 12;
+    case 'small':
+      return 15;
+    case 'medium':
+      return 20;
+    case 'large':
+      return 25;
+    case 'huge':
+      return 30;
+    case 'huge2':
+      return 40;
+    case 'max':
+      return 80;
+    default:
+      return 20;
   }
 };
 
@@ -68,7 +68,7 @@ const rotate = keyframes`
  * Creates a glow animation made for multiple element sequentially
  */
 const glow = (color: string, glowDuration: number, glowStartDelay: number) => {
-  //increase shadow intensity by 3
+  // increase shadow intensity by 3
   const dropShadow = `drop-shadow(0px 0px 6px ${color});`;
 
   // creating keyframe for sequential animations
@@ -117,11 +117,9 @@ const animation = (props: {
       )} ${props.glowDuration}s ease infinite;
     `;
   }
-
-  return;
+  return undefined;
 };
 
-//tslint:disable no-unnecessary-callback-wrapper
 const Svg = React.memo(styled.svg<StyledSvgProps>`
   width: ${props => props.width};
   transform: ${props => `rotate(${props.iconRotation}deg)`};
@@ -135,7 +133,6 @@ const Svg = React.memo(styled.svg<StyledSvgProps>`
   padding: ${props => (props.iconPadding ? props.iconPadding : '')};
   transition: inherit;
 `);
-// tslint:enable no-unnecessary-callback-wrapper
 
 const SessionSvg = (props: {
   viewBox: string;
diff --git a/ts/components/icon/SessionIconButton.tsx b/ts/components/icon/SessionIconButton.tsx
index c446c826e..e53db3d8b 100644
--- a/ts/components/icon/SessionIconButton.tsx
+++ b/ts/components/icon/SessionIconButton.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import classNames from 'classnames';
-import { SessionIcon, SessionIconProps } from '../icon';
 import _ from 'lodash';
-import { SessionNotificationCount } from './SessionNotificationCount';
 import styled from 'styled-components';
 
+import { SessionIcon, SessionIconProps } from '.';
+import { SessionNotificationCount } from './SessionNotificationCount';
+
 interface SProps extends SessionIconProps {
   onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
   notificationCount?: number;
@@ -36,6 +37,7 @@ const StyledSessionIconButton = styled.div<{ color?: string; isSelected?: boolea
   }
 `;
 
+// eslint-disable-next-line react/display-name
 const SessionIconButtonInner = React.forwardRef<HTMLDivElement, SProps>((props, ref) => {
   const {
     iconType,
@@ -72,7 +74,7 @@ const SessionIconButtonInner = React.forwardRef<HTMLDivElement, SProps>((props,
       ref={ref}
       id={id}
       onClick={clickHandler}
-      style={{ ...style, display: isHidden ? 'none' : 'flex', margin: margin ? margin : '' }}
+      style={{ ...style, display: isHidden ? 'none' : 'flex', margin: margin || '' }}
       data-testid={dataTestId}
     >
       <SessionIcon
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 7d4fb90c8..49853ca63 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -1,14 +1,16 @@
+import { ipcRenderer } from 'electron';
 import React, { useEffect, useState } from 'react';
-import { getConversationController } from '../../session/conversations';
-import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
 
+import { debounce, isEmpty, isString } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
-import { Data } from '../../data/data';
-import { getMessageQueue } from '../../session/sending';
-// tslint:disable: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 
+import { Data } from '../../data/data';
+import { getConversationController } from '../../session/conversations';
+import { getMessageQueue } from '../../session/sending';
+import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
+
 import { clearSearch } from '../../state/ducks/search';
 import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
 import {
@@ -22,13 +24,9 @@ import { cleanUpOldDecryptedMedias } from '../../session/crypto/DecryptedAttachm
 
 import { DURATION } from '../../session/constants';
 
-import { debounce, isEmpty, isString } from 'lodash';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
 
-// tslint:disable-next-line: no-import-side-effect no-submodule-imports
-
-import { ipcRenderer } from 'electron';
 import { loadDefaultRooms } from '../../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getOpenGroupManager } from '../../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
@@ -58,8 +56,7 @@ const Section = (props: { type: SectionType }) => {
   const focusedSection = useSelector(getFocusedSection);
   const isSelected = focusedSection === props.type;
 
-  const handleClick = async () => {
-    /* tslint:disable:no-void-expression */
+  const handleClick = () => {
     if (type === SectionType.Profile) {
       dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
@@ -69,7 +66,7 @@ const Section = (props: { type: SectionType }) => {
         : currentTheme.replace('light', 'dark')) as ThemeStateType;
 
       // We want to persist the primary color when using the color mode button
-      await switchThemeTo({
+      void switchThemeTo({
         theme: newTheme,
         mainWindow: true,
         usePrimaryColor: true,
@@ -259,34 +256,48 @@ export const ActionsPanel = () => {
   useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     void fetchReleaseFromFSAndUpdateMain();
   }, fetchReleaseFromFileServerInterval);
 
-  if (!ourPrimaryConversation) {
-    window?.log?.warn('ActionsPanel: ourPrimaryConversation is not set');
-    return null;
-  }
-
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     void syncConfigurationIfNeeded();
   }, DURATION.DAYS * 2);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // trigger an updates from the snodes every hour
 
     void forceRefreshRandomSnodePool();
   }, DURATION.HOURS * 1);
 
   useTimeoutFn(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // trigger an updates from the snodes after 5 minutes, once
     void forceRefreshRandomSnodePool();
   }, DURATION.MINUTES * 5);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // this won't be run every days, but if the app stays open for more than 10 days
     void triggerAvatarReUploadIfNeeded();
   }, DURATION.DAYS * 1);
 
+  if (!ourPrimaryConversation) {
+    window?.log?.warn('ActionsPanel: ourPrimaryConversation is not set');
+    return null;
+  }
   return (
     <>
       <LeftPaneSectionContainer data-testid="leftpane-section-container">
diff --git a/ts/components/leftpane/ContactListItem.tsx b/ts/components/leftpane/ContactListItem.tsx
index 18720ea6e..818bfc4de 100644
--- a/ts/components/leftpane/ContactListItem.tsx
+++ b/ts/components/leftpane/ContactListItem.tsx
@@ -22,7 +22,7 @@ export const ContactListItem = (props: Props) => {
   const isMe = useIsMe(pubkey);
   const isGroup = !useIsPrivate(pubkey);
 
-  const title = name ? name : pubkey;
+  const title = name || pubkey;
   const displayName = isMe ? window.i18n('you') : title;
 
   return (
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index 1af354f24..0e5075a2d 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -1,23 +1,23 @@
 import autoBind from 'auto-bind';
 import React from 'react';
+import { useSelector } from 'react-redux';
 import { AutoSizer, List, ListRowProps } from 'react-virtualized';
+import styled from 'styled-components';
 import { SearchResults } from '../search/SearchResults';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 import { MessageRequestsBanner } from './MessageRequestsBanner';
 
-import { useSelector } from 'react-redux';
-import styled from 'styled-components';
 import { OverlayMode, setOverlayMode } from '../../state/ducks/section';
 import { getOverlayMode } from '../../state/selectors/section';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { SessionSearchInput } from '../SessionSearchInput';
 import { StyledLeftPaneList } from './LeftPaneList';
+import { ConversationListItem } from './conversation-list-item/ConversationListItem';
 import { OverlayClosedGroup } from './overlay/OverlayClosedGroup';
 import { OverlayCommunity } from './overlay/OverlayCommunity';
 import { OverlayMessage } from './overlay/OverlayMessage';
 import { OverlayMessageRequest } from './overlay/OverlayMessageRequest';
 import { OverlayChooseAction } from './overlay/choose-action/OverlayChooseAction';
-import { ConversationListItem } from './conversation-list-item/ConversationListItem';
-import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export interface Props {
   conversationIds?: Array<string>;
@@ -74,7 +74,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
   public renderRow = ({ index, key, style }: ListRowProps): JSX.Element | null => {
     const { conversationIds } = this.props;
 
-    //assume conversations that have been marked unapproved should be filtered out by selector.
+    // assume conversations that have been marked unapproved should be filtered out by selector.
     if (!conversationIds) {
       throw new Error('renderRow: Tried to render without conversations');
     }
diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx
index db1549c4c..e6152806b 100644
--- a/ts/components/leftpane/LeftPaneSettingSection.tsx
+++ b/ts/components/leftpane/LeftPaneSettingSection.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 
-import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
-import { useDispatch, useSelector } from 'react-redux';
+import { resetConversationExternal } from '../../state/ducks/conversations';
+import { recoveryPhraseModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import {
   SectionType,
   setOverlayMode,
@@ -10,10 +11,9 @@ import {
   showSettingsSection,
 } from '../../state/ducks/section';
 import { getFocusedSettingsSection } from '../../state/selectors/section';
-import { recoveryPhraseModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { SessionIcon } from '../icon';
 import { SessionSettingCategory } from '../settings/SessionSettings';
-import { resetConversationExternal } from '../../state/ducks/conversations';
+import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 
 const StyledSettingsSectionTitle = styled.strong`
   font-family: var(--font-font-accent);
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index cc67146a9..f032d36ca 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -1,15 +1,15 @@
 import classNames from 'classnames';
+import { isNil } from 'lodash';
 import React, { useCallback } from 'react';
 import { contextMenu } from 'react-contexify';
+import { createPortal } from 'react-dom';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
 
-import { createPortal } from 'react-dom';
-import { useDispatch, useSelector } from 'react-redux';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
-import _, { isNil } from 'lodash';
 import {
   useAvatarPath,
   useConversationUsername,
@@ -26,9 +26,8 @@ import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
 
 type PropsHousekeeping = {
-  style?: Object;
+  style?: object;
 };
-// tslint:disable: use-simple-attributes
 
 type Props = { conversationId: string } & PropsHousekeeping;
 
@@ -46,7 +45,7 @@ const AvatarItem = () => {
   function onPrivateAvatarClick() {
     dispatch(
       updateUserDetailsModal({
-        conversationId: conversationId,
+        conversationId,
         userName: userName || '',
         authorAvatarPath: avatarPath,
       })
@@ -86,10 +85,10 @@ const ConversationListItemInner = (props: Props) => {
   const triggerId = `${key}-ctxmenu`;
 
   const openConvo = useCallback(
-    async (e: React.MouseEvent<HTMLDivElement>) => {
+    (e: React.MouseEvent<HTMLDivElement>) => {
       // mousedown is invoked sooner than onClick, but for both right and left click
       if (e.button === 0) {
-        await openConversationWithMessages({ conversationKey: conversationId, messageId: null });
+        void openConversationWithMessages({ conversationKey: conversationId, messageId: null });
       }
     },
     [conversationId]
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index 45e4d64fe..6061382f7 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -148,7 +148,7 @@ const AtSymbol = ({ convoId }: { convoId: string }) => {
   return hasMentionedUs && hasUnread ? (
     <MentionAtSymbol
       title="Open to latest mention"
-      onMouseDown={e => openConvoToLastMention(e, convoId)}
+      onMouseDown={e => void openConvoToLastMention(e, convoId)}
     >
       @
     </MentionAtSymbol>
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index c283de734..c115ad974 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -1,19 +1,18 @@
 import React, { useState } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { SessionButton } from '../../basic/SessionButton';
 import { SessionIdEditable } from '../../basic/SessionIdEditable';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { MemberListItem } from '../../MemberListItem';
 import { OverlayHeader } from './OverlayHeader';
-// tslint:disable: no-submodule-imports use-simple-attributes
 
 import { resetOverlayMode } from '../../../state/ducks/section';
 import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations';
 import { SpacerLG } from '../../basic/Text';
-import useKey from 'react-use/lib/useKey';
-import styled from 'styled-components';
 import { SessionSearchInput } from '../../SessionSearchInput';
 import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search';
 import { useSet } from '../../../hooks/useSet';
@@ -65,7 +64,8 @@ async function createClosedGroupWithToasts(
     ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort'));
 
     return false;
-  } else if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
+  }
+  if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
     ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong'));
     return false;
   }
@@ -76,7 +76,8 @@ async function createClosedGroupWithToasts(
   if (groupMemberIds.length < 1) {
     ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember'));
     return false;
-  } else if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
+  }
+  if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
     ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize'));
     return false;
   }
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index c7bfe4851..093941506 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-// tslint:disable: no-submodule-imports use-simple-attributes
+import useKey from 'react-use/lib/useKey';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { SessionJoinableRooms } from './SessionJoinableDefaultRooms';
 
@@ -7,7 +8,6 @@ import { SessionButton } from '../../basic/SessionButton';
 import { SessionIdEditable } from '../../basic/SessionIdEditable';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { OverlayHeader } from './OverlayHeader';
-import { useDispatch, useSelector } from 'react-redux';
 import { resetOverlayMode } from '../../../state/ducks/section';
 import {
   joinOpenGroupV2WithUIEvents,
@@ -15,7 +15,7 @@ import {
 } from '../../../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
 import { openGroupV2CompleteURLRegex } from '../../../session/apis/open_group_api/utils/OpenGroupUtils';
 import { ToastUtils } from '../../../session/utils';
-import useKey from 'react-use/lib/useKey';
+
 import { getOverlayMode } from '../../../state/selectors/section';
 import {
   markConversationInitialLoadingInProgress,
@@ -30,11 +30,10 @@ async function joinOpenGroup(
   if (serverUrl.match(openGroupV2CompleteURLRegex)) {
     const groupCreated = await joinOpenGroupV2WithUIEvents(serverUrl, true, false, uiCallback);
     return groupCreated;
-  } else {
-    ToastUtils.pushToastError('invalidOpenGroupUrl', window.i18n('invalidOpenGroupUrl'));
-    window.log.warn('Invalid opengroupv2 url');
-    return false;
   }
+  ToastUtils.pushToastError('invalidOpenGroupUrl', window.i18n('invalidOpenGroupUrl'));
+  window.log.warn('Invalid opengroupv2 url');
+  return false;
 }
 
 export const OverlayCommunity = () => {
@@ -103,7 +102,7 @@ export const OverlayCommunity = () => {
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
 
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={onTryJoinRoom} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={() => void onTryJoinRoom()} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 5fefc0f29..914016968 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -1,24 +1,24 @@
 import React, { useState } from 'react';
-// tslint:disable: use-simple-attributes no-submodule-imports
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { useDispatch } from 'react-redux';
+import { ConversationTypeEnum } from '../../../models/conversationAttributes';
+import { getConversationController } from '../../../session/conversations';
+import { PubKey } from '../../../session/types';
+import { ToastUtils, UserUtils } from '../../../session/utils';
+import { openConversationWithMessages } from '../../../state/ducks/conversations';
+import { resetOverlayMode } from '../../../state/ducks/section';
 import { SessionButton } from '../../basic/SessionButton';
 import { SessionIdEditable } from '../../basic/SessionIdEditable';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { OverlayHeader } from './OverlayHeader';
-import { resetOverlayMode } from '../../../state/ducks/section';
-import { PubKey } from '../../../session/types';
-import { ConversationTypeEnum } from '../../../models/conversationAttributes';
-import { getConversationController } from '../../../session/conversations';
-import { ToastUtils, UserUtils } from '../../../session/utils';
-import { openConversationWithMessages } from '../../../state/ducks/conversations';
-import useKey from 'react-use/lib/useKey';
-import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSessionIDPill';
-import { Flex } from '../../basic/Flex';
-import { SessionIconButton } from '../../icon';
-import { SpacerMD } from '../../basic/Text';
-import styled from 'styled-components';
+
 import { ONSResolve } from '../../../session/apis/snode_api/onsResolve';
+import { Flex } from '../../basic/Flex';
+import { SpacerMD } from '../../basic/Text';
+import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSessionIDPill';
+import { SessionIconButton } from '../../icon';
 
 const SessionIDDescription = styled.div`
   color: var(--text-secondary-color);
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index d016e448c..529ffd619 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-// tslint:disable: no-submodule-imports use-simple-attributes
 
 import { useDispatch, useSelector } from 'react-redux';
 import useKey from 'react-use/lib/useKey';
@@ -77,6 +76,7 @@ export const OverlayMessageRequest = () => {
 
           for (let index = 0; index < messageRequests.length; index++) {
             const convoId = messageRequests[index];
+            // eslint-disable-next-line no-await-in-loop
             await declineConversationWithoutConfirm({
               blockContact: false,
               conversationId: convoId,
diff --git a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
index cae773e81..332521386 100644
--- a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
+++ b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
@@ -11,7 +11,6 @@ import { Flex } from '../../basic/Flex';
 import { PillContainerHoverable, StyledPillContainerHoverable } from '../../basic/PillContainer';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { H3 } from '../../basic/Text';
-// tslint:disable: no-void-expression
 
 export type JoinableRoomProps = {
   completeUrl: string;
@@ -37,6 +36,7 @@ const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
         if (isCancelled) {
           return;
         }
+        // eslint-disable-next-line more/no-then
         sogsV3FetchPreviewBase64({ ...parsedInfos, imageID })
           .then(base64 => {
             if (isCancelled) {
@@ -63,10 +63,11 @@ const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
     } catch (e) {
       window?.log?.warn(e.message);
     }
+    // eslint-disable-next-line consistent-return
     return () => {
       isCancelled = true;
     };
-  }, [props.imageId, props.completeUrl]);
+  }, [props.imageId, props.completeUrl, dispatch, props.base64Data, props.roomId]);
 
   return (
     <Avatar
diff --git a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
index 4fe86fffe..826d41352 100644
--- a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
+++ b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
@@ -86,7 +86,7 @@ export const ContactRow = (props: Props) => {
   return (
     <StyledRowContainer
       style={style}
-      onClick={() => openConversationWithMessages({ conversationKey: id, messageId: null })}
+      onClick={() => void openConversationWithMessages({ conversationKey: id, messageId: null })}
     >
       <AvatarItem id={id} displayName={displayName} />
       <StyledContactRowName data-testid="module-conversation__user__profile-name">
diff --git a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
index 2cc1781ff..81a0ed6f9 100644
--- a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
+++ b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
@@ -1,13 +1,13 @@
-import React, { useEffect } from 'react';
-// tslint:disable: use-simple-attributes no-submodule-imports
+import React, { useCallback, useEffect } from 'react';
 
+import { isEmpty, isString } from 'lodash';
 import { useDispatch } from 'react-redux';
-import { resetOverlayMode, setOverlayMode } from '../../../../state/ducks/section';
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
+import { resetOverlayMode, setOverlayMode } from '../../../../state/ducks/section';
+
 import { SessionIcon, SessionIconType } from '../../../icon';
 import { ContactsListWithBreaks } from './ContactsListWithBreaks';
-import { isEmpty, isString } from 'lodash';
 
 const StyledActionRow = styled.button`
   border: none;
@@ -50,41 +50,40 @@ export const OverlayChooseAction = () => {
     dispatch(resetOverlayMode());
   }
 
-  function openNewMessage() {
+  const openNewMessage = useCallback(() => {
     dispatch(setOverlayMode('message'));
-  }
+  }, [dispatch]);
 
-  function openCreateGroup() {
+  const openCreateGroup = useCallback(() => {
     dispatch(setOverlayMode('closed-group'));
-  }
+  }, [dispatch]);
 
-  function openJoinCommunity() {
+  const openJoinCommunity = useCallback(() => {
     dispatch(setOverlayMode('open-group'));
-  }
+  }, [dispatch]);
 
   useKey('Escape', closeOverlay);
 
-  function handlePaste(event: ClipboardEvent) {
-    event.preventDefault();
+  useEffect(() => {
+    function handlePaste(event: ClipboardEvent) {
+      event.preventDefault();
 
-    const pasted = event.clipboardData?.getData('text');
+      const pasted = event.clipboardData?.getData('text');
 
-    if (pasted && isString(pasted) && !isEmpty(pasted)) {
-      if (pasted.startsWith('http') || pasted.startsWith('https')) {
-        openJoinCommunity();
-      } else if (pasted.startsWith('05')) {
-        openNewMessage();
+      if (pasted && isString(pasted) && !isEmpty(pasted)) {
+        if (pasted.startsWith('http') || pasted.startsWith('https')) {
+          openJoinCommunity();
+        } else if (pasted.startsWith('05')) {
+          openNewMessage();
+        }
       }
     }
-  }
-
-  useEffect(() => {
     document?.addEventListener('paste', handlePaste);
 
     return () => {
       document?.removeEventListener('paste', handlePaste);
     };
-  }, []);
+  }, [openJoinCommunity, openNewMessage]);
 
   return (
     <div className="module-left-pane-overlay">
diff --git a/ts/components/lightbox/Lightbox.tsx b/ts/components/lightbox/Lightbox.tsx
index 22a1afa03..0de1b43c5 100644
--- a/ts/components/lightbox/Lightbox.tsx
+++ b/ts/components/lightbox/Lightbox.tsx
@@ -1,11 +1,9 @@
-// tslint:disable:react-a11y-anchors
-
 import React, { useRef } from 'react';
 
-// useCss has some issues on our setup. so import it directly
-// tslint:disable-next-line: no-submodule-imports
 import useUnmount from 'react-use/lib/useUnmount';
 import { useDispatch } from 'react-redux';
+import { isUndefined } from 'lodash';
+import styled from 'styled-components';
 import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import { showLightBox } from '../../state/ducks/conversations';
@@ -13,8 +11,6 @@ import { GoogleChrome } from '../../util';
 import { Flex } from '../basic/Flex';
 import { SessionIconButton, SessionIconType } from '../icon';
 import * as MIME from '../../types/MIME';
-import { isUndefined } from 'lodash';
-import styled from 'styled-components';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 const colorSVG = (url: string, color: string) => {
@@ -71,7 +67,7 @@ const styles = {
   } as React.CSSProperties,
   objectParentContainer: {
     flexGrow: 1,
-    textAlign: 'center' as 'center',
+    textAlign: 'center' as const,
     margin: 'auto',
   },
   object: {
@@ -204,7 +200,6 @@ const Icon = ({
   />
 );
 
-// tslint:disable-next-line: max-func-body-length
 export const LightboxObject = ({
   objectURL,
   contentType,
diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx
index 6361cd819..5ff18f6d5 100644
--- a/ts/components/lightbox/LightboxGallery.tsx
+++ b/ts/components/lightbox/LightboxGallery.tsx
@@ -1,13 +1,9 @@
-/**
- * @prettier
- */
 import React, { useCallback, useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
 
 import { Lightbox } from './Lightbox';
 
-// tslint:disable-next-line: no-submodule-imports
-import { useDispatch } from 'react-redux';
-import useKey from 'react-use/lib/useKey';
 import { showLightBox } from '../../state/ducks/conversations';
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { MIME } from '../../types';
@@ -35,15 +31,12 @@ export const LightboxGallery = (props: Props) => {
   const [currentIndex, setCurrentIndex] = useState(-1);
   const selectedConversation = useSelectedConversationKey();
 
-  if (!selectedConversation) {
-    return null;
-  }
-
   const dispatch = useDispatch();
 
   // just run once, when the component is mounted. It's to show the lightbox on the specified index at start.
   useEffect(() => {
     setCurrentIndex(props.selectedIndex);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const selectedMedia = media[currentIndex];
@@ -62,9 +55,12 @@ export const LightboxGallery = (props: Props) => {
   }, [currentIndex, lastIndex]);
 
   const handleSave = useCallback(() => {
+    if (!selectedConversation) {
+      return;
+    }
     const mediaItem = media[currentIndex];
     void saveAttachmentToDisk({ ...mediaItem, conversationId: selectedConversation });
-  }, [currentIndex, media]);
+  }, [currentIndex, media, selectedConversation]);
 
   useKey(
     'ArrowRight',
@@ -91,6 +87,10 @@ export const LightboxGallery = (props: Props) => {
     undefined,
     [currentIndex]
   );
+  if (!selectedConversation) {
+    return null;
+  }
+
   // just to avoid to render the first element during the first render when the user selected another item
   if (currentIndex === -1) {
     return null;
@@ -100,7 +100,6 @@ export const LightboxGallery = (props: Props) => {
 
   const caption = attachment?.caption;
   return (
-    // tslint:disable: use-simple-attributes
     <Lightbox
       onPrevious={hasPrevious ? onPrevious : undefined}
       onNext={hasNext ? onNext : undefined}
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index db95f4bec..841ec249f 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -127,8 +127,8 @@ const DisappearingMessageMenuItem = (): JSX.Element | null => {
       {timerOptions.map(item => (
         <Item
           key={item.value}
-          onClick={async () => {
-            await setDisappearingMessagesByConvoId(selectedConvoId, item.value);
+          onClick={() => {
+            void setDisappearingMessagesByConvoId(selectedConvoId, item.value);
           }}
         >
           {item.name}
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index c5ac79725..59f95b619 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import React from 'react';
 import { animation, Item, Menu } from 'react-contexify';
 
@@ -89,8 +88,8 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
   if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
     const conversation = getConversationController().get(conversationId);
 
-    const togglePinConversation = async () => {
-      await conversation?.togglePinned();
+    const togglePinConversation = () => {
+      void conversation?.togglePinned();
     };
 
     const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index f00ae0b7a..80430bbce 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -83,8 +83,8 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
   if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
     const conversation = getConversationController().get(conversationId);
 
-    const markUnread = async () => {
-      await conversation?.markAsUnread(true);
+    const markUnread = () => {
+      void conversation?.markAsUnread(true);
     };
 
     return <Item onClick={markUnread}>{window.i18n('markUnread')}</Item>;
@@ -104,9 +104,7 @@ export const DeletePrivateContactMenuItem = () => {
   const isRequest = useIsIncomingRequest(convoId);
 
   if (isPrivate && !isRequest) {
-    let menuItemText: string;
-
-    menuItemText = window.i18n('editMenuDeleteContact');
+    const menuItemText = window.i18n('editMenuDeleteContact');
 
     const onClickClose = () => {
       dispatch(updateConfirmModal(null));
@@ -240,8 +238,8 @@ export const UpdateGroupNameMenuItem = () => {
   if (!isKickedFromGroup && !left && weAreAdmin) {
     return (
       <Item
-        onClick={async () => {
-          await showUpdateGroupNameByConvoId(convoId);
+        onClick={() => {
+          void showUpdateGroupNameByConvoId(convoId);
         }}
       >
         {window.i18n('editGroup')}
@@ -359,11 +357,10 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
-      <Item onClick={() => markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
+      <Item onClick={() => void markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
     );
-  } else {
-    return null;
   }
+  return null;
 };
 
 export function isRtlBody(): boolean {
@@ -382,8 +379,8 @@ export const BlockMenuItem = (): JSX.Element | null => {
   if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
-      ? () => unblockConvoById(convoId)
-      : () => blockConvoById(convoId);
+      ? () => void unblockConvoById(convoId)
+      : () => void blockConvoById(convoId);
     return <Item onClick={blockHandler}>{blockTitle}</Item>;
   }
   return null;
@@ -401,7 +398,7 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   }
 
   return (
-    <Item onClick={() => clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+    <Item onClick={() => void clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
   );
 };
 
@@ -464,8 +461,8 @@ export const DeletePrivateConversationMenuItem = () => {
 
   return (
     <Item
-      onClick={async () => {
-        await getConversationController().delete1o1(convoId, {
+      onClick={() => {
+        void getConversationController().delete1o1(convoId, {
           fromSyncMessage: false,
           justHidePrivate: true,
         });
@@ -485,6 +482,7 @@ export const AcceptMsgRequestMenuItem = () => {
   if (isRequest && isPrivate) {
     return (
       <Item
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         onClick={async () => {
           await convo.setDidApproveMe(true);
           await convo.addOutgoingApprovalMessage(Date.now());
@@ -600,8 +598,8 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => {
         return (
           <Item
             key={item.value}
-            onClick={async () => {
-              await setNotificationForConvoId(convoId, item.value);
+            onClick={() => {
+              void setNotificationForConvoId(convoId, item.value);
             }}
             disabled={disabled}
           >
diff --git a/ts/components/menu/MessageRequestBannerContextMenu.tsx b/ts/components/menu/MessageRequestBannerContextMenu.tsx
index d6e3f67e4..c29b228dc 100644
--- a/ts/components/menu/MessageRequestBannerContextMenu.tsx
+++ b/ts/components/menu/MessageRequestBannerContextMenu.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { animation, Item, Menu } from 'react-contexify';
-import _ from 'lodash';
+import { useDispatch } from 'react-redux';
 
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
-import { useDispatch } from 'react-redux';
+
 import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
 
 export type PropsContextConversationItem = {
diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx
index 5a06f87f8..fe3e196d6 100644
--- a/ts/components/registration/RegistrationStages.tsx
+++ b/ts/components/registration/RegistrationStages.tsx
@@ -4,7 +4,7 @@ import { SignInMode, SignInTab } from './SignInTab';
 import { Data } from '../../data/data';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
 import { getConversationController } from '../../session/conversations';
-import { mn_decode } from '../../session/crypto/mnemonic';
+import { mnDecode } from '../../session/crypto/mnemonic';
 import { PromiseUtils, StringUtils, ToastUtils } from '../../session/utils';
 import { TaskTimedOutError } from '../../session/utils/Promise';
 import { trigger } from '../../shims/events';
@@ -18,8 +18,6 @@ import { fromHex } from '../../session/utils/String';
 import { setSignInByLinking, setSignWithRecoveryPhrase, Storage } from '../../util/storage';
 import { SettingsKey } from '../../data/settings-key';
 
-// tslint:disable: use-simple-attributes
-
 export async function resetRegistration() {
   await Data.removeAll();
   Storage.reset();
@@ -188,16 +186,11 @@ export const RegistrationStages = () => {
   const [signInMode, setSignInMode] = useState(SignInMode.Default);
   const [signUpMode, setSignUpMode] = useState(SignUpMode.Default);
 
-  useEffect(() => {
-    void generateMnemonicAndKeyPair();
-    void resetRegistration();
-  }, []);
-
   const generateMnemonicAndKeyPair = async () => {
     if (generatedRecoveryPhrase === '') {
       const mnemonic = await generateMnemonic();
 
-      let seedHex = mn_decode(mnemonic);
+      let seedHex = mnDecode(mnemonic);
       // handle shorter than 32 bytes seeds
       const privKeyHexLength = 32 * 2;
       if (seedHex.length !== privKeyHexLength) {
@@ -213,6 +206,12 @@ export const RegistrationStages = () => {
     }
   };
 
+  useEffect(() => {
+    void generateMnemonicAndKeyPair();
+    void resetRegistration();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const memoizedValue = React.useMemo(() => {
     return {
       registrationPhase,
diff --git a/ts/components/registration/RegistrationUserDetails.tsx b/ts/components/registration/RegistrationUserDetails.tsx
index dd56fe3c3..ab17a76e0 100644
--- a/ts/components/registration/RegistrationUserDetails.tsx
+++ b/ts/components/registration/RegistrationUserDetails.tsx
@@ -10,7 +10,6 @@ const DisplayNameInput = (props: {
   handlePressEnter: () => any;
 }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionInput
       autoFocus={props.stealAutoFocus || false}
       label={window.i18n('displayName')}
@@ -32,7 +31,6 @@ const RecoveryPhraseInput = (props: {
   stealAutoFocus?: boolean;
 }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionInput
       label={window.i18n('recoveryPhrase')}
       type="password"
@@ -48,7 +46,6 @@ const RecoveryPhraseInput = (props: {
 };
 
 export interface Props {
-  // tslint:disable: react-unused-props-and-state
   showDisplayNameField: boolean;
   showSeedField: boolean;
   stealAutoFocus?: boolean;
@@ -75,7 +72,6 @@ export const RegistrationUserDetails = (props: Props) => {
       )}
       <div className="inputfields">
         {props.showDisplayNameField && (
-          // tslint:disable-next-line: use-simple-attributes
           <DisplayNameInput
             stealAutoFocus={!props.showSeedField && props.stealAutoFocus}
             displayName={props.displayName}
diff --git a/ts/components/registration/SignInTab.tsx b/ts/components/registration/SignInTab.tsx
index 406064809..088d4bc36 100644
--- a/ts/components/registration/SignInTab.tsx
+++ b/ts/components/registration/SignInTab.tsx
@@ -20,8 +20,6 @@ export enum SignInMode {
   UsingRecoveryPhrase,
   LinkDevice,
 }
-// tslint:disable: use-simple-attributes
-// tslint:disable: react-unused-props-and-state
 
 const LinkDeviceButton = (props: { onLinkDeviceButtonClicked: () => any }) => {
   return (
diff --git a/ts/components/registration/SignUpTab.tsx b/ts/components/registration/SignUpTab.tsx
index f5c09ee78..9a5f27ab8 100644
--- a/ts/components/registration/SignUpTab.tsx
+++ b/ts/components/registration/SignUpTab.tsx
@@ -79,7 +79,7 @@ export const SignUpTab = () => {
     if (signUpMode === SignUpMode.SessionIDShown) {
       window.Session.setNewSessionID(hexGeneratedPubKey);
     }
-  }, [signUpMode]);
+  }, [signUpMode, hexGeneratedPubKey]);
 
   if (signUpMode === SignUpMode.Default) {
     return (
@@ -111,7 +111,7 @@ export const SignUpTab = () => {
   const signUpWithDetails = async () => {
     await signUp({
       displayName,
-      generatedRecoveryPhrase: generatedRecoveryPhrase,
+      generatedRecoveryPhrase,
     });
   };
 
diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx
index 79f0df58f..13ac83098 100644
--- a/ts/components/search/MessageSearchResults.tsx
+++ b/ts/components/search/MessageSearchResults.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import styled, { CSSProperties } from 'styled-components';
 
 import { getOurPubKeyStrFromCache } from '../../session/utils/User';
 import { openConversationToSpecificMessage } from '../../state/ducks/conversations';
@@ -6,7 +7,6 @@ import { ContactName } from '../conversation/ContactName';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { Timestamp } from '../conversation/Timestamp';
 import { MessageBodyHighlight } from '../basic/MessageBodyHighlight';
-import styled, { CSSProperties } from 'styled-components';
 import { MessageAttributes } from '../../models/messageType';
 import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector';
 import { UserUtils } from '../../session/utils';
@@ -208,7 +208,6 @@ export const MessageSearchResult = (props: MessageSearchResultProps) => {
   if (!source && !destination) {
     return null;
   }
-  // tslint:disable: use-simple-attributes
 
   return (
     <StyledSearchResults
diff --git a/ts/components/search/SearchResults.tsx b/ts/components/search/SearchResults.tsx
index 2b39a07b1..b33d185f4 100644
--- a/ts/components/search/SearchResults.tsx
+++ b/ts/components/search/SearchResults.tsx
@@ -1,16 +1,18 @@
 import React from 'react';
 import styled, { CSSProperties } from 'styled-components';
+import { useSelector } from 'react-redux';
+import { AutoSizer, List } from 'react-virtualized';
+import { isString } from 'lodash';
+
 import { ConversationListItem } from '../leftpane/conversation-list-item/ConversationListItem';
 import { MessageSearchResult } from './MessageSearchResults';
-import { AutoSizer, List } from 'react-virtualized';
-import { useSelector } from 'react-redux';
+
 import {
   SearchResultsMergedListItem,
   getHasSearchResults,
   getSearchResultsList,
   getSearchTerm,
 } from '../../state/selectors/search';
-import { isString } from 'lodash';
 
 const StyledSeparatorSection = styled.div`
   height: 36px;
diff --git a/ts/components/settings/BlockedList.tsx b/ts/components/settings/BlockedList.tsx
index 93179c37c..10b622b53 100644
--- a/ts/components/settings/BlockedList.tsx
+++ b/ts/components/settings/BlockedList.tsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 
-// tslint:disable-next-line: no-submodule-imports
 import useUpdate from 'react-use/lib/useUpdate';
 import styled from 'styled-components';
 import { useSet } from '../../hooks/useSet';
@@ -11,7 +10,6 @@ import { SpacerLG } from '../basic/Text';
 import { SessionIconButton } from '../icon';
 import { MemberListItem } from '../MemberListItem';
 import { SettingsTitleAndDescription } from './SessionSettingListItem';
-// tslint:disable: use-simple-attributes
 
 const BlockedEntriesContainer = styled.div`
   flex-shrink: 1;
diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx
index 5ea8cafb9..1fd73d430 100644
--- a/ts/components/settings/SessionNotificationGroupSettings.tsx
+++ b/ts/components/settings/SessionNotificationGroupSettings.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import styled from 'styled-components';
 import { SettingsKey } from '../../data/settings-key';
@@ -9,7 +10,6 @@ import { SessionButton } from '../basic/SessionButton';
 import { SessionRadioGroup } from '../basic/SessionRadioGroup';
 import { SpacerLG } from '../basic/Text';
 import { SessionSettingsItemWrapper, SessionToggleWithDescription } from './SessionSettingListItem';
-// tslint:disable: use-simple-attributes
 
 enum NOTIFICATION {
   MESSAGE = 'message',
diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx
index c6904126f..c2b111b23 100644
--- a/ts/components/settings/SessionSettingListItem.tsx
+++ b/ts/components/settings/SessionSettingListItem.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import styled from 'styled-components';
+
 import {
   SessionButton,
   SessionButtonColor,
@@ -7,7 +9,6 @@ import {
 } from '../basic/SessionButton';
 import { SessionToggle } from '../basic/SessionToggle';
 import { SessionConfirmDialogProps } from '../dialog/SessionConfirm';
-import styled from 'styled-components';
 import { SessionIconButton } from '../icon';
 
 type ButtonSettingsProps = {
diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx
index 31b967581..e7dc6d2a5 100644
--- a/ts/components/settings/SessionSettings.tsx
+++ b/ts/components/settings/SessionSettings.tsx
@@ -1,18 +1,20 @@
 import React from 'react';
+import { shell } from 'electron';
+import autoBind from 'auto-bind';
+import styled from 'styled-components';
 
 import { SettingsHeader } from './SessionSettingsHeader';
-import { shell } from 'electron';
+
 import { SessionIconButton } from '../icon';
-import autoBind from 'auto-bind';
+
 import { SessionNotificationGroupSettings } from './SessionNotificationGroupSettings';
-// tslint:disable-next-line: no-submodule-imports
+
 import { CategoryConversations } from './section/CategoryConversations';
 import { SettingsCategoryPrivacy } from './section/CategoryPrivacy';
 import { SettingsCategoryAppearance } from './section/CategoryAppearance';
 import { Data } from '../../data/data';
 import { SettingsCategoryPermissions } from './section/CategoryPermissions';
 import { SettingsCategoryHelp } from './section/CategoryHelp';
-import styled from 'styled-components';
 import { sessionPassword } from '../../state/ducks/modalDialog';
 import { PasswordAction } from '../dialog/SessionPasswordDialog';
 import { SectionType, showLeftPaneSection } from '../../state/ducks/section';
@@ -171,6 +173,7 @@ export class SessionSettingsView extends React.Component<SettingsViewProps, Stat
     this.settingsViewRef = React.createRef();
     autoBind(this);
 
+    // eslint-disable-next-line more/no-then
     void Data.getPasswordHash().then(hash => {
       this.setState({
         hasPassword: !!hash,
diff --git a/ts/components/settings/SettingsThemeSwitcher.tsx b/ts/components/settings/SettingsThemeSwitcher.tsx
index 697a8646b..2b7d6fecd 100644
--- a/ts/components/settings/SettingsThemeSwitcher.tsx
+++ b/ts/components/settings/SettingsThemeSwitcher.tsx
@@ -14,8 +14,6 @@ import {
 import { switchPrimaryColorTo } from '../../themes/switchPrimaryColor';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
 
-// tslint:disable: use-simple-attributes
-
 const StyledSwitcherContainer = styled.div`
   font-size: var(--font-size-md);
   padding: var(--margins-lg);
@@ -84,8 +82,8 @@ const Themes = () => {
       {themes.map(theme => (
         <ThemeContainer
           key={theme.id}
-          onClick={async () => {
-            await switchThemeTo({
+          onClick={() => {
+            void switchThemeTo({
               theme: theme.id,
               mainWindow: true,
               dispatch,
@@ -131,8 +129,8 @@ export const SettingsThemeSwitcher = () => {
               inputName="primary-colors"
               ariaLabel={item.ariaLabel}
               color={item.color}
-              onClick={async () => {
-                await switchPrimaryColorTo(item.id, dispatch);
+              onClick={() => {
+                void switchPrimaryColorTo(item.id, dispatch);
               }}
             />
           );
diff --git a/ts/components/settings/ZoomingSessionSlider.tsx b/ts/components/settings/ZoomingSessionSlider.tsx
index a63ebaf3a..11695e71c 100644
--- a/ts/components/settings/ZoomingSessionSlider.tsx
+++ b/ts/components/settings/ZoomingSessionSlider.tsx
@@ -1,6 +1,6 @@
 import Slider from 'rc-slider';
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SessionSettingsItemWrapper } from './SessionSettingListItem';
 
@@ -23,6 +23,7 @@ export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) =
           min={60}
           max={200}
           defaultValue={currentValueFromSettings}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
           onAfterChange={handleSlider}
         />
 
diff --git a/ts/components/settings/section/CategoryAppearance.tsx b/ts/components/settings/section/CategoryAppearance.tsx
index d665b607a..8ad4400fc 100644
--- a/ts/components/settings/section/CategoryAppearance.tsx
+++ b/ts/components/settings/section/CategoryAppearance.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { isHideMenuBarSupported } from '../../../types/Settings';
diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx
index 530831226..3830883ae 100644
--- a/ts/components/settings/section/CategoryConversations.tsx
+++ b/ts/components/settings/section/CategoryConversations.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { ToastUtils } from '../../../session/utils';
@@ -8,7 +8,6 @@ import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
 import { getAudioAutoplay } from '../../../state/selectors/userConfig';
 
 import { BlockedContactsList } from '../BlockedList';
-// tslint:disable: use-simple-attributes
 
 import { SessionToggleWithDescription } from '../SessionSettingListItem';
 
@@ -32,6 +31,7 @@ const CommunitiesPruningSetting = () => {
   );
   return (
     <SessionToggleWithDescription
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClickToggle={async () => {
         await toggleCommunitiesPruning();
         forceUpdate();
diff --git a/ts/components/settings/section/CategoryPermissions.tsx b/ts/components/settings/section/CategoryPermissions.tsx
index 1832d041c..b749bfcb8 100644
--- a/ts/components/settings/section/CategoryPermissions.tsx
+++ b/ts/components/settings/section/CategoryPermissions.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { CallManager, ToastUtils } from '../../../session/utils';
diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
index d2490dad9..b9768c10b 100644
--- a/ts/components/settings/section/CategoryPrivacy.tsx
+++ b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
@@ -75,8 +76,8 @@ export const SettingsCategoryPrivacy = (props: {
           childrenDescription={<TypingBubbleItem />}
         />
         <SessionToggleWithDescription
-          onClickToggle={async () => {
-            await toggleLinkPreviews(isLinkPreviewsOn, forceUpdate);
+          onClickToggle={() => {
+            void toggleLinkPreviews(isLinkPreviewsOn, forceUpdate);
           }}
           title={window.i18n('linkPreviewsTitle')}
           description={window.i18n('linkPreviewDescription')}
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 2ce49e478..336cf401a 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -1,4 +1,5 @@
 import { AsyncObjectWrapper, ConfigDumpDataNode, ConfigDumpRow } from '../../types/sqlSharedTypes';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
 import { cleanData } from '../dataUtils';
diff --git a/ts/data/data.ts b/ts/data/data.ts
index b199a2d1e..df4c54d4f 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -1,5 +1,4 @@
-// tslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression
-// tslint:disable: function-name
+// eslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression function-name
 
 import _ from 'lodash';
 import { MessageResultProps } from '../components/search/MessageSearchResults';
@@ -350,12 +349,10 @@ async function markAllAsReadByConversationNoExpiration(
   conversationId: string,
   returnMessagesUpdated: boolean // for performance reason we do not return them because usually they are not needed
 ): Promise<Array<number>> {
-  // tslint:disable-next-line: no-console
   const messagesIds = await channels.markAllAsReadByConversationNoExpiration(
     conversationId,
     returnMessagesUpdated
   );
-  // tslint:disable-next-line: no-console
   return messagesIds;
 }
 
@@ -390,6 +387,7 @@ async function getMessagesByConversation(
   });
 
   if (skipTimerInit) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const message of messages) {
       message.skipTimerInit = skipTimerInit;
     }
@@ -419,6 +417,7 @@ async function getLastMessagesByConversation(
 ): Promise<MessageCollection> {
   const messages = await channels.getLastMessagesByConversation(conversationId, limit);
   if (skipTimerInit) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const message of messages) {
       message.skipTimerInit = skipTimerInit;
     }
@@ -433,6 +432,7 @@ async function getLastMessageIdInConversation(conversationId: string) {
 
 async function getLastMessageInConversation(conversationId: string) {
   const messages = await channels.getLastMessagesByConversation(conversationId, 1);
+  // eslint-disable-next-line no-restricted-syntax
   for (const message of messages) {
     message.skipTimerInit = true;
   }
@@ -443,6 +443,7 @@ async function getLastMessageInConversation(conversationId: string) {
 
 async function getOldestMessageInConversation(conversationId: string) {
   const messages = await channels.getOldestMessageInConversation(conversationId);
+  // eslint-disable-next-line no-restricted-syntax
   for (const message of messages) {
     message.skipTimerInit = true;
   }
@@ -669,7 +670,7 @@ async function updateSnodePoolOnDb(snodesAsJsonString: string): Promise<void> {
 
 function keysToArrayBuffer(keys: any, data: any) {
   const updated = _.cloneDeep(data);
-  // tslint:disable: one-variable-per-declaration
+
   for (let i = 0, max = keys.length; i < max; i += 1) {
     const key = keys[i];
     const value = _.get(data, key);
@@ -696,7 +697,7 @@ function keysFromArrayBuffer(keys: any, data: any) {
   return updated;
 }
 
-const ITEM_KEYS: Object = {
+const ITEM_KEYS: object = {
   identityKey: ['value.pubKey', 'value.privKey'],
   profileKey: ['value'],
 };
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index c70944d7b..74c479706 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -1,5 +1,4 @@
 import { ipcRenderer } from 'electron';
-import _ from 'lodash';
 import { channels } from './channels';
 import { ConfigDumpData } from './configDump/configDump';
 
@@ -125,7 +124,6 @@ export async function shutdown() {
     _shutdownCallback = (error: any) => {
       window?.log?.info('data.shutdown: process complete');
       if (error) {
-        // tslint:disable: no-void-expression
         return reject(error);
       }
 
@@ -154,7 +152,6 @@ function makeChannel(fnName: string) {
       });
 
       jobs[jobId].timer = setTimeout(
-        // tslint:disable: no-void-expression
         () => reject(new Error(`SQL channel job ${jobId} (${fnName}) timed out`)),
         DATABASE_UPDATE_TIMEOUT
       );
@@ -245,7 +242,6 @@ function removeJob(id: number) {
     jobs[id].timer = null;
   }
 
-  // tslint:disable-next-line: no-dynamic-delete
   delete jobs[id];
 
   if (_shutdownCallback) {
diff --git a/ts/data/dataUtils.ts b/ts/data/dataUtils.ts
index 08093d517..7ea2af971 100644
--- a/ts/data/dataUtils.ts
+++ b/ts/data/dataUtils.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 import _ from 'lodash';
 
 /**
@@ -8,7 +9,6 @@ import _ from 'lodash';
 export function cleanData(data: any): any {
   const keys = Object.keys(data);
 
-  // tslint:disable: one-variable-per-declaration
   for (let index = 0, max = keys.length; index < max; index += 1) {
     const key = keys[index];
     const value = data[key];
@@ -25,7 +25,7 @@ export function cleanData(data: any): any {
     } else if (_.isFunction(value)) {
       // just skip a function which has not a toNumber function. We don't want to save a function to the db.
       // an attachment comes with a toJson() function
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete data[key];
     } else if (Array.isArray(value)) {
       data[key] = value.map(cleanData);
diff --git a/ts/data/opengroups.ts b/ts/data/opengroups.ts
index d14c7952a..6b02ea559 100644
--- a/ts/data/opengroups.ts
+++ b/ts/data/opengroups.ts
@@ -88,7 +88,7 @@ async function opengroupRoomsLoad() {
   const loadedFromDB = await OpenGroupData.getAllV2OpenGroupRooms();
 
   if (loadedFromDB) {
-    cachedRooms = new Array();
+    cachedRooms = [];
     loadedFromDB.forEach(r => {
       try {
         cachedRooms?.push(r as any);
@@ -159,7 +159,6 @@ async function saveV2OpenGroupRoom(room: OpenGroupV2Room): Promise<void> {
     if (isNumber(foundIndex) && foundIndex > -1) {
       throwIfNotLoaded()[foundIndex] = cloneDeep(room);
     }
-    return;
   }
 }
 
diff --git a/ts/hooks/useAppFocused.ts b/ts/hooks/useAppFocused.ts
index 0a1ef4e6a..6523860b2 100644
--- a/ts/hooks/useAppFocused.ts
+++ b/ts/hooks/useAppFocused.ts
@@ -1,8 +1,8 @@
+import { ipcRenderer } from 'electron';
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setIsAppFocused } from '../state/ducks/section';
 import { getIsAppFocused } from '../state/selectors/section';
-import { ipcRenderer } from 'electron';
 
 /**
  * This custom hook should be called on the top of the app only once.
diff --git a/ts/hooks/useEncryptedFileFetch.ts b/ts/hooks/useEncryptedFileFetch.ts
index 038193a99..8274e8d4d 100644
--- a/ts/hooks/useEncryptedFileFetch.ts
+++ b/ts/hooks/useEncryptedFileFetch.ts
@@ -7,26 +7,24 @@ import {
 import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar: boolean) => {
-  // tslint:disable-next-line: no-bitwise
   const [urlToLoad, setUrlToLoad] = useState('');
   const [loading, setLoading] = useState(false);
 
   const mountedRef = useRef(true);
 
-  async function fetchUrl() {
-    perfStart(`getDecryptedMediaUrl-${url}`);
-
-    const decryptedUrl = await getDecryptedMediaUrl(url, contentType, isAvatar);
-    perfEnd(`getDecryptedMediaUrl-${url}`, `getDecryptedMediaUrl-${url}`);
-
-    if (mountedRef.current) {
-      setUrlToLoad(decryptedUrl);
-      setLoading(false);
-    }
-  }
   const alreadyDecrypted = getAlreadyDecryptedMediaUrl(url);
 
   useEffect(() => {
+    async function fetchUrl() {
+      perfStart(`getDecryptedMediaUrl-${url}`);
+      const decryptedUrl = await getDecryptedMediaUrl(url, contentType, isAvatar);
+      perfEnd(`getDecryptedMediaUrl-${url}`, `getDecryptedMediaUrl-${url}`);
+
+      if (mountedRef.current) {
+        setUrlToLoad(decryptedUrl);
+        setLoading(false);
+      }
+    }
     if (alreadyDecrypted) {
       return;
     }
@@ -34,10 +32,11 @@ export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar
     mountedRef.current = true;
     void fetchUrl();
 
+    // eslint-disable-next-line consistent-return
     return () => {
       mountedRef.current = false;
     };
-  }, [url]);
+  }, [url, alreadyDecrypted, contentType, isAvatar]);
 
   if (alreadyDecrypted) {
     return { urlToLoad: alreadyDecrypted, loading: false };
diff --git a/ts/hooks/useFocusMount.ts b/ts/hooks/useFocusMount.ts
index d586667ad..8bd257501 100644
--- a/ts/hooks/useFocusMount.ts
+++ b/ts/hooks/useFocusMount.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useMount from 'react-use/lib/useMount';
 
 export function useFocusMount(ref: React.RefObject<any>, isEditable?: boolean) {
diff --git a/ts/hooks/useModulo.ts b/ts/hooks/useModulo.ts
index 3c6c9cc27..f681c317e 100644
--- a/ts/hooks/useModulo.ts
+++ b/ts/hooks/useModulo.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useInterval from 'react-use/lib/useInterval';
 
 export function useModulo(loopBackAt: number, delay: number) {
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index ba26cf208..a04e8b04d 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,4 +1,4 @@
-import { compact, isEmpty, isNumber } from 'lodash';
+import { compact, isEmpty, isFinite, isNumber } from 'lodash';
 import { useSelector } from 'react-redux';
 import {
   hasValidIncomingRequestValues,
diff --git a/ts/hooks/useSet.ts b/ts/hooks/useSet.ts
index 2c361ee57..4f688cb44 100644
--- a/ts/hooks/useSet.ts
+++ b/ts/hooks/useSet.ts
@@ -26,7 +26,6 @@ export function useSet<T>(initialValues: Array<T> = []) {
   const empty = useCallback(() => {
     if (uniqueValues.length) {
       setUniqueValues([]);
-      return;
     }
   }, [uniqueValues, setUniqueValues]);
 
diff --git a/ts/hooks/useVideoEventListener.ts b/ts/hooks/useVideoEventListener.ts
index b9231207c..06c984aa3 100644
--- a/ts/hooks/useVideoEventListener.ts
+++ b/ts/hooks/useVideoEventListener.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useMountedState from 'react-use/lib/useMountedState';
 import {
   addVideoEventsListener,
@@ -25,7 +25,8 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
     DEVICE_DISABLED_DEVICE_ID
   );
   const [remoteStreamVideoIsMuted, setRemoteStreamVideoIsMuted] = useState(true);
-  const mountedState = useMountedState();
+  const mountedStateFunc = useMountedState();
+  const mountedState = mountedStateFunc();
 
   const [currentConnectedCameras, setCurrentConnectedCameras] = useState<Array<InputItem>>([]);
   const [currentConnectedAudioInputs, setCurrentConnectedAudioInputs] = useState<Array<InputItem>>(
@@ -53,7 +54,7 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
           isAudioMuted,
           currentSelectedAudioOutput: outputSelected,
         } = options;
-        if (mountedState()) {
+        if (mountedState) {
           setLocalStream(lLocalStream);
           setRemoteStream(lRemoteStream);
           setRemoteStreamVideoIsMuted(isRemoteVideoStreamMuted);
@@ -71,7 +72,7 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
     return () => {
       removeVideoEventsListener(uniqueId);
     };
-  }, [ongoingCallPubkey, selectedConversationKey, isFullScreen]);
+  }, [ongoingCallPubkey, selectedConversationKey, isFullScreen, mountedState, onSame, uniqueId]);
 
   return {
     currentConnectedAudioInputs,
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 6b6c7ca27..8ded7592b 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -391,7 +391,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
   const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
   if (!ourConvo) {
     window.log.warn('ourConvo not found... This is not a valid case');
-    return;
+    return null;
   }
 
   let profileKey: Uint8Array | null;
@@ -410,20 +410,20 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
     profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null;
     if (!profileKey) {
       window.log.info('our profileKey not found. Not reuploading our avatar');
-      return;
+      return null;
     }
     const currentAttachmentPath = ourConvo.getAvatarPath();
 
     if (!currentAttachmentPath) {
       window.log.warn('No attachment currently set for our convo.. Nothing to do.');
-      return;
+      return null;
     }
 
     const decryptedAvatarUrl = await getDecryptedMediaUrl(currentAttachmentPath, IMAGE_JPEG, true);
 
     if (!decryptedAvatarUrl) {
       window.log.warn('Could not decrypt avatar stored locally..');
-      return;
+      return null;
     }
     const blob = await urlToBlob(decryptedAvatarUrl);
 
@@ -432,7 +432,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
 
   if (!decryptedAvatarData?.byteLength) {
     window.log.warn('Could not read content of avatar ...');
-    return;
+    return null;
   }
 
   const encryptedData = await encryptProfile(decryptedAvatarData, profileKey);
@@ -440,7 +440,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
   const avatarPointer = await uploadFileToFsWithOnionV4(encryptedData);
   if (!avatarPointer) {
     window.log.warn('failed to upload avatar to fileserver');
-    return;
+    return null;
   }
   const { fileUrl, fileId } = avatarPointer;
 
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 91ebd423b..85bdc930e 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -54,7 +54,7 @@ async function unsendMessagesForEveryone(
     // sending to recipient all the messages separately for now
     await Promise.all(
       unsendMsgObjects.map(unsendObject => {
-        getMessageQueue()
+        return getMessageQueue()
           .sendToGroup({
             message: unsendObject,
             namespace: SnodeNamespaces.ClosedGroupMessage,
@@ -71,7 +71,7 @@ async function unsendMessagesForEveryone(
 }
 
 function getUnsendMessagesObjects(messages: Array<MessageModel>) {
-  //#region building request
+  // #region building request
   return compact(
     messages.map(message => {
       const author = message.get('source');
@@ -91,7 +91,7 @@ function getUnsendMessagesObjects(messages: Array<MessageModel>) {
       return new UnsendMessage(unsendParams);
     })
   );
-  //#endregion
+  // #endregion
 }
 
 /**
@@ -247,7 +247,7 @@ const doDeleteSelectedMessagesInSOGS = async (
   if (!ourDevicePubkey) {
     return;
   }
-  //#region open group v2 deletion
+  // #region open group v2 deletion
   // Get our Moderator status
   const isAdmin = conversation.isAdmin(ourDevicePubkey);
   const isModerator = conversation.isModerator(ourDevicePubkey);
@@ -273,12 +273,13 @@ const doDeleteSelectedMessagesInSOGS = async (
           deletionType: 'complete',
         });
       }
+      return null;
     })
   );
   // successful deletion
   ToastUtils.pushDeleted(toDeleteLocallyIds.length);
   window.inboxStore?.dispatch(resetSelectedMessageIds());
-  //#endregion
+  // #endregion
 };
 
 /**
@@ -303,10 +304,11 @@ const doDeleteSelectedMessages = async ({
 
   const isAllOurs = selectedMessages.every(message => ourDevicePubkey === message.getSource());
   if (conversation.isPublic()) {
-    return doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, isAllOurs);
+    await doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, isAllOurs);
+    return;
   }
 
-  //#region deletion for 1-1 and closed groups
+  // #region deletion for 1-1 and closed groups
 
   if (deleteForEveryone) {
     if (!isAllOurs) {
@@ -314,7 +316,8 @@ const doDeleteSelectedMessages = async ({
       window.inboxStore?.dispatch(resetSelectedMessageIds());
       return;
     }
-    return unsendMessagesForEveryone(conversation, selectedMessages);
+    await unsendMessagesForEveryone(conversation, selectedMessages);
+    return;
   }
 
   // delete just for me in a closed group only means delete locally
@@ -327,12 +330,11 @@ const doDeleteSelectedMessages = async ({
     return;
   }
   // otherwise, delete that message locally, from our swarm and from our other devices
-  return unsendMessageJustForThisUser(conversation, selectedMessages);
+  await unsendMessageJustForThisUser(conversation, selectedMessages);
 
-  //#endregion
+  // #endregion
 };
 
-// tslint:disable-next-line: max-func-body-length
 export async function deleteMessagesByIdForEveryone(
   messageIds: Array<string>,
   conversationId: string
@@ -358,7 +360,6 @@ export async function deleteMessagesByIdForEveryone(
 
         // explicitly close modal for this case.
         window.inboxStore?.dispatch(updateConfirmModal(null));
-        return;
       },
       closeAfterInput: false,
     })
@@ -435,10 +436,9 @@ async function deleteOpenGroupMessages(
   if (allMessagesAreDeleted) {
     window?.log?.info('Removed all those serverIds messages successfully');
     return validMessageModelsToRemove.map(m => m.id as string);
-  } else {
-    window?.log?.info(
-      'failed to remove all those serverIds message. not removing them locally neither'
-    );
-    return [];
   }
+  window?.log?.info(
+    'failed to remove all those serverIds message. not removing them locally neither'
+  );
+  return [];
 }
diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts
index f5e4297e3..2e4d15eea 100644
--- a/ts/interactions/messageInteractions.ts
+++ b/ts/interactions/messageInteractions.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { joinOpenGroupV2WithUIEvents } from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
 import {
   sogsV3AddAdmin,
diff --git a/ts/mains/about_start.tsx b/ts/mains/about_start.tsx
index ed31fcef0..fec0529f5 100644
--- a/ts/mains/about_start.tsx
+++ b/ts/mains/about_start.tsx
@@ -1,4 +1,3 @@
-/* global $, Whisper */
 // const $body = $(document.body);
 
 import React from 'react';
diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts
index f1245942f..a445fb734 100644
--- a/ts/mains/main_node.ts
+++ b/ts/mains/main_node.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-void */
+/* eslint-disable import/first */
+/* eslint-disable import/order */
 /* eslint-disable no-console */
 
 import {
@@ -31,8 +35,6 @@ import packageJson from '../../package.json'; // checked - only node
 setupGlobalErrorHandler();
 import electronLocalshortcut from 'electron-localshortcut';
 
-// tslint:disable: no-console
-
 const getRealPath = pify(fs.realpath);
 
 // Hardcoding appId to prevent build failures on release.
@@ -195,7 +197,7 @@ function prepareURL(pathSegments: Array<string>, moreKeys?: { theme: any }) {
 function handleUrl(event: any, target: string) {
   event?.preventDefault();
   const { protocol } = url.parse(target);
-  // tslint:disable-next-line: no-http-string
+
   if (protocol === 'http:' || protocol === 'https:') {
     void shell.openExternal(target);
   }
@@ -237,7 +239,7 @@ function isVisible(window: { x: number; y: number; width: number }, bounds: any)
   const BOUNDS_BUFFER = 100;
 
   // requiring BOUNDS_BUFFER pixels on the left or right side
-  // tslint:disable: restrict-plus-operands
+
   const rightSideClearOfLeftBound = window.x + window.width >= boundsX + BOUNDS_BUFFER;
   const leftSideClearOfRightBound = window.x <= boundsX + boundsWidth - BOUNDS_BUFFER;
 
@@ -259,7 +261,7 @@ function getStartInTray() {
   const usingTrayIcon = startInTray || process.argv.some(arg => arg === '--use-tray-icon');
   return { usingTrayIcon, startInTray };
 }
-// tslint:disable-next-line: max-func-body-length
+
 async function createWindow() {
   const { minWidth, minHeight, width, height } = getWindowSize();
   windowConfig = windowConfig || {};
@@ -277,7 +279,7 @@ async function createWindow() {
       screen.getPrimaryDisplay().workAreaSize.width - getDefaultWindowSize().defaultWidth;
     const screenHeight =
       screen.getPrimaryDisplay().workAreaSize.height - getDefaultWindowSize().defaultHeight;
-    // tslint:disable: insecure-random
+
     picked.x = Math.floor(Math.random() * screenWidth);
     picked.y = Math.floor(Math.random() * screenHeight);
   }
@@ -593,7 +595,7 @@ async function showPasswordWindow() {
 }
 
 let aboutWindow: BrowserWindow | null;
-// tslint:disable-next-line: max-func-body-length
+
 async function showAbout() {
   if (aboutWindow) {
     aboutWindow.show();
@@ -711,7 +713,7 @@ async function saveDebugLog(_event: any, logText: any) {
     if (result === undefined || outputPath === undefined || outputPath === '') {
       throw Error("User clicked Save button but didn't create a file");
     }
-    // tslint:disable: non-literal-fs-path
+
     fs.writeFile(outputPath, logText, err => {
       if (err) {
         throw Error(`${err}`);
@@ -851,7 +853,6 @@ async function requestShutdown() {
       }
 
       resolve(undefined);
-      return;
     });
     mainWindow?.webContents.send('get-ready-for-shutdown');
 
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index f67e06b3b..e66c8fb0a 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -1,4 +1,10 @@
 import _ from 'lodash';
+import ReactDOM from 'react-dom';
+import Backbone from 'backbone';
+
+import React from 'react';
+import nativeEmojiData from '@emoji-mart/data';
+
 import { MessageModel } from '../models/message';
 import { isMacOS } from '../OS';
 import { queueAllCached } from '../receiver/receiver';
@@ -11,21 +17,16 @@ import { Notifications } from '../util/notifications';
 import { Registration } from '../util/registration';
 import { isSignInByLinking, Storage } from '../util/storage';
 import { Data } from '../data/data';
-import Backbone from 'backbone';
 import { SessionRegistrationView } from '../components/registration/SessionRegistrationView';
 import { SessionInboxView } from '../components/SessionInboxView';
 import { deleteAllLogs } from '../node/logs';
-import ReactDOM from 'react-dom';
-import React from 'react';
 import { OpenGroupData } from '../data/opengroups';
 import { loadKnownBlindedKeys } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import nativeEmojiData from '@emoji-mart/data';
 import { initialiseEmojiData } from '../util/emoji';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { runners } from '../session/utils/job_runners/JobRunner';
 import { SettingsKey } from '../data/settings-key';
-// tslint:disable: max-classes-per-file
 
 // Globally disable drag and drop
 document.body.addEventListener(
@@ -48,7 +49,6 @@ document.body.addEventListener(
 // Load these images now to ensure that they don't flicker on first use
 const images = [];
 function preload(list: Array<string>) {
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let index = 0, max = list.length; index < max; index += 1) {
     const image = new Image();
     image.src = `./images/${list[index]}`;
@@ -121,6 +121,7 @@ async function startJobRunners() {
 // We need this 'first' check because we don't want to start the app up any other time
 //   than the first time. And storage.fetch() will cause onready() to fire.
 let first = true;
+// eslint-disable-next-line @typescript-eslint/no-misused-promises
 Storage.onready(async () => {
   if (!first) {
     return;
@@ -219,10 +220,10 @@ Storage.onready(async () => {
 async function manageExpiringData() {
   await Data.cleanSeenMessages();
   await Data.cleanLastHashes();
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   setTimeout(manageExpiringData, 1000 * 60 * 60);
 }
 
-// tslint:disable-next-line: max-func-body-length
 async function start() {
   void manageExpiringData();
   window.dispatchEvent(new Event('storage_ready'));
@@ -245,11 +246,12 @@ async function start() {
       const sentAt = message.get('sent_at');
 
       if (message.hasErrors()) {
-        return;
+        return null;
       }
 
       window.log.info(`Cleanup: Deleting unsent message ${sentAt}`);
       idsToCleanUp.push(message.id);
+      return null;
     })
   );
   if (idsToCleanUp.length) {
@@ -258,6 +260,7 @@ async function start() {
   window.log.info('Cleanup: complete');
 
   window.log.info('listening for registration events');
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   WhisperEvents.on('registration_done', async () => {
     window.log.info('handling registration event');
 
@@ -274,7 +277,8 @@ async function start() {
     const hideMenuBar = Storage.get('hide-menu-bar', true) as boolean;
     window.setAutoHideMenuBar(hideMenuBar);
     window.setMenuBarVisibility(!hideMenuBar);
-    getConversationController()
+    // eslint-disable-next-line more/no-then
+    void getConversationController()
       .loadPromise()
       ?.then(() => {
         ReactDOM.render(<SessionInboxView />, document.getElementById('root'));
@@ -304,7 +308,7 @@ async function start() {
 
   // Set user's launch count.
   const prevLaunchCount = window.getSettingValue('launch-count');
-  // tslint:disable-next-line: restrict-plus-operands
+
   const launchCount = !prevLaunchCount ? 1 : prevLaunchCount + 1;
 
   window.setTheme = async newTheme => {
@@ -365,6 +369,7 @@ async function start() {
     window.setCallMediaPermissions(enabled);
   };
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   window.openFromNotification = async conversationKey => {
     window.showWindow();
     if (conversationKey) {
@@ -485,13 +490,11 @@ class TextScramble {
     this.chars = '0123456789abcdef';
     this.update = this.update.bind(this);
   }
-  // tslint:disable: insecure-random
 
   public async setText(newText: string) {
     const oldText = this.el.value;
     const length = Math.max(oldText.length, newText.length);
-    // eslint-disable-next-line no-return-assign
-    // tslint:disable-next-line: promise-must-complete
+    // eslint-disable-next-line no-return-assign, no-promise-executor-return
     const promise = new Promise(resolve => (this.resolve = resolve));
     this.queue = [];
 
@@ -518,7 +521,6 @@ class TextScramble {
     let output = '';
     let complete = 0;
 
-    // tslint:disable-next-line: one-variable-per-declaration
     for (let i = 0, n = this.queue.length; i < n; i++) {
       const { from, to, start: startNumber, end } = this.queue[i];
       let { char } = this.queue[i];
diff --git a/ts/mains/password_start.tsx b/ts/mains/password_start.tsx
index fc12c504b..b6a65176d 100644
--- a/ts/mains/password_start.tsx
+++ b/ts/mains/password_start.tsx
@@ -1,4 +1,3 @@
-/* global $, Whisper */
 // const $body = $(document.body);
 
 import React from 'react';
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1e793508e..2ffb16ae7 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -7,6 +7,7 @@ import {
   isArray,
   isEmpty,
   isEqual,
+  isFinite,
   isNumber,
   isString,
   sortBy,
@@ -14,6 +15,8 @@ import {
   uniq,
   xor,
 } from 'lodash';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
@@ -24,7 +27,7 @@ import { BlockedNumberController } from '../util';
 import { MessageModel } from './message';
 import { MessageAttributesOptionals, MessageDirection } from './messageType';
 
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
@@ -48,7 +51,6 @@ import {
   ReduxConversationType,
 } from '../state/ducks/conversations';
 
-import { from_hex } from 'libsodium-wrappers-sumo';
 import {
   ReplyingToMessageProps,
   SendMessageType,
@@ -148,14 +150,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     this.initialPromise = Promise.resolve();
     autoBind(this);
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.throttledBumpTyping = throttle(this.bumpTyping, 300);
     this.updateLastMessage = throttle(this.bouncyUpdateLastMessage.bind(this), 1000, {
       trailing: true,
       leading: true,
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.throttledNotify = debounce(this.notify, 2000, { maxWait: 2000, trailing: true });
     // start right away the function is called, and wait 1sec before calling it again
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.markConversationRead = debounce(this.markConversationReadBouncy, 1000, {
       leading: true,
       trailing: true,
@@ -259,7 +264,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return groupAdmins && groupAdmins.length > 0 ? groupAdmins : [];
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity max-func-body-length
   public getConversationModelProps(): ReduxConversationType {
     const isPublic = this.isPublic();
 
@@ -451,14 +455,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async queueJob(callback: () => Promise<void>) {
-    // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
 
     const taskWithTimeout = createTaskWithTimeout(callback, `conversation ${this.idForLogging()}`);
 
+    // eslint-disable-next-line more/no-then
     this.pending = previous.then(taskWithTimeout, taskWithTimeout);
     const current = this.pending;
-
+    // eslint-disable-next-line more/no-then
     void current.then(() => {
       if (this.pending === current) {
         delete this.pending;
@@ -619,7 +623,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       window.log.error(`Reaction job failed id:${reaction.id} error:`, e);
-      return null;
     }
   }
 
@@ -849,12 +852,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const expireUpdate = {
       identifier: message.id,
       timestamp,
-      expireTimer: expireTimer ? expireTimer : (null as number | null),
+      expireTimer: expireTimer || (null as number | null),
     };
 
     if (this.isMe()) {
       const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate);
-      return message.sendSyncMessageOnly(expirationTimerMessage);
+      await message.sendSyncMessageOnly(expirationTimerMessage);
+      return;
     }
 
     if (this.isPrivate()) {
@@ -879,7 +883,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         namespace: SnodeNamespaces.ClosedGroupMessage,
       });
     }
-    return;
   }
 
   public triggerUIRefresh() {
@@ -1309,7 +1312,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    *
    * Does not do anything for non public chats.
    */
-  // tslint:disable-next-line: cyclomatic-complexity
+
   public async setPollInfo(infos?: {
     active_users: number;
     read: boolean;
@@ -1412,9 +1415,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.isOpenGroupV2()) {
       const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id);
       return roomHasReactionsEnabled(openGroup);
-    } else {
-      return true;
     }
+    return true;
   }
 
   public async removeMessage(messageId: string) {
@@ -1573,7 +1575,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       conversationId,
       iconUrl,
       isExpiringMessage,
-      message: friendRequestText ? friendRequestText : message.getNotificationText(),
+      message: friendRequestText || message.getNotificationText(),
       messageId,
       messageSentAt,
       title: friendRequestText ? '' : convo.getNicknameOrRealUsernameOrPlaceholder(),
@@ -1630,7 +1632,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     // we do not trigger a state change here, instead we rely on the caller to do the commit once it is done with the queue of messages
     this.typingTimer = isTyping
-      ? global.setTimeout(this.clearContactTypingTimer.bind(this, sender), 15 * 1000)
+      ? // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        global.setTimeout(this.clearContactTypingTimer.bind(this, sender), 15 * 1000)
       : null;
   }
 
@@ -1770,7 +1773,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       await message.saveErrors(e);
-      return null;
     }
   }
 
@@ -1789,6 +1791,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     // include our profile (displayName + avatar url + key for the recipient)
+    // eslint-disable-next-line no-param-reassign
     messageParams.lokiProfile = getOurProfile();
 
     if (!ourSignKeyBytes || !groupUrl) {
@@ -1888,12 +1891,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const oldUnreadNowRead = (await this.getUnreadByConversation(newestUnreadDate)).models;
 
     if (!oldUnreadNowRead.length) {
-      //no new messages where read, no need to do anything
+      // no new messages where read, no need to do anything
       return;
     }
 
     // Build the list of updated message models so we can mark them all as read on a single sqlite call
     const readDetails = [];
+    // eslint-disable-next-line no-restricted-syntax
     for (const nowRead of oldUnreadNowRead) {
       nowRead.markMessageReadNoCommit(readAt);
 
@@ -1911,6 +1915,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
     const allProps: Array<MessageModelPropsWithoutConvoProps> = [];
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const nowRead of oldUnreadNowRead) {
       allProps.push(nowRead.getMessageModelProps());
     }
@@ -1961,7 +1966,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   private async clearContactTypingTimer(_sender: string) {
-    if (!!this.typingTimer) {
+    if (this.typingTimer) {
       global.clearTimeout(this.typingTimer);
       this.typingTimer = null;
 
@@ -2067,7 +2072,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const typingMessage = new TypingMessage(typingParams);
 
     const device = new PubKey(recipientId);
-    getMessageQueue()
+    void getMessageQueue()
       .sendToPubKey(device, typingMessage, SnodeNamespaces.UserMessages)
       .catch(window?.log?.error);
   }
@@ -2194,21 +2199,25 @@ export async function commitConversationAndRefreshWrapper(id: string) {
     switch (variant) {
       case 'UserConfig':
         if (SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilUserProfile.insertUserProfileIntoWrapper(convo.id);
         }
         break;
       case 'ContactsConfig':
         if (SessionUtilContact.isContactToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
       case 'UserGroupsConfig':
         if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
       case 'ConvoInfoVolatileConfig':
         if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 592839993..9ca93feb7 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1,28 +1,4 @@
 import Backbone from 'backbone';
-// tslint:disable-next-line: match-default-export-name
-import filesize from 'filesize';
-import { SignalService } from '../../ts/protobuf';
-import { getMessageQueue } from '../../ts/session';
-import { getConversationController } from '../../ts/session/conversations';
-import { DataMessage } from '../../ts/session/messages/outgoing';
-import { PubKey } from '../../ts/session/types';
-import {
-  uploadAttachmentsToFileServer,
-  uploadLinkPreviewToFileServer,
-  uploadQuoteThumbnailsToFileServer,
-  UserUtils,
-} from '../../ts/session/utils';
-import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
-import {
-  DataExtractionNotificationMsg,
-  fillMessageAttributesWithDefaults,
-  MessageAttributes,
-  MessageAttributesOptionals,
-  MessageGroupUpdate,
-  MessageModelType,
-  PropsForDataExtractionNotification,
-  PropsForMessageRequestResponse,
-} from './messageType';
 
 import autoBind from 'auto-bind';
 import {
@@ -38,7 +14,31 @@ import {
   sortBy,
   uniq,
 } from 'lodash';
-import { Data } from '../../ts/data/data';
+import filesize from 'filesize';
+import { SignalService } from '../protobuf';
+import { getMessageQueue } from '../session';
+import { getConversationController } from '../session/conversations';
+import { DataMessage } from '../session/messages/outgoing';
+import { PubKey } from '../session/types';
+import {
+  uploadAttachmentsToFileServer,
+  uploadLinkPreviewToFileServer,
+  uploadQuoteThumbnailsToFileServer,
+  UserUtils,
+} from '../session/utils';
+import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
+import {
+  DataExtractionNotificationMsg,
+  fillMessageAttributesWithDefaults,
+  MessageAttributes,
+  MessageAttributesOptionals,
+  MessageGroupUpdate,
+  MessageModelType,
+  PropsForDataExtractionNotification,
+  PropsForMessageRequestResponse,
+} from './messageType';
+
+import { Data } from '../data/data';
 import { OpenGroupData } from '../data/opengroups';
 import { SettingsKey } from '../data/settings-key';
 import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
@@ -92,7 +92,6 @@ import { Notifications } from '../util/notifications';
 import { Storage } from '../util/storage';
 import { ConversationModel } from './conversation';
 import { READ_MESSAGE_STATE } from './conversationAttributes';
-// tslint:disable: cyclomatic-complexity
 
 /**
  * @returns true if the array contains only a single item being 'You', 'you' or our device pubkey
@@ -187,7 +186,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const expirationTimerUpdate = this.get('expirationTimerUpdate');
 
     // eslint-disable-next-line no-bitwise
-    // tslint:disable-next-line: no-bitwise
     return Boolean(flags & expirationTimerFlag) || !isEmpty(expirationTimerUpdate);
   }
 
@@ -372,7 +370,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     };
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null {
     const groupUpdate = this.getGroupUpdateAsArray();
 
@@ -448,7 +445,8 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return 'read';
     }
     const sent = this.get('sent');
-    // control messages we've sent, synced from the network appear to just have the sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine.,
+    // control messages we've sent, synced from the network appear to just have the
+    // sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine.,
     // TODOLATER
     // const sentAt = this.get('sent_at');
     const sentTo = this.get('sent_to') || [];
@@ -460,7 +458,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return 'sending';
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public getPropsForMessage(): PropsForMessageWithoutConvoProps {
     const sender = this.getSource();
     const expirationLength = this.get('expireTimer') * 1000;
@@ -593,7 +590,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     } = attachment;
 
     const isVoiceMessageBool =
-      // tslint:disable-next-line: no-bitwise
+      // eslint-disable-next-line no-bitwise
       Boolean(flags && flags & SignalService.AttachmentPointer.Flags.VOICE_MESSAGE) || false;
 
     return {
@@ -786,7 +783,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         window?.log?.info(
           'cannot retry send message, the corresponding conversation was not found.'
         );
-        return;
+        return null;
       }
       const { body, attachments, preview, quote, fileIdsToLink } = await this.uploadData();
 
@@ -1018,7 +1015,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     // getNextExpiringMessage is used on app start to clean already expired messages which should have been removed already, but are not
     await this.setToExpire();
 
-    this.getConversation()?.refreshInMemoryDetails();
+    await this.getConversation()?.refreshInMemoryDetails();
   }
 
   public markMessageReadNoCommit(readAt: number) {
@@ -1288,7 +1285,7 @@ export function findAndFormatContact(pubkey: string): FindAndFormatContactType {
   }
 
   return {
-    pubkey: pubkey,
+    pubkey,
     avatarPath: contactModel ? contactModel.getAvatarPath() : null,
     name: contactModel?.getRealSessionUsername() || null,
     profileName,
@@ -1302,16 +1299,11 @@ export function processQuoteAttachment(attachment: any) {
   const objectUrl = thumbnail && thumbnail.objectUrl;
 
   const thumbnailWithObjectUrl =
-    !path && !objectUrl
-      ? null
-      : // tslint:disable: prefer-object-spread
-        Object.assign({}, attachment.thumbnail || {}, {
-          objectUrl: path || objectUrl,
-        });
+    !path && !objectUrl ? null : { ...(attachment.thumbnail || {}), objectUrl: path || objectUrl };
 
-  return Object.assign({}, attachment, {
+  return {
+    ...attachment,
     isVoiceMessage: isVoiceMessage(attachment),
     thumbnail: thumbnailWithObjectUrl,
-  });
-  // tslint:enable: prefer-object-spread
+  };
 }
diff --git a/ts/models/messageFactory.ts b/ts/models/messageFactory.ts
index dd5a37450..d0ce82b53 100644
--- a/ts/models/messageFactory.ts
+++ b/ts/models/messageFactory.ts
@@ -116,6 +116,7 @@ export function markAttributesAsReadIfNeeded(messageAttributes: MessageAttribute
       latestUnreadForThisConvo?.lastRead &&
       sentAt <= latestUnreadForThisConvo.lastRead
     ) {
+      // eslint-disable-next-line no-param-reassign
       messageAttributes.unread = READ_MESSAGE_STATE.read;
     }
   }
diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts
index 28324e470..17a20b411 100644
--- a/ts/node/attachment_channel.ts
+++ b/ts/node/attachment_channel.ts
@@ -4,9 +4,9 @@ import rimraf from 'rimraf';
 import path from 'path';
 import fse from 'fs-extra';
 import pify from 'pify';
+// eslint-disable-next-line import/no-named-default
 import { default as glob } from 'glob';
 
-// tslint:disable: no-console
 import { sqlNode } from './sql'; // checked - only node
 import { createDeleter, getAttachmentsPath } from '../shared/attachments/shared_attachments';
 
@@ -32,14 +32,12 @@ const deleteAll = async ({
 }) => {
   const deleteFromDisk = createDeleter(getAttachmentsPath(userDataPath));
 
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let index = 0, max = attachments.length; index < max; index += 1) {
     const file = attachments[index];
     // eslint-disable-next-line no-await-in-loop
     await deleteFromDisk(file);
   }
 
-  // tslint:disable-next-line: no-console
   console.log(`deleteAll: deleted ${attachments.length} files`);
 };
 
@@ -53,7 +51,7 @@ const getAllAttachments = async (userDataPath: string) => {
 
 async function cleanupOrphanedAttachments(userDataPath: string) {
   const allAttachments = await getAllAttachments(userDataPath);
-  const orphanedAttachments = sqlNode.removeKnownAttachments(allAttachments); //sql.js
+  const orphanedAttachments = sqlNode.removeKnownAttachments(allAttachments);
   await deleteAll({
     userDataPath,
     attachments: orphanedAttachments,
@@ -82,6 +80,7 @@ export async function initAttachmentsChannel({ userDataPath }: { userDataPath: s
     }
   });
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   ipcMain.on(CLEANUP_ORPHANED_ATTACHMENTS_KEY, async event => {
     try {
       await cleanupOrphanedAttachments(userDataPath);
diff --git a/ts/node/config.ts b/ts/node/config.ts
index a4a605b3b..05f2f97f8 100644
--- a/ts/node/config.ts
+++ b/ts/node/config.ts
@@ -1,7 +1,7 @@
+/* eslint-disable no-console */
 import path from 'path';
 
 import { app } from 'electron';
-// tslint:disable: no-console
 
 let environment;
 const isPackaged = app.isPackaged;
@@ -29,9 +29,9 @@ if (environment === 'production') {
 }
 
 // We load config after we've made our modifications to NODE_ENV
-//tslint-disable no-require-imports no-var-requires
-// tslint:disable-next-line: no-require-imports no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const c = require('config');
+
 c.environment = environment;
 
 // Log resulting env vars in use by config
diff --git a/ts/node/config/base_config.ts b/ts/node/config/base_config.ts
index e064d867c..a9c79e19b 100644
--- a/ts/node/config/base_config.ts
+++ b/ts/node/config/base_config.ts
@@ -1,5 +1,4 @@
 import { readFileSync, unlinkSync, writeFileSync } from 'fs';
-// tslint:disable: no-console
 
 const ENCODING = 'utf8';
 
diff --git a/ts/node/config/user_config.ts b/ts/node/config/user_config.ts
index d3ae021e6..abd31d70d 100644
--- a/ts/node/config/user_config.ts
+++ b/ts/node/config/user_config.ts
@@ -4,7 +4,6 @@ import process from 'process';
 import { app } from 'electron';
 
 import { start } from './base_config';
-// tslint:disable: no-console
 
 let storageProfile;
 
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 290515796..6ce8a86c4 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -1,12 +1,11 @@
 import { difference, omit, pick } from 'lodash';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import {
   ConversationAttributes,
   ConversationAttributesWithNotSavedOnes,
   CONVERSATION_PRIORITIES,
 } from '../models/conversationAttributes';
 
-import * as BetterSqlite3 from '@signalapp/better-sqlite3';
-
 export const CONVERSATIONS_TABLE = 'conversations';
 export const MESSAGES_TABLE = 'messages';
 export const MESSAGES_FTS_TABLE = 'messages_fts';
@@ -20,7 +19,6 @@ export const CLOSED_GROUP_V2_KEY_PAIRS_TABLE = 'encryptionKeyPairsForClosedGroup
 export const LAST_HASHES_TABLE = 'lastHashes';
 
 export const HEX_KEY = /[^0-9A-Fa-f]/;
-// tslint:disable: no-console
 
 export function objectToJSON(data: Record<any, any>) {
   return JSON.stringify(data);
@@ -76,7 +74,7 @@ const allowedKeysFormatRowOfConversation = [
   'markedAsUnread',
   'priority',
 ];
-// tslint:disable: cyclomatic-complexity
+
 export function formatRowOfConversation(
   row: Record<string, any>,
   from: string,
@@ -216,7 +214,6 @@ export function assertValidConversationAttributes(
   const foundInAttributesButNotInAllowed = difference(Object.keys(data), allowedKeysTogether);
 
   if (foundInAttributesButNotInAllowed?.length) {
-    // tslint:disable-next-line: no-console
     console.error(
       `assertValidConversationAttributes: an invalid key was given in the record: ${foundInAttributesButNotInAllowed}`
     );
diff --git a/ts/node/encrypt_attachment_buffer.ts b/ts/node/encrypt_attachment_buffer.ts
index cce492e72..fa41651d0 100644
--- a/ts/node/encrypt_attachment_buffer.ts
+++ b/ts/node/encrypt_attachment_buffer.ts
@@ -26,7 +26,6 @@ export async function decryptAttachmentBufferNode(
       return messageTag.message;
     }
   } catch (e) {
-    // tslint:disable: no-console
     console.error('Failed to load the file as an encrypted one', e);
   }
   return new Uint8Array();
@@ -52,8 +51,6 @@ export async function encryptAttachmentBufferNode(
       sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL
     );
 
-    //tslint-disable restrict-plus-operands
-    // tslint:disable-next-line: restrict-plus-operands
     const encryptedBufferWithHeader = new Uint8Array(bufferOut.length + header.length);
     encryptedBufferWithHeader.set(header);
     encryptedBufferWithHeader.set(bufferOut, header.length);
diff --git a/ts/node/global_errors.ts b/ts/node/global_errors.ts
index 621f66ce5..b0d8713af 100644
--- a/ts/node/global_errors.ts
+++ b/ts/node/global_errors.ts
@@ -2,7 +2,6 @@ import { app, clipboard, dialog } from 'electron';
 import { redactAll } from '../util/privacy'; // checked - only node
 import { LocaleMessagesType } from './locale'; // checked - only node
 import { ConsoleCustom } from './logging'; // checked - only node
-// tslint:disable: no-console
 
 // We use hard-coded strings until we're able to update these strings from the locale.
 let quitText = 'Quit';
@@ -40,10 +39,12 @@ export const updateLocale = (messages: LocaleMessagesType) => {
 };
 
 export const setupGlobalErrorHandler = () => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.on('uncaughtException', async error => {
     await handleError('Unhandled Error', error);
   });
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.on('unhandledRejection', async error => {
     await handleError('Unhandled Promise Rejection', error);
   });
diff --git a/ts/node/locale.ts b/ts/node/locale.ts
index edc52b3ea..89ec89ab9 100644
--- a/ts/node/locale.ts
+++ b/ts/node/locale.ts
@@ -16,7 +16,6 @@ function getLocaleMessages(locale: string): LocaleMessagesType {
 
   const targetFile = path.join(getAppRootPath(), '_locales', onDiskLocale, 'messages.json');
 
-  // tslint:disable-next-line: non-literal-fs-path
   return JSON.parse(fs.readFileSync(targetFile, 'utf-8'));
 }
 export type LocaleMessagesType = Record<string, string>;
diff --git a/ts/node/logging.ts b/ts/node/logging.ts
index 5ceb4bf99..f256d4f82 100644
--- a/ts/node/logging.ts
+++ b/ts/node/logging.ts
@@ -15,8 +15,6 @@ import { redactAll } from '../util/privacy';
 
 const LEVELS = ['fatal', 'error', 'warn', 'info', 'debug', 'trace'];
 let logger: Logger | undefined;
-// tslint:disable: non-literal-fs-path
-// tslint:disable: no-console
 
 export type ConsoleCustom = typeof console & {
   _log: (...args: any) => void;
@@ -75,6 +73,7 @@ export async function initializeLogger() {
       );
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     ipc.on('delete-all-logs', async event => {
       try {
         await deleteAllLogs(logPath);
@@ -101,7 +100,6 @@ async function deleteAllLogs(logPath: string) {
         }
 
         resolve(undefined);
-        return;
       }
     );
   });
@@ -216,7 +214,6 @@ async function fetchLog(logFile: string) {
       );
 
       resolve(data);
-      return;
     });
   });
 }
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index 078a88cc5..4c7573b3c 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -1,8 +1,6 @@
+import { isString } from 'lodash';
 import { LocaleMessagesType } from './locale';
 
-import { isString } from 'lodash';
-
-// tslint:disable-next-line: max-func-body-length
 export const createTemplate = (
   options: {
     openReleaseNotes: () => void;
@@ -153,8 +151,8 @@ export const createTemplate = (
 
   if (platform === 'darwin') {
     return updateForMac(template, messages, {
-      showAbout: showAbout,
-      showWindow: showWindow,
+      showAbout,
+      showWindow,
     });
   }
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 05297e8e3..988403634 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import {
   ContactsConfigWrapperNode,
@@ -5,7 +6,7 @@ import {
   UserConfigWrapperNode,
   UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
-import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
+import { compact, isArray, isEmpty, isFinite, isNumber, isString, map, pick } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationAttributes,
@@ -37,7 +38,7 @@ import { sleepFor } from '../../session/utils/Promise';
 
 const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG);
 
-// tslint:disable: no-console quotemark one-variable-per-declaration no-unused-expression
+// eslint:disable: quotemark one-variable-per-declaration no-unused-expression
 
 function getSessionSchemaVersion(db: BetterSqlite3.Database) {
   const result = db
@@ -618,7 +619,7 @@ function updateToSessionSchemaVersion20(currentVersion: number, db: BetterSqlite
     //     `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND (name IS NULL or name = '') AND json_extract(json, '$.nickname') <> '';`
     //   )
     //   .all();
-    // tslint:disable-next-line: no-void-expression
+
     // (rowsToUpdate || []).forEach(r => {
     //   const obj = jsonToObject(r.json);
 
@@ -721,7 +722,6 @@ function updateToSessionSchemaVersion23(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-// tslint:disable-next-line: max-func-body-length
 function updateToSessionSchemaVersion24(currentVersion: number, db: BetterSqlite3.Database) {
   const targetVersion = 24;
   if (currentVersion >= targetVersion) {
@@ -921,13 +921,11 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
     if (!oldConvoId) {
       return null;
     }
-    return (
-      oldConvoId
-        ?.replace(`https://${ipToRemove}`, urlToUse)
-        // tslint:disable-next-line: no-http-string
-        ?.replace(`http://${ipToRemove}`, urlToUse)
-        ?.replace(ipToRemove, urlToUse)
-    );
+    return oldConvoId
+      ?.replace(`https://${ipToRemove}`, urlToUse)
+
+      ?.replace(`http://${ipToRemove}`, urlToUse)
+      ?.replace(ipToRemove, urlToUse);
   }
 
   function getAllOpenGroupV2Conversations(instance: BetterSqlite3.Database) {
@@ -962,7 +960,6 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
     return roomId;
   }
 
-  // tslint:disable-next-line: max-func-body-length
   db.transaction(() => {
     // First we want to drop the column friendRequestStatus if it is there, otherwise the transaction fails
     const rows = db.pragma(`table_info(${CONVERSATIONS_TABLE});`);
@@ -1104,7 +1101,8 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
 
     /**
      * Lastly, we need to take care of messages.
-     * For duplicated rooms, we drop all the messages from the IP one. (Otherwise we would need to compare each message id to not break the PRIMARY_KEY on the messageID and those are just sogs messages).
+     * For duplicated rooms, we drop all the messages from the IP one. (Otherwise we
+     * would need to compare each message id to not break the PRIMARY_KEY on the messageID and those are just sogs messages).
      * For non duplicated rooms which got renamed to their dns ID, we override the stored conversationId in the message with the new conversationID
      */
     dropFtsAndTriggers(db);
@@ -1266,10 +1264,10 @@ function insertContactIntoContactWrapper(
             // expirationTimerSeconds: 0,
           })
         );
-      } catch (e) {
+      } catch (err2) {
         // there is nothing else we can do here
         console.error(
-          `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}. Skipping contact entirely`
+          `contactsConfigWrapper.set during migration failed with ${err2.message} for id: ${contact.id}. Skipping contact entirely`
         );
       }
     }
@@ -1897,6 +1895,7 @@ export async function updateSessionSchema(db: BetterSqlite3.Database) {
        *
        * This means that this sleepFor will only sleep for at most 600ms, even if we need to run 30 migrations.
        */
+      // eslint-disable-next-line no-await-in-loop
       await sleepFor(200); // give some time for the UI to not freeze between 2 migrations
     }
   }
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index 602e196cf..6d7bddcd7 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -15,9 +15,9 @@ import {
 import { getAppRootPath } from '../getRootPath';
 import { updateSessionSchema } from './sessionMigrations';
 
-// tslint:disable: no-console quotemark non-literal-fs-path one-variable-per-declaration
+// eslint:disable: quotemark non-literal-fs-path one-variable-per-declaration
 const openDbOptions = {
-  // tslint:disable-next-line: no-constant-condition
+  // eslint-disable-next-line no-constant-condition
   verbose: false ? console.log : undefined,
 
   nativeBinding: path.join(
@@ -31,7 +31,7 @@ const openDbOptions = {
   ),
 };
 
-// tslint:disable: no-console one-variable-per-declaration
+// eslint:disable: one-variable-per-declaration
 
 function updateToSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
   if (currentVersion >= 1) {
@@ -125,7 +125,6 @@ function updateToSchemaVersion1(currentVersion: number, db: BetterSqlite3.Databa
     db.pragma('user_version = 1');
   })();
 
-  // tslint:disable: no-console
   console.log('updateToSchemaVersion1: success!');
 }
 
@@ -587,6 +586,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
 
   // First, we try to open the database without any cipher changes
   try {
+    // eslint-disable-next-line new-cap
     db = new (BetterSqlite3 as any).default(filePath, openDbOptions);
 
     keyDatabase(db, key);
@@ -607,6 +607,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
 
   let db1;
   try {
+    // eslint-disable-next-line new-cap
     db1 = new (BetterSqlite3 as any).default(filePath, openDbOptions);
     keyDatabase(db1, key);
 
@@ -625,6 +626,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
   //   migrate to the latest ciphers after we've modified the defaults.
   let db2;
   try {
+    // eslint-disable-next-line new-cap
     db2 = new (BetterSqlite3 as any).default(filePath, openDbOptions);
     keyDatabase(db2, key);
 
diff --git a/ts/node/permissions.ts b/ts/node/permissions.ts
index 74b0ac129..e1e5c4726 100644
--- a/ts/node/permissions.ts
+++ b/ts/node/permissions.ts
@@ -1,9 +1,8 @@
 // The list of permissions is here:
 //   https://electronjs.org/docs/api/session#sessetpermissionrequesthandlerhandler
-// tslint:disable: no-console
+import { session } from 'electron';
 
 import { UserConfig } from './config/user_config';
-import { session } from 'electron';
 
 const PERMISSIONS: Record<string, boolean> = {
   // Allowed
diff --git a/ts/node/protocol_filter.ts b/ts/node/protocol_filter.ts
index 842ed12fd..c4912b12a 100644
--- a/ts/node/protocol_filter.ts
+++ b/ts/node/protocol_filter.ts
@@ -1,7 +1,6 @@
 import path from 'path';
 import fs from 'fs';
 import { Protocol, ProtocolRequest } from 'electron';
-// tslint:disable: no-console
 
 function eliminateAllAfterCharacter(str: string, character: string) {
   const index = str.indexOf(character);
@@ -37,7 +36,7 @@ function createFileHandler({
     const target = path.normalize(urlToPath(request.url, { isWindows }));
     // here we attempt to follow symlinks to the ultimate final path, reflective of what
     //   we do in main.js on userDataPath and installPath
-    // tslint:disable-next-line: non-literal-fs-path
+
     const realPath = fs.existsSync(target) ? fs.realpathSync(target) : target;
     // finally we do case-insensitive checks on windows
     const properCasing = isWindows ? realPath.toLowerCase() : realPath;
diff --git a/ts/node/spell_check.ts b/ts/node/spell_check.ts
index 00f73afe8..93eceab72 100644
--- a/ts/node/spell_check.ts
+++ b/ts/node/spell_check.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-console
-
 import { BrowserWindow, Menu } from 'electron';
 import { sync as osLocaleSync } from 'os-locale';
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index d0d9e3dae..c94186f3b 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -20,6 +20,8 @@ import {
   omit,
   uniq,
 } from 'lodash';
+import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
+
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { PubKey } from '../session/types/PubKey'; // checked - only node
 import { redactAll } from '../util/privacy'; // checked - only node
@@ -71,10 +73,9 @@ import {
   isInstanceInitialized,
 } from './sqlInstance';
 import { configDumpData } from './sql_calls/config_dump';
-import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
 import { Quote } from '../receiver/types';
 
-// tslint:disable: no-console function-name non-literal-fs-path
+// eslint:disable: function-name non-literal-fs-path
 
 const MAX_PUBKEYS_MEMBERS = 300;
 
@@ -305,7 +306,6 @@ function getAllItems() {
 }
 function removeItemById(id: string) {
   removeById(ITEMS_TABLE, id);
-  return;
 }
 
 function createOrUpdate(table: string, data: StorageItem, instance?: BetterSqlite3.Database) {
@@ -412,7 +412,7 @@ function getConversationCount() {
  * Because everytime you'll update the saveConversation with a new argument, the migration you wrote a month ago still relies on the old way.
  * Because of that, there is no `instance` argument here, and you should not add one as this is only needed during migrations (which will break if you do it)
  */
-// tslint:disable-next-line: max-func-body-length cyclomatic-complexity
+
 function saveConversation(data: ConversationAttributes): SaveConversationReturn {
   const formatted = assertValidConversationAttributes(data);
 
@@ -1066,6 +1066,7 @@ function getMessagesBySenderAndSentAt(
   const db = assertGlobalInstance();
   const rows = [];
 
+  // eslint-disable-next-line no-restricted-syntax
   for (const msgProps of propsList) {
     const { source, timestamp } = msgProps;
 
@@ -1234,7 +1235,6 @@ function getMessagesByConversation(
     const messageFound = getMessageById(messageId || firstUnread);
 
     if (messageFound && messageFound.conversationId === conversationId) {
-      // tslint:disable-next-li ne: no-shadowed-variable
       const start = Date.now();
       const msgTimestamp =
         messageFound.serverTimestamp || messageFound.sent_at || messageFound.received_at;
@@ -1646,7 +1646,6 @@ const unprocessed: UnprocessedDataNode = {
     assertGlobalInstance()
       .prepare('DELETE FROM unprocessed WHERE id = $id;')
       .run({ id });
-    return;
   },
 
   removeAllUnprocessed: () => {
@@ -1875,7 +1874,6 @@ function removeKnownAttachments(allAttachments: Array<string>) {
     forEach(messages, message => {
       const externalFiles = getExternalFilesForMessage(message);
       forEach(externalFiles, file => {
-        // tslint:disable-next-line: no-dynamic-delete
         delete lookup[file];
       });
     });
@@ -1918,7 +1916,6 @@ function removeKnownAttachments(allAttachments: Array<string>) {
       const avatar = (conversation as ConversationAttributes)?.avatarInProfile;
       const externalFiles = getExternalFilesForConversation(avatar);
       forEach(externalFiles, file => {
-        // tslint:disable-next-line: no-dynamic-delete
         delete lookup[file];
       });
     });
@@ -2295,9 +2292,7 @@ function cleanUpOldOpengroupsOnStart() {
     const allInactiveAndWithoutMessagesConvo = allInactiveConvos
       .map(c => c.id as string)
       .filter(convoId => {
-        return convoId !== ourPubkey && getMessagesCountBySender({ source: convoId }) === 0
-          ? true
-          : false;
+        return !!(convoId !== ourPubkey && getMessagesCountBySender({ source: convoId }) === 0);
       });
     if (allInactiveAndWithoutMessagesConvo.length) {
       console.info(
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index b16b6e4ab..0435979e5 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -9,6 +9,7 @@ import {
   ConfigDumpRow,
   ConfigDumpRowWithoutData,
 } from '../../types/sqlSharedTypes';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { assertGlobalInstance } from '../sqlInstance';
 
diff --git a/ts/node/sql_channel.ts b/ts/node/sql_channel.ts
index 4e4b7d8d3..1573be71b 100644
--- a/ts/node/sql_channel.ts
+++ b/ts/node/sql_channel.ts
@@ -7,7 +7,6 @@ let initialized = false;
 
 const SQL_CHANNEL_KEY = 'sql-channel';
 const ERASE_SQL_KEY = 'erase-sql-key';
-// tslint:disable: no-console
 
 export function initializeSqlChannel() {
   if (initialized) {
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index d4c16f52c..2fa56752b 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -1,7 +1,7 @@
 import { omit, startsWith } from 'lodash';
 
 import { MessageModel } from '../models/message';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { AttachmentDownloads } from '../session/utils';
 import { ConversationModel } from '../models/conversation';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
@@ -229,6 +229,7 @@ async function processQuoteAttachments(
 
     addedCount += 1;
 
+    // eslint-disable-next-line no-await-in-loop
     const thumbnail = await AttachmentDownloads.addJob(attachment.thumbnail, {
       messageId: message.id,
       type: 'quote',
diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts
index 67b3fd8d3..b8a060ac5 100644
--- a/ts/receiver/cache.ts
+++ b/ts/receiver/cache.ts
@@ -1,6 +1,7 @@
+import { map, toNumber } from 'lodash';
+
 import { EnvelopePlus } from './types';
 import { StringUtils } from '../session/utils';
-import _ from 'lodash';
 import { Data } from '../data/data';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
@@ -47,8 +48,8 @@ async function increaseAttemptsOrRemove(
   items: Array<UnprocessedParameter>
 ): Promise<Array<UnprocessedParameter>> {
   return Promise.all(
-    _.map(items, async item => {
-      const attempts = _.toNumber(item.attempts || 0) + 1;
+    map(items, async item => {
+      const attempts = toNumber(item.attempts || 0) + 1;
 
       try {
         if (attempts >= 10) {
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 1e7f0ed73..da4d8775c 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -1,4 +1,6 @@
-import { Data } from '../../ts/data/data';
+import _, { isNumber, toNumber } from 'lodash';
+
+import { Data } from '../data/data';
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
@@ -10,7 +12,6 @@ import { removeFromCache } from './cache';
 import { decryptWithSessionProtocol } from './contentMessage';
 import { EnvelopePlus } from './types';
 
-import _, { isNumber, toNumber } from 'lodash';
 import { ConversationModel } from '../models/conversation';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { getSwarmPollingInstance } from '../session/apis/snode_api';
@@ -20,6 +21,7 @@ import { UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ReleasedFeatures } from '../util/releaseFeature';
 import { Storage } from '../util/storage';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import { getSettingsKeyFromLibsessionWrapper } from './configMessage';
 import { ECKeyPair, HexKeyPair } from './keypairs';
@@ -258,7 +260,8 @@ export async function handleNewClosedGroup(
 
   if (envelope.senderIdentity === ourNumber.key) {
     window?.log?.warn('Dropping new closed group updatemessage from our other device.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   const {
@@ -284,7 +287,8 @@ export async function handleNewClosedGroup(
     // not from legacy config, so this is a new closed group deposited on our swarm by a user.
     // we do not want to process it if our wrapper is more recent that that invite to group envelope.
     window.log.info('dropping invite to legacy group because our wrapper is more recent');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!members.includes(ourNumber.key)) {
@@ -301,7 +305,6 @@ export async function handleNewClosedGroup(
     // if we did not left this group, just add the keypair we got if not already there
     if (!groupConvo.get('isKickedFromGroup') && !groupConvo.get('left')) {
       const ecKeyPairAlreadyExistingConvo = new ECKeyPair(
-        // tslint:disable: no-non-null-assertion
         encryptionKeyPair!.publicKey,
         encryptionKeyPair!.privateKey
       );
@@ -348,8 +351,8 @@ export async function handleNewClosedGroup(
   // We only set group admins on group creation
   const groupDetails: ClosedGroup.GroupInfo = {
     id: groupId,
-    name: name,
-    members: members,
+    name,
+    members,
     admins,
     activeAt: envelopeTimestamp,
   };
@@ -367,7 +370,7 @@ export async function handleNewClosedGroup(
   convo.updateLastMessage();
 
   await convo.commit();
-  // tslint:disable: no-non-null-assertion
+
   const ecKeyPair = new ECKeyPair(encryptionKeyPair!.publicKey, encryptionKeyPair!.privateKey);
   window?.log?.info(`Received the encryptionKeyPair for new group ${groupId}`);
 
@@ -440,7 +443,7 @@ async function handleClosedGroupEncryptionKeyPair(
   const ourWrapper = groupUpdate.wrappers.find(w => toHex(w.publicKey) === ourNumber.key);
   if (!ourWrapper) {
     window?.log?.warn(
-      `Couldn\'t find our wrapper in the encryption keypairs wrappers for group ${groupPublicKey}`
+      `Couldn't find our wrapper in the encryption keypairs wrappers for group ${groupPublicKey}`
     );
     await removeFromCache(envelope);
     return;
@@ -528,12 +531,14 @@ async function performIfValid(
   const convo = getConversationController().get(groupPublicKey);
   if (!convo) {
     window?.log?.warn('dropping message for nonexistent group');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!convo) {
     window?.log?.warn('Ignoring a closed group update message (INFO) for a non-existing group');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   // Check that the message isn't from before the group was created
@@ -552,7 +557,8 @@ async function performIfValid(
     window?.log?.warn(
       'Got a group update with an older timestamp than when we joined this group last time. Dropping it.'
     );
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   // Check that the sender is a member of the group (before the update)
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index e68e6476a..4ad37d0ca 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import { ContactInfo } from 'libsession_util_nodejs';
 import { compact, difference, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
@@ -38,6 +39,7 @@ import {
   isSignInByLinking,
   setLastProfileUpdateTimestamp,
 } from '../util/storage';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
@@ -134,7 +136,7 @@ async function mergeConfigsWithIncomingUpdates(
         needsPush,
         kind: LibSessionUtil.variantToKind(variant),
         publicKey,
-        latestEnvelopeTimestamp: latestEnvelopeTimestamp ? latestEnvelopeTimestamp : Date.now(),
+        latestEnvelopeTimestamp: latestEnvelopeTimestamp || Date.now(),
       };
       groupedResults.set(variant, incomingConfResult);
     }
@@ -279,7 +281,6 @@ async function deleteContactsFromDB(contactsToRemove: Array<string>) {
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   const us = UserUtils.getOurPubKeyStrFromCache();
 
@@ -1084,7 +1085,8 @@ async function handleConfigurationMessageLegacy(
 
   if (envelope.source !== ourPubkey) {
     window?.log?.info('Dropping configuration change from someone else than us.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   await handleOurProfileUpdateLegacy(envelope.timestamp, configurationMessage);
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index ca0179a63..1a1ff95cd 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -1,7 +1,8 @@
+import { compact, flatten, identity, isEmpty, isFinite, pickBy, toNumber } from 'lodash';
+
 import { handleSwarmDataMessage } from './dataMessage';
 import { EnvelopePlus } from './types';
 
-import { compact, flatten, identity, isEmpty, pickBy, toNumber } from 'lodash';
 import { SignalService } from '../protobuf';
 import { KeyPrefixType, PubKey } from '../session/types';
 import { removeFromCache, updateCacheWithDecryptedContent } from './cache';
@@ -41,7 +42,8 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH
 
     if (!plaintext) {
       return;
-    } else if (plaintext instanceof ArrayBuffer && plaintext.byteLength === 0) {
+    }
+    if (plaintext instanceof ArrayBuffer && plaintext.byteLength === 0) {
       return;
     }
     const sentAtTimestamp = toNumber(envelope.timestamp);
@@ -85,6 +87,7 @@ async function decryptForClosedGroup(envelope: EnvelopePlus) {
         }
         const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair);
 
+        // eslint-disable-next-line no-await-in-loop
         decryptedContent = await decryptWithSessionProtocol(
           envelope,
           envelope.content,
@@ -189,7 +192,7 @@ export async function decryptWithSessionProtocol(
   if (!isValid) {
     perfEnd(`decryptWithSessionProtocol-${envelope.id}`, 'decryptWithSessionProtocol');
 
-    throw new Error('Invalid message signature.'); //throw Error.invalidSignature
+    throw new Error('Invalid message signature.');
   }
   // 4. ) Get the sender's X25519 public key
   const senderX25519PublicKey = sodium.crypto_sign_ed25519_pk_to_curve25519(senderED25519PublicKey);
@@ -201,8 +204,10 @@ export async function decryptWithSessionProtocol(
 
   // set the sender identity on the envelope itself.
   if (isClosedGroup) {
+    // eslint-disable-next-line no-param-reassign
     envelope.senderIdentity = `${KeyPrefixType.standard}${toHex(senderX25519PublicKey)}`;
   } else {
+    // eslint-disable-next-line no-param-reassign
     envelope.source = `${KeyPrefixType.standard}${toHex(senderX25519PublicKey)}`;
   }
   perfEnd(`decryptWithSessionProtocol-${envelope.id}`, 'decryptWithSessionProtocol');
@@ -250,46 +255,41 @@ export async function decryptEnvelopeWithOurKey(
   }
 }
 
-// tslint:disable-next-line: max-func-body-length
 async function decrypt(envelope: EnvelopePlus): Promise<any> {
-  try {
-    if (envelope.content.byteLength === 0) {
-      throw new Error('Received an empty envelope.');
-    }
-
-    let plaintext: ArrayBuffer | null = null;
-    switch (envelope.type) {
-      // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
-      case SignalService.Envelope.Type.SESSION_MESSAGE:
-        plaintext = await decryptEnvelopeWithOurKey(envelope);
-        break;
-      case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
-        plaintext = await decryptForClosedGroup(envelope);
-        break;
-      default:
-        assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`);
-    }
-
-    if (!plaintext) {
-      // content could not be decrypted.
-      await removeFromCache(envelope);
-      return null;
-    }
-
-    perfStart(`updateCacheWithDecryptedContent-${envelope.id}`);
-
-    await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => {
-      window?.log?.error(
-        'decrypt failed to save decrypted message contents to cache:',
-        error && error.stack ? error.stack : error
-      );
-    });
-    perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent');
-
-    return plaintext;
-  } catch (error) {
-    throw error;
+  if (envelope.content.byteLength === 0) {
+    throw new Error('Received an empty envelope.');
   }
+
+  let plaintext: ArrayBuffer | null = null;
+  switch (envelope.type) {
+    // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
+    case SignalService.Envelope.Type.SESSION_MESSAGE:
+      plaintext = await decryptEnvelopeWithOurKey(envelope);
+      break;
+    case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
+      plaintext = await decryptForClosedGroup(envelope);
+      break;
+    default:
+      assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`);
+  }
+
+  if (!plaintext) {
+    // content could not be decrypted.
+    await removeFromCache(envelope);
+    return null;
+  }
+
+  perfStart(`updateCacheWithDecryptedContent-${envelope.id}`);
+
+  await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => {
+    window?.log?.error(
+      'decrypt failed to save decrypted message contents to cache:',
+      error && error.stack ? error.stack : error
+    );
+  });
+  perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent');
+
+  return plaintext;
 }
 
 async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelope: EnvelopePlus) {
@@ -309,11 +309,11 @@ async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelop
           `received message from contact ${envelope.source} which appears to be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. Dropping it`
         );
         return true;
-      } else {
-        window.log.info(
-          `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
-        );
       }
+
+      window.log.info(
+        `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
+      );
     } catch (e) {
       window.log.warn(
         'ContactsWrapperActions.get in handleSwarmDataMessage failed with',
@@ -369,7 +369,6 @@ function shouldDropBlockedUserMessage(
   return !isControlDataMessageOnly;
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 export async function innerHandleSwarmContentMessage(
   envelope: EnvelopePlus,
   sentAtTimestamp: number,
@@ -401,9 +400,8 @@ export async function innerHandleSwarmContentMessage(
       if (shouldDropBlockedUserMessage(content, envelopeSource)) {
         window?.log?.info('Dropping blocked user message');
         return;
-      } else {
-        window?.log?.info('Allowing group-control message only from blocked user');
       }
+      window?.log?.info('Allowing group-control message only from blocked user');
     }
 
     // if this is a direct message, envelope.senderIdentity is undefined
@@ -412,7 +410,8 @@ export async function innerHandleSwarmContentMessage(
 
     if (isPrivateConversationMessage) {
       if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope)) {
-        return removeFromCache(envelope);
+        await removeFromCache(envelope);
+        return;
       }
     }
 
@@ -513,7 +512,7 @@ export async function innerHandleSwarmContentMessage(
   }
 }
 
-function onReadReceipt(readAt: number, timestamp: number, source: string) {
+async function onReadReceipt(readAt: number, timestamp: number, source: string) {
   window?.log?.info('read receipt', source, timestamp);
 
   if (!Storage.get(SettingsKey.settingsReadReceipt)) {
@@ -521,7 +520,7 @@ function onReadReceipt(readAt: number, timestamp: number, source: string) {
   }
 
   // Calling this directly so we can wait for completion
-  return ReadReceipts.onReadReceipt({
+  await ReadReceipts.onReadReceipt({
     source,
     timestamp,
     readAt,
@@ -538,6 +537,7 @@ async function handleReceiptMessage(
 
   const results = [];
   if (type === SignalService.ReceiptMessage.Type.READ) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const ts of timestamp) {
       const promise = onReadReceipt(toNumber(envelope.timestamp), toNumber(ts), envelope.source);
       results.push(promise);
@@ -625,9 +625,9 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal
     ])
   )?.models?.[0];
   const messageHash = messageToDelete?.get('messageHash');
-  //#endregion
+  // #endregion
 
-  //#region executing deletion
+  // #region executing deletion
   if (messageHash && messageToDelete) {
     window.log.info('handleUnsendMessage: got a request to delete ', messageHash);
     const conversation = getConversationController().get(messageToDelete.get('conversationId'));
@@ -731,9 +731,9 @@ async function handleMessageRequestResponse(
     // this is based on the messageId as  primary key. So this should overwrite existing messages with new merged data
     await Data.saveMessages(allMessageModels.map(m => m.attributes));
 
-    // tslint:disable-next-line: prefer-for-of
     for (let index = 0; index < convosToMerge.length; index++) {
       const element = convosToMerge[index];
+      // eslint-disable-next-line no-await-in-loop
       await getConversationController().deleteBlindedContact(element.id);
     }
   }
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 9bff8f236..edea30808 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -1,10 +1,12 @@
-import { SignalService } from './../protobuf';
+/* eslint-disable no-param-reassign */
+import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash';
+
+import { SignalService } from '../protobuf';
 import { removeFromCache } from './cache';
 import { getEnvelopeId } from './common';
 import { EnvelopePlus } from './types';
 
-import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { ConversationModel } from '../models/conversation';
 import { getConversationController } from '../session/conversations';
 import { PubKey } from '../session/types';
@@ -99,7 +101,6 @@ export function cleanIncomingDataMessage(
   rawDataMessage: SignalService.DataMessage,
   envelope?: EnvelopePlus
 ) {
-  /* tslint:disable:no-bitwise */
   const FLAGS = SignalService.DataMessage.Flags;
 
   // Now that its decrypted, validate the message and clean it up for consumer
@@ -113,6 +114,7 @@ export function cleanIncomingDataMessage(
   if (rawDataMessage.expireTimer == null) {
     rawDataMessage.expireTimer = 0;
   }
+  // eslint-disable-next-line no-bitwise
   if (rawDataMessage.flags & FLAGS.EXPIRATION_TIMER_UPDATE) {
     rawDataMessage.body = '';
     rawDataMessage.attachments = [];
@@ -148,7 +150,7 @@ export function cleanIncomingDataMessage(
  *        * envelope.source is our pubkey (our other device has the same pubkey as us)
  *        * dataMessage.syncTarget is either the group public key OR the private conversation this message is about.
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 export async function handleSwarmDataMessage(
   envelope: EnvelopePlus,
   sentAtTimestamp: number,
@@ -171,7 +173,8 @@ export async function handleSwarmDataMessage(
   /**
    * This is a mess, but
    *
-   * 1. if syncTarget is set and this is a synced message, syncTarget holds the conversationId in which this message is addressed. This syncTarget can be a private conversation pubkey or a closed group pubkey
+   * 1. if syncTarget is set and this is a synced message, syncTarget holds the conversationId in which this message is addressed.
+   *    This syncTarget can be a private conversation pubkey or a closed group pubkey
    *
    * 2. for a closed group message, envelope.senderIdentity is the pubkey of the sender and envelope.source is the pubkey of the closed group.
    *
@@ -184,7 +187,8 @@ export async function handleSwarmDataMessage(
 
   if (isSyncedMessage && !isMe) {
     window?.log?.warn('Got a sync message from someone else than me. Dropping it.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
   const convoIdToAddTheMessageTo = PubKey.removeTextSecurePrefixIfNeeded(
     isSyncedMessage ? cleanDataMessage.syncTarget : envelope.source
@@ -226,12 +230,13 @@ export async function handleSwarmDataMessage(
 
   if (!messageHasVisibleContent(cleanDataMessage)) {
     window?.log?.warn(`Message ${getEnvelopeId(envelope)} ignored; it was empty`);
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!convoIdToAddTheMessageTo) {
     window?.log?.error('We cannot handle a message without a conversationId');
-    confirm();
+    await removeFromCache(envelope);
     return;
   }
 
@@ -255,6 +260,7 @@ export async function handleSwarmDataMessage(
     sentAtTimestamp,
     cleanDataMessage,
     convoToAddMessageTo,
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     () => removeFromCache(envelope)
   );
 }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 004f72327..1c1623cad 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -1,7 +1,8 @@
+import _ from 'lodash';
+
 import { queueAttachmentDownloads } from './attachments';
 
-import _ from 'lodash';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { ConversationModel } from '../models/conversation';
 import { MessageModel } from '../models/message';
 import { getConversationController } from '../session/conversations';
@@ -28,7 +29,6 @@ function contentTypeSupported(type: string): boolean {
  * You have to call msg.commit() once you are done with the handling of this message
  */
 async function copyFromQuotedMessage(
-  // tslint:disable-next-line: cyclomatic-complexity
   msg: MessageModel,
   quote?: SignalService.DataMessage.IQuote | null
 ): Promise<void> {
@@ -39,7 +39,7 @@ async function copyFromQuotedMessage(
 
   const quoteLocal: Quote = {
     attachments: attachments || null,
-    author: author,
+    author,
     id: _.toNumber(quoteId),
     text: null,
     referencedMessageNotFound: false,
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 3fe517954..15938d25e 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -1,11 +1,12 @@
+/* eslint-disable more/no-then */
 import { v4 as uuidv4 } from 'uuid';
+import _ from 'lodash';
+
 import { EnvelopePlus } from './types';
-export { downloadAttachment } from './attachments';
 
 import { addToCache, getAllFromCache, getAllFromCacheForSource, removeFromCache } from './cache';
 
 // innerHandleSwarmContentMessage is only needed because of code duplication in handleDecryptedEnvelope...
-import _ from 'lodash';
 import { handleSwarmContentMessage, innerHandleSwarmContentMessage } from './contentMessage';
 
 import { Data } from '../data/data';
@@ -16,6 +17,8 @@ import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 import { getEnvelopeId } from './common';
 
+export { downloadAttachment } from './attachments';
+
 const incomingMessagePromises: Array<Promise<any>> = [];
 
 async function handleSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) {
@@ -90,7 +93,8 @@ async function handleRequestDetail(
     // Sender identity will be lost if we load from cache, because
     // plaintext (and protobuf.Envelope) does not have that field...
     envelope.source = inConversation;
-    // tslint:disable-next-line no-parameter-reassignment
+
+    // eslint-disable-next-line no-param-reassign
     plaintext = SignalService.Envelope.encode(envelope).finish();
     envelope.senderIdentity = senderIdentity;
   }
@@ -129,7 +133,6 @@ export function handleRequest(
   inConversation: string | null,
   messageHash: string
 ): void {
-  // tslint:disable-next-line no-promise-as-boolean
   const lastPromise = _.last(incomingMessagePromises) || Promise.resolve();
 
   const promise = handleRequestDetail(plaintext, inConversation, lastPromise, messageHash).catch(
@@ -141,7 +144,6 @@ export function handleRequest(
   incomingMessagePromises.push(promise);
 }
 
-// tslint:enable:cyclomatic-complexity max-func-body-length */
 /**
  * Used in main_renderer.js
  */
@@ -175,7 +177,6 @@ async function queueCached(item: UnprocessedParameter) {
 
     // Why do we need to do this???
     envelope.senderIdentity = envelope.senderIdentity || item.senderIdentity;
-    envelope.serverTimestamp = envelope.serverTimestamp;
 
     const { decrypted } = item;
 
diff --git a/ts/session/apis/file_server_api/FileServerApi.ts b/ts/session/apis/file_server_api/FileServerApi.ts
index 6481c085b..b3720fa97 100644
--- a/ts/session/apis/file_server_api/FileServerApi.ts
+++ b/ts/session/apis/file_server_api/FileServerApi.ts
@@ -5,7 +5,6 @@ import {
   parseBatchGlobalStatusCode,
 } from '../open_group_api/sogsv3/sogsV3BatchPoll';
 
-// tslint:disable-next-line: no-http-string
 export const fileServerURL = 'http://filev2.getsession.org';
 export const fileServerPubKey = 'da21e1d886c6fbaea313f75298bd64aab03a97ce985b46bb2dad9f2089c8ee59';
 const RELEASE_VERSION_ENDPOINT = '/session_version?platform=desktop';
@@ -41,7 +40,7 @@ export const uploadFileToFsWithOnionV4 = async (
   }
   const fileUrl = `${fileServerURL}${POST_GET_FILE_ENDPOINT}/${fileId}`;
   return {
-    fileId: fileId,
+    fileId,
     fileUrl,
   };
 };
diff --git a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
index 01e4133f4..4ba6fae61 100644
--- a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
@@ -36,8 +36,6 @@ export type OpenGroupV2InfoJoinable = OpenGroupV2Info & {
   base64Data?: string;
 };
 
-// tslint:disable: no-http-string
-
 export const ourSogsLegacyIp = '116.203.70.33';
 export const ourSogsDomainName = 'open.getsession.org';
 export const ourSogsUrl = `https://${ourSogsDomainName}`;
@@ -92,8 +90,8 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
   } catch (e) {
     try {
       serverUrl = new window.URL(`http://${serverLowerCase}`);
-    } catch (e) {
-      window.log.error(`hasExistingOpenGroup with ${serverNotLowerCased} with ${e.message}`);
+    } catch (err2) {
+      window.log.error(`hasExistingOpenGroup with ${serverNotLowerCased} with ${err2.message}`);
 
       return false;
     }
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index b7b4bd62f..02457ad4f 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationModel } from '../../../../models/conversation';
 import { getConversationController } from '../../../conversations';
@@ -13,7 +12,6 @@ import {
 } from '../utils/OpenGroupUtils';
 import { hasExistingOpenGroup } from './ApiUtil';
 import { getOpenGroupManager } from './OpenGroupManagerV2';
-// tslint:disable: variable-name
 
 // Inputs that should work:
 // https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
@@ -77,8 +75,9 @@ async function joinOpenGroupV2(
 
   if (alreadyExist) {
     window?.log?.warn('Skipping join opengroupv2: already exists');
-    return;
-  } else if (existingConvo) {
+    return undefined;
+  }
+  if (existingConvo) {
     // we already have a convo associated with it. Remove everything related to it so we start fresh
     window?.log?.warn('leaving before rejoining open group v2 room', conversationId);
 
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index bbf8614df..fde16bcc9 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -1,3 +1,9 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
+
+import { clone, groupBy, isEqual, uniqBy } from 'lodash';
+import autoBind from 'auto-bind';
+
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationModel } from '../../../../models/conversation';
 import { getConversationController } from '../../../conversations';
@@ -11,8 +17,6 @@ import {
 } from './ApiUtil';
 import { OpenGroupServerPoller } from './OpenGroupServerPoller';
 
-import autoBind from 'auto-bind';
-import _, { clone, isEqual } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationTypeEnum,
@@ -91,14 +95,14 @@ export class OpenGroupManagerV2 {
   }
 
   public addRoomToPolledRooms(roomInfos: Array<OpenGroupRequestCommonType>) {
-    const grouped = _.groupBy(roomInfos, r => r.serverUrl);
+    const grouped = groupBy(roomInfos, r => r.serverUrl);
     const groupedArray = Object.values(grouped);
 
     for (const groupedRooms of groupedArray) {
       const groupedRoomsServerUrl = groupedRooms[0].serverUrl;
       const poller = this.pollers.get(groupedRoomsServerUrl);
       if (!poller) {
-        const uniqGroupedRooms = _.uniqBy(groupedRooms, r => r.roomId);
+        const uniqGroupedRooms = uniqBy(groupedRooms, r => r.roomId);
 
         this.pollers.set(groupedRoomsServerUrl, new OpenGroupServerPoller(uniqGroupedRooms));
       } else {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
index a5237506c..31559840e 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
@@ -1,5 +1,6 @@
+import { compact } from 'lodash';
+
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
-import _, { compact } from 'lodash';
 import { OpenGroupMessageV2 } from './OpenGroupMessageV2';
 import { UserUtils } from '../../../utils';
 import { fromHexToArray } from '../../../utils/String';
@@ -36,7 +37,7 @@ const getOurOpenGroupHeaders = async (
   const signingKeys = await UserUtils.getUserED25519KeyPairBytes();
   if (!signingKeys) {
     window?.log?.error('getOurOpenGroupHeaders - Unable to get our signing keys');
-    return;
+    return undefined;
   }
 
   const nonce = (await getSodiumRenderer()).randombytes_buf(16);
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index 4a5ad3c4a..d91efc166 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -1,11 +1,14 @@
+/* eslint-disable no-loop-func */
+/* eslint-disable no-restricted-syntax */
 import { AbortController } from 'abort-controller';
+import { isNumber, isObject } from 'lodash';
+import autoBind from 'auto-bind';
+
 import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils';
 import { OpenGroupRequestCommonType } from './ApiUtil';
-import _, { isNumber, isObject } from 'lodash';
 
 import { OpenGroupData } from '../../../../data/opengroups';
 import { OpenGroupMessageV2 } from './OpenGroupMessageV2';
-import autoBind from 'auto-bind';
 import { DURATION } from '../../../constants';
 import {
   batchGlobalIsSuccess,
@@ -108,6 +111,7 @@ export class OpenGroupServerPoller {
     });
 
     this.abortController = new AbortController();
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.pollForEverythingTimer = global.setInterval(this.compactPoll, pollForEverythingInterval);
 
     if (this.roomIdsToPoll.size) {
@@ -339,6 +343,7 @@ export class OpenGroupServerPoller {
                 stateConversations.selectedConversation &&
                 conversationKey === stateConversations.selectedConversation
               ) {
+                // eslint-disable-next-line more/no-then
                 void openConversationWithMessages({ conversationKey, messageId: null }).then(() => {
                   window.inboxStore?.dispatch(
                     markConversationInitialLoadingInProgress({
diff --git a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
index 709bcb68f..565c14612 100644
--- a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
@@ -23,7 +23,7 @@ export const filterDuplicatesFromDbAndIncomingV4 = async (
   const filteredInDb = await Data.filterAlreadyFetchedOpengroupMessage(
     filtered.map(m => {
       // We have confirmed these exist by filtering above.
-      // tslint:disable-next-line no-non-null-assertion
+
       return { sender: m.session_id! as string, serverTimestamp: m.posted! };
     })
   );
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index 89297d34d..fd4e76043 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -1,9 +1,10 @@
 import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
-import _, { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash';
+import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js';
+import { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash';
+
 import { getConversationController } from '../../../conversations';
 import { LibSodiumWrappers } from '../../../crypto';
 import { KeyPrefixType, PubKey } from '../../../types';
-import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js';
 import { Data } from '../../../../data/data';
 import { combineKeys, generateBlindingFactor } from '../../../utils/SodiumUtils';
 import { OpenGroupData } from '../../../../data/opengroups';
@@ -152,8 +153,6 @@ export function tryMatchBlindWithStandardKey(
   // We don't want to stop iterating even if an error happens while looking for a blind/standard match.
   // That's why we catch any errors and return false if it happens.
   try {
-    // tslint:disable: no-bitwise
-
     const sessionIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(standardSessionId).key);
     const blindedIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(blindedSessionId).key);
     const kBytes = generateBlindingFactor(serverPubKey, sodium);
@@ -171,6 +170,7 @@ export function tryMatchBlindWithStandardKey(
     //  For the negative, what we're going to get out of the above is simply the negative of pk1, so
     // flip the sign bit to get pk2:
     const pk2 = cloneDeep(pk1);
+    // eslint-disable-next-line no-bitwise
     pk2[31] = pk1[31] ^ 0b1000_0000;
 
     const match =
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index ea9fcc157..d76c94e4b 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -1,4 +1,9 @@
-import _, { compact, isArray, isEmpty, isNumber, isObject, pick } from 'lodash';
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-await-in-loop */
+import { compact, isArray, isEmpty, isFinite, isNumber, isObject, pick } from 'lodash';
+import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo';
+import { v4 } from 'uuid';
+
 import { OpenGroupData } from '../../../../data/opengroups';
 import { handleOpenGroupV4Message } from '../../../../receiver/opengroup';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
@@ -22,12 +27,11 @@ import {
   tryMatchBlindWithStandardKey,
 } from './knownBlindedkeys';
 import { SogsBlinding } from './sogsBlinding';
-import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo';
+
 import { UserUtils } from '../../../utils';
 import { innerHandleSwarmContentMessage } from '../../../../receiver/contentMessage';
 import { EnvelopePlus } from '../../../../receiver/types';
 import { SignalService } from '../../../../protobuf';
-import { v4 } from 'uuid';
 import { removeMessagePadding } from '../../../crypto/BufferPadding';
 import { getSodiumRenderer } from '../../../crypto';
 import { handleOutboxMessageModel } from '../../../../receiver/dataMessage';
@@ -191,7 +195,6 @@ const handleSogsV3DeletedMessages = async (
   return messagesWithoutDeleted;
 };
 
-// tslint:disable-next-line: max-func-body-length cyclomatic-complexity
 const handleMessagesResponseV4 = async (
   messages: Array<OpenGroupMessageV4>,
   serverUrl: string,
@@ -268,7 +271,6 @@ const handleMessagesResponseV4 = async (
     // then we try to find matching real session ids with the blinded ids we have.
     // this is where we override the blindedId with the real one in case we already know that user real sessionId
 
-    // tslint:disable: prefer-for-of
     const messagesWithResolvedBlindedIdsIfFound = [];
     for (let index = 0; index < messagesFilteredBlindedIds.length; index++) {
       const newMessage = messagesFilteredBlindedIds[index];
@@ -350,7 +352,6 @@ type InboxOutboxResponseObject = {
   message: string; // base64 data
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleInboxOutboxMessages(
   inboxOutboxResponse: Array<InboxOutboxResponseObject>,
   serverUrl: string,
@@ -359,7 +360,7 @@ async function handleInboxOutboxMessages(
   // inbox/outbox messages are blinded so decrypt them using the blinding logic.
   // handle them as a message request after that.
   if (!inboxOutboxResponse || !isArray(inboxOutboxResponse) || inboxOutboxResponse.length === 0) {
-    //nothing to do
+    // nothing to do
     return;
   }
 
@@ -529,7 +530,7 @@ export const handleBatchPollResults = async (
     for (let index = 0; index < batchPollResults.body.length; index++) {
       const subResponse = batchPollResults.body[index] as any;
       // using subreqOptions as request type lookup,
-      //assumes batch subresponse order matches the subrequest order
+      // assumes batch subresponse order matches the subrequest order
       const subrequestOption = subrequestOptionsLookup[index];
       const responseType = subrequestOption.type;
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
index 2f3318a6d..d9bc2f08b 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
@@ -1,6 +1,9 @@
+import { crypto_hash_sha512, from_hex, to_hex } from 'libsodium-wrappers-sumo';
+import { isEqual } from 'lodash';
+
 import { encode, fromUInt8ArrayToBase64, stringToUint8Array, toHex } from '../../../utils/String';
 import { concatUInt8Array, getSodiumRenderer, LibSodiumWrappers } from '../../../crypto';
-import { crypto_hash_sha512, from_hex, to_hex } from 'libsodium-wrappers-sumo';
+
 import { ByteKeyPair } from '../../../utils/User';
 import { StringUtils } from '../../../utils';
 import { KeyPrefixType, PubKey } from '../../../types';
@@ -11,7 +14,6 @@ import {
   sharedBlindedEncryptionKey,
   toX25519,
 } from '../../../utils/SodiumUtils';
-import { isEqual } from 'lodash';
 import { OnionSending } from '../../../onions/onionSend';
 
 async function getSogsSignature({
@@ -165,22 +167,20 @@ const getBlindingValues = (
   secretKey: Uint8Array;
   publicKey: Uint8Array;
 } => {
-  let ka;
-  let kA;
   const k = sodium.crypto_core_ed25519_scalar_reduce(sodium.crypto_generichash(64, serverPK));
 
   // use curve key i.e. s.privKey
   let a = sodium.crypto_sign_ed25519_sk_to_curve25519(signingKeys.privKeyBytes); // this is the equivalent of ios generatePrivateKeyScalar
 
   if (a.length > 32) {
-    window.log.warn('length of signing key is too long, cutting to 32: oldlength', length);
+    window.log.warn('length of signing key is too long, cutting to 32: oldlength', a.length);
     a = a.slice(0, 32);
   }
 
   // our blinded keypair
-  ka = sodium.crypto_core_ed25519_scalar_mul(k, a); // had to cast for some reason
+  const ka = sodium.crypto_core_ed25519_scalar_mul(k, a); // had to cast for some reason
 
-  kA = sodium.crypto_scalarmult_ed25519_base_noclamp(ka);
+  const kA = sodium.crypto_scalarmult_ed25519_base_noclamp(ka);
 
   return {
     a,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
index 776ca9e0b..5b63d2285 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import { AbortSignal } from 'abort-controller';
 import { flatten, isEmpty, isNumber, isObject } from 'lodash';
 import { OpenGroupData } from '../../../../data/opengroups';
@@ -366,7 +367,7 @@ const getBatchRequest = async (
 
   if (!headers) {
     window?.log?.error('Unable to create headers for batch request - aborting');
-    return;
+    return undefined;
   }
 
   return {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
index d248c7a4b..2e99163d7 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
@@ -71,7 +71,7 @@ export type ParsedMemberCount = {
 export async function fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl(serverUrl: string) {
   let relatedRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
   if (!relatedRooms || relatedRooms.length === 0) {
-    return;
+    return undefined;
   }
 
   // we actually don't do that call using batch send for now to avoid having to deal with the headers in batch poll.
@@ -83,18 +83,19 @@ export async function fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl(serverUr
     new AbortController().signal
   );
   if (!capabilities) {
-    return;
+    return undefined;
   }
   // just fetch updated data from the DB, just in case
   relatedRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
   if (!relatedRooms || relatedRooms.length === 0) {
-    return;
+    return undefined;
   }
   const newSortedCaps = capabilities.sort();
 
   await Promise.all(
     relatedRooms.map(async room => {
       if (!isEqual(newSortedCaps, room.capabilities?.sort() || '')) {
+        // eslint-disable-next-line no-param-reassign
         room.capabilities = newSortedCaps;
         await OpenGroupData.saveV2OpenGroupRoom(room);
       }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
index 292a68811..b6aff6dbc 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
@@ -86,9 +86,8 @@ export const clearSogsReactionByServerId = async (
     if (batchGlobalIsSuccess(result) && batchFirstSubIsSuccess(result)) {
       updateMutationCache(cacheEntry, rawMessage.seqno);
       return true;
-    } else {
-      return false;
     }
+    return false;
   } catch (e) {
     window?.log?.error("clearSogsReactionByServerId Can't decode JSON body");
   }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index cd36b82b9..e52087a45 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -1,5 +1,5 @@
 import AbortController, { AbortSignal } from 'abort-controller';
-import { isUndefined, toNumber } from 'lodash';
+import { isFinite, isUndefined, toNumber } from 'lodash';
 import {
   OpenGroupData,
   OpenGroupV2Room,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
index 2257aa1de..e9fc9f2bd 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 /**
  * This is strictly use to resolve conflicts between local state and the opengroup poll updates
  * Currently only supports message reactions 26/08/2022
@@ -123,7 +124,6 @@ export async function processMessagesUsingCache(
           );
           break;
         case 'CLEAR':
-          // tslint:disable-next-line: no-dynamic-delete
           delete updatedReactions[reaction];
           window.log.debug(
             `SOGS Mutation Cache: Cleared all ${reaction} reactions based on the cache in ${server}/${room} for message ${message.id}`
@@ -143,6 +143,7 @@ export async function processMessagesUsingCache(
     }
   }
 
+  // eslint-disable-next-line no-param-reassign
   message.reactions = updatedReactions;
   await Reactions.handleOpenGroupMessageReactions(
     getOpenGroupV2ConversationId(server, room),
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
index 5f4f340f6..1a29f1675 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
@@ -28,7 +28,7 @@ export const getAllRoomInfos = async (roomInfos: OpenGroupV2Room) => {
   const statusCode = parseBatchGlobalStatusCode(result);
 
   window?.log?.warn('getAllRoomInfos failed invalid status code:', statusCode);
-  return;
+  return undefined;
 };
 
 const parseRooms = (jsonResult?: Record<string, any>): undefined | Array<OpenGroupV2Info> => {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
index 286c67da9..2938c86ba 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
@@ -147,5 +147,5 @@ export const sendMessageOnionV4BlindedRequest = async (
     throw new Error('Could not blinded message request, server returned invalid data');
   }
 
-  return { serverId, serverTimestamp: Math.floor(serverTimestamp * 1000) }; //timestamp are now returned with a seconds.ms syntax
+  return { serverId, serverTimestamp: Math.floor(serverTimestamp * 1000) }; // timestamp are now returned with a seconds.ms syntax
 };
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
index a13e8f062..b85f2e88a 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
@@ -74,7 +74,6 @@ export const sendSogsReactionOnionV4 = async (
   // The SOGS endpoint supports any text input so we need to make sure we are sending a valid unicode emoji
   // for an invalid input we use https://emojipedia.org/frame-with-an-x/ as a replacement since it cannot rendered as an emoji but is valid unicode
   // NOTE emoji-mart v5.2.2 types for getEmojiDataFromNative are broken
-  // @ts-ignore
   const emoji = (getEmojiDataFromNative(reaction.emoji) as FixedBaseEmoji) ? reaction.emoji : '🖾';
   const endpoint = `/room/${room}/reaction/${reaction.id}/${emoji}`;
   const method = reaction.action === Action.REACT ? 'PUT' : 'DELETE';
diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
index d7b579f24..d2af2e941 100644
--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@@ -1,7 +1,8 @@
-import _, { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 
+// eslint-disable-next-line prefer-regex-literals
 const protocolRegex = new RegExp('https?://');
 
 const dot = '\\.';
@@ -25,6 +26,7 @@ const openGroupV2ServerUrlRegex = new RegExp(
  * see https://stackoverflow.com/a/9275499/1680951
  */
 export const openGroupV2CompleteURLRegex = new RegExp(
+  // eslint-disable-next-line no-useless-escape
   `^${openGroupV2ServerUrlRegex.source}\/${roomIdV2Regex}${qMark}${publicKeyParam}${publicKeyRegex}$`
 );
 
@@ -32,7 +34,7 @@ export const openGroupV2CompleteURLRegex = new RegExp(
  * Just a constant to have less 'http' everywhere.
  * This is the prefix used to identify our open groups in the conversation database (v1 or v2)
  */
-// tslint:disable-next-line: no-http-string
+
 const openGroupPrefix = 'http'; // can be http:// or https://
 
 /**
@@ -61,7 +63,6 @@ export function prefixify(server: string): string {
     return server;
   }
 
-  // tslint:disable-next-line: no-http-string
   return `http://${server}`;
 }
 
diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
index 0dc51a5fd..bdf6c9848 100644
--- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts
+++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -1,19 +1,18 @@
-import { Constants } from '../..';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
 import https from 'https';
 import _ from 'lodash';
-
 import tls from 'tls';
-import { sha256 } from '../../crypto';
 import pRetry from 'p-retry';
+
+import { sha256 } from '../../crypto';
+import { Constants } from '../..';
 import { SeedNodeAPI } from '.';
 import { allowOnlyOneAtATime } from '../../utils/Promise';
 import { APPLICATION_JSON } from '../../../types/MIME';
 import { isLinux } from '../../../OS';
 import { Snode } from '../../../data/data';
 
-// tslint:disable: function-name
-
 /**
  * Fetch all snodes from seed nodes.
  * Exported only for tests. This is not to be used by the app directly
@@ -88,7 +87,6 @@ const getSslAgentForSeedNode = async (seedNodeHost: string, isSsl = false) => {
       throw new Error(`Unknown seed node: ${seedNodeHost}`);
   }
 
-  // tslint:disable: non-literal-fs-path
   // read the cert each time. We only run this request once for each seed node nevertheless.
   const sslOptions: https.AgentOptions = {
     // as the seed nodes are using a self signed certificate, we have to provide it here.
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index c666dd56f..2eeefde01 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-prototype-builtins */
+/* eslint-disable no-restricted-syntax */
 import { compact, sample } from 'lodash';
 import pRetry from 'p-retry';
 import { Snode } from '../../../data/data';
@@ -11,8 +13,6 @@ import { SnodeSignature } from './snodeSignatures';
 
 export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.';
 
-// tslint:disable: max-func-body-length
-
 // TODOLATER we should merge those two functions together as they are almost exactly the same
 const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
@@ -116,7 +116,6 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                   const deletedObj = snodeJson.deleted as Record<number, Array<string>>;
                   const hashes: Array<string> = [];
 
-                  // tslint:disable: no-for-in
                   for (const key in deletedObj) {
                     if (deletedObj.hasOwnProperty(key)) {
                       hashes.push(...deletedObj[key]);
@@ -180,7 +179,6 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   }
 };
 
-// tslint:disable-next-line: variable-name
 const TEST_getMinTimeout = () => 500;
 
 /**
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 693fded70..67025418e 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -113,7 +113,7 @@ export type StoreOnNodeMessage = {
 };
 
 export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams };
-export type NetworkTimeSubRequest = { method: 'info'; params: {} };
+export type NetworkTimeSubRequest = { method: 'info'; params: object };
 
 type DeleteSigParameters = {
   pubkey: string;
@@ -158,7 +158,7 @@ export type SnodeApiSubRequests =
   | DeleteAllFromNodeSubRequest
   | UpdateExpiryOnNodeSubRequest;
 
-// tslint:disable: array-type
+// eslint-disable-next-line @typescript-eslint/array-type
 export type NonEmptyArray<T> = [T, ...T[]];
 
 export type NotEmptyArrayOfBatchResults = NonEmptyArray<{
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 94ed2b979..86f6b7695 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -46,6 +46,7 @@ export async function doSnodeBatchRequest(
   if (decoded?.length) {
     for (let index = 0; index < decoded.length; index++) {
       const resultRow = decoded[index];
+      // eslint-disable-next-line no-await-in-loop
       await processOnionRequestErrorAtDestination({
         statusCode: resultRow.code,
         body: JSON.stringify(resultRow.body),
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
index 0819023e0..c47a67682 100644
--- a/ts/session/apis/snode_api/expire.ts
+++ b/ts/session/apis/snode_api/expire.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import { isEmpty, sample } from 'lodash';
 import { Snode } from '../../../data/data';
 import { getSodiumRenderer } from '../../crypto';
@@ -101,6 +102,7 @@ async function processExpirationResults(
     const expiryApplied = swarm[nodeKey].expiry;
     const signature = swarm[nodeKey].signature;
 
+    // eslint-disable-next-line no-await-in-loop
     const isValid = await verifySignature({
       pubkey,
       snodePubkey: nodeKey,
diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts
index dfbb6bb5d..086d849b6 100644
--- a/ts/session/apis/snode_api/getNetworkTime.ts
+++ b/ts/session/apis/snode_api/getNetworkTime.ts
@@ -15,7 +15,6 @@ function getNetworkTimeSubRequests(): Array<NetworkTimeSubRequest> {
   return [request];
 }
 
-// tslint:disable-next-line: variable-name
 const getNetworkTime = async (snode: Snode): Promise<string | number> => {
   const subRequests = getNetworkTimeSubRequests();
   const result = await doSnodeBatchRequest(subRequests, snode, 4000, null);
diff --git a/ts/session/apis/snode_api/hfHandling.ts b/ts/session/apis/snode_api/hfHandling.ts
index dcd7565b6..04fd35175 100644
--- a/ts/session/apis/snode_api/hfHandling.ts
+++ b/ts/session/apis/snode_api/hfHandling.ts
@@ -12,7 +12,8 @@ const hasSeenHardfork191ItemId = 'hasSeenHardfork191';
  * this is only intended for testing. Do not call this in production.
  */
 export function resetHardForkCachedValues() {
-  hasSeenHardfork190 = hasSeenHardfork191 = undefined;
+  hasSeenHardfork190 = undefined;
+  hasSeenHardfork191 = undefined;
 }
 
 /**
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 1adb6d5e2..e4345401b 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -50,6 +50,7 @@ export type SnodeNamespacesUser = PickEnum<
 /**
  * Returns true if that namespace is associated with the config of a user (not his messages, only configs)
  */
+// eslint-disable-next-line consistent-return
 function isUserConfigNamespace(namespace: SnodeNamespaces) {
   switch (namespace) {
     case SnodeNamespaces.UserMessages:
@@ -74,6 +75,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) {
   }
 }
 
+// eslint-disable-next-line consistent-return
 function namespacePriority(namespace: SnodeNamespaces): number {
   switch (namespace) {
     case SnodeNamespaces.UserMessages:
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index 5bb089b91..d29274a49 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -1,23 +1,26 @@
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch, RequestInit, Response } from 'node-fetch';
 import https from 'https';
+import ByteBuffer from 'bytebuffer';
+import pRetry from 'p-retry';
+import { cloneDeep, isEmpty, isString, omit } from 'lodash';
+import { AbortSignal } from 'abort-controller';
+import { to_string } from 'libsodium-wrappers-sumo';
 
 import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool';
-import ByteBuffer from 'bytebuffer';
+
 import { OnionPaths } from '../../onions';
 import { toHex } from '../../utils/String';
-import pRetry from 'p-retry';
 import { ed25519Str, incrementBadPathCountOrDrop } from '../../onions/onionPath';
-import { cloneDeep, isEmpty, isString, omit } from 'lodash';
-// hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures)
-let snodeFailureCount: Record<string, number> = {};
 
 import { Snode } from '../../../data/data';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { hrefPnServerProd } from '../push_notification_api/PnServer';
 import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface';
 import { encodeV4Request } from '../../onions/onionv4';
-import { AbortSignal } from 'abort-controller';
-import { to_string } from 'libsodium-wrappers-sumo';
+
+// hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures)
+let snodeFailureCount: Record<string, number> = {};
 
 export const resetSnodeFailureCount = () => {
   snodeFailureCount = {};
@@ -40,7 +43,8 @@ export const buildErrorMessageWithFailedCode = (prefix: string, code: number, su
  * The first one, on the request itself, the other one in the json returned.
  *
  * If the request failed to reach the one of the node of the onion path, the one on the request is set.
- * But if the request reaches the destination node and it fails to process the request (bad node for this pubkey), you will get a 200 on the request itself, but the json you get will contain the real status.
+ * But if the request reaches the destination node and it fails to process the request (bad node for this pubkey),
+ * you will get a 200 on the request itself, but the json you get will contain the real status.
  */
 export interface SnodeResponse {
   bodyBinary: Uint8Array | null;
@@ -173,7 +177,7 @@ async function buildOnionCtxs(
         target,
         method: 'POST',
       };
-      // tslint:disable-next-line: no-http-string
+
       if (finalRelayOptions?.protocol === 'http') {
         dest.protocol = finalRelayOptions.protocol;
         dest.port = finalRelayOptions.port || 80;
@@ -420,7 +424,8 @@ async function processOnionRequestErrorOnPath(
     try {
       cipherAsString = to_string(new Uint8Array(ciphertext));
     } catch (e) {
-      // we might actually end up often in this case here often (for all calls to a non snode, so with onionv4 we will get binary data, and the to_string above won't work as it has a custom onion v4 encoding)
+      // we might actually end up often in this case here often (for all calls to a non snode, so with onionv4 we
+      // will get binary data, and the to_string above won't work as it has a custom onion v4 encoding)
       cipherAsString = '';
     }
   }
@@ -651,7 +656,9 @@ async function processOnionResponseV4({
   const bodyBinary: Uint8Array = new Uint8Array(plaintextBuffer);
 
   // Handling of the status code of the destination is done on the calling function, because the content of the onion response needs first to be decoded.
-  // Also, we actually do not care much about the status code of the destination here, because the destination cannot be a service node (we do not support onion v4 to a snode destination, only *through* them), so there is no rebuilding of the path for a destination case possible.
+  // Also, we actually do not care much about the status code of the destination here, because the destination
+  // cannot be a service node(we do not support onion v4 to a snode destination, only * through * them),
+  // so there is no rebuilding of the path for a destination case possible.
 
   return {
     bodyBinary,
@@ -744,7 +751,8 @@ async function handle421InvalidSwarm({
  * So after this call, if the snode keeps getting errors, we won't contact it again
  *
  * @param snodeEd25519 the snode ed25519 which cause issues (this might be a nodeNotFound)
- * @param guardNodeEd25519 the guard node ed25519 of the current path in use. a nodeNoteFound ed25519 is not part of any path, so we fallback to this one if we need to increment the bad path count of the current path in use
+ * @param guardNodeEd25519 the guard node ed25519 of the current path in use. a nodeNoteFound ed25519
+ *       is not part of any path, so we fallback to this one if we need to increment the bad path count of the current path in use
  * @param associatedWith if set, we will drop this snode from the swarm of the pubkey too
  * @param isNodeNotFound if set, we will drop this snode right now as this is an invalid node for the network.
  */
diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts
index 1643b3f81..2e5cef200 100644
--- a/ts/session/apis/snode_api/onsResolve.ts
+++ b/ts/session/apis/snode_api/onsResolve.ts
@@ -56,7 +56,7 @@ async function getSessionIDForOnsName(onsNameCase: string) {
     }
     const hexEncodedCipherText = intermediate?.encrypted_value;
 
-    const isArgon2Based = !Boolean(intermediate?.nonce);
+    const isArgon2Based = !intermediate?.nonce;
     const ciphertext = fromHexToArray(hexEncodedCipherText);
     let sessionIDAsData: Uint8Array;
     let nonce: Uint8Array;
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 3167476c6..f453402ec 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -1,12 +1,14 @@
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
+import https from 'https';
+import { clone } from 'lodash';
 import pRetry from 'p-retry';
+
 import { HTTPError, NotFoundError } from '../../utils/errors';
 import { Snode } from '../../../data/data';
 
 import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions';
 import { APPLICATION_JSON } from '../../../types/MIME';
-import https from 'https';
-import { clone } from 'lodash';
 
 export interface LokiFetchOptions {
   method: 'GET' | 'POST';
@@ -119,7 +121,7 @@ export async function snodeRpc(
     targetNode: Snode;
     associatedWith: string | null;
     timeout?: number;
-  } //the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance
+  } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance
 ): Promise<undefined | SnodeResponse> {
   const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`;
 
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index 7a31d4589..f13a27e21 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -1,8 +1,8 @@
 import _, { shuffle } from 'lodash';
+import pRetry from 'p-retry';
 
 import { Data, Snode } from '../../../data/data';
 
-import pRetry from 'p-retry';
 import { ed25519Str } from '../../onions/onionPath';
 import { OnionPaths } from '../../onions';
 import { Onions, SnodePool } from '.';
@@ -36,7 +36,6 @@ export const requiredSnodesForAgreement = 24;
 
 let randomSnodePool: Array<Snode> = [];
 
-// tslint:disable-next-line: function-name
 export function TEST_resetState() {
   randomSnodePool = [];
   swarmCache.clear();
@@ -126,10 +125,10 @@ export async function forceRefreshRandomSnodePool(): Promise<Array<Snode>> {
     // if that fails to get enough snodes, even after retries, well we just have to retry later.
     try {
       await SnodePool.TEST_fetchFromSeedWithRetriesAndWriteToDb();
-    } catch (e) {
+    } catch (err2) {
       window?.log?.warn(
         'forceRefreshRandomSnodePool: Failed to fetch snode pool from seed. Fetching from seed node instead:',
-        e.message
+        err2.message
       );
     }
   }
@@ -178,7 +177,7 @@ export async function getRandomSnodePool(): Promise<Array<Snode>> {
  * It also resets the onionpaths failure count and snode failure count.
  * This function does not throw.
  */
-// tslint:disable: function-name
+
 export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() {
   const seedNodes = window.getSeedNodeList();
 
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index d2a3ac945..f185edee0 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -1,3 +1,6 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable more/no-then */
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import { compact, concat, difference, flatten, last, sample, toNumber, uniqBy } from 'lodash';
 import { Data, Snode } from '../../../data/data';
 import { SignalService } from '../../../protobuf';
@@ -473,7 +476,7 @@ export class SwarmPolling {
       await Promise.all(
         lastMessages.map(async (lastMessage, index) => {
           if (!lastMessage) {
-            return;
+            return undefined;
           }
           return this.updateLastHash({
             edkey: snodeEdkey,
@@ -491,10 +494,8 @@ export class SwarmPolling {
         if (window.inboxStore?.getState().onionPaths.isOnline) {
           window.inboxStore?.dispatch(updateIsOnline(false));
         }
-      } else {
-        if (!window.inboxStore?.getState().onionPaths.isOnline) {
-          window.inboxStore?.dispatch(updateIsOnline(true));
-        }
+      } else if (!window.inboxStore?.getState().onionPaths.isOnline) {
+        window.inboxStore?.dispatch(updateIsOnline(true));
       }
       window?.log?.info('pollNodeForKey failed with:', e.message);
       return null;
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 15301f05b..dac444ea1 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -1,5 +1,3 @@
-// tslint:disable: binary-expression-operand-order
-
 const seconds = 1000;
 const minutes = seconds * 60;
 const hours = minutes * 60;
@@ -26,7 +24,6 @@ export const SWARM_POLLING_TIMEOUT = {
 };
 
 export const PROTOCOLS = {
-  // tslint:disable-next-line: no-http-string
   HTTP: 'http:',
   HTTPS: 'https:',
 };
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index b4b41d294..a8995b071 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -1,3 +1,8 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable more/no-then */
+import { ConvoVolatileType } from 'libsession_util_nodejs';
+import { isEmpty, isNil } from 'lodash';
+
 import { Data } from '../../data/data';
 import { OpenGroupData } from '../../data/opengroups';
 import { ConversationCollection, ConversationModel } from '../../models/conversation';
@@ -10,7 +15,6 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou
 import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { PubKey } from '../types';
 
-import { ConvoVolatileType } from 'libsession_util_nodejs';
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
@@ -26,7 +30,6 @@ import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
-import { isEmpty, isNil } from 'lodash';
 import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations';
 import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups';
 import { OpenGroupUtils } from '../apis/open_group_api/utils';
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 24d5ae051..0b7ebd0c6 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -144,45 +144,45 @@ async function sendToGroupMembers(
       );
     }
     return allInvitesSent;
-  } else {
-    // Confirmation dialog that recursively calls sendToGroupMembers on resolve
-
-    window.inboxStore?.dispatch(
-      updateConfirmModal({
-        title:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailTitlePlural')
-            : window.i18n('closedGroupInviteFailTitle'),
-        message:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailMessagePlural')
-            : window.i18n('closedGroupInviteFailMessage'),
-        okText: window.i18n('closedGroupInviteOkText'),
-        onClickOk: async () => {
-          const membersToResend: Array<string> = new Array<string>();
-          inviteResults.forEach((result, index) => {
-            const member = listOfMembers[index];
-            // group invite must always contain the admin member.
-            if (result !== true || admins.includes(member)) {
-              membersToResend.push(member);
-            }
-          });
-          if (membersToResend.length > 0) {
-            const isRetrySend = true;
-            await sendToGroupMembers(
-              membersToResend,
-              groupPublicKey,
-              groupName,
-              admins,
-              encryptionKeyPair,
-              existingExpireTimer,
-              isRetrySend
-            );
-          }
-        },
-      })
-    );
   }
+  // Confirmation dialog that recursively calls sendToGroupMembers on resolve
+
+  window.inboxStore?.dispatch(
+    updateConfirmModal({
+      title:
+        inviteResults.length > 1
+          ? window.i18n('closedGroupInviteFailTitlePlural')
+          : window.i18n('closedGroupInviteFailTitle'),
+      message:
+        inviteResults.length > 1
+          ? window.i18n('closedGroupInviteFailMessagePlural')
+          : window.i18n('closedGroupInviteFailMessage'),
+      okText: window.i18n('closedGroupInviteOkText'),
+      onClickOk: async () => {
+        const membersToResend: Array<string> = new Array<string>();
+        inviteResults.forEach((result, index) => {
+          const member = listOfMembers[index];
+          // group invite must always contain the admin member.
+          if (result !== true || admins.includes(member)) {
+            membersToResend.push(member);
+          }
+        });
+        if (membersToResend.length > 0) {
+          const isRetrySend = true;
+          await sendToGroupMembers(
+            membersToResend,
+            groupPublicKey,
+            groupName,
+            admins,
+            encryptionKeyPair,
+            existingExpireTimer,
+            isRetrySend
+          );
+        }
+      },
+    })
+  );
+
   return allInvitesSent;
 }
 
diff --git a/ts/session/crypto/BufferPadding.ts b/ts/session/crypto/BufferPadding.ts
index 23931e9c7..05b23f6ff 100644
--- a/ts/session/crypto/BufferPadding.ts
+++ b/ts/session/crypto/BufferPadding.ts
@@ -20,7 +20,8 @@ export function removeMessagePadding(paddedData: ArrayBuffer): ArrayBuffer {
       const plaintext = new Uint8Array(i);
       plaintext.set(paddedPlaintext.subarray(0, i));
       return plaintext.buffer;
-    } else if (paddedPlaintext[i] !== PADDING_BYTE) {
+    }
+    if (paddedPlaintext[i] !== PADDING_BYTE) {
       // window?.log?.warn('got a message without padding... Letting it through for now');
       return paddedPlaintext;
     }
@@ -77,6 +78,7 @@ export function addAttachmentPadding(data: ArrayBuffer): ArrayBuffer {
 
   let paddedSize = Math.max(
     541,
+    // eslint-disable-next-line prefer-exponentiation-operator, no-restricted-properties
     Math.floor(Math.pow(1.05, Math.ceil(Math.log(originalUInt.length) / Math.log(1.05))))
   );
 
diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts
index 9dbffe79f..88e04b9df 100644
--- a/ts/session/crypto/DecryptedAttachmentsManager.ts
+++ b/ts/session/crypto/DecryptedAttachmentsManager.ts
@@ -1,3 +1,7 @@
+/* eslint-disable import/no-import-module-exports */
+/* eslint-disable no-async-promise-executor */
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-restricted-syntax */
 /**
  * This file handles attachments for us.
  * If the attachment filepath is an encrypted one. It will decrypt it, cache it, and return the blob url to it.
@@ -5,9 +9,11 @@
  *
  *
  */
+import { reject } from 'lodash';
 
 import * as fse from 'fs-extra';
 import path from 'path';
+
 import { DURATION } from '../constants';
 import { makeObjectUrl, urlToBlob } from '../../types/attachments/VisualAttachment';
 import {
@@ -129,28 +135,25 @@ export const getDecryptedMediaUrl = async (
             // window.log.debug(' file decrypted :', url, ' as ', obj);
             urlToDecryptingPromise.delete(url);
             resolve(obj);
-            return;
-          } else {
-            // failed to decrypt, fallback to url image loading
-            // it might be a media we received before the update encrypting attachments locally.
-            urlToDecryptingPromise.delete(url);
-            window.log.info('error decrypting file :', url);
-            resolve(url);
-
             return;
           }
+          // failed to decrypt, fallback to url image loading
+          // it might be a media we received before the update encrypting attachments locally.
+          urlToDecryptingPromise.delete(url);
+          window.log.info('error decrypting file :', url);
+          resolve(url);
         } catch (e) {
           window.log.warn(e);
+          reject(e.message);
         }
       })
     );
 
     return urlToDecryptingPromise.get(url) as Promise<string>;
-  } else {
-    // Not sure what we got here. Just return the file.
-
-    return url;
   }
+  // Not sure what we got here. Just return the file.
+
+  return url;
 };
 
 /**
@@ -163,7 +166,8 @@ export const getAlreadyDecryptedMediaUrl = (url: string): string | null => {
   }
   if (url.startsWith('blob:')) {
     return url;
-  } else if (exports.getLocalAttachmentPath() && url.startsWith(exports.getLocalAttachmentPath())) {
+  }
+  if (exports.getLocalAttachmentPath() && url.startsWith(exports.getLocalAttachmentPath())) {
     if (urlToDecryptedBlobMap.has(url)) {
       const existing = urlToDecryptedBlobMap.get(url);
 
diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts
index 7f570a239..66eff6517 100644
--- a/ts/session/crypto/MessageEncrypter.ts
+++ b/ts/session/crypto/MessageEncrypter.ts
@@ -2,11 +2,12 @@ import { SignalService } from '../../protobuf';
 import { PubKey } from '../types';
 import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '.';
 import { fromHexToArray } from '../utils/String';
-export { concatUInt8Array, getSodiumRenderer };
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { UserUtils } from '../utils';
 import { addMessagePadding } from './BufferPadding';
 
+export { concatUInt8Array, getSodiumRenderer };
+
 type EncryptResult = {
   envelopeType: SignalService.Envelope.Type;
   cipherText: Uint8Array;
diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts
index c2d63d5a3..dd0cde454 100644
--- a/ts/session/crypto/index.ts
+++ b/ts/session/crypto/index.ts
@@ -1,15 +1,14 @@
+import crypto from 'crypto';
+import libsodiumwrappers from 'libsodium-wrappers-sumo';
+
 import * as MessageEncrypter from './MessageEncrypter';
 import * as DecryptedAttachmentsManager from './DecryptedAttachmentsManager';
 
-export { MessageEncrypter, DecryptedAttachmentsManager };
-import crypto from 'crypto';
-
-// libsodium-wrappers requires the `require` call to work
-// tslint:disable-next-line: no-require-imports
-import libsodiumwrappers from 'libsodium-wrappers-sumo';
 import { toHex } from '../utils/String';
 import { ECKeyPair } from '../../receiver/keypairs';
 
+export { MessageEncrypter, DecryptedAttachmentsManager };
+
 export type LibSodiumWrappers = typeof libsodiumwrappers;
 
 export async function getSodiumRenderer(): Promise<LibSodiumWrappers> {
diff --git a/ts/session/crypto/mnemonic.ts b/ts/session/crypto/mnemonic.ts
index 600e63e67..ffac2d96b 100644
--- a/ts/session/crypto/mnemonic.ts
+++ b/ts/session/crypto/mnemonic.ts
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import crc32 from 'buffer-crc32';
 
 class MnemonicError extends Error {}
@@ -14,7 +15,7 @@ const MN_DEFAULT_WORDSET = 'english';
 
 function mn_get_checksum_index(words: Array<string>, prefixLen: number) {
   let trimmedWords = '';
-  // tslint:disable-next-line: prefer-for-of
+
   for (let i = 0; i < words.length; i++) {
     trimmedWords += words[i].slice(0, prefixLen);
   }
@@ -23,7 +24,7 @@ function mn_get_checksum_index(words: Array<string>, prefixLen: number) {
   return index;
 }
 
-export function mn_encode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
+export function mnEncode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
   const wordset = mnWords[wordsetName];
   let out = [] as Array<any>;
   const n = wordset.words.length;
@@ -52,7 +53,7 @@ function mn_swap_endian_4byte(str: string) {
   return str.slice(6, 8) + str.slice(4, 6) + str.slice(2, 4) + str.slice(0, 2);
 }
 
-export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
+export function mnDecode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
   const wordset = mnWords[wordsetName];
   let out = '';
   const n = wordset.words.length;
@@ -78,8 +79,9 @@ export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET)
   }
   // Decode mnemonic
   for (let i = 0; i < wlist.length; i += 3) {
-    // tslint:disable-next-line: one-variable-per-declaration
-    let w1, w2, w3;
+    let w1;
+    let w2;
+    let w3;
     if (wordset.prefixLen === 0) {
       w1 = wordset.words.indexOf(wlist[i]);
       w2 = wordset.words.indexOf(wlist[i + 1]);
@@ -92,7 +94,7 @@ export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET)
     if (w1 === -1 || w2 === -1 || w3 === -1) {
       throw new MnemonicError('invalid word in mnemonic');
     }
-    // tslint:disable-next-line: restrict-plus-operands
+
     const x = w1 + n * ((n - w1 + w2) % n) + n * n * ((n - w2 + w3) % n);
     if (x % n !== w1) {
       throw new MnemonicError(
@@ -126,8 +128,7 @@ const mnWords = {} as Record<
 >;
 mnWords.english = {
   prefixLen: 3,
-  // tslint:disable-next-line: non-literal-require
-  // tslint:disable-next-line: no-require-imports
+  // eslint-disable-next-line global-require
   words: require('../../../mnemonic_languages/english.json'),
   truncWords: [],
 };
@@ -135,9 +136,10 @@ mnWords.english = {
 export function get_languages(): Array<string> {
   return Object.keys(mnWords);
 }
-// tslint:disable: prefer-for-of
-// tslint:disable: no-for-in
+
+// eslint-disable-next-line no-restricted-syntax
 for (const i in mnWords) {
+  // eslint-disable-next-line no-prototype-builtins
   if (mnWords.hasOwnProperty(i)) {
     if (mnWords[i].prefixLen === 0) {
       continue;
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 230fc2b68..990476614 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -1,8 +1,7 @@
-import { PubKey } from '../types';
-
 import _ from 'lodash';
-
 import { v4 as uuidv4 } from 'uuid';
+
+import { PubKey } from '../types';
 import { getMessageQueue } from '..';
 import { Data } from '../../data/data';
 import { ConversationModel } from '../../models/conversation';
@@ -221,7 +220,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     // Note: legacy group to not support change of admins.
     type: ConversationTypeEnum.GROUP,
     active_at: details.activeAt ? details.activeAt : 0,
-    left: details.activeAt ? false : true,
+    left: !details.activeAt,
   };
 
   conversation.set(updates);
diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts
index e489d2ca3..4e08f1d55 100644
--- a/ts/session/messages/incoming/IncomingMessage.ts
+++ b/ts/session/messages/incoming/IncomingMessage.ts
@@ -27,7 +27,10 @@ export class IncomingMessage<T extends IncomingMessageAvailableTypes> {
    *      * for a 1o1 message, the is the sender
    *      * for a message in a group, this is the pubkey of the group (as everyone
    *            in a group send message to the group pubkey)
-   * - `authorInGroup` is only set when this message is incoming from a closed group. This is the old `senderIdentity` and is the publicKey of the sender inside the message itself once decrypted. This is the real sender of a closed group message.
+   * - `authorInGroup` is only set when this message is incoming
+   *    from a closed group. This is the old `senderIdentity` and
+   *    is the publicKey of the sender inside the message itself once
+   *    decrypted. This is the real sender of a closed group message.
    * - `message` is the data of the ContentMessage itself.
    */
   constructor({
diff --git a/ts/session/messages/outgoing/controlMessage/CallMessage.ts b/ts/session/messages/outgoing/controlMessage/CallMessage.ts
index b7ae4e5d1..b0c2609d9 100644
--- a/ts/session/messages/outgoing/controlMessage/CallMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/CallMessage.ts
@@ -3,6 +3,7 @@ import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
 import { signalservice } from '../../../../protobuf/compiled';
 import { TTL_DEFAULT } from '../../../constants';
+
 interface CallMessageParams extends MessageParams {
   type: SignalService.CallMessage.Type;
   sdpMLineIndexes?: Array<number>;
diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
index 562fb6ae1..50bf298bc 100644
--- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
@@ -1,7 +1,8 @@
+import { v4 as uuid } from 'uuid';
+
 import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
-import { v4 as uuid } from 'uuid';
 import { PubKey } from '../../../types';
 import { getMessageQueue } from '../../..';
 import { getConversationController } from '../../../conversations';
@@ -9,6 +10,7 @@ import { UserUtils } from '../../../utils';
 import { SettingsKey } from '../../../../data/settings-key';
 import { Storage } from '../../../../util/storage';
 import { SnodeNamespaces } from '../../../apis/snode_api/namespaces';
+
 interface DataExtractionNotificationMessageParams extends MessageParams {
   referencedAttachmentTimestamp: number;
 }
diff --git a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
index dcedf5269..0bc5af5ca 100644
--- a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
+++ b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
@@ -4,7 +4,6 @@ import { ContentMessage } from '../ContentMessage';
 import { MessageParams } from '../Message';
 import { buildProfileForOutgoingMessage } from '../visibleMessage/VisibleMessage';
 
-// tslint:disable-next-line: no-empty-interface
 export interface MessageRequestResponseParams extends MessageParams {
   lokiProfile?: LokiProfile;
 }
diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
index 9ff10de83..487a0b6ec 100644
--- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
@@ -1,9 +1,9 @@
 // this is not a very good name, but a configuration message is a message sent to our other devices so sync our current public and closed groups
+import Long from 'long';
 
 import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
-import Long from 'long';
 import { TTL_DEFAULT } from '../../../constants';
 
 interface SharedConfigParams extends MessageParams {
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
index ca4c7461b..c8a43a777 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
@@ -24,7 +24,6 @@ export class ClosedGroupAddedMembersMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED;
     dataMessage.closedGroupControlMessage!.members = this.addedMembers.map(fromHexToArray);
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
index d22981146..9976015d5 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
@@ -25,13 +25,12 @@ export class ClosedGroupEncryptionPairMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR;
     dataMessage.closedGroupControlMessage!.wrappers = this.encryptedKeyPairs.map(w => {
       const { publicKey, encryptedKeyPair } = w;
       return {
-        publicKey: publicKey,
+        publicKey,
         encryptedKeyPair,
       };
     });
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
index 5455337b5..c63d85f45 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
@@ -15,7 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from './ClosedGroupEncryptionPairMes
 export class ClosedGroupEncryptionPairReplyMessage extends ClosedGroupEncryptionPairMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
-    // tslint:disable: no-non-null-assertion
+
     dataMessage.closedGroupControlMessage!.publicKey = fromHexToArray(this.groupId.key);
 
     return dataMessage;
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
index 04bdce0e3..65f335fef 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
@@ -5,7 +5,6 @@ export class ClosedGroupMemberLeftMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT;
 
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
index 0867ad63a..71a390c67 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
@@ -23,7 +23,6 @@ export class ClosedGroupNameChangeMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE;
     dataMessage.closedGroupControlMessage!.name = this.name;
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
index 70d6c8461..019d832bc 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
@@ -24,7 +24,6 @@ export class ClosedGroupRemovedMembersMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED;
     dataMessage.closedGroupControlMessage!.members = this.removedMembers.map(fromHexToArray);
diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
index 89a6dfa84..11e248d76 100644
--- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
+++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
@@ -29,7 +29,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage {
     }
   }
   public dataProto(): SignalService.DataMessage {
-    //expireTimer is set in the dataProto in this call directly
+    // expireTimer is set in the dataProto in this call directly
     const dataProto = this.chatMessage.dataProto();
 
     const groupMessage = new SignalService.GroupContext();
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 08254af42..245709ad1 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -1,22 +1,24 @@
-import { Data, Snode } from '../../../ts/data/data';
-import * as SnodePool from '../apis/snode_api/snodePool';
+/* eslint-disable import/no-mutable-exports */
+/* eslint-disable no-await-in-loop */
 import _ from 'lodash';
+import pRetry from 'p-retry';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
+
+import { Data, Snode } from '../../data/data';
+import * as SnodePool from '../apis/snode_api/snodePool';
 import { UserUtils } from '../utils';
 import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions';
 import { allowOnlyOneAtATime } from '../utils/Promise';
-import pRetry from 'p-retry';
+import { updateOnionPaths } from '../../state/ducks/onion';
+import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI';
+import { OnionPaths } from '.';
+import { APPLICATION_JSON } from '../../types/MIME';
 
 const desiredGuardCount = 3;
 const minimumGuardCount = 2;
-
-import { updateOnionPaths } from '../../state/ducks/onion';
-import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI';
-
-import { OnionPaths } from './';
-import { APPLICATION_JSON } from '../../types/MIME';
-
 const ONION_REQUEST_HOPS = 3;
+
 export let onionPaths: Array<Array<Snode>> = [];
 
 /**
@@ -24,12 +26,11 @@ export let onionPaths: Array<Array<Snode>> = [];
  * @returns a copy of the onion path currently used by the app.
  *
  */
-// tslint:disable-next-line: variable-name
+
 export const TEST_getTestOnionPath = () => {
   return _.cloneDeep(onionPaths);
 };
 
-// tslint:disable-next-line: variable-name
 export const TEST_getTestguardNodes = () => {
   return _.cloneDeep(guardNodes);
 };
@@ -50,7 +51,6 @@ export const clearTestOnionPath = () => {
  */
 export let pathFailureCount: Record<string, number> = {};
 
-// tslint:disable-next-line: variable-name
 export const resetPathFailureCount = () => {
   pathFailureCount = {};
 };
@@ -204,7 +204,7 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
     // this might happen if the snodeEd25519 is the one of the target snode, just increment the target snode count by 1
     await Onions.incrementBadSnodeCountOrDrop({ snodeEd25519 });
 
-    return;
+    return undefined;
   }
 
   const guardNodeEd25519 = onionPaths[pathWithSnodeIndex][0].pubkey_ed25519;
@@ -218,8 +218,6 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
   window?.log?.info('handling bad path for path index', pathWithSnodeIndex);
   const oldPathFailureCount = pathFailureCount[guardNodeEd25519] || 0;
 
-  // tslint:disable: prefer-for-of
-
   const newPathFailureCount = oldPathFailureCount + 1;
   // skip the first one as the first one is the guard node.
   // a guard node is dropped when the path is dropped completely (in dropPathStartingWithGuardNode)
@@ -233,6 +231,7 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
   }
   // the path is not yet THAT bad. keep it for now
   pathFailureCount[guardNodeEd25519] = newPathFailureCount;
+  return undefined;
 }
 
 /**
diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts
index a678bb4fd..48146a5bb 100644
--- a/ts/session/onions/onionSend.ts
+++ b/ts/session/onions/onionSend.ts
@@ -1,4 +1,6 @@
-// tslint:disable: cyclomatic-complexity
+import { toNumber } from 'lodash';
+import pRetry from 'p-retry';
+import { AbortSignal } from 'abort-controller';
 
 import { OnionPaths } from '.';
 import {
@@ -9,9 +11,7 @@ import {
   SnodeResponse,
   STATUS_NO_STATUS,
 } from '../apis/snode_api/onions';
-import { toNumber } from 'lodash';
 import { PROTOCOLS } from '../constants';
-import pRetry from 'p-retry';
 import { Snode } from '../../data/data';
 import { OnionV4 } from './onionv4';
 import { OpenGroupPollingUtils } from '../apis/open_group_api/opengroupV2/OpenGroupPollingUtils';
@@ -19,7 +19,6 @@ import {
   addBinaryContentTypeToHeaders,
   addJsonContentTypeToHeaders,
 } from '../apis/open_group_api/sogsv3/sogsV3SendMessage';
-import { AbortSignal } from 'abort-controller';
 import { pnServerPubkeyHex, pnServerUrl } from '../apis/push_notification_api/PnServer';
 import { fileServerPubKey, fileServerURL } from '../apis/file_server_api/FileServerApi';
 import { invalidAuthRequiresBlinding } from '../apis/open_group_api/opengroupV2/OpenGroupServerPoller';
@@ -34,7 +33,6 @@ export type OnionFetchOptions = {
 // NOTE some endpoints require decoded strings
 const endpointExceptions = ['/reaction'];
 const endpointRequiresDecoding = (url: string): string => {
-  // tslint:disable-next-line: prefer-for-of
   for (let i = 0; i < endpointExceptions.length; i++) {
     if (url.includes(endpointExceptions[i])) {
       return decodeURIComponent(url);
@@ -103,7 +101,7 @@ export type OnionV4BinarySnodeResponse = {
  * Build & send an onion v4 request to a non snode, and handle retries.
  * We actually can only send v4 request to non snode, as the snodes themselves do not support v4 request as destination.
  */
-// tslint:disable-next-line: max-func-body-length
+
 const sendViaOnionV4ToNonSnodeWithRetries = async (
   destinationX25519Key: string,
   url: URL,
diff --git a/ts/session/onions/onionv4.ts b/ts/session/onions/onionv4.ts
index 170dfa213..096f42241 100644
--- a/ts/session/onions/onionv4.ts
+++ b/ts/session/onions/onionv4.ts
@@ -65,7 +65,7 @@ const decodeV4Response = (snodeResponse: SnodeResponseV4): DecodedResponseV4 | u
     window?.log?.error(
       'decodeV4Response: response is missing prefix and suffix characters - Dropping response'
     );
-    return;
+    return undefined;
   }
 
   try {
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index af20d5391..97a0009cd 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -1,7 +1,9 @@
+import { AbortController } from 'abort-controller';
+
 import { PendingMessageCache } from './PendingMessageCache';
 import { JobQueue, MessageUtils, UserUtils } from '../utils';
 import { PubKey, RawMessage } from '../types';
-import { MessageSender } from './';
+import { MessageSender } from '.';
 import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage';
 import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage';
 import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
@@ -22,7 +24,6 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope
 import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage';
 import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
-import { AbortController } from 'abort-controller';
 import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction';
 import {
   SnodeNamespaces,
@@ -112,7 +113,7 @@ export class MessageQueue {
       }
 
       await MessageSentHandler.handlePublicMessageSentSuccess(message.identifier, {
-        serverId: serverId,
+        serverId,
         serverTimestamp: sentTimestamp,
       });
     } catch (e) {
@@ -184,7 +185,7 @@ export class MessageQueue {
   }): Promise<void> {
     let destinationPubKey: PubKey | undefined = groupPubKey;
     if (message instanceof ExpirationTimerUpdateMessage || message instanceof ClosedGroupMessage) {
-      destinationPubKey = groupPubKey ? groupPubKey : message.groupId;
+      destinationPubKey = groupPubKey || message.groupId;
     }
 
     if (!destinationPubKey) {
@@ -265,6 +266,7 @@ export class MessageQueue {
     const messages = await this.pendingMessageCache.getForDevice(device);
 
     const jobQueue = this.getJobQueue(device);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     messages.forEach(async message => {
       const messageId = message.identifier;
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 33612d56a..be9d1ed37 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -2,9 +2,9 @@
 
 import { AbortController } from 'abort-controller';
 import ByteBuffer from 'bytebuffer';
-import _, { isEmpty, isNil, isString, sample } from 'lodash';
+import _, { isEmpty, isNil, isString, sample, toNumber } from 'lodash';
 import pRetry from 'p-retry';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { SignalService } from '../../protobuf';
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
@@ -47,7 +47,7 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff
   const contentDecoded = SignalService.Content.decode(plainTextBuffer);
 
   const { dataMessage, dataExtractionNotification, typingMessage } = contentDecoded;
-  if (dataMessage && dataMessage.timestamp && dataMessage.timestamp > 0) {
+  if (dataMessage && dataMessage.timestamp && toNumber(dataMessage.timestamp) > 0) {
     // this is a sync message, do not overwrite the message timestamp
     if (dataMessage.syncTarget) {
       return {
@@ -60,11 +60,11 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff
   if (
     dataExtractionNotification &&
     dataExtractionNotification.timestamp &&
-    dataExtractionNotification.timestamp > 0
+    toNumber(dataExtractionNotification.timestamp) > 0
   ) {
     dataExtractionNotification.timestamp = networkTimestamp;
   }
-  if (typingMessage && typingMessage.timestamp && typingMessage.timestamp > 0) {
+  if (typingMessage && typingMessage.timestamp && toNumber(typingMessage.timestamp) > 0) {
     typingMessage.timestamp = networkTimestamp;
   }
   const overRiddenTimestampBuffer = SignalService.Content.encode(contentDecoded).finish();
@@ -84,9 +84,8 @@ function isSyncMessage(message: ContentMessage) {
     (message as any).syncTarget?.length > 0
   ) {
     return true;
-  } else {
-    return false;
   }
+  return false;
 }
 
 /**
@@ -261,9 +260,8 @@ function encryptionBasedOnConversation(destination: PubKey) {
       ?.isClosedGroup()
   ) {
     return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
-  } else {
-    return SignalService.Envelope.Type.SESSION_MESSAGE;
   }
+  return SignalService.Envelope.Type.SESSION_MESSAGE;
 }
 
 type SharedEncryptAndWrap = {
diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index da599e6e3..0f5dbcea8 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -40,7 +40,6 @@ async function handlePublicMessageSentSuccess(
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleMessageSentSuccess(
   sentMessage: RawMessage,
   effectiveTimestamp: number,
diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts
index 10b3739aa..f199dd8fd 100644
--- a/ts/session/sending/PendingMessageCache.ts
+++ b/ts/session/sending/PendingMessageCache.ts
@@ -1,11 +1,11 @@
 import _ from 'lodash';
-import { Data } from '../../../ts/data/data';
-import { PartialRawMessage, RawMessage } from '../types/RawMessage';
+import { Data } from '../../data/data';
+import { Storage } from '../../util/storage';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ContentMessage } from '../messages/outgoing';
 import { PubKey } from '../types';
+import { PartialRawMessage, RawMessage } from '../types/RawMessage';
 import { MessageUtils } from '../utils';
-import { SnodeNamespaces } from '../apis/snode_api/namespaces';
-import { Storage } from '../../util/storage';
 
 // This is an abstraction for storing pending messages.
 // Ideally we want to store pending messages in the database so that
@@ -75,7 +75,7 @@ export class PendingMessageCache {
 
     // Return if message doesn't exist in cache
     if (!this.find(message)) {
-      return;
+      return undefined;
     }
 
     // Remove item from cache and sync with database
diff --git a/ts/session/tslint.json b/ts/session/tslint.json
deleted file mode 100644
index 6d990c28d..000000000
--- a/ts/session/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": ["../../tslint.json"],
-  "rules": {
-    "no-unused-variable": false,
-    "use-simple-attributes": false
-  }
-}
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index 987250d1c..2320bf646 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -33,7 +33,7 @@ export class PubKey {
   // This is a temporary fix to allow groupPubkeys created from mobile to be handled correctly
   // They have a different regex to match
   // FIXME move this to a new class which validates group ids and use it in all places where we have group ids (message sending included)
-  // tslint:disable: member-ordering
+
   public static readonly regexForPubkeys = `(([0-1]5)?${PubKey.HEX}{${this.PUBKEY_LEN_NO_PREFIX}})`;
   public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!';
   // prettier-ignore
@@ -183,9 +183,8 @@ export class PubKey {
   public static getPrefix(key: string): KeyPrefixType | null {
     if (this.isValidPrefixAndLength(key)) {
       return key.substring(0, 2) as KeyPrefixType;
-    } else {
-      return null;
     }
+    return null;
   }
 
   /**
diff --git a/ts/session/utils/Attachments.ts b/ts/session/utils/Attachments.ts
index 922dc2c01..c2fb6ce08 100644
--- a/ts/session/utils/Attachments.ts
+++ b/ts/session/utils/Attachments.ts
@@ -1,4 +1,6 @@
 import * as crypto from 'crypto';
+import _ from 'lodash';
+
 import { Attachment } from '../../types/Attachment';
 
 import {
@@ -9,7 +11,6 @@ import {
   QuotedAttachmentWithUrl,
 } from '../messages/outgoing/visibleMessage/VisibleMessage';
 import { addAttachmentPadding } from '../crypto/BufferPadding';
-import _ from 'lodash';
 import { encryptAttachment } from '../../util/crypto/attachmentsEncrypter';
 import { uploadFileToFsWithOnionV4 } from '../apis/file_server_api/FileServerApi';
 
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 9838cedb3..8bc14d72d 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -1,9 +1,9 @@
 import { filter, isNumber, omit } from 'lodash';
-// tslint:disable-next-line: no-submodule-imports
+
 import { v4 as uuidv4 } from 'uuid';
 
 import * as Constants from '../constants';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { MessageModel } from '../../models/message';
 import { downloadAttachment, downloadAttachmentSogsV3 } from '../../receiver/attachments';
 import { initializeAttachmentLogic, processNewAttachment } from '../../types/MessageAttachment';
@@ -15,7 +15,6 @@ import { AttachmentDownloadMessageDetails } from '../../types/sqlSharedTypes';
 const MAX_ATTACHMENT_JOB_PARALLELISM = 3;
 
 const TICK_INTERVAL = Constants.DURATION.MINUTES;
-// tslint:disable: function-name
 
 const RETRY_BACKOFF = {
   1: Constants.DURATION.SECONDS * 30,
@@ -91,6 +90,7 @@ export async function addJob(attachment: any, job: AttachmentDownloadMessageDeta
 
 async function _tick() {
   await _maybeStartJob();
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   timeout = setTimeout(_tick, TICK_INTERVAL);
 }
 
@@ -131,14 +131,12 @@ async function _maybeStartJob() {
     Math.min(needed, nextJobsWithoutCurrentlyRunning.length)
   );
 
-  // tslint:disable: one-variable-per-declaration
   for (let i = 0, max = jobs.length; i < max; i += 1) {
     const job = jobs[i];
     _activeAttachmentDownloadJobs[job.id] = _runJob(job);
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function _runJob(job: any) {
   const { id, messageId, attachment, type, index, attempts, isOpenGroupV2, openGroupV2Details } =
     job || {};
@@ -230,7 +228,6 @@ async function _runJob(job: any) {
 
     await _finishJob(found, id);
   } catch (error) {
-    // tslint:disable: restrict-plus-operands
     const currentAttempt: 1 | 2 | 3 = (attempts || 0) + 1;
 
     // if we get a 404 error for attachment downloaded, we can safely assume that the attachment expired server-side.
@@ -268,7 +265,7 @@ async function _runJob(job: any) {
     };
 
     await Data.saveAttachmentDownloadJob(failedJob);
-    // tslint:disable-next-line: no-dynamic-delete
+
     delete _activeAttachmentDownloadJobs[id];
     void _maybeStartJob();
   }
@@ -283,7 +280,7 @@ async function _finishJob(message: MessageModel | null, id: string) {
   }
 
   await Data.removeAttachmentDownloadJob(id);
-  // tslint:disable-next-line: no-dynamic-delete
+
   delete _activeAttachmentDownloadJobs[id];
   await _maybeStartJob();
 }
@@ -300,7 +297,6 @@ function _markAttachmentAsError(attachment: any) {
   };
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 function _addAttachmentToMessage(
   message: MessageModel | null | undefined,
   attachment: any,
@@ -332,6 +328,7 @@ function _addAttachmentToMessage(
         throw new Error("_addAttachmentToMessage: quote didn't exist");
       }
 
+      // eslint-disable-next-line no-param-reassign
       delete message.attributes.quote.attachments;
 
       return;
@@ -341,6 +338,7 @@ function _addAttachmentToMessage(
       throw new Error(`_addAttachmentToMessage: preview didn't exist or ${index} was too large`);
     }
 
+    // eslint-disable-next-line no-param-reassign
     delete message.attributes.preview[0].image;
     return;
   }
diff --git a/ts/session/utils/AttachmentsV2.ts b/ts/session/utils/AttachmentsV2.ts
index 22a08da68..f8d53fb88 100644
--- a/ts/session/utils/AttachmentsV2.ts
+++ b/ts/session/utils/AttachmentsV2.ts
@@ -1,6 +1,9 @@
+import { isFinite } from 'lodash';
 import { Attachment } from '../../types/Attachment';
 
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
+import { uploadFileToRoomSogs3 } from '../apis/open_group_api/sogsv3/sogsV3SendFile';
+import { addAttachmentPadding } from '../crypto/BufferPadding';
 import {
   AttachmentPointer,
   AttachmentPointerWithUrl,
@@ -8,10 +11,7 @@ import {
   Quote,
   QuotedAttachment,
 } from '../messages/outgoing/visibleMessage/VisibleMessage';
-import { addAttachmentPadding } from '../crypto/BufferPadding';
 import { RawPreview, RawQuote } from './Attachments';
-import _ from 'lodash';
-import { uploadFileToRoomSogs3 } from '../apis/open_group_api/sogsv3/sogsV3SendFile';
 
 interface UploadParamsV2 {
   attachment: Attachment;
diff --git a/ts/session/utils/JobQueue.ts b/ts/session/utils/JobQueue.ts
index e466a1a06..21a029e0e 100644
--- a/ts/session/utils/JobQueue.ts
+++ b/ts/session/utils/JobQueue.ts
@@ -21,8 +21,8 @@ export class JobQueue {
       return this.jobs.get(id) as Promise<Result>;
     }
 
-    // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
+    // eslint-disable-next-line more/no-then
     this.pending = previous.then(job, job);
 
     const current = this.pending;
diff --git a/ts/session/utils/Messages.ts b/ts/session/utils/Messages.ts
index fe94a9b05..36384d260 100644
--- a/ts/session/utils/Messages.ts
+++ b/ts/session/utils/Messages.ts
@@ -29,9 +29,8 @@ function getEncryptionTypeFromMessageType(
     isGroup
   ) {
     return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
-  } else {
-    return SignalService.Envelope.Type.SESSION_MESSAGE;
   }
+  return SignalService.Envelope.Type.SESSION_MESSAGE;
 }
 
 export async function toRawMessage(
@@ -45,7 +44,6 @@ export async function toRawMessage(
 
   const encryption = getEncryptionTypeFromMessageType(message, isGroup);
 
-  // tslint:disable-next-line: no-unnecessary-local-variable
   const rawMessage: RawMessage = {
     identifier: message.identifier,
     plainTextBuffer,
diff --git a/ts/session/utils/Performance.ts b/ts/session/utils/Performance.ts
index 001a56687..3576f0e4b 100644
--- a/ts/session/utils/Performance.ts
+++ b/ts/session/utils/Performance.ts
@@ -1,12 +1,10 @@
 export function perfStart(prefix: string) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof performance !== 'undefined') {
     performance?.mark?.(`${prefix}-start`);
   }
 }
 
 export function perfEnd(prefix: string, measureName: string) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof performance !== 'undefined') {
     performance?.mark?.(`${prefix}-end`);
     performance?.measure?.(measureName, `${prefix}-start`, `${prefix}-end`);
diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts
index e9aeb0ea1..087568e2b 100644
--- a/ts/session/utils/Promise.ts
+++ b/ts/session/utils/Promise.ts
@@ -1,4 +1,8 @@
+/* eslint-disable no-promise-executor-return */
+/* eslint-disable no-async-promise-executor */
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import { Snode } from '../../data/data';
+
 type SimpleFunction<T> = (arg: T) => void;
 type Return<T> = Promise<T> | T;
 
@@ -31,7 +35,7 @@ export async function allowOnlyOneAtATime<T>(
       if (timeoutMs) {
         timeoutTimer = setTimeout(() => {
           window?.log?.warn(`allowOnlyOneAtATime - TIMEDOUT after ${timeoutMs}ms`);
-          // tslint:disable-next-line: no-dynamic-delete
+
           delete oneAtaTimeRecord[name]; // clear lock
           reject();
         }, timeoutMs);
@@ -54,7 +58,7 @@ export async function allowOnlyOneAtATime<T>(
             timeoutTimer = null;
           }
         }
-        // tslint:disable-next-line: no-dynamic-delete
+
         delete oneAtaTimeRecord[name]; // clear lock
         reject(e);
       }
@@ -65,7 +69,7 @@ export async function allowOnlyOneAtATime<T>(
           timeoutTimer = null;
         }
       }
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete oneAtaTimeRecord[name]; // clear lock
       // release the kraken
       resolve(innerRetVal);
@@ -199,7 +203,7 @@ export async function timeout<T>(promise: Promise<T>, timeoutMs: number): Promis
   return Promise.race([timeoutPromise, promise]);
 }
 
-export async function delay(timeoutMs: number = 2000): Promise<Boolean> {
+export async function delay(timeoutMs: number = 2000): Promise<boolean> {
   return new Promise(resolve => {
     setTimeout(() => {
       resolve(true);
@@ -207,10 +211,9 @@ export async function delay(timeoutMs: number = 2000): Promise<Boolean> {
   });
 }
 
-// tslint:disable: no-string-based-set-timeout
 export const sleepFor = async (ms: number, showLog = false) => {
   if (showLog) {
-    // tslint:disable-next-line: no-console
+    // eslint-disable-next-line no-console
     console.info(`sleeping for ${ms}ms...`);
   }
   return new Promise(resolve => {
@@ -226,7 +229,8 @@ export const firstTrue = async (ps: Array<Promise<any>>) => {
     async p =>
       new Promise(
         // eslint-disable more/no-then
-        // tslint:disable: no-void-expression
+
+        // eslint-disable-next-line more/no-then
         (resolve, reject) => p.then(v => v && resolve(v), reject)
       )
   );
diff --git a/ts/session/utils/TaskWithTimeout.ts b/ts/session/utils/TaskWithTimeout.ts
index 28e1747c7..c9f0ef591 100644
--- a/ts/session/utils/TaskWithTimeout.ts
+++ b/ts/session/utils/TaskWithTimeout.ts
@@ -1,3 +1,7 @@
+/* eslint-disable no-useless-return */
+/* eslint-disable consistent-return */
+/* eslint-disable no-promise-executor-return */
+
 export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: number) => {
   const timeout = givenTimeout || 1000 * 60 * 3; // three minutes
 
@@ -16,7 +20,7 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb
           return;
         }
 
-        return null;
+        return;
       }, timeout);
       const clearTimer = () => {
         try {
@@ -61,6 +65,7 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb
         return;
       }
 
+      // eslint-disable-next-line more/no-then
       return promise.then(success, failure);
     });
 };
diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts
index 2d6540083..0bcae2c78 100644
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { UserUtils } from '.';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { PubKey } from '../types';
 import { fromHexToArray, toHex } from './String';
 import { getConversationController } from '../conversations';
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 092e72d0e..171661c85 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -1,5 +1,9 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-param-reassign */
 import _ from 'lodash';
-import { MessageUtils, ToastUtils, UserUtils } from '../';
+import { v4 as uuidv4 } from 'uuid';
+
+import { MessageUtils, ToastUtils, UserUtils } from '..';
 import { SignalService } from '../../../protobuf';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import {
@@ -17,7 +21,6 @@ import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage'
 import { ed25519Str } from '../../onions/onionPath';
 import { PubKey } from '../../types';
 
-import { v4 as uuidv4 } from 'uuid';
 import { getIsRinging } from '../RingingManager';
 import { getBlackSilenceMediaStream } from './Silence';
 import { getMessageQueue } from '../..';
@@ -31,8 +34,6 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
 
-// tslint:disable: function-name
-
 export type InputItem = { deviceId: string; label: string };
 
 export const callTimeoutMs = 60000;
@@ -187,8 +188,9 @@ async function getConnectedDevices(type: 'videoinput' | 'audioinput' | 'audioout
 }
 
 // Listen for changes to media devices and update the list accordingly
-// tslint:disable-next-line: no-typeof-undefined
+
 if (typeof navigator !== 'undefined') {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   navigator?.mediaDevices?.addEventListener('devicechange', async () => {
     await updateConnectedDevices();
     callVideoListeners();
@@ -319,7 +321,7 @@ export async function selectAudioInputByDeviceId(audioInputDeviceId: string) {
       sender.track.enabled = false;
     }
     const silence = getBlackSilenceMediaStream().getAudioTracks()[0];
-    sender?.replaceTrack(silence);
+    void sender?.replaceTrack(silence);
     // do the same changes locally
     localStream?.getAudioTracks().forEach(t => {
       t.stop();
@@ -404,6 +406,7 @@ async function createOfferAndSendIt(recipient: string) {
       lines[lineWithFtmpIndex] = `${partBeforeComma[0]};cbr=1`;
       let overridenSdps = lines.join('\n');
       overridenSdps = overridenSdps.replace(
+        // eslint-disable-next-line prefer-regex-literals
         new RegExp('.+urn:ietf:params:rtp-hdrext:ssrc-audio-level.*\\r?\\n'),
         ''
       );
@@ -449,14 +452,14 @@ async function openMediaDevicesAndAddTracks() {
       return;
     }
 
-    selectedAudioInputId = DEVICE_DISABLED_DEVICE_ID; //audioInputsList[0].deviceId;
+    selectedAudioInputId = DEVICE_DISABLED_DEVICE_ID; // audioInputsList[0].deviceId;
     selectedCameraId = DEVICE_DISABLED_DEVICE_ID;
     window.log.info(
       `openMediaDevices videoDevice:${selectedCameraId} audioDevice:${selectedAudioInputId}`
     );
 
     localStream = getBlackSilenceMediaStream();
-    localStream.getTracks().map(track => {
+    localStream.getTracks().forEach(track => {
       if (localStream) {
         peerConnection?.addTrack(track, localStream);
       }
@@ -530,6 +533,7 @@ export async function USER_callRecipient(recipient: string) {
   await createOfferAndSendIt(recipient);
 
   // close and end the call if callTimeoutMs is reached and still not connected
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   global.setTimeout(async () => {
     if (justCreatedCallUUID === currentCallUUID && getIsRinging()) {
       window.log.info(
@@ -541,7 +545,7 @@ export async function USER_callRecipient(recipient: string) {
   }, callTimeoutMs);
 }
 
-const iceCandidates: Array<RTCIceCandidate> = new Array();
+const iceCandidates: Array<RTCIceCandidate> = [];
 const iceSenderDebouncer = _.debounce(async (recipient: string) => {
   if (!iceCandidates) {
     return;
@@ -710,7 +714,7 @@ function onDataChannelReceivedMessage(ev: MessageEvent<string>) {
     }
 
     if (parsed.video !== undefined) {
-      remoteVideoStreamIsMuted = !Boolean(parsed.video);
+      remoteVideoStreamIsMuted = !parsed.video;
     }
   } catch (e) {
     window.log.warn('onDataChannelReceivedMessage Could not parse data in event', ev);
@@ -763,7 +767,8 @@ function createOrGetPeerConnection(withPubkey: string) {
     );
 
     if (peerConnection && peerConnection?.iceConnectionState === 'disconnected') {
-      //this will trigger a negotiation event with iceRestart set to true in the createOffer options set
+      // this will trigger a negotiation event with iceRestart set to true in the createOffer options set
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       global.setTimeout(async () => {
         window.log.info('onconnectionstatechange disconnected: restartIce()');
 
@@ -847,6 +852,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
       const sdpMLineIndex = lastCandidatesFromSender.sdpMLineIndexes[index];
       const sdpMid = lastCandidatesFromSender.sdpMids[index];
       const candicate = new RTCIceCandidate({ sdpMid, sdpMLineIndex, candidate: sdp });
+      // eslint-disable-next-line no-await-in-loop
       await peerConnection.addIceCandidate(candicate);
     }
   }
@@ -936,19 +942,18 @@ export async function USER_hangup(fromSender: string) {
   if (!currentCallUUID) {
     window.log.warn('should not be able to hangup without a currentCallUUID');
     return;
-  } else {
-    rejectedCallUUIDS.add(currentCallUUID);
-    const endCallMessage = new CallMessage({
-      type: SignalService.CallMessage.Type.END_CALL,
-      timestamp: Date.now(),
-      uuid: currentCallUUID,
-    });
-    void getMessageQueue().sendToPubKeyNonDurably({
-      pubkey: PubKey.cast(fromSender),
-      message: endCallMessage,
-      namespace: SnodeNamespaces.UserMessages,
-    });
   }
+  rejectedCallUUIDS.add(currentCallUUID);
+  const endCallMessage = new CallMessage({
+    type: SignalService.CallMessage.Type.END_CALL,
+    timestamp: Date.now(),
+    uuid: currentCallUUID,
+  });
+  void getMessageQueue().sendToPubKeyNonDurably({
+    pubkey: PubKey.cast(fromSender),
+    message: endCallMessage,
+    namespace: SnodeNamespaces.UserMessages,
+  });
 
   window.inboxStore?.dispatch(endCall());
   window.log.info('sending hangup with an END_CALL MESSAGE');
@@ -1177,13 +1182,12 @@ export async function handleMissedCall(
       ToastUtils.pushedMissedCallNotApproved(displayname);
       break;
     case 'too-old-timestamp':
-      //no toast for this case, the missed call notification is enough
+      // no toast for this case, the missed call notification is enough
       break;
     default:
   }
 
   await addMissedCallMessage(sender, incomingOfferTimestamp);
-  return;
 }
 
 async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
@@ -1266,9 +1270,9 @@ export async function handleCallTypeAnswer(
       }
     }
     return;
-  } else {
-    window.log.info(`handling callMessage ANSWER from ${callMessageUUID}`);
   }
+  window.log.info(`handling callMessage ANSWER from ${callMessageUUID}`);
+
   const cachedMessage = getCachedMessageFromCallMessage(callMessage, envelopeTimestamp);
 
   pushCallMessageToCallCache(sender, callMessageUUID, cachedMessage);
@@ -1324,13 +1328,13 @@ export async function handleCallTypeIceCandidates(
 
 async function addIceCandidateToExistingPeerConnection(callMessage: SignalService.CallMessage) {
   if (peerConnection) {
-    // tslint:disable-next-line: prefer-for-of
     for (let index = 0; index < callMessage.sdps.length; index++) {
       const sdp = callMessage.sdps[index];
       const sdpMLineIndex = callMessage.sdpMLineIndexes[index];
       const sdpMid = callMessage.sdpMids[index];
       const candicate = new RTCIceCandidate({ sdpMid, sdpMLineIndex, candidate: sdp });
       try {
+        // eslint-disable-next-line no-await-in-loop
         await peerConnection.addIceCandidate(candicate);
       } catch (err) {
         if (!ignoreOffer) {
@@ -1343,7 +1347,6 @@ async function addIceCandidateToExistingPeerConnection(callMessage: SignalServic
   }
 }
 
-// tslint:disable-next-line: no-async-without-await
 export async function handleOtherCallTypes(
   sender: string,
   callMessage: SignalService.CallMessage,
@@ -1368,7 +1371,7 @@ function createCallCacheForPubkeyAndUUID(sender: string, uuid: string) {
   }
 
   if (!callCache.get(sender)?.has(uuid)) {
-    callCache.get(sender)?.set(uuid, new Array());
+    callCache.get(sender)?.set(uuid, []);
   }
 }
 
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index ce5fb6bfc..abb1c71b3 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -204,9 +204,8 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
     if (!this.isStarted) {
       if (this.jobsScheduled.length) {
         return 'job_deferred';
-      } else {
-        return 'no_job';
       }
+      return 'no_job';
     }
 
     if (this.currentJob) {
@@ -322,7 +321,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
             nextJob.persistedData.delayBetweenRetries
           }...`
         );
-        nextJob.persistedData.currentRetry = nextJob.persistedData.currentRetry + 1;
+        nextJob.persistedData.currentRetry += 1;
         // that job can be restarted. Plan a retry later with the already defined retry
         nextJob.persistedData.nextAttemptTimestamp =
           Date.now() + nextJob.persistedData.delayBetweenRetries;
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index b266760d9..85e52b7a3 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -100,7 +100,6 @@ export abstract class PersistedJob<T extends PersistedJobData> {
    */
   public async waitForCurrentTry() {
     try {
-      // tslint:disable-next-line: no-promise-as-boolean
       return this.runningPromise || Promise.resolve(true);
     } catch (e) {
       window.log.warn('waitForCurrentTry got an error: ', e.message);
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index fb6c5af6d..273ab4346 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -92,7 +92,6 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     });
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public async run(): Promise<RunJobResult> {
     const convoId = this.persistedData.conversationId;
 
@@ -185,14 +184,12 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
         );
         return RunJobResult.RetryJobIfPossible;
       }
-    } else {
+    } else if (conversation.get('avatarInProfile')) {
       // there is no valid avatar to download, make sure the local file of the avatar of that user is removed
-      if (conversation.get('avatarInProfile')) {
-        conversation.set({
-          avatarInProfile: undefined,
-        });
-        changes = true;
-      }
+      conversation.set({
+        avatarInProfile: undefined,
+      });
+      changes = true;
     }
 
     if (conversation.id === UserUtils.getOurPubKeyStrFromCache()) {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 5fc60cbf9..aaae284d1 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import { compact, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
@@ -71,32 +72,28 @@ function resultsToSuccessfulChange(
    * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes
    */
 
-  try {
-    if (!result?.length) {
-      return successfulChanges;
-    }
-
-    for (let j = 0; j < result.length; j++) {
-      const batchResult = result[j];
-      const messagePostedHashes = batchResult?.body?.hash;
-
-      if (
-        batchResult.code === 200 &&
-        isString(messagePostedHashes) &&
-        request.messages?.[j].message
-      ) {
-        // the library keeps track of the hashes to push and pushed using the hashes now
-        successfulChanges.push({
-          updatedHash: messagePostedHashes,
-          message: request.messages?.[j].message,
-        });
-      }
-    }
-
+  if (!result?.length) {
     return successfulChanges;
-  } catch (e) {
-    throw e;
   }
+
+  for (let j = 0; j < result.length; j++) {
+    const batchResult = result[j];
+    const messagePostedHashes = batchResult?.body?.hash;
+
+    if (
+      batchResult.code === 200 &&
+      isString(messagePostedHashes) &&
+      request.messages?.[j].message
+    ) {
+      // the library keeps track of the hashes to push and pushed using the hashes now
+      successfulChanges.push({
+        updatedHash: messagePostedHashes,
+        message: request.messages?.[j].message,
+      });
+    }
+  }
+
+  return successfulChanges;
 }
 
 async function buildAndSaveDumpsToDB(
@@ -238,6 +235,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       await buildAndSaveDumpsToDB(changes, thisJobDestination);
       this.triggerConfSyncJobDone();
       return RunJobResult.Success;
+      // eslint-disable-next-line no-useless-catch
     } catch (e) {
       throw e;
     } finally {
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 153a46e72..5ad67302a 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -1,3 +1,6 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
 import { difference, omit } from 'lodash';
 import Long from 'long';
 import { UserUtils } from '..';
@@ -144,6 +147,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   return results;
 }
 
+// eslint-disable-next-line consistent-return
 function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrapperObjectTypes {
   switch (kind) {
     case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
@@ -159,6 +163,7 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap
   }
 }
 
+// eslint-disable-next-line consistent-return
 function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedConfigMessage.Kind {
   switch (variant) {
     case 'UserConfig':
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 00186a241..01d95a471 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -36,7 +36,7 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean {
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that contact does not exist in the wrapper, it is created before being updated.
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
   const foundConvo = getConversationController().get(id);
   if (!foundConvo) {
@@ -95,13 +95,11 @@ async function refreshMappedValue(id: string, duringAppStart = false) {
         .get(id)
         ?.triggerUIRefresh();
     }
-  } else {
-    if (mappedContactWrapperValues.delete(id)) {
-      if (!duringAppStart) {
-        getConversationController()
-          .get(id)
-          ?.triggerUIRefresh();
-      }
+  } else if (mappedContactWrapperValues.delete(id)) {
+    if (!duringAppStart) {
+      getConversationController()
+        .get(id)
+        ?.triggerUIRefresh();
     }
   }
 }
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index abcf92dcc..dbde50150 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,5 +1,6 @@
+/* eslint-disable no-case-declarations */
 import { BaseConvoInfoVolatile, ConvoVolatileType } from 'libsession_util_nodejs';
-import { isEmpty } from 'lodash';
+import { isEmpty, isFinite } from 'lodash';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
@@ -259,7 +260,9 @@ async function removeContactFromWrapper(convoId: string) {
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
  *
  *
- * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts,
+ * but it would require it to be a index.ts instead, which causes a
+ * whole other bunch of issues because it is a native node module.
  */
 function getConvoInfoVolatileTypes(): Array<ConvoVolatileType> {
   return ['1o1', 'LegacyGroup', 'Community'];
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 0a129c637..0186f5568 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import { CommunityInfo, UserGroupsType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
@@ -33,7 +34,9 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean {
 }
 
 /**
- * We do not want to include groups left in the wrapper, but when receiving a list of wrappers from the network we need to check against the one present locally but already left, to know we need to remove them.
+ * We do not want to include groups left in the wrapper, but when receiving a list
+ * of wrappers from the network we need to check against the one present locally
+ * but already left, to know we need to remove them.
  *
  * This is to take care of this case:
  * - deviceA creates group
@@ -181,7 +184,9 @@ async function removeLegacyGroupFromWrapper(groupPk: string) {
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
  *
  *
- * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts,
+ * but it would require it to be a index.ts instead, which causes a
+ * whole other bunch of issues because it is a native node module.
  */
 function getUserGroupTypes(): Array<UserGroupsType> {
   return ['Community', 'LegacyGroup'];
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index e1d3ace6c..8baff4f1d 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -96,21 +96,20 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
-          return;
         });
         return;
-      } else {
-        resolve(true);
-        return;
       }
+      resolve(true);
+      return;
     }
     const allConvos = getConversationController().getConversations();
 
+    // eslint-disable-next-line more/no-then
     void getCurrentConfigurationMessage(allConvos)
       .then(configMessage => {
         // this just adds the message to the sending queue.
         // if waitForMessageSent is set, we need to effectively wait until then
-        // tslint:disable-next-line: no-void-expression
+
         const callback = waitForMessageSent
           ? () => {
               resolve(true);
diff --git a/ts/shims/events.ts b/ts/shims/events.ts
index b5e93d876..2ab75b3c8 100644
--- a/ts/shims/events.ts
+++ b/ts/shims/events.ts
@@ -1,5 +1,4 @@
 export function trigger(name: string, param1?: any, param2?: any) {
-  // @ts-ignore
   window.Whisper.events.trigger(name, param1, param2);
 }
 
diff --git a/ts/state/actions.ts b/ts/state/actions.ts
index d3eab8b63..526a1de7c 100644
--- a/ts/state/actions.ts
+++ b/ts/state/actions.ts
@@ -8,7 +8,7 @@ import { actions as theme } from './ducks/theme';
 import { actions as modalDialog } from './ducks/modalDialog';
 import { actions as primaryColor } from './ducks/primaryColor';
 
-export function mapDispatchToProps(dispatch: Dispatch): Object {
+export function mapDispatchToProps(dispatch: Dispatch): object {
   return {
     ...bindActionCreators(
       {
diff --git a/ts/state/createStore.ts b/ts/state/createStore.ts
index 38760107a..96cbd64b5 100644
--- a/ts/state/createStore.ts
+++ b/ts/state/createStore.ts
@@ -1,24 +1,22 @@
+/* eslint-disable no-console */
+import storage from 'redux-persist/lib/storage';
+
 import { createLogger } from 'redux-logger';
 import { configureStore } from '@reduxjs/toolkit';
-import { rootReducer } from './reducer';
-import { persistReducer } from 'redux-persist';
-// tslint:disable-next-line: match-default-export-name
-import promiseMiddleware from 'redux-promise-middleware';
 
-// tslint:disable-next-line: no-submodule-imports match-default-export-name
-import storage from 'redux-persist/lib/storage';
-// @ts-ignore
-const env = window.getEnvironment();
+import { persistReducer } from 'redux-persist';
+
+import promiseMiddleware from 'redux-promise-middleware';
+import { rootReducer } from './reducer';
 
 // So Redux logging doesn't go to disk, and so we can get colors/styles
 const directConsole = {
-  // @ts-ignore
-  log: console._log,
+  log: (console as any)._log,
   groupCollapsed: console.groupCollapsed,
   group: console.group,
   groupEnd: console.groupEnd,
   warn: console.warn,
-  // tslint:disable-next-line no-console
+
   error: console.error,
 };
 
@@ -35,7 +33,7 @@ export const persistConfig = {
 const persistedReducer = persistReducer(persistConfig, rootReducer);
 
 // Exclude logger if we're in production mode
-const disableLogging = true; //; env === 'production' || true; // ALWAYS TURNED OFF
+const disableLogging = true;
 const middlewareList = disableLogging ? [promiseMiddleware] : [logger, promiseMiddleware];
 
 export const createStore = (initialState: any) =>
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 5108cdfd0..5e26b98c8 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { omit, toNumber } from 'lodash';
 import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox';
@@ -529,12 +530,12 @@ function handleMessagesChangedOrAdded(
   state: ConversationsStateType,
   payload: Array<MessageModelPropsWithoutConvoProps>
 ) {
+  let stateCopy = state;
   payload.forEach(element => {
-    // tslint:disable-next-line: no-parameter-reassignment
-    state = handleMessageChangedOrAdded(state, element);
+    stateCopy = handleMessageChangedOrAdded(stateCopy, element);
   });
 
-  return state;
+  return stateCopy;
 }
 
 function handleMessageExpiredOrDeleted(
@@ -567,7 +568,6 @@ function handleMessageExpiredOrDeleted(
           `Deleting quote {${timestamp}-${sender}} ${JSON.stringify(message2Delete)}`
         );
 
-        // tslint:disable-next-line: no-dynamic-delete
         delete editedQuotes[`${timestamp}-${sender}`];
       }
 
@@ -594,12 +594,12 @@ function handleMessagesExpiredOrDeleted(
     }>
   >
 ): ConversationsStateType {
+  let stateCopy = state;
   action.payload.forEach(element => {
-    // tslint:disable-next-line: no-parameter-reassignment
-    state = handleMessageExpiredOrDeleted(state, element);
+    stateCopy = handleMessageExpiredOrDeleted(stateCopy, element);
   });
 
-  return state;
+  return stateCopy;
 }
 
 function handleConversationReset(state: ConversationsStateType, action: PayloadAction<string>) {
diff --git a/ts/state/ducks/defaultRooms.tsx b/ts/state/ducks/defaultRooms.tsx
index 8ea290481..ffca2b1d9 100644
--- a/ts/state/ducks/defaultRooms.tsx
+++ b/ts/state/ducks/defaultRooms.tsx
@@ -29,7 +29,7 @@ const defaultRoomsSlice = createSlice({
     updateDefaultRooms(state, action) {
       // window?.log?.info('updating default rooms', action.payload);
       const rooms = action.payload as Array<OpenGroupV2InfoJoinable>;
-      return { ...state, rooms: rooms };
+      return { ...state, rooms };
     },
     updateDefaultRoomsInProgress(state, action) {
       const inProgress = action.payload as boolean;
diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx
index ea8428b70..37053dcfc 100644
--- a/ts/state/ducks/modalDialog.tsx
+++ b/ts/state/ducks/modalDialog.tsx
@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
 import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
+
 export type BanType = 'ban' | 'unban';
 
 export type ConfirmModalState = SessionConfirmDialogProps | null;
@@ -16,7 +17,7 @@ export type UpdateGroupMembersModalState = InviteContactModalState;
 export type UpdateGroupNameModalState = InviteContactModalState;
 export type ChangeNickNameModalState = InviteContactModalState;
 export type AdminLeaveClosedGroupModalState = InviteContactModalState;
-export type EditProfileModalState = {} | null;
+export type EditProfileModalState = object | null;
 export type OnionPathModalState = EditProfileModalState;
 export type RecoveryPhraseModalState = EditProfileModalState;
 export type DeleteAccountModalState = EditProfileModalState;
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index d31bcea10..b868d6c82 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -1,8 +1,9 @@
-import { Data } from '../../../ts/data/data';
+/* eslint-disable no-restricted-syntax */
+import _, { isNaN } from 'lodash';
+import { Data } from '../../data/data';
 import { AdvancedSearchOptions, SearchOptions } from '../../types/Search';
 import { cleanSearchTerm } from '../../util/cleanSearchTerm';
 
-import _ from 'lodash';
 import { MessageResultProps } from '../../components/search/MessageSearchResults';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { PubKey } from '../../session/types';
diff --git a/ts/state/ducks/section.tsx b/ts/state/ducks/section.tsx
index d1e1351e2..17fe873ff 100644
--- a/ts/state/ducks/section.tsx
+++ b/ts/state/ducks/section.tsx
@@ -117,6 +117,7 @@ export const reducer = (
   switch (type) {
     case FOCUS_SECTION:
       // if we change to something else than settings, reset the focused settings section
+      // eslint-disable-next-line no-case-declarations
       const castedPayload = (payload as unknown) as SectionType;
 
       if (castedPayload !== SectionType.Settings) {
diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx
index 7f7050ff3..b499c78d1 100644
--- a/ts/state/ducks/settings.tsx
+++ b/ts/state/ducks/settings.tsx
@@ -1,6 +1,7 @@
+import { isBoolean } from 'lodash';
+
 import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 import { SettingsKey } from '../../data/settings-key';
-import { isBoolean } from 'lodash';
 import { Storage } from '../../util/storage';
 
 const SettingsBoolsKeyTrackedInRedux = [
@@ -62,7 +63,6 @@ const settingsSlice = createSlice({
         return state;
       }
 
-      // tslint:disable-next-line: no-dynamic-delete
       delete state.settingsBools[action.payload];
       return state;
     },
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
index c1f915c09..6ebe3c6ce 100644
--- a/ts/state/ducks/sogsRoomInfo.tsx
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { sortBy, uniq, xor } from 'lodash';
+import { isFinite, sortBy, uniq, xor } from 'lodash';
 import {
   getCanWriteOutsideRedux,
   getCurrentSubscriberCountOutsideRedux,
diff --git a/ts/state/ducks/stagedAttachments.ts b/ts/state/ducks/stagedAttachments.ts
index 727b3ab47..8c6787d44 100644
--- a/ts/state/ducks/stagedAttachments.ts
+++ b/ts/state/ducks/stagedAttachments.ts
@@ -60,7 +60,7 @@ const stagedAttachmentsSlice = createSlice({
           URL.revokeObjectURL(attachment.videoUrl);
         }
       });
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete state.stagedAttachments[conversationKey];
       return state;
     },
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index b81405f70..c6db627a7 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -59,5 +59,4 @@ export const reducers = {
 
 // Making this work would require that our reducer signature supported AnyAction, not
 //   our restricted actions
-// @ts-ignore
 export const rootReducer = combineReducers(reducers);
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 97a4f4904..21b03d926 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1,4 +1,6 @@
+/* eslint-disable no-restricted-syntax */
 import { createSelector } from '@reduxjs/toolkit';
+import { filter, isEmpty, isNumber, pick, sortBy, toNumber, isFinite } from 'lodash';
 
 import {
   ConversationLookupType,
@@ -19,7 +21,6 @@ import { ReplyingToMessageProps } from '../../components/conversation/compositio
 import { MessageAttachmentSelectorProps } from '../../components/conversation/message/message-content/MessageAttachment';
 import { MessageContentSelectorProps } from '../../components/conversation/message/message-content/MessageContent';
 import { MessageContentWithStatusSelectorProps } from '../../components/conversation/message/message-content/MessageContentWithStatus';
-import { MessageContextMenuSelectorProps } from '../../components/conversation/message/message-content/MessageContextMenu';
 import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText';
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
@@ -32,7 +33,6 @@ import { BlockedNumberController } from '../../util';
 import { Storage } from '../../util/storage';
 import { getIntl } from './user';
 
-import { filter, isEmpty, isNumber, pick, sortBy, toNumber } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { processQuoteAttachment } from '../../models/message';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
@@ -284,7 +284,6 @@ const _getLeftPaneConversationIds = (
     .map(m => m.id);
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const _getPrivateFriendsConversations = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
@@ -300,7 +299,6 @@ const _getPrivateFriendsConversations = (
   });
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const _getGlobalUnreadCount = (sortedConversations: Array<ReduxConversationType>): number => {
   let globalUnreadCount = 0;
   for (const conversation of sortedConversations) {
@@ -647,8 +645,6 @@ export const getSelectedConversation = createSelector(
   }
 );
 
-// tslint:disable: cyclomatic-complexity
-
 export const getMessagePropsByMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
   getSelectedConversation,
@@ -753,7 +749,6 @@ export const getMessageReactsProps = createSelector(getMessagePropsByMessageId,
   return msgProps;
 });
 
-// tslint:disable: cyclomatic-complexity
 export const getMessageQuoteProps = createSelector(
   getConversationLookup,
   getMessagesOfSelectedConversation,
@@ -835,7 +830,6 @@ export const getMessageQuoteProps = createSelector(
     };
   }
 );
-// tslint:enable: cyclomatic-complexity
 
 export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageTextSelectorProps
@@ -855,33 +849,6 @@ export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (p
   return msgProps;
 });
 
-/**
- * TODO probably not something which should be memoized with createSelector as we rememoize it for each message (and override the previous one). Not sure what is the right way to do a lookup. But maybe something like having the messages as a record<id, message> and do a simple lookup to grab the details.
- * And the the sorting would be done in a memoized selector
- */
-export const getMessageContextMenuProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageContextMenuSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageContextMenuSelectorProps = pick(props.propsForMessage, [
-    'attachments',
-    'sender',
-    'direction',
-    'status',
-    'isDeletable',
-    'isSenderAdmin',
-    'text',
-    'serverTimestamp',
-    'timestamp',
-    'isDeletableForEveryone',
-  ]);
-
-  return msgProps;
-});
-
 export const getMessageAttachmentProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageAttachmentSelectorProps
   | undefined => {
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
index 1dd0fabc4..c23e9c41f 100644
--- a/ts/state/selectors/messages.ts
+++ b/ts/state/selectors/messages.ts
@@ -9,9 +9,9 @@ import {
 import { StateType } from '../reducer';
 import { getMessagePropsByMessageId } from './conversations';
 
-const useMessageIdProps = (messageId: string | undefined) => {
+function useMessagePropsByMessageId(messageId: string | undefined) {
   return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId));
-};
+}
 
 const useSenderConvoProps = (
   msgProps: MessageModelPropsWithConvoProps | undefined
@@ -26,7 +26,7 @@ const useSenderConvoProps = (
 };
 
 export const useAuthorProfileName = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -41,7 +41,7 @@ export const useAuthorProfileName = (messageId: string): string | null => {
 };
 
 export const useAuthorName = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -52,7 +52,7 @@ export const useAuthorName = (messageId: string): string | null => {
 };
 
 export const useAuthorAvatarPath = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -62,46 +62,66 @@ export const useAuthorAvatarPath = (messageId: string): string | null => {
 };
 
 export const useMessageIsDeleted = (messageId: string): boolean => {
-  const props = useMessageIdProps(messageId);
+  const props = useMessagePropsByMessageId(messageId);
   return props?.propsForMessage.isDeleted || false;
 };
 
 export const useFirstMessageOfSeries = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.firstMessageOfSeries || false;
+  return useMessagePropsByMessageId(messageId)?.firstMessageOfSeries || false;
 };
 
 export const useLastMessageOfSeries = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.lastMessageOfSeries || false;
+  return useMessagePropsByMessageId(messageId)?.lastMessageOfSeries || false;
 };
 
 export const useMessageAuthor = (messageId: string | undefined): string | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.sender;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.sender;
 };
 
 export const useMessageDirection = (messageId: string | undefined): string | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.direction;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.direction;
 };
 
 export const useMessageLinkPreview = (messageId: string | undefined): Array<any> | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.previews;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.previews;
 };
 
 export const useMessageAttachments = (
   messageId: string | undefined
 ): Array<PropsForAttachment> | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.attachments;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.attachments;
 };
 
 export const useMessageSenderIsAdmin = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.propsForMessage.isSenderAdmin || false;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isSenderAdmin || false;
 };
 
 export const useMessageIsDeletable = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.propsForMessage.isDeletable || false;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isDeletable || false;
 };
 
 export const useMessageStatus = (
   messageId: string | undefined
 ): LastMessageStatusType | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.status;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.status;
 };
+
+export function useMessageSender(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.sender;
+}
+
+export function useMessageIsDeletableForEveryone(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isDeletableForEveryone;
+}
+
+export function useMessageServerTimestamp(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.serverTimestamp;
+}
+
+export function useMessageTimestamp(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.timestamp;
+}
+
+export function useMessageBody(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.text;
+}
diff --git a/ts/state/selectors/onions.ts b/ts/state/selectors/onions.ts
index 99b9a1ee8..84764663e 100644
--- a/ts/state/selectors/onions.ts
+++ b/ts/state/selectors/onions.ts
@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 
 import { StateType } from '../reducer';
 import { OnionState } from '../ducks/onion';
-import { SectionType } from '../../state/ducks/section';
+import { SectionType } from '../ducks/section';
 
 export const getOnionPaths = (state: StateType): OnionState => state.onionPaths;
 
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index 6238742b8..f8db935d2 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -28,7 +28,7 @@ const getSearchResults = createSelector(
             // on some edges cases, we have an id but no corresponding convo because it matches a query but the conversation was removed.
             // Don't return anything when activeAt is unset (i.e. no current conversations with this user)
             if (!value || value.activeAt === undefined || value.activeAt === 0) {
-              //activeAt can be 0 when linking device
+              // activeAt can be 0 when linking device
               return false;
             }
 
diff --git a/ts/test/automation/create_user.spec.ts b/ts/test/automation/create_user.spec.ts
index e3e884524..6829b93cd 100644
--- a/ts/test/automation/create_user.spec.ts
+++ b/ts/test/automation/create_user.spec.ts
@@ -13,9 +13,9 @@ sessionTestOneWindow('Create User', async ([window]) => {
   // Open profile tab
   await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
   await sleepFor(100, true);
-  //check username matches
+  // check username matches
   await waitForTestIdWithText(window, 'your-profile-name', userA.userName);
-  //check session id matches
+  // check session id matches
   await waitForTestIdWithText(window, 'your-session-id', userA.sessionid);
   // exit profile module
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/delete_account.spec.ts b/ts/test/automation/delete_account.spec.ts
index caee2934e..5ca1cdd11 100644
--- a/ts/test/automation/delete_account.spec.ts
+++ b/ts/test/automation/delete_account.spec.ts
@@ -1,11 +1,10 @@
-import { _electron, test } from '@playwright/test';
+import { test } from '@playwright/test';
 import { beforeAllClean, forceCloseAllWindows } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
 import { sendNewMessage } from './utilities/send_message';
 import { clickOnMatchingText, clickOnTestIdWithText, typeIntoInput } from './utilities/utils';
 import { sleepFor } from '../../session/utils/Promise';
 import { openApp } from './setup/open';
-// tslint:disable: no-console
 
 test.beforeEach(beforeAllClean);
 
diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index 35a218d65..d4cf3a757 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -10,8 +10,6 @@ import {
   waitForTestIdWithText,
 } from './utilities/utils';
 
-// tslint:disable: no-console
-
 const testMessage = 'Test-Message- (A -> B) ';
 const sentMessage = `${testMessage}${Date.now()}`;
 
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index bad40ede9..c8af5e0df 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -21,7 +21,6 @@ const windows: Array<Page> = [];
 test.beforeEach(beforeAllClean);
 
 test.afterEach(() => forceCloseAllWindows(windows));
-// tslint:disable: no-console
 
 test('Link a device', async () => {
   const [windowA] = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
diff --git a/ts/test/automation/message_checks.spec.ts b/ts/test/automation/message_checks.spec.ts
index fe254cc32..9fc59ce2c 100644
--- a/ts/test/automation/message_checks.spec.ts
+++ b/ts/test/automation/message_checks.spec.ts
@@ -110,6 +110,7 @@ sessionTestTwoWindows('Send long text and reply test', async ([windowA, windowB]
 
   const testReply = `${userB.userName} replying to long text message from ${userA.userName}`;
   const longText =
+    // eslint-disable-next-line max-len
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum quis lacinia mi. Praesent fermentum vehicula rhoncus. Aliquam ac purus lobortis, convallis nisi quis, pulvinar elit. Nam commodo eros in molestie lobortis. Donec at mattis est. In tempor ex nec velit mattis, vitae feugiat augue maximus. Nullam risus libero, bibendum et enim et, viverra viverra est. Suspendisse potenti. Sed ut nibh in sem rhoncus suscipit. Etiam tristique leo sit amet ullamcorper dictum. Suspendisse sollicitudin, lectus et suscipit eleifend, libero dui ultricies neque, non elementum nulla orci bibendum lorem. Suspendisse potenti. Aenean a tellus imperdiet, iaculis metus quis, pretium diam. Nunc varius vitae enim vestibulum interdum. In hac habitasse platea dictumst. Donec auctor sem quis eleifend fermentum. Vestibulum neque nulla, maximus non arcu gravida, condimentum euismod turpis. Cras ac mattis orci. Quisque ac enim pharetra felis sodales eleifend. Aliquam erat volutpat. Donec sit amet mollis nibh, eget feugiat ipsum. Integer vestibulum purus ac suscipit egestas. Duis vitae aliquet ligula.';
 
   await createContact(windowA, windowB, userA, userB);
diff --git a/ts/test/automation/password.spec.ts b/ts/test/automation/password.spec.ts
index 6aef1a791..b6e5eb8a0 100644
--- a/ts/test/automation/password.spec.ts
+++ b/ts/test/automation/password.spec.ts
@@ -8,7 +8,6 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
-// tslint:disable: no-console
 
 const testPassword = '123456';
 const newTestPassword = '789101112';
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index f47f97418..7ba7bfdee 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -4,7 +4,6 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { isLinux, isMacOS } from '../../../OS';
 import { MULTI_PREFIX, NODE_ENV } from './open';
-// tslint:disable: no-console
 
 const getDirectoriesOfSessionDataPath = (source: string) =>
   readdirSync(source, { withFileTypes: true })
@@ -41,7 +40,7 @@ function cleanUpOtherTest() {
   const allAppDataPath = getDirectoriesOfSessionDataPath(parentFolderOfAllDataPath);
   console.info('allAppDataPath', allAppDataPath);
 
-  allAppDataPath.map(folder => {
+  allAppDataPath.forEach(folder => {
     const pathToRemove = join(parentFolderOfAllDataPath, folder);
     rmdirSync(pathToRemove, { recursive: true });
   });
diff --git a/ts/test/automation/setup/create_group.ts b/ts/test/automation/setup/create_group.ts
index 08aaf086e..fb6496cf4 100644
--- a/ts/test/automation/setup/create_group.ts
+++ b/ts/test/automation/setup/create_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { sendMessage } from '../utilities/message';
 import { sendNewMessage } from '../utilities/send_message';
 import {
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 7ddf1536d..113909289 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -2,13 +2,13 @@ import { Page } from '@playwright/test';
 import { User } from '../types/testing';
 import { clickOnMatchingText, typeIntoInput } from '../utilities/utils';
 import { sleepFor } from '../../../session/utils/Promise';
-// tslint:disable: no-console
+
 export const newUser = async (window: Page, userName: string): Promise<User> => {
   // Create User
   await clickOnMatchingText(window, 'Create Session ID');
   // Wait for animation for finish creating ID
   await sleepFor(2500);
-  //Save session ID to a variable
+  // Save session ID to a variable
   const sessionid = await window.inputValue('[data-testid=session-id-signup]');
   await clickOnMatchingText(window, 'Continue');
   // Input username = testuser
diff --git a/ts/test/automation/setup/open.ts b/ts/test/automation/setup/open.ts
index 61f380d63..35529b6b4 100644
--- a/ts/test/automation/setup/open.ts
+++ b/ts/test/automation/setup/open.ts
@@ -5,7 +5,6 @@ import { getAppRootPath } from '../../../node/getRootPath';
 export const NODE_ENV = 'production';
 export const MULTI_PREFIX = 'test-integration-testnet-';
 const multisAvailable = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-// tslint:disable: no-console
 
 export async function openApp(windowsToCreate: number) {
   if (windowsToCreate >= multisAvailable.length) {
diff --git a/ts/test/automation/setup/recovery_using_seed.ts b/ts/test/automation/setup/recovery_using_seed.ts
index 34a1765eb..d2b033371 100644
--- a/ts/test/automation/setup/recovery_using_seed.ts
+++ b/ts/test/automation/setup/recovery_using_seed.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnTestIdWithText, typeIntoInput } from '../utilities/utils';
 
 export async function recoverFromSeed(window: Page, userName: string, recoveryPhrase: string) {
diff --git a/ts/test/automation/setup/sessionTest.ts b/ts/test/automation/setup/sessionTest.ts
index 4b92a80c8..e9a80de16 100644
--- a/ts/test/automation/setup/sessionTest.ts
+++ b/ts/test/automation/setup/sessionTest.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/array-type */
 import { Page, test } from '@playwright/test';
 import { beforeAllClean, forceCloseAllWindows } from './beforeEach';
 import { openApp } from './open';
@@ -31,6 +32,7 @@ function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
         throw new Error(`openApp should have opened ${count} windows but did not.`);
       }
       await testCallback(windows as N);
+      // eslint-disable-next-line no-useless-catch
     } catch (e) {
       throw e;
     } finally {
diff --git a/ts/test/automation/setup/test_user.ts b/ts/test/automation/setup/test_user.ts
index 1af13715d..960219c67 100644
--- a/ts/test/automation/setup/test_user.ts
+++ b/ts/test/automation/setup/test_user.ts
@@ -1,5 +1,3 @@
-import { _electron } from '@playwright/test';
-
 export const userA = {
   userName: 'Alice',
   sessionid: '059e36f9bb03ac4e1ff9ff7d4aedd791d1f412770c6cd2796b855af12a7c7ea000',
diff --git a/ts/test/automation/tslint.json b/ts/test/automation/tslint.json
deleted file mode 100644
index ff7a903b3..000000000
--- a/ts/test/automation/tslint.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["../tslint.json"],
-  "rules": {
-    "no-empty": false,
-    "array-type": false,
-    "no-console": false,
-    "no-void-expression": false
-  }
-}
diff --git a/ts/test/automation/user_actions.spec.ts b/ts/test/automation/user_actions.spec.ts
index d26476440..f70af5594 100644
--- a/ts/test/automation/user_actions.spec.ts
+++ b/ts/test/automation/user_actions.spec.ts
@@ -46,7 +46,7 @@ sessionTestTwoWindows('Block user in conversation options', async ([windowA, win
   // Check to see if User B is a contact
   await clickOnTestIdWithText(windowA, 'new-conversation-button');
   await waitForTestIdWithText(windowA, 'module-conversation__user__profile-name', userB.userName);
-  //Click on three dots menu
+  // Click on three dots menu
   await clickOnTestIdWithText(windowA, 'message-section');
 
   await clickOnTestIdWithText(windowA, 'three-dots-conversation-options');
@@ -83,7 +83,7 @@ sessionTestTwoWindows('Block user in conversation list', async ([windowA, window
   // Check to see if User B is a contact
   await clickOnTestIdWithText(windowA, 'new-conversation-button');
   await waitForTestIdWithText(windowA, 'module-conversation__user__profile-name', userB.userName);
-  //Click on three dots menu
+  // Click on three dots menu
   await clickOnTestIdWithText(windowA, 'message-section');
 
   await clickOnTestIdWithText(
diff --git a/ts/test/automation/utilities/leave_group.ts b/ts/test/automation/utilities/leave_group.ts
index e23f86aeb..84cd0b259 100644
--- a/ts/test/automation/utilities/leave_group.ts
+++ b/ts/test/automation/utilities/leave_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import {  Page } from '@playwright/test';
 import { clickOnMatchingText, clickOnTestIdWithText, waitForTestIdWithText } from './utils';
 
 export const leaveGroup = async (window: Page) => {
diff --git a/ts/test/automation/utilities/linked_device.ts b/ts/test/automation/utilities/linked_device.ts
index 2db8d7165..0dc169e1c 100644
--- a/ts/test/automation/utilities/linked_device.ts
+++ b/ts/test/automation/utilities/linked_device.ts
@@ -1,4 +1,3 @@
-import { _electron } from 'playwright-core';
 import { logIn } from '../setup/log_in';
 import { openApp } from '../setup/open';
 
diff --git a/ts/test/automation/utilities/message.ts b/ts/test/automation/utilities/message.ts
index a2282d27a..18799eb50 100644
--- a/ts/test/automation/utilities/message.ts
+++ b/ts/test/automation/utilities/message.ts
@@ -1,6 +1,5 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnTestIdWithText, typeIntoInput } from './utils';
-// tslint:disable: no-console
 
 export const sendMessage = async (window: Page, message: string) => {
   // type into message input box
diff --git a/ts/test/automation/utilities/rename_group.ts b/ts/test/automation/utilities/rename_group.ts
index e3e3d6751..2c5981f34 100644
--- a/ts/test/automation/utilities/rename_group.ts
+++ b/ts/test/automation/utilities/rename_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import {
   clickOnMatchingText,
   clickOnTestIdWithText,
diff --git a/ts/test/automation/utilities/send_message.ts b/ts/test/automation/utilities/send_message.ts
index 27e818f0f..aa716348e 100644
--- a/ts/test/automation/utilities/send_message.ts
+++ b/ts/test/automation/utilities/send_message.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { sendMessage } from './message';
 import { clickOnTestIdWithText, typeIntoInput } from './utils';
 
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 06d5a022d..94e8a10ea 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -1,8 +1,11 @@
-import { ElementHandle } from '@playwright/test';
+/* eslint-disable no-useless-escape */
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable no-await-in-loop */
 import { Page } from 'playwright-core';
+
+import { ElementHandle } from '@playwright/test';
 import { sleepFor } from '../../../session/utils/Promise';
 import { loaderType, Strategy } from '../types/testing';
-// tslint:disable: no-console
 
 // WAIT FOR FUNCTIONS
 
@@ -11,7 +14,7 @@ export async function waitForTestIdWithText(window: Page, dataTestId: string, te
   if (text) {
     // " =>  \\\"
     /* prettier-ignore */
-    // tslint:disable-next-line: quotemark
+
     const escapedText = text.replace(/"/g, '\\\"');
 
     builtSelector += `:has-text("${escapedText}")`;
@@ -41,7 +44,7 @@ export async function waitForTextMessage(window: Page, text: string, maxWait?: n
   if (text) {
     // " =>  \\\"
     /* prettier-ignore */
-    // tslint:disable-next-line: quotemark
+
     const escapedText = text.replace(/"/g, '\\\"');
 
     builtSelector += `:has-text("${escapedText}")`;
@@ -99,7 +102,6 @@ export async function clickOnElement(
   const builtSelector = `css=[${strategy}=${selector}]`;
   await window.waitForSelector(builtSelector, { timeout: maxWait });
   await window.click(builtSelector);
-  return;
 }
 
 export async function clickOnMatchingText(window: Page, text: string, rightButton = false) {
@@ -114,7 +116,7 @@ export async function clickOnTestIdWithText(
   rightButton?: boolean,
   maxWait?: number
 ) {
-  console.info(`clickOnTestIdWithText with testId:${dataTestId} and text:${text ? text : 'none'}`);
+  console.info(`clickOnTestIdWithText with testId:${dataTestId} and text:${text || 'none'}`);
 
   const builtSelector = !text
     ? `css=[data-testid=${dataTestId}]`
diff --git a/ts/test/components/media-gallery/groupMessagesByDate_test.ts b/ts/test/components/media-gallery/groupMessagesByDate_test.ts
index 8f572f7d7..fc7cd0e06 100644
--- a/ts/test/components/media-gallery/groupMessagesByDate_test.ts
+++ b/ts/test/components/media-gallery/groupMessagesByDate_test.ts
@@ -30,7 +30,6 @@ const toMediaItem = (date: Date): MediaItemType => ({
   messageId: '123456',
 });
 
-// tslint:disable: max-func-body-length
 describe('groupMediaItemsByDate', () => {
   it('should group mediaItems', () => {
     const referenceTime = new Date('2018-04-12T18:00Z').getTime(); // Thu
diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
index b095cd13a..d2de24cfe 100644
--- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts
+++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
@@ -1,19 +1,19 @@
 import chai, { expect } from 'chai';
 import * as crypto from 'crypto';
 import Sinon, * as sinon from 'sinon';
+import chaiBytes from 'chai-bytes';
+
 import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '../../../../session/crypto';
 import { TestUtils } from '../../../test-utils';
 import { SignalService } from '../../../../protobuf';
 
 import { StringUtils, UserUtils } from '../../../../session/utils';
 
-import chaiBytes from 'chai-bytes';
 import { PubKey } from '../../../../session/types';
 import { fromHex, toHex } from '../../../../session/utils/String';
 import { addMessagePadding } from '../../../../session/crypto/BufferPadding';
 import { SessionKeyPair } from '../../../../receiver/keypairs';
 
-// tslint:disable-next-line: variable-name
 export const TEST_identityKeyPair: SessionKeyPair = {
   pubKey: new Uint8Array([
     5,
@@ -92,7 +92,6 @@ export const TEST_identityKeyPair: SessionKeyPair = {
 };
 chai.use(chaiBytes);
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageEncrypter', () => {
   const ourNumber = '0123456789abcdef';
   const ourUserEd25516Keypair = {
@@ -154,7 +153,6 @@ describe('MessageEncrypter', () => {
     });
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('Session Protocol', () => {
     beforeEach(() => {
       Sinon.stub(UserUtils, 'getIdentityKeyPair').resolves(TEST_identityKeyPair);
@@ -186,10 +184,7 @@ describe('MessageEncrypter', () => {
       const cryptoSignDetachedSpy = Sinon.spy(sodium, 'crypto_sign_detached');
       const plainText = '123456';
       const plainTextBytes = new Uint8Array(StringUtils.encode(plainText, 'utf8'));
-      const userED25519PubKeyBytes = new Uint8Array(
-        // tslint:disable: no-non-null-assertion
-        StringUtils.fromHex(keypair!.pubKey)
-      );
+      const userED25519PubKeyBytes = new Uint8Array(StringUtils.fromHex(keypair!.pubKey));
       const recipientX25519PublicKeyWithoutPrefix = PubKey.removePrefixIfNeeded(recipient.key);
 
       const recipientX25519PublicKey = new Uint8Array(
diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
index 88c153a4f..f925d4c45 100644
--- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
+++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
@@ -1,16 +1,16 @@
+import { fromBase64, fromHex } from 'bytebuffer';
 import chai, { expect } from 'chai';
 import chaiBytes from 'chai-bytes';
-import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
-import { ByteKeyPair } from '../../../../session/utils/User';
 import { to_hex } from 'libsodium-wrappers-sumo';
-import { fromBase64, fromHex } from 'bytebuffer';
-import { StringUtils } from '../../../../session/utils';
+
+import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
 import { concatUInt8Array, getSodiumRenderer } from '../../../../session/crypto';
 import { KeyPrefixType } from '../../../../session/types';
+import { StringUtils } from '../../../../session/utils';
+import { ByteKeyPair } from '../../../../session/utils/User';
 
 chai.use(chaiBytes);
 
-// tslint:disable-next-line: max-func-body-length
 describe('OpenGroupAuthentication', () => {
   const secondPartPrivKey = new Uint8Array([
     186,
@@ -201,7 +201,6 @@ describe('OpenGroupAuthentication', () => {
 
   const body = 'hello 🎂';
 
-  // tslint:disable-next-line: max-func-body-length
   describe('HeaderCreation', () => {
     describe('Blinded Headers', () => {
       it('should produce correct X-SOGS-Nonce', async () => {
@@ -421,7 +420,7 @@ const decryptBlindedMessage = async (
     window?.log?.error(
       'decryptBlindedMessage - Dropping message due to unsupported encryption version'
     );
-    return;
+    return undefined;
   }
 
   const nonceLength = sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES;
@@ -439,7 +438,7 @@ const decryptBlindedMessage = async (
   if (plaintextIncoming.length <= 32) {
     // throw Error;
     window?.log?.error('decryptBlindedMessage: plaintext insufficient length');
-    return;
+    return undefined;
   }
 
   const msg = plaintextIncoming.slice(0, plaintextIncoming.length - 32);
diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
index afec9950e..983da4ca6 100644
--- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
+++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
@@ -3,10 +3,8 @@ import { beforeEach } from 'mocha';
 import Sinon from 'sinon';
 import * as DecryptedAttachmentsManager from '../../../../session/crypto/DecryptedAttachmentsManager';
 import { TestUtils } from '../../../test-utils';
-// tslint:disable: chai-vague-errors no-unused-expression
 
 describe('DecryptedAttachmentsManager', () => {
-  // tslint:disable-next-line: no-empty
   beforeEach(() => {
     DecryptedAttachmentsManager.resetDecryptedUrlForTesting();
     TestUtils.stubWindowLog();
@@ -135,7 +133,7 @@ describe('DecryptedAttachmentsManager', () => {
         expect(resolved2.startsWith(now2.slice(0, 9))).to.be.true;
       });
     });
-  }); // tslint:disable: no-empty
+  });
 
   it.skip('cleanUpOldDecryptedMedias', () => {});
   it.skip('getDecryptedBlob', () => {});
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 588065154..b5763c03a 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -9,9 +9,6 @@ import {
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('libsession_contacts', () => {
   describe('filter contacts for wrapper', () => {
     const ourNumber = '051234567890acbdef';
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index 27c837038..1af72e7fc 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -1,6 +1,8 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
-import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
 import Sinon from 'sinon';
+
+import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
 import { UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index 166ce063f..9eb29164a 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -9,9 +9,6 @@ import {
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('libsession_groups', () => {
   describe('filter user groups for wrapper', () => {
     const ourNumber = '051234567890acbdef';
diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts
index 0f30d6a9b..7fb84974b 100644
--- a/ts/test/session/unit/messages/ChatMessage_test.ts
+++ b/ts/test/session/unit/messages/ChatMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
-import { SignalService } from '../../../../protobuf';
 import { TextEncoder } from 'util';
 import { toNumber } from 'lodash';
+import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import {
   AttachmentPointerWithUrl,
@@ -52,7 +52,7 @@ describe('VisibleMessage', () => {
     };
     const message = new VisibleMessage({
       timestamp: Date.now(),
-      lokiProfile: lokiProfile,
+      lokiProfile,
     });
     const plainText = message.plainTextBuffer();
     const decoded = SignalService.Content.decode(plainText);
@@ -68,9 +68,7 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with a quote without attachments', () => {
-    let quote: Quote;
-
-    quote = { id: 1234, author: 'author', text: 'text' };
+    const quote: Quote = { id: 1234, author: 'author', text: 'text' };
     const message = new VisibleMessage({
       timestamp: Date.now(),
       quote,
@@ -84,9 +82,7 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with a preview', () => {
-    let preview: PreviewWithAttachmentUrl;
-
-    preview = { url: 'url', title: 'title', id: 1 };
+    const preview: PreviewWithAttachmentUrl = { url: 'url', title: 'title', id: 1 };
     const previews = new Array<PreviewWithAttachmentUrl>();
     previews.push(preview);
 
@@ -106,15 +102,17 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with an AttachmentPointer', () => {
-    let attachment: AttachmentPointerWithUrl;
-
-    attachment = { url: 'url', contentType: 'contentType', id: 1234 };
+    const attachment: AttachmentPointerWithUrl = {
+      url: 'url',
+      contentType: 'contentType',
+      id: 1234,
+    };
     const attachments = new Array<AttachmentPointerWithUrl>();
     attachments.push(attachment);
 
     const message = new VisibleMessage({
       timestamp: Date.now(),
-      attachments: attachments,
+      attachments,
     });
     const plainText = message.plainTextBuffer();
     const decoded = SignalService.Content.decode(plainText);
diff --git a/ts/test/session/unit/messages/ConfigurationMessage_test.ts b/ts/test/session/unit/messages/ConfigurationMessage_test.ts
index fb8d7060e..ca541a776 100644
--- a/ts/test/session/unit/messages/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/messages/ConfigurationMessage_test.ts
@@ -9,7 +9,6 @@ import {
 } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('ConfigurationMessage', () => {
   it('throw if closed group is not set', () => {
     const activeClosedGroups = null as any;
diff --git a/ts/test/session/unit/messages/MessageRequestResponse_test.ts b/ts/test/session/unit/messages/MessageRequestResponse_test.ts
index 85da9a965..6473a562b 100644
--- a/ts/test/session/unit/messages/MessageRequestResponse_test.ts
+++ b/ts/test/session/unit/messages/MessageRequestResponse_test.ts
@@ -4,9 +4,7 @@ import { v4 } from 'uuid';
 import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import { MessageRequestResponse } from '../../../../session/messages/outgoing/controlMessage/MessageRequestResponse';
-// tslint:disable: no-unused-expression
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageRequestResponse', () => {
   let message: MessageRequestResponse | undefined;
   it('correct ttl', () => {
diff --git a/ts/test/session/unit/messages/ReceiptMessage_test.ts b/ts/test/session/unit/messages/ReceiptMessage_test.ts
index e4c479be3..977f94699 100644
--- a/ts/test/session/unit/messages/ReceiptMessage_test.ts
+++ b/ts/test/session/unit/messages/ReceiptMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { beforeEach } from 'mocha';
+import { toNumber } from 'lodash';
 
 import { SignalService } from '../../../../protobuf';
-import { toNumber } from 'lodash';
 import { Constants } from '../../../../session';
 import { ReadReceiptMessage } from '../../../../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 
diff --git a/ts/test/session/unit/messages/TypingMessage_test.ts b/ts/test/session/unit/messages/TypingMessage_test.ts
index 09ff22277..621d5f877 100644
--- a/ts/test/session/unit/messages/TypingMessage_test.ts
+++ b/ts/test/session/unit/messages/TypingMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
-import { SignalService } from '../../../../protobuf';
 import Long from 'long';
 import { toNumber } from 'lodash';
+import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import { TypingMessage } from '../../../../session/messages/outgoing/controlMessage/TypingMessage';
 
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index f5c8babf0..1eab0e6f4 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
@@ -8,7 +6,6 @@ import {
   fillConvoAttributesWithDefaults,
 } from '../../../../models/conversationAttributes';
 
-// tslint:disable-next-line: max-func-body-length
 describe('fillConvoAttributesWithDefaults', () => {
   describe('members', () => {
     it('initialize members if they are not given', () => {
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 4efc4c9b3..636c85a4b 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
@@ -9,7 +7,6 @@ import {
 } from '../../../../models/conversationAttributes';
 import { formatRowOfConversation } from '../../../../node/database_utility';
 
-// tslint:disable-next-line: max-func-body-length
 describe('formatRowOfConversation', () => {
   describe('isTrustedForAttachmentDownload', () => {
     it('initialize isTrustedForAttachmentDownload if they are not given', () => {
diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts
index 39cecc72e..9c731074d 100644
--- a/ts/test/session/unit/onion/GuardNodes_test.ts
+++ b/ts/test/session/unit/onion/GuardNodes_test.ts
@@ -1,15 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
-import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 import { Snode } from '../../../../data/data';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import {
   generateFakeSnodes,
@@ -17,6 +14,7 @@ import {
   stubData,
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -34,9 +32,6 @@ const fakeSnodePool: Array<Snode> = [
   ...generateFakeSnodes(3),
 ];
 
-// tslint:disable: variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('GuardNodes', () => {
   let getSnodePoolFromDBOrFetchFromSeed: sinon.SinonStub;
   let fetchFromSeedWithRetriesAndWriteToDb: sinon.SinonStub;
diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts
index 9b8723411..38fd3553b 100644
--- a/ts/test/session/unit/onion/OnionErrors_test.ts
+++ b/ts/test/session/unit/onion/OnionErrors_test.ts
@@ -1,21 +1,19 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
+import AbortController from 'abort-controller';
 
 import { TestUtils } from '../../../test-utils';
 import * as SnodeAPI from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
-import { OnionPaths } from '../../../../session/onions/';
+import { OnionPaths } from '../../../../session/onions';
 import {
   NEXT_NODE_NOT_FOUND_PREFIX,
   Onions,
   OXEN_SERVER_ERROR,
 } from '../../../../session/apis/snode_api/onions';
-import AbortController from 'abort-controller';
-import { Snode } from '../../../../../ts/data/data';
+import { Snode } from '../../../../data/data';
 import { pathFailureCount } from '../../../../session/onions/onionPath';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils';
@@ -43,7 +41,6 @@ const getFakeResponseOnDestination = (statusCode?: number, body?: string) => {
   };
 };
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPathsErrors', () => {
   // Initialize new stubbed cache
   let updateSwarmSpy: sinon.SinonStub;
@@ -54,15 +51,15 @@ describe('OnionPathsErrors', () => {
   let incrementBadSnodeCountOrDropSpy: sinon.SinonSpy;
 
   let updateGuardNodesStub: sinon.SinonStub;
-  // tslint:disable-next-line: one-variable-per-declaration
-  let guardPubkeys: Array<string>,
-    otherNodesPubkeys: Array<string>,
-    guardNodesArray: Array<Snode>,
-    guardSnode1: Snode,
-    otherNodesArray: Array<Snode>,
-    fakeSnodePool: Array<Snode>,
-    associatedWith: string,
-    fakeSwarmForAssociatedWith: Array<string>;
+
+  let guardPubkeys: Array<string>;
+  let otherNodesPubkeys: Array<string>;
+  let guardNodesArray: Array<Snode>;
+  let guardSnode1: Snode;
+  let otherNodesArray: Array<Snode>;
+  let fakeSnodePool: Array<Snode>;
+  let associatedWith: string;
+  let fakeSwarmForAssociatedWith: Array<string>;
 
   let oldOnionPaths: Array<Array<Snode>>;
 
diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts
index bd62a2ed1..c30b8517e 100644
--- a/ts/test/session/unit/onion/OnionPaths_test.ts
+++ b/ts/test/session/unit/onion/OnionPaths_test.ts
@@ -1,14 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon from 'sinon';
 import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import * as SNodeAPI from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import { GuardNode, Snode } from '../../../../data/data';
 import {
@@ -18,6 +16,7 @@ import {
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -43,7 +42,6 @@ const fakeGuardNodesFromDB: Array<GuardNode> = fakeGuardNodesEd25519.map(ed25519
   };
 });
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPaths', () => {
   // Initialize new stubbed cache
   let oldOnionPaths: Array<Array<Snode>>;
@@ -60,7 +58,6 @@ describe('OnionPaths', () => {
       TestUtils.stubData('getGuardNodes').resolves(fakeGuardNodesFromDB);
       TestUtils.stubData('createOrUpdateItem').resolves();
       TestUtils.stubWindow('getSeedNodeList', () => ['seednode1']);
-      // tslint:disable: no-void-expression no-console
 
       TestUtils.stubWindowLog();
 
diff --git a/ts/test/session/unit/onion/SeedNodeAPI_test.ts b/ts/test/session/unit/onion/SeedNodeAPI_test.ts
index d46dbaeb3..4d2d335c8 100644
--- a/ts/test/session/unit/onion/SeedNodeAPI_test.ts
+++ b/ts/test/session/unit/onion/SeedNodeAPI_test.ts
@@ -1,19 +1,17 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon from 'sinon';
-import _ from 'lodash';
+import chaiAsPromised from 'chai-as-promised';
 import { describe } from 'mocha';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { SnodeFromSeed } from '../../../../session/apis/seed_node_api/SeedNodeAPI';
 import { Snode } from '../../../../data/data';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -39,9 +37,7 @@ const fakeSnodePoolFromSeedNode: Array<SnodeFromSeed> = fakeSnodePool.map(m => {
     pubkey_ed25519: m.pubkey_ed25519,
   };
 });
-// tslint:disable: variable-name
 
-// tslint:disable-next-line: max-func-body-length
 describe('SeedNodeAPI', () => {
   // Initialize new stubbed cache
 
diff --git a/ts/test/session/unit/onion/SnodeNamespace_test.ts b/ts/test/session/unit/onion/SnodeNamespace_test.ts
index b6a88952a..11fd31780 100644
--- a/ts/test/session/unit/onion/SnodeNamespace_test.ts
+++ b/ts/test/session/unit/onion/SnodeNamespace_test.ts
@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import Sinon from 'sinon';
 import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces';
 
-// tslint:disable-next-line: max-func-body-length
 describe('Snode namespaces', () => {
   describe('maxSizeMap', () => {
     afterEach(() => {
diff --git a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
index 0a4b5350f..f3d9f950a 100644
--- a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
+++ b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
@@ -1,15 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
-import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 import { Snode } from '../../../../data/data';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import {
   generateFakeSnodes,
@@ -17,6 +14,7 @@ import {
   stubData,
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -33,9 +31,7 @@ const fakeSnodePool: Array<Snode> = [
   generateFakeSnodeWithEdKey(guard3ed),
   ...generateFakeSnodes(3),
 ];
-// tslint:disable: variable-name
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPaths', () => {
   describe('getSnodePoolFromDBOrFetchFromSeed', () => {
     let getSnodePoolFromDb: sinon.SinonStub;
diff --git a/ts/test/session/unit/onion/hfHandling_test.ts b/ts/test/session/unit/onion/hfHandling_test.ts
index c0ae84c3d..0c0bf1a32 100644
--- a/ts/test/session/unit/onion/hfHandling_test.ts
+++ b/ts/test/session/unit/onion/hfHandling_test.ts
@@ -8,7 +8,6 @@ import {
 } from '../../../../session/apis/snode_api/hfHandling';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('hardfork handling', () => {
   describe('getHasSeenHF190', () => {
     afterEach(() => {
@@ -142,7 +141,6 @@ describe('hardfork handling', () => {
     });
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('handleHardforkResult', () => {
     afterEach(() => {
       Sinon.restore();
diff --git a/ts/test/session/unit/padding/Padding_test.ts b/ts/test/session/unit/padding/Padding_test.ts
index 6f3d58350..1577c364d 100644
--- a/ts/test/session/unit/padding/Padding_test.ts
+++ b/ts/test/session/unit/padding/Padding_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 
@@ -11,12 +9,12 @@ import {
   removeMessagePadding,
 } from '../../../../session/crypto/BufferPadding';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../../../session/constants';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('Padding', () => {
   describe('Attachment padding', () => {
     it('add padding', () => {
@@ -32,7 +30,7 @@ describe('Padding', () => {
     });
 
     it('no padding if attachment has the max size', () => {
-      //if the attachment is already of the max size, we do not pad it more
+      // if the attachment is already of the max size, we do not pad it more
       const bufferIn = new Uint8Array(MAX_ATTACHMENT_FILESIZE_BYTES);
       const paddedBuffer = addAttachmentPadding(bufferIn);
       expect(paddedBuffer.byteLength).to.equal(MAX_ATTACHMENT_FILESIZE_BYTES);
@@ -57,7 +55,7 @@ describe('Padding', () => {
       const bufferIn = new Uint8Array(MAX_ATTACHMENT_FILESIZE_BYTES + 1);
       const paddedBuffer = addAttachmentPadding(bufferIn);
       const expectedPaddedSize = Math.floor(
-        Math.pow(1.05, Math.ceil(Math.log(bufferIn.length) / Math.log(1.05)))
+        1.05 ** Math.ceil(Math.log(bufferIn.length) / Math.log(1.05))
       );
       expect(new Uint8Array(paddedBuffer.slice(0, bufferIn.length))).to.equalBytes(bufferIn);
       // this makes sure that the padding is just the 0 bytes
diff --git a/ts/test/session/unit/privacy/Privacy_test.ts b/ts/test/session/unit/privacy/Privacy_test.ts
index 42c814ac7..843ff2a08 100644
--- a/ts/test/session/unit/privacy/Privacy_test.ts
+++ b/ts/test/session/unit/privacy/Privacy_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string  max-func-body-length
-
 import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 
@@ -7,6 +5,7 @@ import path from 'path';
 
 import chaiAsPromised from 'chai-as-promised';
 import { redactAll } from '../../../../util/privacy';
+
 chai.use(chaiAsPromised as any);
 describe('Privacy', () => {
   describe('Redact sessionID', () => {
diff --git a/ts/test/session/unit/reactions/ReactionMessage_test.ts b/ts/test/session/unit/reactions/ReactionMessage_test.ts
index 8961626d1..256a73658 100644
--- a/ts/test/session/unit/reactions/ReactionMessage_test.ts
+++ b/ts/test/session/unit/reactions/ReactionMessage_test.ts
@@ -1,15 +1,19 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-unused-expressions */
 import chai, { expect } from 'chai';
 import Sinon, { useFakeTimers } from 'sinon';
+import { noop } from 'lodash';
+import chaiAsPromised from 'chai-as-promised';
+
 import { Reactions } from '../../../../util/reactions';
 import { Data } from '../../../../data/data';
 import * as Storage from '../../../../util/storage';
 import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../../../test-utils/utils';
 import { DEFAULT_RECENT_REACTS } from '../../../../session/constants';
-import { noop } from 'lodash';
+
 import { UserUtils } from '../../../../session/utils';
 import { SignalService } from '../../../../protobuf';
 import { MessageCollection } from '../../../../models/message';
-import chaiAsPromised from 'chai-as-promised';
 
 chai.use(chaiAsPromised as any);
 
@@ -60,9 +64,9 @@ describe('ReactionMessage', () => {
 
     expect(updatedMessage?.get('reacts'), 'original message should have reacts').to.not.be
       .undefined;
-    // tslint:disable: no-non-null-assertion
+
     expect(updatedMessage?.get('reacts')!['😄'], 'reacts should have 😄 key').to.not.be.undefined;
-    // tslint:disable: no-non-null-assertion
+
     expect(
       updatedMessage!.get('reacts')!['😄'].senders[0],
       'sender pubkey should match'
diff --git a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
index ac7bd2ecd..f8d8f5b0f 100644
--- a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
+++ b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 import Sinon from 'sinon';
@@ -8,7 +6,6 @@ import { TestUtils } from '../../../../test-utils';
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('filterDuplicatesFromDbAndIncomingV4', () => {
   describe('filters already duplicated message in the same incoming batch', () => {
     beforeEach(() => {
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index 7a8e9f62f..9466c1d3b 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -1,21 +1,21 @@
-// tslint:disable: no-implicit-dependencies
-
 import chai from 'chai';
+import Sinon from 'sinon';
+import chaiAsPromised from 'chai-as-promised';
+
 import { SignalService } from '../../../../protobuf';
 
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
-import Sinon from 'sinon';
 import * as cache from '../../../../receiver/cache';
 import { EnvelopePlus } from '../../../../receiver/types';
 
-import chaiAsPromised from 'chai-as-promised';
 import { ConfigMessageHandler } from '../../../../receiver/configMessage';
 import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { stubData } from '../../../test-utils/utils';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 96954ff96..86ab970ee 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -12,7 +12,6 @@ import {
 
 describe('state/selectors/conversations', () => {
   describe('#getSortedConversationsList', () => {
-    // tslint:disable-next-line: max-func-body-length
     it('sorts conversations based on timestamp then by intl-friendly title', () => {
       const i18n = (key: string) => key;
       const data: ConversationLookupType = {
@@ -145,7 +144,6 @@ describe('state/selectors/conversations', () => {
   });
 
   describe('#getSortedConversationsWithPinned', () => {
-    // tslint:disable-next-line: max-func-body-length
     it('sorts conversations based on pin, timestamp then by intl-friendly title', () => {
       const i18n = (key: string) => key;
       const data: ConversationLookupType = {
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index e07421342..70fa7816c 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -1,12 +1,19 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
+/* eslint-disable consistent-return */
+/* eslint-disable no-unused-expressions */
+/* eslint-disable more/no-then */
+/* eslint-disable no-loop-func */
+/* eslint-disable @typescript-eslint/no-floating-promises */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-unreachable-loop */
+/* eslint-disable no-restricted-syntax */
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
 import { randomBytes } from 'crypto';
+import chaiAsPromised from 'chai-as-promised';
 
 import { GroupUtils, PromiseUtils, UserUtils } from '../../../../session/utils';
-import { TestUtils } from '../../../../test/test-utils';
+import { TestUtils } from '../../../test-utils';
 import { MessageQueue } from '../../../../session/sending/MessageQueue';
 import { ContentMessage } from '../../../../session/messages/outgoing';
 import { PubKey, RawMessage } from '../../../../session/types';
@@ -14,7 +21,6 @@ import { MessageSender } from '../../../../session/sending';
 import { PendingMessageCacheStub } from '../../../test-utils/stubs';
 import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage';
 
-import chaiAsPromised from 'chai-as-promised';
 import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler';
 import { stubData } from '../../../test-utils/utils';
 import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
@@ -24,7 +30,6 @@ chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageQueue', () => {
   // Initialize new stubbed cache
   const ourDevice = TestUtils.generateFakePubKey();
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 4626fae4d..7cf526c65 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -37,7 +37,6 @@ describe('MessageSender', () => {
     await getConversationController().load();
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('send', () => {
     const ourNumber = '0123456789abcdef';
     let sessionMessageAPISendStub: sinon.SinonStub<any>;
@@ -309,7 +308,6 @@ describe('MessageSender', () => {
       });
       try {
         await MessageSender.sendToOpenGroupV2(message, roomInfos, false, []);
-        // tslint:disable-next-line: no-empty
       } catch (e) {}
       // we made the fourth call success, but we should not get there. We should stop at 3 the retries (1+2)
       expect(decodev4responseStub.calledThrice);
diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts
index 4da6d7d28..caa031020 100644
--- a/ts/test/session/unit/sending/PendingMessageCache_test.ts
+++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts
@@ -1,9 +1,11 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import * as _ from 'lodash';
 import { MessageUtils } from '../../../../session/utils';
-import { TestUtils } from '../../../../test/test-utils';
+import { TestUtils } from '../../../test-utils';
 import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache';
 import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
diff --git a/ts/test/session/unit/sogsv3/ApiUtil_test.ts b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
index 68f9464f1..d4e7c4cd2 100644
--- a/ts/test/session/unit/sogsv3/ApiUtil_test.ts
+++ b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
@@ -1,5 +1,4 @@
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string max-func-body-length
-
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
diff --git a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
index 45d138d32..4600363bc 100644
--- a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
+++ b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
@@ -1,11 +1,8 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { parseCapabilities } from '../../../../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
 import { getCapabilitiesFromBatch } from '../../../../session/apis/open_group_api/sogsv3/sogsCapabilities';
 
-// tslint:disable: chai-vague-errors
-
 describe('FetchCapabilities', () => {
   afterEach(() => {
     Sinon.restore();
diff --git a/ts/test/session/unit/sogsv3/MutationCache_test.ts b/ts/test/session/unit/sogsv3/MutationCache_test.ts
index dc46a7b08..82f07f896 100644
--- a/ts/test/session/unit/sogsv3/MutationCache_test.ts
+++ b/ts/test/session/unit/sogsv3/MutationCache_test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import {
@@ -14,7 +15,6 @@ import {
   OpenGroupMessageV4,
   OpenGroupReactionMessageV4,
 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupServerPoller';
-// tslint:disable: chai-vague-errors
 
 describe('mutationCache', () => {
   TestUtils.stubWindowLog();
@@ -322,7 +322,7 @@ describe('mutationCache', () => {
         server: roomInfos.serverUrl,
         room: roomInfos.roomId,
         changeType: ChangeType.REACTIONS,
-        seqno: 301, //// greater than response messageResponse seqno should be processed
+        seqno: 301, // greater than response messageResponse seqno should be processed
         metadata: {
           messageId: originalMessage.serverId,
           emoji: '😈',
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 022848ae7..7beeed054 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -1,4 +1,4 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key';
@@ -25,8 +25,6 @@ import { UserUtils } from '../../../../session/utils';
 import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable: chai-vague-errors
-
 const serverPublicKey = 'serverPublicKey';
 const blindedId = '151111';
 const blindedId2 = '152222';
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 06a56bc2f..4af38c1fb 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 import Sinon, * as sinon from 'sinon';
@@ -20,20 +18,17 @@ import { sleepFor } from '../../../../session/utils/Promise';
 import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { TestUtils } from '../../../test-utils';
 import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
-// tslint:disable: chai-vague-errors
 
 chai.use(chaiAsPromised as any);
 chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('SwarmPolling', () => {
   // Initialize new stubbed cache
   const ourPubkey = TestUtils.generateFakePubKey();
   const ourNumber = ourPubkey.key;
 
-  // tslint:disable-next-line: variable-name
   let pollOnceForKeySpy: Sinon.SinonSpy<any>;
 
   let swarmPolling: SwarmPolling;
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index 1ac6c8a48..232c2106b 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -3,7 +3,6 @@ import { isEmpty } from 'lodash';
 import path from 'path';
 
 describe('Updater', () => {
-  // tslint:disable-next-line: no-empty
   it.skip('isUpdateAvailable', () => {});
 
   it('package.json target are correct', () => {
diff --git a/ts/test/session/unit/utils/JobQueue_test.ts b/ts/test/session/unit/utils/JobQueue_test.ts
index 575592fff..3b91c738c 100644
--- a/ts/test/session/unit/utils/JobQueue_test.ts
+++ b/ts/test/session/unit/utils/JobQueue_test.ts
@@ -1,11 +1,10 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { v4 as uuid } from 'uuid';
+import chaiAsPromised from 'chai-as-promised';
+
 import { JobQueue } from '../../../../session/utils/JobQueue';
 import { TestUtils } from '../../../test-utils';
 
-import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised as any);
 
 const { assert } = chai;
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index 0f3d34913..7b9a6bd74 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -1,15 +1,15 @@
-// tslint:disable: no-implicit-dependencies
-
+/* eslint-disable no-unused-expressions */
 import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import { beforeEach } from 'mocha';
+import Sinon from 'sinon';
+
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { PubKey } from '../../../../session/types';
 import { MessageUtils, UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
-import chaiAsPromised from 'chai-as-promised';
-import { beforeEach } from 'mocha';
-import Sinon from 'sinon';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { SignalService } from '../../../../protobuf';
@@ -24,17 +24,16 @@ import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/con
 import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils';
 import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
+
 chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
-// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string  max-func-body-length
 
 describe('Message Utils', () => {
   afterEach(() => {
     Sinon.restore();
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('toRawMessage', () => {
     it('can convert to raw message', async () => {
       const device = TestUtils.generateFakePubKey();
@@ -48,15 +47,12 @@ describe('Message Utils', () => {
 
       expect(Object.keys(rawMessage)).to.have.length(6);
 
-      // do not believe tslint. those calls to.exist are actually correct here
-      // tslint:disable: no-unused-expression
       expect(rawMessage.identifier).to.exist;
       expect(rawMessage.namespace).to.exist;
       expect(rawMessage.device).to.exist;
       expect(rawMessage.encryption).to.exist;
       expect(rawMessage.plainTextBuffer).to.exist;
       expect(rawMessage.ttl).to.exist;
-      // tslint:enable: no-unused-expression
 
       expect(rawMessage.identifier).to.equal(message.identifier);
       expect(rawMessage.device).to.equal(device.key);
@@ -313,11 +309,10 @@ describe('Message Utils', () => {
       );
       const convos = getConversationController().getConversations();
 
-      //convoID3 is active but 4 and 5 are not
+      // convoID3 is active but 4 and 5 are not
       const configMessage = await getCurrentConfigurationMessage(convos);
       expect(configMessage.activeOpenGroups.length).to.equal(1);
       expect(configMessage.activeOpenGroups[0]).to.equal(
-        // tslint:disable-next-line: no-http-string
         'http://chat-dev2.lokinet.org/fish?public_key=serverPublicKey'
       );
     });
diff --git a/ts/test/session/unit/utils/OpenGroupUtils_test.ts b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
index ecd6b507e..a86cd4b74 100644
--- a/ts/test/session/unit/utils/OpenGroupUtils_test.ts
+++ b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai, { expect } from 'chai';
 
 import chaiAsPromised from 'chai-as-promised';
@@ -8,9 +6,9 @@ import {
   getOpenGroupV2ConversationId,
   prefixify,
 } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
+
 chai.use(chaiAsPromised as any);
 
-// tslint:disable: no-http-string
 describe('OpenGroupUtils', () => {
   describe('prefixify', () => {
     it('should just return if http:// is as prefix', () => {
diff --git a/ts/test/session/unit/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts
index 2673fc0ed..075ebc260 100644
--- a/ts/test/session/unit/utils/Promise_test.ts
+++ b/ts/test/session/unit/utils/Promise_test.ts
@@ -1,12 +1,9 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
+import chaiAsPromised from 'chai-as-promised';
 
 import { PromiseUtils } from '../../../../session/utils';
 
-// tslint:disable-next-line: no-require-imports no-var-requires
-import chaiAsPromised from 'chai-as-promised';
 import {
   allowOnlyOneAtATime,
   hasAlreadyOneAtaTimeMatching,
@@ -53,7 +50,6 @@ describe('Promise Utils', () => {
       // completionSpy will be called on done
       const completionSpy = Sinon.spy();
 
-      // tslint:disable-next-line: mocha-unneeded-done
       const task = (done: any) => {
         completionSpy();
         done();
@@ -106,7 +102,6 @@ describe('Promise Utils', () => {
       // completionSpy will be called on done
       const completionSpy = Sinon.spy();
 
-      // tslint:disable-next-line: mocha-unneeded-done
       const task = (done: any) => {
         completionSpy();
         done();
@@ -177,7 +172,6 @@ describe('Promise Utils', () => {
         await allowOnlyOneAtATime('testing', spy, 5);
         throw new Error('should not get here');
       } catch (e) {
-        // tslint:disable-next-line: no-console
         console.error(e);
         expect(e).to.be.be.eql(undefined, 'should be undefined');
       }
@@ -218,6 +212,6 @@ describe('Promise Utils', () => {
     expect(
       enableLogRedirect,
       'If you see this message, just set `enableLogRedirect` to false in `ts/test/test-utils/utils/stubbing.ts`'
-    ).to.be.false;
+    ).to.be.eq(false);
   });
 });
diff --git a/ts/test/session/unit/utils/RingBuffer_test.ts b/ts/test/session/unit/utils/RingBuffer_test.ts
index add8aa712..684506d3c 100644
--- a/ts/test/session/unit/utils/RingBuffer_test.ts
+++ b/ts/test/session/unit/utils/RingBuffer_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression no-require-imports no-var-requires
-
 import chai from 'chai';
 import { RingBuffer } from '../../../../session/utils/RingBuffer';
 
diff --git a/ts/test/session/unit/utils/String_test.ts b/ts/test/session/unit/utils/String_test.ts
index b814e614f..4813618fb 100644
--- a/ts/test/session/unit/utils/String_test.ts
+++ b/ts/test/session/unit/utils/String_test.ts
@@ -1,12 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
 import chai from 'chai';
 import ByteBuffer from 'bytebuffer';
+import chaiAsPromised from 'chai-as-promised';
 
 // Can't import type as StringUtils.Encoding
 import { Encoding } from '../../../../session/utils/String';
 import { StringUtils } from '../../../../session/utils';
 
-import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
@@ -82,7 +82,7 @@ describe('String Utils', () => {
     });
 
     it('can encode huge string', () => {
-      const stringSize = Math.pow(2, 16);
+      const stringSize = 2 ** 16;
       const testString = Array(stringSize)
         .fill('0')
         .join('');
@@ -137,14 +137,14 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length(0);
       });
     });
 
     it('can decode huge buffer', () => {
-      const bytes = Math.pow(2, 16);
+      const bytes = 2 ** 16;
       const bufferString = Array(bytes)
         .fill('A')
         .join('');
@@ -156,8 +156,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -171,8 +171,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -188,8 +188,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -203,8 +203,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -218,8 +218,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
diff --git a/ts/test/session/unit/utils/TaskWithTimeout_test.ts b/ts/test/session/unit/utils/TaskWithTimeout_test.ts
index 4f1e86a4d..52e70bfda 100644
--- a/ts/test/session/unit/utils/TaskWithTimeout_test.ts
+++ b/ts/test/session/unit/utils/TaskWithTimeout_test.ts
@@ -1,10 +1,9 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
+/* eslint-disable more/no-then */
 import chai from 'chai';
-
-// tslint:disable-next-line: no-require-imports no-var-requires
 import chaiAsPromised from 'chai-as-promised';
+
 import { createTaskWithTimeout } from '../../../../session/utils/TaskWithTimeout';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -51,7 +50,6 @@ describe('createTaskWithTimeout', () => {
     );
   });
   it('resolves if task returns something falsey', async () => {
-    // tslint:disable-next-line: no-empty
     const task = () => {};
     const taskWithTimeout = createTaskWithTimeout(task, taskName);
     await taskWithTimeout();
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 675fb04d1..121358a0d 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import _, { isUndefined } from 'lodash';
+import { isUndefined } from 'lodash';
 import Sinon from 'sinon';
 import { v4 } from 'uuid';
 import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner';
@@ -11,7 +11,6 @@ import {
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
 import { TestUtils } from '../../../../test-utils';
-// tslint:disable: no-console
 
 function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
   const job = new FakeSleepForJob({
@@ -47,7 +46,6 @@ function getFakeSleepForMultiJob({
   return job;
 }
 
-// tslint:disable-next-line: max-func-body-length
 describe('JobRunner', () => {
   let getItemById: Sinon.SinonStub;
   let clock: Sinon.SinonFakeTimers;
@@ -337,7 +335,9 @@ describe('JobRunner', () => {
     it('does not await if no job at all ', async () => {
       await runner.loadJobsFromDb();
       runner.startProcessing();
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does not await if there are jobs but none are started', async () => {
@@ -346,7 +346,9 @@ describe('JobRunner', () => {
       const job = getFakeSleepForJob(150);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_deferred');
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does await if there are jobs and one is started', async () => {
@@ -356,8 +358,9 @@ describe('JobRunner', () => {
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_started');
       clock.tick(5000);
+      const ret = await runner.stopAndWaitCurrentJob();
 
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('await');
+      expect(ret).to.be.eq('await');
     });
   });
 
@@ -365,7 +368,8 @@ describe('JobRunner', () => {
     it('does not await if no job at all ', async () => {
       await runner.loadJobsFromDb();
       runner.startProcessing();
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does not await if there are jobs but none are started', async () => {
@@ -374,7 +378,9 @@ describe('JobRunner', () => {
       const job = getFakeSleepForJob(150);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_deferred');
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does await if there are jobs and one is started', async () => {
diff --git a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
index fa1fc5129..b1a468298 100644
--- a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
+++ b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
@@ -16,7 +16,6 @@ export class PendingMessageCacheStub extends PendingMessageCache {
     return this.dbData;
   }
 
-  protected async saveToDB() {
-    return;
-  }
+  // eslint-disable-next-line  no-empty-function
+  protected async saveToDB() {}
 }
diff --git a/ts/test/test-utils/utils/envelope.ts b/ts/test/test-utils/utils/envelope.ts
index 100bb620b..0a36e329a 100644
--- a/ts/test/test-utils/utils/envelope.ts
+++ b/ts/test/test-utils/utils/envelope.ts
@@ -1,7 +1,6 @@
-import { EnvelopePlus } from '../../../receiver/types';
-import { SignalService } from '../../../protobuf';
-
 import { v4 as uuidv4 } from 'uuid';
+import { SignalService } from '../../../protobuf';
+import { EnvelopePlus } from '../../../receiver/types';
 
 export function generateEnvelopePlusClosedGroup(groupId: string, sender: string): EnvelopePlus {
   const envelope: EnvelopePlus = {
diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts
index 3afba778d..9fd9f0275 100644
--- a/ts/test/test-utils/utils/message.ts
+++ b/ts/test/test-utils/utils/message.ts
@@ -45,7 +45,7 @@ export function generateOpenGroupMessageV4(): OpenGroupMessageV4 {
     reactions: {},
     seqno: 0,
     session_id: TestUtils.generateFakePubKey().key,
-    // tslint:disable-next-line: insecure-random
+
     id: Math.floor(Math.random() * 100000),
     data: 'whatever',
   };
@@ -75,7 +75,6 @@ export function generateOpenGroupVisibleMessage(): OpenGroupVisibleMessage {
 }
 
 export function generateOpenGroupV2RoomInfos(): OpenGroupRequestCommonType {
-  // tslint:disable-next-line: no-http-string
   return { roomId: 'main', serverUrl: 'http://open.getsession.org' };
 }
 
diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts
index 9c9cefb26..617473ce2 100644
--- a/ts/test/test-utils/utils/pubkey.ts
+++ b/ts/test/test-utils/utils/pubkey.ts
@@ -40,13 +40,11 @@ export function generateFakeECKeyPair(): ECKeyPair {
 export function generateFakePubKeys(amount: number): Array<PubKey> {
   const numPubKeys = amount > 0 ? Math.floor(amount) : 0;
 
-  // tslint:disable-next-line: no-unnecessary-callback-wrapper
   return new Array(numPubKeys).fill(0).map(() => generateFakePubKey());
 }
 
 export function generateFakeSnode(): Snode {
   return {
-    // tslint:disable: insecure-random
     ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`,
     port: 22116,
     pubkey_x25519: generateFakePubKeyStr(),
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 8ff01faf8..20eb343a7 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -1,6 +1,7 @@
+/* eslint-disable func-names */
 import { expect } from 'chai';
 import Sinon from 'sinon';
-import { Data } from '../../../../ts/data/data';
+import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 
@@ -11,7 +12,7 @@ const globalAny: any = global;
 
 // We have to do this in a weird way because Data uses module.exports
 //  which doesn't play well with sinon or ImportMock
-// tslint:disable: no-require-imports no-var-requires
+
 type DataFunction = typeof Data;
 type OpenGroupDataFunction = typeof OpenGroupData;
 type ConfigDumpDataFunction = typeof ConfigDumpData;
@@ -45,10 +46,8 @@ export function stubLibSessionWorker(value: any) {
 }
 
 export function stubCreateObjectUrl() {
-  // tslint:disable-next-line: no-empty no-function-expression
   (global as any).URL = function() {};
   (global as any).URL.createObjectURL = () => {
-    // tslint:disable-next-line: insecure-random
     return `${Date.now()}:${Math.floor(Math.random() * 1000)}`;
   };
 }
@@ -59,7 +58,6 @@ type WindowValue<K extends keyof Window> = Partial<Window[K]> | undefined;
  * Stub a window object
  */
 export function stubWindow<K extends keyof Window>(fn: K, value: WindowValue<K>) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof globalAny.window === 'undefined') {
     globalAny.window = {};
   }
@@ -84,7 +82,6 @@ export const enableLogRedirect = false;
 
 export const stubWindowLog = () => {
   stubWindow('log', {
-    // tslint:disable: no-void-expression no-console
     info: (...args: any) => (enableLogRedirect ? console.info(...args) : {}),
     warn: (...args: any) => (enableLogRedirect ? console.warn(...args) : {}),
     error: (...args: any) => (enableLogRedirect ? console.error(...args) : {}),
diff --git a/ts/test/test-utils/utils/timeout.ts b/ts/test/test-utils/utils/timeout.ts
index cafd9cf55..f052e4d9f 100644
--- a/ts/test/test-utils/utils/timeout.ts
+++ b/ts/test/test-utils/utils/timeout.ts
@@ -1,4 +1,5 @@
 export async function timeout(ms: number): Promise<void> {
-  // tslint:disable-next-line no-string-based-set-timeout
-  return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
 }
diff --git a/ts/test/tslint.json b/ts/test/tslint.json
deleted file mode 100644
index ebe01b7f1..000000000
--- a/ts/test/tslint.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["../../tslint.json"],
-  "rules": {
-    "no-implicit-dependencies": false,
-    "max-func-body-length": false,
-    "no-unused-expression": false,
-    "no-unused-variable": false,
-    "await-promise": [true, "PromiseLike"],
-    "no-floating-promises": [true, "PromiseLike"]
-  }
-}
diff --git a/ts/test/types/Attachment_test.ts b/ts/test/types/Attachment_test.ts
index b7a5b6a2e..4542782b1 100644
--- a/ts/test/types/Attachment_test.ts
+++ b/ts/test/types/Attachment_test.ts
@@ -17,7 +17,6 @@ const stringToArrayBuffer = (str: string) => {
   return array.buffer;
 };
 
-// tslint:disable-next-line: max-func-body-length
 describe('Attachment', () => {
   describe('getFileExtension', () => {
     it('should return file extension from content type', () => {
diff --git a/ts/test/types/Settings_test.ts b/ts/test/types/Settings_test.ts
index 609617bc7..a8c981db2 100644
--- a/ts/test/types/Settings_test.ts
+++ b/ts/test/types/Settings_test.ts
@@ -2,9 +2,8 @@ import os from 'os';
 import Sinon from 'sinon';
 import { assert } from 'chai';
 
-import * as Settings from '../../../ts/types/Settings';
+import * as Settings from '../../types/Settings';
 
-// tslint:disable-next-line: max-func-body-length
 describe('Settings', () => {
   describe('isAudioNotificationSupported', () => {
     context('on macOS', () => {
diff --git a/ts/test/types/initializeAttachmentMetadata_test.ts b/ts/test/types/initializeAttachmentMetadata_test.ts
index e8c126370..f0dd1a601 100644
--- a/ts/test/types/initializeAttachmentMetadata_test.ts
+++ b/ts/test/types/initializeAttachmentMetadata_test.ts
@@ -6,9 +6,7 @@ import {
   hasVisualMediaAttachmentInMessage,
 } from '../../types/message/initializeAttachmentMetadata';
 import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../test-utils/utils';
-// tslint:disable: chai-vague-errors no-unused-expression
 
-// tslint:disable-next-line: max-func-body-length
 describe('initializeAttachmentMetadata', () => {
   beforeEach(() => {
     stubWindowLog();
@@ -23,61 +21,61 @@ describe('initializeAttachmentMetadata', () => {
     it('empty list attachments should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment has undefined content type should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: undefined }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment has null content type should return true', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: null }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment is gif should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/gif' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is gif should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/gif' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is jpeg should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/jpeg' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is png should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/png' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is JPG should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/JPG' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is PNG should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/PNG' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is audio should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'audio/mp3' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is flagged as voice message should return false', () => {
@@ -87,7 +85,7 @@ describe('initializeAttachmentMetadata', () => {
           { contentType: 'audio/mp3', flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE },
         ],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is flagged as voice message but no content type is false', () => {
@@ -97,13 +95,13 @@ describe('initializeAttachmentMetadata', () => {
           { contentType: undefined, flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE },
         ],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment content type is audio and other is null should return true', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'audio/mp3' }, { contentType: null }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment content type is audio and other is null should return true', () => {
@@ -111,7 +109,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/mp3' }, { contentType: 'file/whatever' }],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
   });
 
@@ -119,7 +117,7 @@ describe('initializeAttachmentMetadata', () => {
     it('no attachments should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
 
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('empty attachments list should return false', () => {
@@ -127,7 +125,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is undefined should return false', () => {
@@ -135,7 +133,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: undefined }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is null should return false', () => {
@@ -143,7 +141,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: null }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is image/whatever should return true', () => {
@@ -151,7 +149,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/whatever' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is jpeg should return true', () => {
@@ -159,7 +157,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/jpeg' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is png should return true', () => {
@@ -167,7 +165,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/png' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is JPG should return true', () => {
@@ -175,7 +173,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments where one is not image and one is returns true', () => {
@@ -183,7 +181,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/whatever' }, { contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments where both are images returns true', () => {
@@ -191,7 +189,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/whatever' }, { contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments  where none are images returns false', () => {
@@ -199,7 +197,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/whatever' }, { contentType: 'audio/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
   });
 
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index 601bd897e..fca76b8ae 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -1,11 +1,8 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { BlockedNumberController } from '../../util/blockedNumberController';
 import { TestUtils } from '../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('BlockedNumberController', () => {
   let memoryDB: { [key: string]: any };
   beforeEach(() => {
@@ -48,7 +45,7 @@ describe('BlockedNumberController', () => {
     it('should return empty if nothing in the db exists', async () => {
       await BlockedNumberController.load();
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      expect(blockedNumbers).to.be.empty;
+      expect(blockedNumbers.length).to.be.eq(0);
     });
   });
 
@@ -73,8 +70,8 @@ describe('BlockedNumberController', () => {
       await BlockedNumberController.unblockAll([primary.key]);
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      expect(blockedNumbers).to.be.empty;
-      expect(memoryDB.blocked).to.be.empty;
+      expect(blockedNumbers.length).to.be.eq(0);
+      expect(Object.keys(memoryDB.blocked)).to.be.be.eq(0);
     });
 
     it('should only unblock if a device was blocked', async () => {
diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx
index 4c28e306c..d06f553e2 100644
--- a/ts/themes/SessionTheme.tsx
+++ b/ts/themes/SessionTheme.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { createGlobalStyle } from 'styled-components';
-import { classicDark } from './';
+import { classicDark } from './classicDark';
 import { declareCSSVariables, THEME_GLOBALS } from './globals';
 
 // Defaults to Classic Dark theme
diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx
index 4f0191e04..ad7f68a7d 100644
--- a/ts/themes/constants/colors.tsx
+++ b/ts/themes/constants/colors.tsx
@@ -281,7 +281,6 @@ export const getThemeColors = (): Array<ThemeType> => [
     id: 'ocean-light',
     title: window.i18n('oceanLightThemeTitle'),
     style: {
-      // tslint:disable: no-non-null-assertion
       background: THEMES.OCEAN_LIGHT.COLOR7!,
       border: THEMES.OCEAN_LIGHT.COLOR3,
       receivedBackground: THEMES.OCEAN_LIGHT.COLOR1,
diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx
index e0018ea0f..795d116c4 100644
--- a/ts/themes/globals.tsx
+++ b/ts/themes/globals.tsx
@@ -152,6 +152,7 @@ export const THEME_GLOBALS: ThemeGlobals = {
 // These should only be needed for the global style (at root).
 export function declareCSSVariables(variables: Record<string, string>) {
   let output = '';
+  // eslint-disable-next-line no-restricted-syntax
   for (const [key, value] of Object.entries(variables)) {
     output += `${key}: ${value};\n`;
   }
diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts
index fe9908591..158c8d798 100644
--- a/ts/themes/oceanDark.ts
+++ b/ts/themes/oceanDark.ts
@@ -1,4 +1,3 @@
-/* tslint:disable: no-non-null-assertion */
 import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts
index 4cf2d064d..96544f6df 100644
--- a/ts/themes/oceanLight.ts
+++ b/ts/themes/oceanLight.ts
@@ -1,4 +1,3 @@
-/* tslint:disable: no-non-null-assertion */
 import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
diff --git a/ts/themes/variableColors.tsx b/ts/themes/variableColors.tsx
index 105825bc5..79d317135 100644
--- a/ts/themes/variableColors.tsx
+++ b/ts/themes/variableColors.tsx
@@ -77,7 +77,9 @@ export type ThemeColorVariables = {
   '--button-icon-stroke-selected-color': string;
 
   /* Conversation Tab */
-  /* This is also user for Overlay Tabs, Contact Rows, Convesation List Items, Message Search Results, Message Requests Banner, Member List Item, Contact List Items, Message Right Click Highlighting etc. */
+  /* This is also user for Overlay Tabs, Contact Rows, Convesation List Items,
+   Message Search Results, Message Requests Banner, Member List Item,
+   Contact List Items, Message Right Click Highlighting etc. */
   '--conversation-tab-background-color': string;
   '--conversation-tab-background-hover-color': string;
   '--conversation-tab-background-selected-color': string;
@@ -196,6 +198,7 @@ export type ThemeColorVariables = {
 };
 
 export function loadThemeColors(variables: ThemeColorVariables) {
+  // eslint-disable-next-line no-restricted-syntax
   for (const [key, value] of Object.entries(variables)) {
     document.documentElement.style.setProperty(key, value);
   }
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index bb44d962a..5c2559d9a 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -83,7 +83,7 @@ export function getExtensionForDisplay({
   }
 
   if (!contentType) {
-    return;
+    return undefined;
   }
 
   const slash = contentType.indexOf('/');
@@ -91,7 +91,7 @@ export function getExtensionForDisplay({
     return contentType.slice(slash + 1);
   }
 
-  return;
+  return undefined;
 }
 
 export function isAudio(attachments?: Array<AttachmentType>) {
@@ -276,7 +276,7 @@ export const isFile = (attachment: Attachment): boolean => {
 export const isVoiceMessage = (attachment: Attachment): boolean => {
   const flag = SignalService.AttachmentPointer.Flags.VOICE_MESSAGE;
   const hasFlag =
-    // tslint:disable-next-line no-bitwise
+    // eslint-disable-next-line no-bitwise
     !isUndefined(attachment.flags) && (attachment.flags & flag) === flag;
   if (hasFlag) {
     return true;
@@ -346,9 +346,8 @@ export const getFileExtension = (attachment: AttachmentType): string | undefined
       const dotLastIndex = attachment.fileName.lastIndexOf('.');
       if (dotLastIndex !== -1) {
         return attachment.fileName.substring(dotLastIndex + 1);
-      } else {
-        return undefined;
       }
+      return undefined;
     }
     return undefined;
   }
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index bea00fe83..10dae7fb6 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -15,8 +15,6 @@ import {
 } from './attachments/migrations';
 import { ConversationAttributes } from '../models/conversationAttributes';
 
-// tslint:disable: prefer-object-spread
-
 // I think this is only used on the renderer side, but how?!
 
 export const deleteExternalMessageFiles = async (message: {
diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts
index 7de45482f..3bec31a77 100644
--- a/ts/types/attachments/VisualAttachment.ts
+++ b/ts/types/attachments/VisualAttachment.ts
@@ -1,16 +1,16 @@
 /* eslint-disable more/no-then */
 /* global document, URL, Blob */
 
+import { blobToArrayBuffer, dataURLToBlob } from 'blob-util';
 import { toLogFormat } from './Errors';
 
 import {
   getDecryptedBlob,
   getDecryptedMediaUrl,
-} from '../../../ts/session/crypto/DecryptedAttachmentsManager';
-import { blobToArrayBuffer, dataURLToBlob } from 'blob-util';
-import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil';
-import { GoogleChrome } from '../../util';
+} from '../../session/crypto/DecryptedAttachmentsManager';
 import { ToastUtils } from '../../session/utils';
+import { GoogleChrome } from '../../util';
+import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil';
 
 export const THUMBNAIL_SIDE = 200;
 export const THUMBNAIL_CONTENT_TYPE = 'image/png';
@@ -24,7 +24,8 @@ export const getImageDimensions = async ({
 }: {
   objectUrl: string;
 }): Promise<{ height: number; width: number }> =>
-  new Promise(async (resolve, reject) => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  new Promise((resolve, reject) => {
     const image = document.createElement('img');
 
     image.addEventListener('load', () => {
@@ -38,8 +39,12 @@ export const getImageDimensions = async ({
       reject(error);
     });
     // image/jpg is hard coded here but does not look to cause any issues
-    const decryptedUrl = await getDecryptedMediaUrl(objectUrl, 'image/jpg', false);
-    image.src = decryptedUrl;
+    void getDecryptedMediaUrl(objectUrl, 'image/jpg', false)
+      .then(decryptedUrl => {
+        image.src = decryptedUrl;
+      })
+      // eslint-disable-next-line no-console
+      .catch(console.error);
   });
 
 export const makeImageThumbnailBuffer = async ({
@@ -67,7 +72,7 @@ export const makeVideoScreenshot = async ({
   objectUrl: string;
   contentType: string | undefined;
 }) =>
-  new Promise<Blob>(async (resolve, reject) => {
+  new Promise<Blob>((resolve, reject) => {
     const video = document.createElement('video');
 
     function capture() {
@@ -94,11 +99,11 @@ export const makeVideoScreenshot = async ({
       reject(error);
     });
 
-    const decryptedUrl = await getDecryptedMediaUrl(objectUrl, contentType, false);
-    video.src = decryptedUrl;
-    video.muted = true;
-    // for some reason, this is to be started, otherwise the generated thumbnail will be empty
-    await video.play();
+    void getDecryptedMediaUrl(objectUrl, contentType, false).then(decryptedUrl => {
+      video.src = decryptedUrl;
+      video.muted = true;
+      void video.play(); // for some reason, this is to be started, otherwise the generated thumbnail will be empty
+    });
   });
 
 export const makeObjectUrl = (data: ArrayBufferLike, contentType: string) => {
@@ -150,27 +155,28 @@ export async function pickFileForAvatar(): Promise<string | null> {
     ctx.fillStyle = 'blue';
     ctx.fillRect(0, 0, canvas.width, canvas.height);
     return new Promise(resolve => {
-      canvas.toBlob(async blob => {
+      canvas.toBlob(blob => {
         const file = new File([blob as Blob], 'image.png', { type: 'image/png' });
-        const url = await autoScaleAvatarBlob(file);
-        resolve(url);
+        void autoScaleAvatarBlob(file)
+          .then(url => resolve(url))
+          // eslint-disable-next-line no-console
+          .catch(console.error);
       });
     });
-  } else {
-    const [fileHandle] = await (window as any).showOpenFilePicker({
-      types: [
-        {
-          description: 'Images',
-          accept: {
-            'image/*': ['.png', '.gif', '.jpeg', '.jpg'],
-          },
-        },
-      ],
-      excludeAcceptAllOption: true,
-      multiple: false,
-    });
-
-    const file = (await fileHandle.getFile()) as File;
-    return autoScaleAvatarBlob(file);
   }
+  const [fileHandle] = await (window as any).showOpenFilePicker({
+    types: [
+      {
+        description: 'Images',
+        accept: {
+          'image/*': ['.png', '.gif', '.jpeg', '.jpg'],
+        },
+      },
+    ],
+    excludeAcceptAllOption: true,
+    multiple: false,
+  });
+
+  const file = (await fileHandle.getFile()) as File;
+  return autoScaleAvatarBlob(file);
 }
diff --git a/ts/types/attachments/migrations.ts b/ts/types/attachments/migrations.ts
index 5626803d6..63f6efff3 100644
--- a/ts/types/attachments/migrations.ts
+++ b/ts/types/attachments/migrations.ts
@@ -1,9 +1,16 @@
-import * as GoogleChrome from '../../../ts/util/GoogleChrome';
-import * as MIME from '../../../ts/types/MIME';
-import { toLogFormat } from './Errors';
 import { arrayBufferToBlob, blobToArrayBuffer } from 'blob-util';
-
 import { isString } from 'lodash';
+
+import * as MIME from '../MIME';
+import * as GoogleChrome from '../../util/GoogleChrome';
+import { toLogFormat } from './Errors';
+
+import {
+  deleteOnDisk,
+  getAbsoluteAttachmentPath,
+  readAttachmentData,
+  writeNewAttachmentData,
+} from '../MessageAttachment';
 import {
   getImageDimensions,
   makeImageThumbnailBuffer,
@@ -13,12 +20,6 @@ import {
   THUMBNAIL_CONTENT_TYPE,
   THUMBNAIL_SIDE,
 } from './VisualAttachment';
-import {
-  deleteOnDisk,
-  getAbsoluteAttachmentPath,
-  readAttachmentData,
-  writeNewAttachmentData,
-} from '../MessageAttachment';
 
 // Returns true if `rawAttachment` is a valid attachment based on our current schema.
 // Over time, we can expand this definition to become more narrow, e.g. require certain
diff --git a/ts/types/message/initializeAttachmentMetadata.ts b/ts/types/message/initializeAttachmentMetadata.ts
index aa283ade2..7f41c7003 100644
--- a/ts/types/message/initializeAttachmentMetadata.ts
+++ b/ts/types/message/initializeAttachmentMetadata.ts
@@ -15,7 +15,7 @@ export const getAttachmentMetadata = (
   hasFileAttachments: 1 | 0;
   hasVisualMediaAttachments: 1 | 0;
 } => {
-  const hasAttachments = Boolean((message.get('attachments') || []).length) ? 1 : 0;
+  const hasAttachments = (message.get('attachments') || []).length ? 1 : 0;
   const hasFileAttachments = hasFileAttachmentInMessage(message) ? 1 : 0;
   const hasVisualMediaAttachments = hasVisualMediaAttachmentInMessage(message) ? 1 : 0;
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index a3d3cf5f8..ba54939b0 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,3 +1,6 @@
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
+// eslint-disable-next-line camelcase
 import { from_hex } from 'libsodium-wrappers-sumo';
 import { isArray, isEmpty, isEqual } from 'lodash';
 import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'libsession_util_nodejs';
@@ -209,7 +212,7 @@ export function getLegacyGroupInfoFromDBValues({
   lastJoinedTimestamp,
 }: Pick<
   ConversationAttributes,
-  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer'
+  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' // | 'expireTimer'
 > & {
   encPubkeyHex: string;
   encSeckeyHex: string;
@@ -245,7 +248,8 @@ export function getLegacyGroupInfoFromDBValues({
  */
 export function assertUnreachable(_x: never, message: string): never {
   const msg = `assertUnreachable: Didn't expect to get here with "${message}"`;
-  // tslint:disable: no-console
+  // eslint:disable: no-console
+  // eslint-disable-next-line no-console
   console.info(msg);
   throw new Error(msg);
 }
diff --git a/ts/updater/index.ts b/ts/updater/index.ts
index ab4ba4e95..7fd408b8a 100644
--- a/ts/updater/index.ts
+++ b/ts/updater/index.ts
@@ -51,8 +51,6 @@ function autoUpdateDisabled() {
   const autoUpdate = typeof userSetting !== 'boolean' || userSetting;
 
   return (
-    process.mas || // From Electron: Mac App Store build
-    // tslint:disable-next-line: no-backbone-get-set-outside-model
-    !autoUpdate // User setting
+    process.mas || !autoUpdate // From Electron: Mac App Store build // User setting
   );
 }
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index ce592fb11..785b4d9cd 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -1,9 +1,14 @@
-import * as path from 'path';
-import * as fs from 'fs-extra';
-import { autoUpdater, UpdateInfo } from 'electron-updater';
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-console */
 import { app, BrowserWindow } from 'electron';
+import { autoUpdater, UpdateInfo } from 'electron-updater';
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
+
 import { windowMarkShouldQuit } from '../node/window_state';
 
+import { getLastestRelease } from '../node/latest_desktop_release';
 import {
   getPrintableError,
   LoggerType,
@@ -12,14 +17,12 @@ import {
   showDownloadUpdateDialog,
   showUpdateDialog,
 } from './common';
-import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
-import { getLastestRelease } from '../node/latest_desktop_release';
 
 let isUpdating = false;
 let downloadIgnored = false;
 let interval: NodeJS.Timeout | undefined;
 let stopped = false;
-// tslint:disable: no-console
+// eslint:disable: no-console
 
 export async function start(
   getMainWindow: () => BrowserWindow | null,
@@ -202,7 +205,6 @@ async function canAutoUpdate(): Promise<boolean> {
 
   return new Promise(resolve => {
     try {
-      // tslint:disable-next-line: non-literal-fs-path
       const exists = fs.existsSync(appUpdateConfigPath);
       resolve(exists);
     } catch (e) {
diff --git a/ts/util/abbreviateNumber.ts b/ts/util/abbreviateNumber.ts
index abc18a675..9870164af 100644
--- a/ts/util/abbreviateNumber.ts
+++ b/ts/util/abbreviateNumber.ts
@@ -5,12 +5,12 @@ const abbreviations = ['k', 'm', 'b', 't'];
 
 export function abbreviateNumber(number: number, decimals: number = 2): string {
   let result = String(number);
-  const d = Math.pow(10, decimals);
+  const d = 10 ** decimals;
 
   // Go through the array backwards, so we do the largest first
   for (let i = abbreviations.length - 1; i >= 0; i--) {
     // Convert array index to "1000", "1000000", etc
-    const size = Math.pow(10, (i + 1) * 3);
+    const size = 10 ** ((i + 1) * 3);
 
     // If the number is bigger or equal do the abbreviation
     if (size <= number) {
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index cbe6961bb..b95a6bb92 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -5,7 +5,7 @@ import { getOurPubKeyStrFromCache } from '../session/utils/User';
 import { trigger } from '../shims/events';
 
 import { actions as userActions } from '../state/ducks/user';
-import { mn_decode, mn_encode } from '../session/crypto/mnemonic';
+import { mnDecode, mnEncode } from '../session/crypto/mnemonic';
 import { SettingsKey } from '../data/settings-key';
 import {
   saveRecoveryPhrase,
@@ -48,7 +48,7 @@ const generateKeypair = async (
   mnemonic: string,
   mnemonicLanguage: string
 ): Promise<SessionKeyPair> => {
-  let seedHex = mn_decode(mnemonic, mnemonicLanguage);
+  let seedHex = mnDecode(mnemonic, mnemonicLanguage);
   // handle shorter than 32 bytes seeds
   const privKeyHexLength = 32 * 2;
   if (seedHex.length !== privKeyHexLength) {
@@ -133,7 +133,7 @@ export async function generateMnemonic() {
   const seedSize = 16;
   const seed = (await getSodiumRenderer()).randombytes_buf(seedSize);
   const hex = toHex(seed);
-  return mn_encode(hex);
+  return mnEncode(hex);
 }
 
 async function createAccount(identityKeyPair: SessionKeyPair) {
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index 46812f53a..e0dc727ec 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -1,15 +1,17 @@
+/* eslint-disable max-len */
+import imageType from 'image-type';
+
+import { arrayBufferToBlob } from 'blob-util';
+import loadImage, { LoadImageOptions } from 'blueimp-load-image';
+import { StagedAttachmentType } from '../components/conversation/composition/CompositionBox';
 import { SignalService } from '../protobuf';
-import loadImage, { CropOptions, LoadImageOptions } from 'blueimp-load-image';
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { sendDataExtractionNotification } from '../session/messages/outgoing/controlMessage/DataExtractionNotificationMessage';
 import { AttachmentType, save } from '../types/Attachment';
-import { StagedAttachmentType } from '../components/conversation/composition/CompositionBox';
-import { getAbsoluteAttachmentPath, processNewAttachment } from '../types/MessageAttachment';
-import { arrayBufferToBlob } from 'blob-util';
 import { IMAGE_GIF, IMAGE_JPEG, IMAGE_PNG, IMAGE_TIFF, IMAGE_UNKNOWN } from '../types/MIME';
+import { getAbsoluteAttachmentPath, processNewAttachment } from '../types/MessageAttachment';
 import { THUMBNAIL_SIDE } from '../types/attachments/VisualAttachment';
 
-import imageType from 'image-type';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../session/constants';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 
@@ -147,7 +149,7 @@ async function canvasToBlob(
  * @param attachment The attachment to scale down
  * @param maxMeasurements any of those will be used if set
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 export async function autoScale<T extends { contentType: string; blob: Blob }>(
   attachment: T,
   maxMeasurements?: MaxScaleSize
@@ -187,14 +189,10 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
     throw new Error(`GIF is too large, required size is ${maxSize}`);
   }
 
-  const crop: CropOptions = {
-    crop: makeSquare,
-  };
-
   const loadImgOpts: LoadImageOptions = {
     maxWidth: makeSquare ? maxMeasurements?.maxSide : maxWidth,
     maxHeight: makeSquare ? maxMeasurements?.maxSide : maxHeight,
-    ...crop,
+    crop: !!makeSquare,
     orientation: 1,
     aspectRatio: makeSquare ? 1 : undefined,
     canvas: true,
@@ -244,6 +242,7 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
     if (DEBUG_ATTACHMENTS_SCALE) {
       // window.log.info(`autoscale iteration: [${i}] for:`, attachment);
     }
+    // eslint-disable-next-line no-await-in-loop
     const tempBlob = await canvasToBlob(canvas.image as HTMLCanvasElement, 'image/jpeg', quality);
 
     if (!tempBlob) {
diff --git a/ts/util/attachments_files.ts b/ts/util/attachments_files.ts
index 94076f146..1a8749710 100644
--- a/ts/util/attachments_files.ts
+++ b/ts/util/attachments_files.ts
@@ -8,10 +8,6 @@ import {
   encryptAttachmentBufferRenderer,
 } from './local_attachments_encrypter';
 
-if (window) {
-  //tslint-disable no-empty
-}
-
 // to me, this file is only used in the renderer
 // import { decryptAttachmentBuffer, encryptAttachmentBuffer } from './encrypt_attachment_buffer';
 
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index d65a3a331..76d5aa77c 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -5,7 +5,6 @@ import { Storage } from './storage';
 
 const BLOCKED_NUMBERS_ID = 'blocked';
 
-// tslint:disable-next-line: no-unnecessary-class
 export class BlockedNumberController {
   private static loaded: boolean = false;
   private static blockedNumbers: Set<string> = new Set();
@@ -64,6 +63,7 @@ export class BlockedNumberController {
     for (let index = 0; index < users.length; index++) {
       const user = users[index];
       try {
+        // eslint-disable-next-line no-await-in-loop
         await commitConversationAndRefreshWrapper(user);
       } catch (e) {
         window.log.warn(
diff --git a/ts/util/crypto/attachmentsEncrypter.ts b/ts/util/crypto/attachmentsEncrypter.ts
index 3258bf539..141fd0cbd 100644
--- a/ts/util/crypto/attachmentsEncrypter.ts
+++ b/ts/util/crypto/attachmentsEncrypter.ts
@@ -1,11 +1,9 @@
-// tslint:disable: binary-expression-operand-order
-// tslint:disable: restrict-plus-operands
-// tslint:disable: no-function-expression
+/* eslint-disable more/no-then */
 
 async function sign(key: any, data: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.sign({ name: 'HMAC', hash: 'SHA-256' }, secondKey, data);
     });
 }
@@ -13,14 +11,14 @@ async function sign(key: any, data: any) {
 async function encrypt(key: any, data: any, iv: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'AES-CBC' }, false, ['encrypt'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.encrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
     });
 }
 async function decrypt(key: any, data: any, iv: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'AES-CBC' }, false, ['decrypt'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.decrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
     });
 }
@@ -28,17 +26,16 @@ async function calculateMAC(key: any, data: any) {
   return sign(key, data);
 }
 async function verifyMAC(data: any, key: any, mac: any, length: any) {
-  // tslint:disable-next-line: variable-name
-  return sign(key, data).then(function(calculated_mac) {
-    if (mac.byteLength !== length || calculated_mac.byteLength < length) {
+  return sign(key, data).then(calculatedMac => {
+    if (mac.byteLength !== length || calculatedMac.byteLength < length) {
       throw new Error('Bad MAC length');
     }
-    const a = new Uint8Array(calculated_mac);
+    const a = new Uint8Array(calculatedMac);
     const b = new Uint8Array(mac);
     let result = 0;
     for (let i = 0; i < mac.byteLength; ++i) {
-      // tslint:disable-next-line: no-bitwise
-      result = result | (a[i] ^ b[i]);
+      // eslint-disable-next-line no-bitwise
+      result |= a[i] ^ b[i];
     }
     if (result !== 0) {
       throw new Error('Bad MAC');
@@ -52,7 +49,7 @@ async function verifyDigest(data: ArrayBuffer, theirDigest: ArrayBuffer) {
     const b = new Uint8Array(theirDigest);
     let result = 0;
     for (let i = 0; i < theirDigest.byteLength; i += 1) {
-      // tslint:disable-next-line: no-bitwise
+      // eslint-disable-next-line no-bitwise
       result |= a[i] ^ b[i];
     }
     if (result !== 0) {
diff --git a/ts/util/crypto/profileEncrypter.ts b/ts/util/crypto/profileEncrypter.ts
index 3a345bde7..d63c8ed4b 100644
--- a/ts/util/crypto/profileEncrypter.ts
+++ b/ts/util/crypto/profileEncrypter.ts
@@ -1,3 +1,4 @@
+/* eslint-disable more/no-then */
 import { getSodiumRenderer } from '../../session/crypto';
 
 const PROFILE_IV_LENGTH = 12; // bytes
@@ -34,6 +35,7 @@ export async function decryptProfile(data: ArrayBuffer, key: ArrayBuffer): Promi
             error.name = 'ProfileDecryptError';
             throw error;
           }
+          throw error;
         })
     );
 }
@@ -56,7 +58,6 @@ export async function encryptProfile(data: ArrayBuffer, key: ArrayBuffer): Promi
       crypto.subtle
         .encrypt({ name: 'AES-GCM', iv, tagLength: PROFILE_TAG_LENGTH }, keyForEncryption, data)
         .then(ciphertext => {
-          // tslint:disable-next-line: restrict-plus-operands
           const ivAndCiphertext = new Uint8Array(PROFILE_IV_LENGTH + ciphertext.byteLength);
           ivAndCiphertext.set(new Uint8Array(iv));
           ivAndCiphertext.set(new Uint8Array(ciphertext), PROFILE_IV_LENGTH);
diff --git a/ts/util/emoji.ts b/ts/util/emoji.ts
index d3dbed303..7892f2583 100644
--- a/ts/util/emoji.ts
+++ b/ts/util/emoji.ts
@@ -1,6 +1,9 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-continue */
+/* eslint-disable no-param-reassign */
+/* eslint-disable import/no-mutable-exports  */
+import { PartialI18n, init } from 'emoji-mart';
 import { FixedBaseEmoji, NativeEmojiData } from '../types/Reaction';
-// @ts-ignore
-import { init, PartialI18n } from 'emoji-mart';
 import { loadEmojiPanelI18n } from './i18n';
 
 export type SizeClassType = 'default' | 'small' | 'medium' | 'large' | 'jumbo';
@@ -33,13 +36,14 @@ export function getEmojiSizeClass(str: string): SizeClassType {
   const emojiCount = getCountOfAllMatches(str);
   if (emojiCount > 6) {
     return 'small';
-  } else if (emojiCount > 4) {
-    return 'medium';
-  } else if (emojiCount > 2) {
-    return 'large';
-  } else {
-    return 'jumbo';
   }
+  if (emojiCount > 4) {
+    return 'medium';
+  }
+  if (emojiCount > 2) {
+    return 'large';
+  }
+  return 'jumbo';
 }
 
 export let nativeEmojiData: NativeEmojiData | null = null;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 239455e58..e7df1ba95 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -29,7 +29,7 @@ export async function destroyMessagesAndUpdateRedux(
   window.inboxStore?.dispatch(messagesExpired(messages));
 
   // trigger a refresh the last message for all those uniq conversation
-  conversationWithChanges.map(convoIdToUpdate => {
+  conversationWithChanges.forEach(convoIdToUpdate => {
     getConversationController()
       .get(convoIdToUpdate)
       ?.updateLastMessage();
@@ -49,7 +49,7 @@ async function destroyExpiredMessages() {
       messageId: m.id,
     }));
 
-    messages.map(expired => {
+    messages.forEach(expired => {
       window.log.info('Message expired', {
         sentAt: expired.get('sent_at'),
       });
@@ -98,7 +98,7 @@ async function checkExpiringMessages() {
   if (timeout) {
     global.clearTimeout(timeout);
   }
-  timeout = global.setTimeout(destroyExpiredMessages, wait);
+  timeout = global.setTimeout(() => void destroyExpiredMessages(), wait);
 }
 const throttledCheckExpiringMessages = throttle(checkExpiringMessages, 1000);
 
@@ -111,7 +111,7 @@ const initExpiringMessageListener = () => {
 
   void checkExpiringMessages();
 
-  initWallClockListener(throttledCheckExpiringMessages);
+  initWallClockListener(() => void throttledCheckExpiringMessages());
   isInit = true;
 };
 
diff --git a/ts/util/i18n.ts b/ts/util/i18n.ts
index 90ccf33f2..70d8fb520 100644
--- a/ts/util/i18n.ts
+++ b/ts/util/i18n.ts
@@ -13,7 +13,8 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
   function getMessage(key: string, substitutions: Array<string>) {
     const message = messages[key];
     if (!message) {
-      // tslint:disable-next-line: no-console
+      // eslint:disable: no-console
+      // eslint-disable-next-line no-console
       (window.log.error || console.log)(
         `i18n: Attempted to get translation for nonexistent key '${key}'`
       );
@@ -29,7 +30,8 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
       );
 
       return substituted.replaceAll('ￗ', '$');
-    } else if (substitutions) {
+    }
+    if (substitutions) {
       return message.replace(/\$.+?\$/, substitutions);
     }
 
@@ -41,6 +43,7 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
   return getMessage;
 };
 
+// eslint-disable-next-line import/no-mutable-exports
 export let langNotSupportedMessageShown = false;
 
 export const loadEmojiPanelI18n = async () => {
@@ -62,4 +65,5 @@ export const loadEmojiPanelI18n = async () => {
       }
     }
   }
+  return undefined;
 };
diff --git a/ts/util/index.ts b/ts/util/index.ts
index 0f359efc4..83d746404 100644
--- a/ts/util/index.ts
+++ b/ts/util/index.ts
@@ -1,17 +1,9 @@
 import * as GoogleChrome from './GoogleChrome';
 import { arrayBufferToObjectURL } from './arrayBufferToObjectURL';
 import { missingCaseError } from './missingCaseError';
-import { makeLookup } from './makeLookup';
 import * as AttachmentUtil from './attachmentsUtil';
 import * as LinkPreviewUtil from './linkPreviewFetch';
 
 export * from './blockedNumberController';
 
-export {
-  arrayBufferToObjectURL,
-  GoogleChrome,
-  makeLookup,
-  missingCaseError,
-  AttachmentUtil,
-  LinkPreviewUtil,
-};
+export { arrayBufferToObjectURL, GoogleChrome, missingCaseError, AttachmentUtil, LinkPreviewUtil };
diff --git a/ts/util/linkPreviewFetch.ts b/ts/util/linkPreviewFetch.ts
index 3f99e9391..86d1fdc40 100644
--- a/ts/util/linkPreviewFetch.ts
+++ b/ts/util/linkPreviewFetch.ts
@@ -4,7 +4,6 @@ import { AbortSignal } from 'abort-controller';
 import { IMAGE_GIF, IMAGE_ICO, IMAGE_JPEG, IMAGE_PNG, IMAGE_WEBP, MIMEType } from '../types/MIME';
 
 const MAX_REQUEST_COUNT_WITH_REDIRECTS = 20;
-// tslint:disable: prefer-for-of
 
 // Lifted from the `fetch` spec [here][0].
 // [0]: https://fetch.spec.whatwg.org/#redirect-status
diff --git a/ts/util/linkPreviews.ts b/ts/util/linkPreviews.ts
index 1d72647cf..ba78f0d6c 100644
--- a/ts/util/linkPreviews.ts
+++ b/ts/util/linkPreviews.ts
@@ -79,6 +79,7 @@ const VALID_URI_CHARACTERS = new Set([
   '_',
   '~',
 ]);
+// eslint-disable-next-line prefer-regex-literals
 const ASCII_PATTERN = new RegExp('[\\u0020-\\u007F]', 'g');
 const MAX_HREF_LENGTH = 2 ** 12;
 
diff --git a/ts/util/makeLookup.ts b/ts/util/makeLookup.ts
deleted file mode 100644
index 3042c518e..000000000
--- a/ts/util/makeLookup.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { fromPairs, map } from 'lodash';
-
-export function makeLookup<T>(items: Array<T>, key: string): { [key: string]: T } {
-  // Yep, we can't index into item without knowing what it is. True. But we want to.
-  // @ts-ignore
-  const pairs = map(items, item => [item[key], item]);
-
-  return fromPairs(pairs);
-}
diff --git a/ts/util/notifications.ts b/ts/util/notifications.ts
index 8950cf1f5..f4fcf4b08 100644
--- a/ts/util/notifications.ts
+++ b/ts/util/notifications.ts
@@ -116,7 +116,6 @@ function clearByMessageId(messageId: string) {
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 function update(forceRefresh = false) {
   if (lastNotificationDisplayed) {
     lastNotificationDisplayed.close();
diff --git a/ts/util/privacy.ts b/ts/util/privacy.ts
index 203e08498..387876f0b 100644
--- a/ts/util/privacy.ts
+++ b/ts/util/privacy.ts
@@ -1,6 +1,5 @@
 /* eslint-env node */
 
-// tslint:disable-next-line: no-submodule-imports
 import { escapeRegExp, isEmpty, isRegExp, isString } from 'lodash';
 import { compose } from 'lodash/fp';
 import { getAppRootPath } from '../node/getRootPath';
diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts
index f1f40d46c..cb1cad416 100644
--- a/ts/util/reactions.ts
+++ b/ts/util/reactions.ts
@@ -6,7 +6,7 @@ import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/know
 import { ToastUtils, UserUtils } from '../session/utils';
 
 import { Action, OpenGroupReactionList, ReactionList, RecentReactions } from '../types/Reaction';
-import { getRecentReactions, saveRecentReations } from '../util/storage';
+import { getRecentReactions, saveRecentReations } from './storage';
 
 const SOGSReactorsFetchCount = 5;
 const rateCountLimit = 20;
@@ -23,9 +23,8 @@ function hitRateLimit(): boolean {
       latestReactionTimestamps.pop();
       window.log.warn(`Only ${rateCountLimit} reactions are allowed per minute`);
       return true;
-    } else {
-      latestReactionTimestamps.shift();
     }
+    latestReactionTimestamps.shift();
   }
   return false;
 }
@@ -74,17 +73,17 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
     const conversationModel = found?.getConversation();
     if (!conversationModel) {
       window.log.warn(`Conversation for ${messageId} not found in db`);
-      return;
+      return undefined;
     }
 
     if (!conversationModel.hasReactions()) {
       window.log.warn("This conversation doesn't have reaction support");
-      return;
+      return undefined;
     }
 
     if (hitRateLimit()) {
       ToastUtils.pushRateLimitHitReactions();
-      return;
+      return undefined;
     }
 
     let me = UserUtils.getOurPubKeyStrFromCache();
@@ -96,7 +95,7 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
         me = conversationModel.getUsInThatConversation();
       } else {
         window.log.warn(`Server Id was not found in message ${messageId} for opengroup reaction`);
-        return;
+        return undefined;
       }
     }
 
@@ -131,10 +130,9 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
       found.get('isPublic') ? `on ${conversationModel.id}` : ''
     );
     return reaction;
-  } else {
-    window.log.warn(`Message ${messageId} not found in db`);
-    return;
   }
+  window.log.warn(`Message ${messageId} not found in db`);
+  return undefined;
 };
 
 /**
@@ -154,12 +152,12 @@ const handleMessageReaction = async ({
 }) => {
   if (!reaction.emoji) {
     window?.log?.warn(`There is no emoji for the reaction ${reaction}.`);
-    return;
+    return undefined;
   }
 
   const originalMessage = await getMessageByReaction(reaction, openGroupConversationId);
   if (!originalMessage) {
-    return;
+    return undefined;
   }
 
   const reacts: ReactionList = originalMessage.get('reacts') ?? {};
@@ -171,10 +169,9 @@ const handleMessageReaction = async ({
   if (details.you && senders.includes(sender)) {
     if (reaction.action === Action.REACT) {
       window.log.warn('Received duplicate message for your reaction. Ignoring it');
-      return;
-    } else {
-      details.you = false;
+      return undefined;
     }
+    details.you = false;
   } else {
     details.you = you;
   }
@@ -183,7 +180,7 @@ const handleMessageReaction = async ({
     case Action.REACT:
       if (senders.includes(sender)) {
         window.log.warn('Received duplicate reaction message. Ignoring it', reaction, sender);
-        return;
+        return undefined;
       }
       details.senders.push(sender);
       count += 1;
@@ -209,7 +206,6 @@ const handleMessageReaction = async ({
       originalMessage.set('reactsIndex', (originalMessage.get('reactsIndex') ?? 0) + 1);
     }
   } else {
-    // tslint:disable-next-line: no-dynamic-delete
     delete reacts[reaction.emoji];
   }
 
@@ -239,12 +235,11 @@ const handleClearReaction = async (conversationId: string, serverId: number, emo
     window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
-    return;
+    return undefined;
   }
 
   const reacts: ReactionList | undefined = originalMessage.get('reacts');
   if (reacts) {
-    // tslint:disable-next-line: no-dynamic-delete
     delete reacts[emoji];
   }
 
@@ -272,12 +267,12 @@ const handleOpenGroupMessageReactions = async (
     window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
-    return;
+    return undefined;
   }
 
   if (!originalMessage.get('isPublic')) {
     window.log.warn('handleOpenGroupMessageReactions() should only be used in opengroups');
-    return;
+    return undefined;
   }
 
   if (isEmpty(reactions)) {
@@ -307,6 +302,7 @@ const handleOpenGroupMessageReactions = async (
           if (conversationModel) {
             const me =
               conversationModel.getUsInThatConversation() || UserUtils.getOurPubKeyStrFromCache();
+            // eslint-disable-next-line no-param-reassign
             reactions[key].reactors = [me, ...reactorsWithoutMe];
           }
         }
@@ -325,7 +321,6 @@ const handleOpenGroupMessageReactions = async (
           you,
         };
       } else {
-        // tslint:disable-next-line: no-dynamic-delete
         delete reacts[key];
       }
     });
diff --git a/ts/util/readReceipts.ts b/ts/util/readReceipts.ts
index e730f907c..624413ba2 100644
--- a/ts/util/readReceipts.ts
+++ b/ts/util/readReceipts.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { MessageCollection } from '../models/message';
 
 import { Data } from '../data/data';
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 602f3b553..76f2e972d 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -15,6 +15,7 @@ export function resetFeatureReleasedCachedValue() {
   isUserConfigLibsessionFeatureReleased = undefined;
 }
 
+// eslint-disable-next-line consistent-return
 function getIsFeatureReleasedCached(featureName: FeatureNameTracked) {
   switch (featureName) {
     case 'disappearing_messages':
@@ -39,6 +40,7 @@ function setIsFeatureReleasedCached(featureName: FeatureNameTracked, value: bool
   }
 }
 
+// eslint-disable-next-line consistent-return
 function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
   switch (featureName) {
     case 'disappearing_messages':
diff --git a/ts/util/saveQRCode.ts b/ts/util/saveQRCode.ts
index 785a9f315..9e2c5a70c 100644
--- a/ts/util/saveQRCode.ts
+++ b/ts/util/saveQRCode.ts
@@ -9,7 +9,6 @@ export function saveQRCode(
 ): void {
   const qrSVG = document.querySelector('.qr-image svg');
   if (qrSVG) {
-    // tslint:disable-next-line: no-http-string
     qrSVG.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
     qrSVG.setAttribute('width', width);
     qrSVG.setAttribute('height', height);
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index 856f77f4d..ba229323c 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -1,8 +1,8 @@
+import { isBoolean } from 'lodash';
 import { Data } from '../data/data';
 import { SessionKeyPair } from '../receiver/keypairs';
 import { DEFAULT_RECENT_REACTS } from '../session/constants';
 import { deleteSettingsBoolValue, updateSettingsBoolValue } from '../state/ducks/settings';
-import { isBoolean } from 'lodash';
 import { ReleasedFeatures } from './releaseFeature';
 
 let ready = false;
@@ -50,7 +50,6 @@ async function remove(key: string) {
     window.log.warn('Called storage.get before storage is ready. key:', key);
   }
 
-  // tslint:disable-next-line: no-dynamic-delete
   delete items[key];
 
   window?.inboxStore?.dispatch(deleteSettingsBoolValue(key));
@@ -79,7 +78,6 @@ async function fetch() {
   reset();
   const array = await Data.getAllItems();
 
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let i = 0, max = array.length; i < max; i += 1) {
     const item = array[i];
     const { id } = item;
@@ -154,9 +152,8 @@ export function getRecentReactions(): Array<string> {
   const reactions = Storage.get('recent_reactions') as string;
   if (reactions) {
     return reactions.split(' ');
-  } else {
-    return DEFAULT_RECENT_REACTS;
   }
+  return DEFAULT_RECENT_REACTS;
 }
 
 export async function saveRecentReations(reactions: Array<string>) {
diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts
index 201ed703f..84f29845a 100644
--- a/ts/webworker/worker_interface.ts
+++ b/ts/webworker/worker_interface.ts
@@ -43,7 +43,7 @@ export class WorkerInterface {
       const { resolve, reject, fnName } = job;
 
       if (errorForDisplay) {
-        // tslint:disable: no-console
+        // eslint:disable: no-console
 
         window?.log?.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
         return reject(
@@ -118,7 +118,6 @@ export class WorkerInterface {
     if (this._DEBUG) {
       this._jobs[id].complete = true;
     } else {
-      // tslint:disable-next-line: no-dynamic-delete
       delete this._jobs[id];
     }
   }
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index fb2555e9a..419aba445 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -1,8 +1,6 @@
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
 import { join } from 'path';
-import { getAppRootPath } from '../../../node/getRootPath';
-import { WorkerInterface } from '../../worker_interface';
-import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
-
 import {
   BaseWrapperActionsCalls,
   ContactInfoSet,
@@ -13,6 +11,10 @@ import {
   UserGroupsWrapperActionsCalls,
 } from 'libsession_util_nodejs';
 
+import { getAppRootPath } from '../../../node/getRootPath';
+import { WorkerInterface } from '../../worker_interface';
+import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
+
 let libsessionWorkerInterface: WorkerInterface | undefined;
 
 const internalCallLibSessionWorker = async ([
diff --git a/ts/webworker/workers/browser/util_worker_interface.ts b/ts/webworker/workers/browser/util_worker_interface.ts
index 4a995ebe9..cafef5cd9 100644
--- a/ts/webworker/workers/browser/util_worker_interface.ts
+++ b/ts/webworker/workers/browser/util_worker_interface.ts
@@ -1,6 +1,6 @@
-import { WorkerInterface } from '../../worker_interface';
 import { join } from 'path';
 import { getAppRootPath } from '../../../node/getRootPath';
+import { WorkerInterface } from '../../worker_interface';
 
 let utilWorkerInterface: WorkerInterface | undefined;
 
diff --git a/ts/webworker/workers/index.ts b/ts/webworker/workers/index.ts
index 58bea990d..c5ce4c98a 100644
--- a/ts/webworker/workers/index.ts
+++ b/ts/webworker/workers/index.ts
@@ -1,3 +1,4 @@
 import * as utilWorkerInterface from './browser/util_worker_interface';
 import * as libSessionWorkerInterface from './browser/libsession_worker_interface';
+
 export { utilWorkerInterface, libSessionWorkerInterface };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index d86a070ae..75100a511 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,3 +1,5 @@
+/* eslint-disable consistent-return */
+/* eslint-disable no-case-declarations */
 import { isEmpty, isNull } from 'lodash';
 import {
   BaseConfigWrapperNode,
@@ -6,11 +8,11 @@ import {
   UserConfigWrapperNode,
   UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
-// tslint:disable: no-console
 
 /**
  *
@@ -117,8 +119,6 @@ function initUserWrapper(options: Array<any>, wrapperType: ConfigWrapperObjectTy
   }
 }
 
-// tslint:disable: function-name no-console
-
 onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
   const [jobId, config, action, ...args] = e.data;
 
diff --git a/ts/webworker/workers/node/util/util.worker.ts b/ts/webworker/workers/node/util/util.worker.ts
index f0ab356e9..8c3148c20 100644
--- a/ts/webworker/workers/node/util/util.worker.ts
+++ b/ts/webworker/workers/node/util/util.worker.ts
@@ -1,5 +1,6 @@
 import ByteBuffer from 'bytebuffer';
 import { generateKeyPair, sharedKey, verify } from 'curve25519-js';
+// eslint-disable-next-line import/no-named-default
 import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
 import _ from 'lodash';
 import {
@@ -28,8 +29,7 @@ const functions = {
   encryptAttachmentBufferNode,
   bytesFromString,
 };
-// tslint:disable: function-name
-//tslint-disable no-console
+
 onmessage = async (e: any) => {
   const [jobId, fnName, ...args] = e.data;
 
@@ -100,10 +100,11 @@ async function verifyAllSignatures(
 ) {
   const checked = [];
   // keep this out of a racing (i.e. no Promise.all) for easier debugging for now
-  // tslint:disable-next-line: prefer-for-of
+  // eslint-disable-next-line: prefer-for-of
   for (let index = 0; index < uncheckedSignatureMessages.length; index++) {
     const unchecked = uncheckedSignatureMessages[index];
     try {
+      // eslint-disable-next-line no-await-in-loop
       const valid = await verifySignature(
         unchecked.sender,
         unchecked.base64EncodedData,
@@ -113,7 +114,7 @@ async function verifyAllSignatures(
         checked.push(unchecked.base64EncodedData);
         continue;
       }
-      // tslint:disable: no-console
+      // eslint:disable: no-console
       console.info('got an opengroup message with an invalid signature');
     } catch (e) {
       console.error(e);
@@ -244,7 +245,6 @@ async function EncryptAESGCM(symmetricKey: ArrayBuffer, plaintext: ArrayBuffer)
     plaintext
   );
 
-  // tslint:disable-next-line: restrict-plus-operands
   const ivAndCiphertext = new Uint8Array(NONCE_LENGTH + ciphertext.byteLength);
 
   ivAndCiphertext.set(nonce);
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 2d467ccc3..143e45d96 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -1,12 +1,9 @@
+// eslint-disable-next-line import/no-unresolved
 import {} from 'styled-components/cssprop';
 
-import { LocalizerType } from '../ts/types/Util';
+import { LocalizerType } from './types/Util';
 
-import { Store } from '@reduxjs/toolkit';
-
-import { ConversationCollection, ConversationModel } from './models/conversation';
-import { ConversationType } from './state/ducks/conversations';
-import { StateType } from './state/reducer';
+import { ConversationCollection } from './models/conversation';
 import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors';
 
 export interface LibTextsecure {
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index b0d7b49f0..000000000
--- a/tslint.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["tslint:recommended", "tslint-react", "tslint-microsoft-contrib"],
-  "jsRules": {},
-  "rules": {
-    "use-simple-attributes": false,
-    "align": false,
-    "newline-per-chained-call": false,
-    "array-type": [true, "generic"],
-    "arrow-parens": [true, "ban-single-arg-parens"],
-    "import-spacing": false,
-    "indent": [true, "spaces", 2],
-    "interface-name": [true, "never-prefix"],
-    "jsx-no-multiline-js": false,
-    "jsx-no-lambda": false,
-    "react-this-binding-issue": false,
-    "linebreak-style": [true, "LF"],
-    "max-line-length": false,
-    "mocha-avoid-only": true,
-    "mocha-no-side-effect-code": false,
-    "mocha-unneeded-done": true,
-    "no-angle-bracket-type-assertion": true,
-    "no-consecutive-blank-lines": [true, 2],
-    "no-submodule-imports": false,
-    "object-literal-key-quotes": [true, "as-needed"],
-    "object-literal-sort-keys": false,
-    "no-async-without-await": true,
-    "no-empty-interface": false,
-    "prefer-for-of": false,
-    "chai-vague-errors": false,
-    "no-useless-files": false,
-    "ordered-imports": false,
-    "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"],
-    "semicolon": [true, "always", "ignore-bound-class-methods"],
-    "trailing-comma": [
-      true,
-      {
-        "singleline": "never",
-        "multiline": {
-          "objects": "always",
-          "arrays": "always",
-          "functions": "never",
-          "typeLiterals": "always"
-        },
-        "esSpecCompliant": true
-      }
-    ],
-    "variable-name": [true, "check-format", "allow-leading-underscore", "allow-pascal-case"],
-    "function-name": [
-      true,
-      {
-        "function-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "private-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "protected-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "static-method-regex": "^[a-zA-Z][\\w\\d]+$"
-      }
-    ],
-    "no-implicit-dependencies": [true, ["electron"]],
-    "completed-docs": false,
-    "export-name": false,
-    "no-any": false,
-    "no-increment-decrement": false,
-    "no-object-literal-type-assertion": false,
-    "no-relative-imports": false,
-    "no-unsafe-any": false,
-    "typedef": false,
-    "possible-timing-attack": false,
-    "no-null-keyword": false,
-    "import-name": false,
-    "missing-jsdoc": false,
-    "no-reserved-keywords": false,
-    "no-single-line-block-comment": false,
-    "no-use-before-declare": false,
-    "prefer-array-literal": false,
-    "prefer-method-signature": false,
-    "prefer-type-cast": false,
-    "strict-boolean-expressions": false,
-    "no-promise-as-boolean": true,
-    "await-promise": true,
-    "no-suspicious-comment": false,
-    "no-backbone-get-set-outside-model": false,
-    "underscore-consistent-invocation": false,
-    "newline-before-return": false,
-    "number-literal-format": false,
-    "no-unnecessary-local-variable": false,
-    "no-unnecessary-type-assertion": false,
-    "react-no-dangerous-html": [
-      true,
-      {
-        "file": "ts/components/session/SessionHTMLRenderer.tsx",
-        "method": "<unknown>",
-        "comment": "Usage has been approved by Maxim on 13 Dec 2019"
-      }
-    ],
-    "max-func-body-length": [true, 350]
-  },
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"]
-}
diff --git a/utils.worker.config.js b/utils.worker.config.js
index bb892369a..001dddb40 100644
--- a/utils.worker.config.js
+++ b/utils.worker.config.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const path = require('path');
 
 module.exports = {
diff --git a/yarn.lock b/yarn.lock
index f5aaaa9ed..746c9bcae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
   integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -535,34 +540,56 @@
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.1":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
+  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.15.0"
+    espree "^9.6.0"
+    globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.44.0":
+  version "8.44.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
+  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -671,6 +698,27 @@
     lodash "^4.17.15"
     tmp-promise "^3.0.2"
 
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
 "@npmcli/fs@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
@@ -1083,6 +1131,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/json-schema@^7.0.12":
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1303,6 +1356,11 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
   integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
 
+"@types/semver@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
 "@types/sinon@9.0.4":
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1"
@@ -1385,6 +1443,92 @@
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.1.0.tgz#96f3ca6615717659d06c9f7161a1d14ab0c49c66"
+  integrity sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/type-utils" "6.1.0"
+    "@typescript-eslint/utils" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/parser@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.1.0.tgz#3135bf65dca5340d8650703eb8cb83113e156ee5"
+  integrity sha512-hIzCPvX4vDs4qL07SYzyomamcs2/tQYXg5DtdAfj35AyJ5PIUqhsLf4YrEIFzZcND7R2E8tpQIZKayxg8/6Wbw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.1.0.tgz#a6cdbe11630614f8c04867858a42dd56590796ed"
+  integrity sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+
+"@typescript-eslint/type-utils@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.1.0.tgz#21cc6c3bc1980b03f9eb4e64580d0c5be6f08215"
+  integrity sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/utils" "6.1.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/types@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.1.0.tgz#2d607c62827bb416ada5c96ebfa2ef84e45a8dfa"
+  integrity sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==
+
+"@typescript-eslint/typescript-estree@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.1.0.tgz#ea382f6482ba698d7e993a88ce5391ea7a66c33d"
+  integrity sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.1.0.tgz#1641843792b4e3451cc692e2c73055df8b26f453"
+  integrity sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.1.0.tgz#d2b84dff6b58944d3257ea03687e269a788c73be"
+  integrity sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
@@ -1596,6 +1740,11 @@ acorn@^8.5.0, acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+
 add-dom-event-listener@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
@@ -1840,6 +1989,11 @@ array-includes@^3.1.6:
     get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -1860,6 +2014,17 @@ array.prototype.flatmap@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 arraybuffer.prototype.slice@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
@@ -2232,11 +2397,6 @@ builder-util@23.6.0:
     stat-mode "^1.0.0"
     temp-file "^3.4.0"
 
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==
-
 bunyan@^1.8.15:
   version "1.8.15"
   resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46"
@@ -2375,7 +2535,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2606,7 +2766,7 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.12.1, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3010,11 +3170,6 @@ diff@5.0.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 diff@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -3030,6 +3185,13 @@ dir-compare@^2.4.0:
     commander "2.9.0"
     minimatch "3.0.4"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 dmg-builder@23.0.8:
   version "23.0.8"
   resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800"
@@ -3651,6 +3813,32 @@ eslint-plugin-more@^1.0.5:
   resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f"
   integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w==
 
+eslint-plugin-react-hooks@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+
+eslint-plugin-react@^7.33.0:
+  version "7.33.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz#6c356fb0862fec2cd1b04426c669ea746e9b6eb3"
+  integrity sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
+    doctrine "^2.1.0"
+    estraverse "^5.3.0"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.8"
+
 eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -3659,10 +3847,10 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd"
+  integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -3684,65 +3872,72 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.15.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
-  integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
+eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@^8.45.0:
+  version "8.45.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
+  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
   dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.9.2"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.1.0"
+    "@eslint/js" "8.44.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.2"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.6.0"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
+espree@^9.6.0:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.7.1"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -3758,7 +3953,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -3826,6 +4021,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.2.9:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
+  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3851,6 +4057,13 @@ fastest-stable-stringify@^2.0.2:
   resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
   integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==
 
+fastq@^1.6.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  dependencies:
+    reusify "^1.0.4"
+
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -3911,7 +4124,7 @@ find-cache-dir@^3.2.0:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@5.0.0:
+find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
@@ -4079,11 +4292,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -4162,7 +4370,7 @@ getobject@^1.0.0:
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45"
   integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg==
 
-glob-parent@^6.0.1, glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -4209,7 +4417,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4256,10 +4464,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
-  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -4270,6 +4478,18 @@ globalthis@^1.0.1, globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4304,6 +4524,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4490,6 +4715,11 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+ignore@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
 image-type@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/image-type/-/image-type-4.1.0.tgz#72a88d64ff5021371ed67b9a466442100be57cd1"
@@ -4507,7 +4737,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
   integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -4680,7 +4910,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0:
+is-core-module@^2.11.0, is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -4763,7 +4993,7 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-inside@^3.0.2:
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -5150,6 +5380,16 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9"
+  integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
+
 just-extend@^4.0.2:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
@@ -5449,6 +5689,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 mic-recorder-to-mp3@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/mic-recorder-to-mp3/-/mic-recorder-to-mp3-2.2.2.tgz#32e767d1196fb81d10e279f31c304350c9501d01"
@@ -5569,18 +5814,18 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mocha@10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9"
@@ -5672,6 +5917,11 @@ nanoid@^3.3.4:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5886,6 +6136,32 @@ object.entries@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
+  dependencies:
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 object.values@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
@@ -5938,17 +6214,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-homedir@1.0.2:
   version "1.0.2"
@@ -6423,6 +6699,11 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 queue-promise@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/queue-promise/-/queue-promise-2.2.1.tgz#8de03fb79ba458efcb5ebf76368ab029d2669752"
@@ -6802,11 +7083,6 @@ regexp.prototype.flags@^1.5.0:
     define-properties "^1.2.0"
     functions-have-names "^1.2.3"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 registry-auth-token@^4.0.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac"
@@ -6875,7 +7151,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0, resolve@^1.3.2:
+resolve@^1.20.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6893,6 +7169,15 @@ resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^2.0.0-next.4:
+  version "2.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
+  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -6910,6 +7195,11 @@ retry@^0.13.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rimraf@2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -6957,6 +7247,13 @@ rtl-css-js@^1.14.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
 run-script-os@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347"
@@ -7098,7 +7395,7 @@ semver@5.4.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
-semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7108,12 +7405,12 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^6.2.0:
+semver@^6.2.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2:
+semver@^7.3.2, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -7391,6 +7688,20 @@ stat-mode@^1.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+
 string.prototype.trim@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
@@ -7472,7 +7783,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -7700,6 +8011,11 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
+ts-api-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.1.tgz#8144e811d44c749cd65b2da305a032510774452d"
+  integrity sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==
+
 ts-easing@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
@@ -7730,63 +8046,11 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.0, tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslint-microsoft-contrib@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.0.0.tgz#7bff73c9ad7a0b7eb5cdb04906de58f42a2bf7a2"
-  integrity sha512-R//efwn+34IUjTJeYgNDAJdzG0jyLWIehygPt/PHuZAieTolFVS56FgeFW7DOLap9ghXzMiFPTmDgm54qaL7QA==
-  dependencies:
-    tsutils "^2.27.2 <2.29.0"
-
-tslint-react@3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1"
-  integrity sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==
-  dependencies:
-    tsutils "^2.13.1"
-
-tslint@5.19.0:
-  version "5.19.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.19.0.tgz#a2cbd4a7699386da823f6b499b8394d6c47bb968"
-  integrity sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
-tsutils@^2.13.1, tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
-"tsutils@^2.27.2 <2.29.0":
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
-  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7867,10 +8131,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.6.3:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+typescript@^5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
 uc.micro@^1.0.1:
   version "1.0.6"
@@ -7993,11 +8257,6 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 verror@^1.10.0:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
@@ -8204,7 +8463,7 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

From feaba36fa43acd027d909b1c0ae82f465a3b4654 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 26 Jul 2023 14:06:11 +0200
Subject: [PATCH 172/178] fix: picker emoji-mart errors after update

---
 .eslintrc.js                                  |  2 +-
 package.json                                  |  7 +-
 .../conversation/SessionEmojiPanel.tsx        |  7 +-
 .../leftpane/overlay/OverlayCommunity.tsx     |  2 +-
 ts/node/sql.ts                                |  6 +-
 .../sogsv3/sogsV3SendReaction.ts              | 10 +--
 ts/test/util/blockedNumberController_test.ts  |  2 +-
 ts/types/Reaction.ts                          | 67 +------------------
 ts/util/emoji.ts                              |  6 +-
 yarn.lock                                     | 31 ++++-----
 10 files changed, 34 insertions(+), 106 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 27afc3b43..6b9ace6d5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -118,7 +118,7 @@ module.exports = {
     },
     {
       files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
-      rules: { 'no-console': 'off' },
+      rules: { 'no-console': 'off', 'import/no-extraneous-dependencies': 'off' },
     },
   ],
 };
diff --git a/package.json b/package.json
index 40cae5167..c6a941cb8 100644
--- a/package.json
+++ b/package.json
@@ -71,8 +71,8 @@
     "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js"
   },
   "dependencies": {
-    "@emoji-mart/data": "^1.0.6",
-    "@emoji-mart/react": "^1.0.1",
+    "@emoji-mart/data": "^1.1.2",
+    "@emoji-mart/react": "^1.1.1",
     "@reduxjs/toolkit": "1.8.5",
     "@signalapp/better-sqlite3": "^8.4.3",
     "@types/react-mentions": "^4.1.8",
@@ -93,7 +93,7 @@
     "dompurify": "^2.0.7",
     "electron-localshortcut": "^3.2.1",
     "electron-updater": "^4.2.2",
-    "emoji-mart": "^5.2.2",
+    "emoji-mart": "^5.5.2",
     "filesize": "3.6.1",
     "firstline": "1.2.1",
     "fs-extra": "9.0.0",
@@ -154,7 +154,6 @@
     "@types/config": "0.0.34",
     "@types/dompurify": "^2.0.0",
     "@types/electron-localshortcut": "^3.1.0",
-    "@types/emoji-mart": "3.0.9",
     "@types/filesize": "3.6.0",
     "@types/firstline": "^2.0.2",
     "@types/fs-extra": "5.0.5",
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 11d0ac9e9..c71af3d87 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -1,10 +1,10 @@
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 import styled from 'styled-components';
-import Picker from '@emoji-mart/react';
 import { useSelector } from 'react-redux';
+import Picker from '@emoji-mart/react';
+
 import { getTheme, isDarkTheme } from '../../state/selectors/theme';
-import { FixedBaseEmoji, FixedPickerProps } from '../../types/Reaction';
 import {
   COLORS,
   ColorsType,
@@ -16,6 +16,7 @@ import {
 import { hexColorToRGB } from '../../util/hexColorToRGB';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
 import { i18nEmojiData } from '../../util/emoji';
+import { FixedBaseEmoji } from '../../types/Reaction';
 
 export const StyledEmojiPanel = styled.div<{
   isModal: boolean;
@@ -90,7 +91,7 @@ type Props = {
   onKeyDown?: (event: any) => void;
 };
 
-const pickerProps: FixedPickerProps = {
+const pickerProps = {
   title: '',
   showPreview: true,
   autoFocus: true,
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index 093941506..f64d1b3fe 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -102,7 +102,7 @@ export const OverlayCommunity = () => {
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
 
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={() => void onTryJoinRoom()} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={url => void onTryJoinRoom(url)} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index c94186f3b..493339044 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -637,13 +637,13 @@ function getPubkeysInPublicConversation(conversationId: string) {
       conversation.capabilities?.includes('blind')
   );
 
-  const whereClause = hasBlindOn ? 'AND source LIKE "15%"' : '';
+  const whereClause = hasBlindOn ? "AND source LIKE '15%'" : ''; // the LIKE content has to be ' and not "
 
   const rows = assertGlobalInstance()
     .prepare(
       `SELECT DISTINCT source FROM ${MESSAGES_TABLE} WHERE
-      conversationId = $conversationId ${whereClause}
-     ORDER BY received_at DESC LIMIT ${MAX_PUBKEYS_MEMBERS};`
+    conversationId = $conversationId ${whereClause}
+   ORDER BY received_at DESC LIMIT ${MAX_PUBKEYS_MEMBERS};`
     )
     .all({
       conversationId,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
index b85f2e88a..e5628febd 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
@@ -2,12 +2,7 @@ import { AbortSignal } from 'abort-controller';
 import { getEmojiDataFromNative } from 'emoji-mart';
 import { Data } from '../../../../data/data';
 import { ConversationModel } from '../../../../models/conversation';
-import {
-  Action,
-  FixedBaseEmoji,
-  OpenGroupReactionResponse,
-  Reaction,
-} from '../../../../types/Reaction';
+import { Action, OpenGroupReactionResponse, Reaction } from '../../../../types/Reaction';
 import { Reactions } from '../../../../util/reactions';
 import { OnionSending } from '../../../onions/onionSend';
 import { ToastUtils, UserUtils } from '../../../utils';
@@ -74,7 +69,8 @@ export const sendSogsReactionOnionV4 = async (
   // The SOGS endpoint supports any text input so we need to make sure we are sending a valid unicode emoji
   // for an invalid input we use https://emojipedia.org/frame-with-an-x/ as a replacement since it cannot rendered as an emoji but is valid unicode
   // NOTE emoji-mart v5.2.2 types for getEmojiDataFromNative are broken
-  const emoji = (getEmojiDataFromNative(reaction.emoji) as FixedBaseEmoji) ? reaction.emoji : '🖾';
+  // eslint-disable-next-line @typescript-eslint/await-thenable
+  const emoji = (await getEmojiDataFromNative(reaction.emoji)) ? reaction.emoji : '🖾';
   const endpoint = `/room/${room}/reaction/${reaction.id}/${emoji}`;
   const method = reaction.action === Action.REACT ? 'PUT' : 'DELETE';
   const serverPubkey = allValidRoomInfos[0].serverPublicKey;
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index fca76b8ae..904a3d3a9 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -71,7 +71,7 @@ describe('BlockedNumberController', () => {
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
       expect(blockedNumbers.length).to.be.eq(0);
-      expect(Object.keys(memoryDB.blocked)).to.be.be.eq(0);
+      expect(Object.keys(memoryDB.blocked).length).to.be.be.eq(0);
     });
 
     it('should only unblock if a device was blocked', async () => {
diff --git a/ts/types/Reaction.ts b/ts/types/Reaction.ts
index f2ab687e2..4e0c7a465 100644
--- a/ts/types/Reaction.ts
+++ b/ts/types/Reaction.ts
@@ -1,4 +1,4 @@
-import { EmojiSet, PartialI18n } from 'emoji-mart';
+import { Emoji, EmojiMartData } from '@emoji-mart/data';
 
 export const reactionLimit: number = 6;
 
@@ -30,14 +30,7 @@ export class RecentReactions {
   }
 }
 
-type BaseEmojiSkin = { unified: string; native: string };
-
-export interface FixedBaseEmoji {
-  id: string;
-  name: string;
-  keywords: Array<string>;
-  skins: Array<BaseEmojiSkin>;
-  version: number;
+export interface FixedBaseEmoji extends Emoji {
   search?: string;
   // props from emoji panel click event
   native?: string;
@@ -46,64 +39,10 @@ export interface FixedBaseEmoji {
   unified?: string;
 }
 
-export interface NativeEmojiData {
-  categories: Array<{ id: string; emojis: Array<string> }>;
-  emojis: Record<string, FixedBaseEmoji>;
-  aliases: Record<string, string>;
-  sheet: { cols: number; rows: number };
+export interface NativeEmojiData extends EmojiMartData {
   ariaLabels?: Record<string, string>;
 }
 
-// Types for EmojiMart 5 are currently broken these are a temporary fixes
-export interface FixedPickerProps {
-  autoFocus?: boolean | undefined;
-  title?: string | undefined;
-  theme?: 'auto' | 'light' | 'dark' | undefined;
-  perLine?: number | undefined;
-  stickySearch?: boolean | undefined;
-  searchPosition?: 'sticky' | 'static' | 'none' | undefined;
-  emojiButtonSize?: number | undefined;
-  emojiButtonRadius?: number | undefined;
-  emojiButtonColors?: string | undefined;
-  maxFrequentRows?: number | undefined;
-  icons?: 'auto' | 'outline' | 'solid';
-  set?: EmojiSet | undefined;
-  emoji?: string | undefined;
-  navPosition?: 'bottom' | 'top' | 'none' | undefined;
-  showPreview?: boolean | undefined;
-  previewEmoji?: boolean | undefined;
-  noResultsEmoji?: string | undefined;
-  previewPosition?: 'bottom' | 'top' | 'none' | undefined;
-  skinTonePosition?: 'preview' | 'search' | 'none';
-  i18n?: PartialI18n | undefined;
-  onEmojiSelect?: (emoji: FixedBaseEmoji) => void;
-  onClickOutside?: () => void;
-  onKeyDown?: (event: any) => void;
-  onAddCustomEmoji?: () => void;
-  getImageURL?: () => void;
-  getSpritesheetURL?: () => void;
-  // Below here I'm currently unsure of usage
-  // style?: React.CSSProperties | undefined;
-  // color?: string | undefined;
-  // skin?: EmojiSkin | undefined;
-  // defaultSkin?: EmojiSkin | undefined;
-  // backgroundImageFn?: BackgroundImageFn | undefined;
-  // sheetSize?: EmojiSheetSize | undefined;
-  // emojisToShowFilter?(emoji: EmojiData): boolean;
-  // showSkinTones?: boolean | undefined;
-  // emojiTooltip?: boolean | undefined;
-  // include?: CategoryName[] | undefined;
-  // exclude?: CategoryName[] | undefined;
-  // recent?: string[] | undefined;
-  // /** NOTE: custom emoji are copied into a singleton object on every new mount */
-  // custom?: CustomEmoji[] | undefined;
-  // skinEmoji?: string | undefined;
-  // notFound?(): React.Component;
-  // notFoundEmoji?: string | undefined;
-  // enableFrequentEmojiSort?: boolean | undefined;
-  // useButton?: boolean | undefined;
-}
-
 export enum Action {
   REACT = 0,
   REMOVE = 1,
diff --git a/ts/util/emoji.ts b/ts/util/emoji.ts
index 7892f2583..209498b5f 100644
--- a/ts/util/emoji.ts
+++ b/ts/util/emoji.ts
@@ -2,7 +2,7 @@
 /* eslint-disable no-continue */
 /* eslint-disable no-param-reassign */
 /* eslint-disable import/no-mutable-exports  */
-import { PartialI18n, init } from 'emoji-mart';
+import { init, I18n } from 'emoji-mart';
 import { FixedBaseEmoji, NativeEmojiData } from '../types/Reaction';
 import { loadEmojiPanelI18n } from './i18n';
 
@@ -47,7 +47,7 @@ export function getEmojiSizeClass(str: string): SizeClassType {
 }
 
 export let nativeEmojiData: NativeEmojiData | null = null;
-export let i18nEmojiData: PartialI18n | null = null;
+export let i18nEmojiData: typeof I18n | null = null;
 
 export async function initialiseEmojiData(data: any): Promise<void> {
   const ariaLabels: Record<string, string> = {};
@@ -85,7 +85,7 @@ export async function initialiseEmojiData(data: any): Promise<void> {
   i18nEmojiData = await loadEmojiPanelI18n();
   // Data needs to be initialised once per page load for the emoji components
   // See https://github.com/missive/emoji-mart#%EF%B8%8F%EF%B8%8F-headless-search
-  init({ data, i18n: i18nEmojiData });
+  await init({ data, i18n: i18nEmojiData });
 }
 
 // Synchronous version of Emoji Mart's SearchIndex.search()
diff --git a/yarn.lock b/yarn.lock
index 746c9bcae..f9a86d35a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -508,15 +508,15 @@
     minimatch "^3.0.4"
     plist "^3.0.4"
 
-"@emoji-mart/data@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.6.tgz#68f71be5e023653a3f9f73f4beadfd50848e2131"
-  integrity sha512-8wu3ec/kLCB0Y3K+pOKyY6Ob+xtQu3XhZvntdrpOTUQZ/PO6FW5PpFw7RE1kQ/up1fsVSJBl5mZ8Gs4SPwTYeg==
+"@emoji-mart/data@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513"
+  integrity sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg==
 
-"@emoji-mart/react@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.0.1.tgz#46b6a2e92faf16fa9b7f9471f137fa2e3d1e8ac3"
-  integrity sha512-ALhLD96BOL5w+a4NI5NpmfqfF1aVjjj2qJE0dLst/OhjBfVmpteWNgn/h8LZy9ulU6AnbeS+13KnPFzDjCvRRw==
+"@emoji-mart/react@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a"
+  integrity sha512-NMlFNeWgv1//uPsvLxvGQoIerPuVdXwK/EUek8OOkJ6wVOWPUizRBJU0hDqWZCOROVpfBgCemaC3m6jDOXi03g==
 
 "@emotion/is-prop-valid@^0.8.8":
   version "0.8.8"
@@ -1010,13 +1010,6 @@
   dependencies:
     electron "*"
 
-"@types/emoji-mart@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/@types/emoji-mart/-/emoji-mart-3.0.9.tgz#2f7ef5d9ec194f28029c46c81a5fc1e5b0efa73c"
-  integrity sha512-qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
@@ -3403,10 +3396,10 @@ electron@*, electron@25.3.0:
     "@types/node" "^18.11.18"
     extract-zip "^2.0.1"
 
-emoji-mart@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.2.2.tgz#1c093ffc19554dd6edfcfeec9aca43ff38bcc16e"
-  integrity sha512-BvcrX+Ps9MxSVEjnvxupclU3MBD6WVC4WZOY26csfC6oFdaWpFhdrzeVNVBmCLPOmzY1SE0aAsqZJRNVbZ1yhQ==
+emoji-mart@^5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af"
+  integrity sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A==
 
 emoji-regex@^8.0.0:
   version "8.0.0"

From fe2d5ffe6df4bc4bf4fc1b92148468f425aa95d9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 1 Aug 2023 07:04:40 +0200
Subject: [PATCH 173/178] test: fix remaining integration tests

"Check profile picture syncs" is not fixed yet as it need to be fully
updated and not just fixed (not done as part of this eslint-related PR)
---
 ts/test/automation/linked_device_user.spec.ts |  6 ++--
 ts/test/automation/setup/new_user.ts          | 13 ++++----
 ts/test/automation/utilities/leave_group.ts   |  2 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   | 30 +++++++++----------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index c8af5e0df..5ccec8f8c 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -83,10 +83,10 @@ test('Check profile picture syncs', async () => {
 
   await waitForTestIdWithText(windowA, 'copy-button-profile-update', 'Copy');
   await clickOnTestIdWithText(windowA, 'modal-close-button');
-
-  await sleepFor(500);
+  // TODO this test should retry a few times for the avatar to match
+  await sleepFor(500, true);
   const leftpaneAvatarContainer = await waitForTestIdWithText(windowB, 'leftpane-primary-avatar');
-  await sleepFor(500);
+  await sleepFor(500, true);
   const screenshot = await leftpaneAvatarContainer.screenshot({
     type: 'jpeg',
     // path: 'avatar-updated-blue',
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 113909289..99816bf34 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -1,15 +1,10 @@
 import { Page } from '@playwright/test';
 import { User } from '../types/testing';
-import { clickOnMatchingText, typeIntoInput } from '../utilities/utils';
-import { sleepFor } from '../../../session/utils/Promise';
+import { clickOnMatchingText, clickOnTestIdWithText, typeIntoInput } from '../utilities/utils';
 
 export const newUser = async (window: Page, userName: string): Promise<User> => {
   // Create User
   await clickOnMatchingText(window, 'Create Session ID');
-  // Wait for animation for finish creating ID
-  await sleepFor(2500);
-  // Save session ID to a variable
-  const sessionid = await window.inputValue('[data-testid=session-id-signup]');
   await clickOnMatchingText(window, 'Continue');
   // Input username = testuser
   await typeIntoInput(window, 'display-name-input', userName);
@@ -17,6 +12,12 @@ export const newUser = async (window: Page, userName: string): Promise<User> =>
   // save recovery phrase
   await clickOnMatchingText(window, 'Reveal Recovery Phrase');
   const recoveryPhrase = await window.innerText('[data-testid=recovery-phrase-seed-modal]');
+  await window.click('.session-icon-button.small');
+
+  await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
+
+  // Save session ID to a variable
+  const sessionid = await window.innerText('[data-testid=your-session-id]');
 
   console.info(`${userName}: Session ID: ${sessionid} and Recovery phrase: ${recoveryPhrase}`);
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/utilities/leave_group.ts b/ts/test/automation/utilities/leave_group.ts
index 84cd0b259..3318755c5 100644
--- a/ts/test/automation/utilities/leave_group.ts
+++ b/ts/test/automation/utilities/leave_group.ts
@@ -1,4 +1,4 @@
-import {  Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnMatchingText, clickOnTestIdWithText, waitForTestIdWithText } from './utils';
 
 export const leaveGroup = async (window: Page) => {
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 4af38c1fb..5f904582b 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -202,7 +202,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -214,7 +214,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     describe('legacy group', () => {
@@ -231,7 +231,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -257,7 +257,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         getItemByIdStub.restore();
         getItemByIdStub = TestUtils.stubData('getItemById');
@@ -283,9 +283,9 @@ describe('SwarmPolling', () => {
         await swarmPolling.pollForAllKeys();
 
         expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       it('does run twice if activeAt less than one hour ', async () => {
@@ -302,7 +302,7 @@ describe('SwarmPolling', () => {
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         pollOnceForKeySpy.resetHistory();
         clock.tick(9000);
@@ -317,7 +317,7 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
 
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -347,9 +347,9 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
         // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -374,7 +374,7 @@ describe('SwarmPolling', () => {
         // we should have only one more call here, the one for our direct pubkey fetch
         expect(pollOnceForKeySpy.callCount).to.eq(3);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       describe('multiple runs', () => {
@@ -416,10 +416,10 @@ describe('SwarmPolling', () => {
           // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
           expect(pollOnceForKeySpy.callCount).to.eq(4);
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
 
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
 
@@ -440,9 +440,9 @@ describe('SwarmPolling', () => {
           expect(pollOnceForKeySpy.callCount).to.eq(4);
 
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
       });

From 9e21d6e0ac1daaecfbd89db7e05d89196a9eafb3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 1 Aug 2023 12:05:39 +0200
Subject: [PATCH 174/178] chore: remove unused dependencies

---
 package.json |   28 +-
 yarn.lock    | 1606 +++++++-------------------------------------------
 2 files changed, 209 insertions(+), 1425 deletions(-)

diff --git a/package.json b/package.json
index c6a941cb8..c259527ba 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
     "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
     "build:workers": "yarn worker:utils && yarn worker:libsession",
-    "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
+    "watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn build-everything:watch",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
@@ -47,10 +47,8 @@
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .",
-
     "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots",
     "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
-    "coverage": "nyc --reporter=html mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
     "build-release:win32": "yarn build-release-non-linux",
@@ -80,13 +78,11 @@
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
     "blob-util": "2.0.2",
-    "blueimp-canvas-to-blob": "^3.29.0",
     "blueimp-load-image": "5.14.0",
     "buffer-crc32": "0.2.13",
     "bunyan": "^1.8.15",
     "bytebuffer": "^5.0.1",
     "classnames": "2.2.5",
-    "color": "^3.1.2",
     "config": "1.28.1",
     "country-code-lookup": "^0.0.19",
     "curve25519-js": "https://github.com/oxen-io/curve25519-js",
@@ -107,13 +103,11 @@
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
-    "mustache": "2.3.0",
     "node-fetch": "^2.6.7",
     "os-locale": "5.0.0",
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
     "protobufjs": "^6.11.2",
-    "queue-promise": "^2.2.1",
     "rc-slider": "^8.7.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
@@ -122,7 +116,6 @@
     "react-h5-audio-player": "^3.2.0",
     "react-intersection-observer": "^8.30.3",
     "react-mentions": "^4.4.9",
-    "react-portal": "^4.2.0",
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
     "react-toastify": "^6.0.9",
@@ -150,7 +143,6 @@
     "@types/chai": "4.2.18",
     "@types/chai-as-promised": "^7.1.2",
     "@types/classnames": "2.2.3",
-    "@types/color": "^3.0.0",
     "@types/config": "0.0.34",
     "@types/dompurify": "^2.0.0",
     "@types/electron-localshortcut": "^3.1.0",
@@ -161,14 +153,11 @@
     "@types/linkify-it": "^3.0.2",
     "@types/lodash": "^4.14.194",
     "@types/mocha": "5.0.0",
-    "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",
     "@types/pify": "3.0.2",
     "@types/rc-slider": "^8.6.5",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
-    "@types/react-mic": "^12.4.1",
-    "@types/react-portal": "^4.0.2",
     "@types/react-redux": "^7.1.24",
     "@types/react-virtualized": "9.18.12",
     "@types/redux-logger": "3.0.7",
@@ -180,18 +169,14 @@
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
     "asar": "3.1.0",
-    "buffer": "^6.0.3",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
-    "cmake-js": "^7.2.1",
-    "concurrently": "^7.4.0",
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
     "dmg-builder": "23.6.0",
     "electron": "25.3.0",
     "electron-builder": "23.0.8",
-    "esbuild": "^0.14.29",
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
@@ -201,30 +186,23 @@
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "events": "^3.3.0",
-    "jsdom": "^19.0.0",
+    "jsdom": "^22.1.0",
     "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "^2.7.5",
     "mocha": "10.0.0",
-    "nan": "^2.17.0",
-    "node-gyp": "9.0.0",
     "node-loader": "^2.0.0",
-    "nyc": "^15.1.0",
     "patch-package": "^6.4.7",
     "playwright": "1.16.3",
-    "postcss-loader": "^7.0.2",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
-    "process": "^0.11.10",
     "run-script-os": "^1.1.6",
     "sass": "^1.60.0",
     "sass-loader": "^13.2.2",
     "sinon": "9.0.2",
-    "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
-    "ts-mock-imports": "^1.3.0",
     "typescript": "^5.1.6",
     "webpack": "^5.76.3",
-    "webpack-cli": "^5.0.1"
+    "webpack-cli": "^5.1.4"
   },
   "engines": {
     "node": "18.15.0"
diff --git a/yarn.lock b/yarn.lock
index f9a86d35a..9718a312a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,7 +20,7 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -32,7 +32,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
   integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
 
-"@babel/core@^7.14.8", "@babel/core@^7.7.5":
+"@babel/core@^7.14.8":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
   integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
@@ -411,14 +411,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
-  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.3.4":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
   integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
@@ -572,11 +565,6 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
   integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
@@ -606,22 +594,6 @@
   resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.1.tgz#d18da31cec58c1aa8fdf4def451cc7e3196d88de"
   integrity sha512-yKzixjC9ct9RC/aSGo1OGxkG2rpfhlr/urRz6k2YZlIBzn92PBTlqtSx8o8dFYEorr3eUFSCBZFzBy1yw5jsAA==
 
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
 "@jest/types@^27.2.5", "@jest/types@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
@@ -719,22 +691,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
-  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
-  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@playwright/test@1.16.3":
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.16.3.tgz#99439d07af6a355586393b463fd88315f32d2a57"
@@ -965,25 +921,6 @@
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
   integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA==
 
-"@types/color-convert@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
-  integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-name@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
-"@types/color@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.3.tgz#e6d8d72b7aaef4bb9fe80847c26c7c786191016d"
-  integrity sha512-X//qzJ3d3Zj82J9sC/C18ZY5f43utPbAJ6PhYt/M7uG6etcF6MRpKdN880KBy43B0BMzSfeT96MzrsNjFI3GbA==
-  dependencies:
-    "@types/color-convert" "*"
-
 "@types/config@0.0.34":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0"
@@ -1119,12 +1056,7 @@
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
   integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-schema@^7.0.12":
+"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.12"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ -1183,11 +1115,6 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/mustache@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-4.1.2.tgz#d0e158013c81674a5b6d8780bc3fe234e1804eaf"
-  integrity sha512-c4OVMMcyodKQ9dpwBwh3ofK9P6U9ZktKU9S+p33UqwMNN1vlv2P0zJZUScTshnx7OEoIIRcCFNQ904sYxZz8kg==
-
 "@types/node-fetch@^2.5.7":
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
@@ -1196,21 +1123,11 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "17.0.35"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
-  integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
-
-"@types/node@^18.11.18":
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^18.11.18":
   version "18.16.19"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
   integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
 "@types/pify@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39"
@@ -1258,20 +1175,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-mic@^12.4.1":
-  version "12.4.3"
-  resolved "https://registry.yarnpkg.com/@types/react-mic/-/react-mic-12.4.3.tgz#d6e0f318a7ff930c57060b988fcd8e541d713be5"
-  integrity sha512-PCp+Phe0WcFRPhDQjOfiONz2OJSef+ds+8g7vN/xqRntcfGKPCyr4ZaiICaNJ+8uZcoUaw7F1E15AEUOjRW4IQ==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-portal@^4.0.2":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-portal/-/react-portal-4.0.4.tgz#1c0e5a248f6e18a66f981139c13b6e796f4a92b6"
-  integrity sha512-ecVWngYHeSymq5XdrQOXRpIb9ay5SM4Stm/ur6+wc0Z+r05gafZ5SuMRbXKYsj4exNJa+4CTKK6J7qcTKm9K5g==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-redux@^7.1.24":
   version "7.1.24"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
@@ -1290,15 +1193,7 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
-"@types/react@^17.0.2":
+"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
   version "17.0.45"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f"
   integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==
@@ -1307,6 +1202,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
 "@types/redux-logger@3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
@@ -1344,12 +1247,7 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
   integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
-"@types/semver@^7.3.6":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
-  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
-
-"@types/semver@^7.5.0":
+"@types/semver@^7.3.6", "@types/semver@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
   integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
@@ -1648,20 +1546,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
-  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
+"@webpack-cli/configtest@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
+  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
 
-"@webpack-cli/info@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
-  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
+"@webpack-cli/info@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
+  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
 
-"@webpack-cli/serve@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
-  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
+"@webpack-cli/serve@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
+  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
@@ -1683,16 +1581,11 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-abab@^2.0.5, abab@^2.0.6:
+abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 abort-controller@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -1700,14 +1593,6 @@ abort-controller@3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
@@ -1718,22 +1603,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.5.0, acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
-acorn@^8.9.0:
+acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -1752,23 +1622,6 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
-  dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -1926,23 +1779,11 @@ app-builder-lib@23.6.0:
     tar "^6.1.11"
     temp-file "^3.4.0"
 
-append-transform@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
-  integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==
-  dependencies:
-    default-require-extensions "^3.0.0"
-
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
-
 are-we-there-yet@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
@@ -1951,13 +1792,6 @@ are-we-there-yet@^3.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2207,11 +2041,6 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blueimp-canvas-to-blob@^3.29.0:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz#d965f06cb1a67fdae207a2be56683f55ef531466"
-  integrity sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==
-
 blueimp-load-image@5.14.0:
   version "5.14.0"
   resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6"
@@ -2251,11 +2080,6 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -2312,14 +2136,6 @@ buffer@^5.1.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 builder-util-runtime@8.9.2:
   version "8.9.2"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
@@ -2407,30 +2223,6 @@ bytebuffer@^5.0.1:
   dependencies:
     long "~3"
 
-cacache@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.0.tgz#87a6bae558a511c9cb2a13768073e240ca76153a"
-  integrity sha512-Pk4aQkwCW82A4jGKFvcGkQFqZcMspfP9YWq9Pr87/ldDvlWf718zeI6KWCdKt/jeihu6BytHRUicJPB1K2k8EQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 cacheable-lookup@^5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
@@ -2449,16 +2241,6 @@ cacheable-request@^7.0.2:
     normalize-url "^6.0.1"
     responselike "^2.0.0"
 
-caching-transform@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-4.0.0.tgz#00d297a4206d71e2163c39eaffa8157ac0651f0f"
-  integrity sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==
-  dependencies:
-    hasha "^5.0.0"
-    make-dir "^3.0.0"
-    package-hash "^4.0.0"
-    write-file-atomic "^3.0.0"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2472,11 +2254,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 camelcase@^6.0.0, camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
@@ -2600,11 +2377,6 @@ classnames@^2.2.5, classnames@^2.2.6:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
@@ -2618,15 +2390,6 @@ cli-truncate@^2.1.0:
     slice-ansi "^3.0.0"
     string-width "^4.2.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -2685,7 +2448,7 @@ cmake-js@^7.2.1:
     which "^2.0.2"
     yargs "^17.6.0"
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2704,36 +2467,20 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^3.1.2:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
-  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
-  dependencies:
-    color-convert "^1.9.3"
-    color-string "^1.6.0"
-
 colorette@^2.0.14:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 colors@1.0.3:
   version "1.0.3"
@@ -2759,6 +2506,11 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2774,16 +2526,6 @@ commander@^8.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commander@^9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
-  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
@@ -2814,21 +2556,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concurrently@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368"
-  integrity sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA==
-  dependencies:
-    chalk "^4.1.0"
-    date-fns "^2.29.1"
-    lodash "^4.17.21"
-    rxjs "^7.0.0"
-    shell-quote "^1.7.3"
-    spawn-command "^0.0.2-1"
-    supports-color "^8.1.0"
-    tree-kill "^1.2.2"
-    yargs "^17.3.1"
-
 config@1.28.1:
   version "1.28.1"
   resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d"
@@ -2883,17 +2610,6 @@ core-util-is@1.0.2:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
 country-code-lookup@^0.0.19:
   version "0.0.19"
   resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6"
@@ -2995,22 +2711,12 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
-  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
+  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
   dependencies:
-    cssom "~0.3.6"
+    rrweb-cssom "^0.6.0"
 
 csstype@^3.0.2, csstype@^3.0.6:
   version "3.1.0"
@@ -3021,19 +2727,14 @@ csstype@^3.0.2, csstype@^3.0.6:
   version "0.0.4"
   resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
 
-data-urls@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
-  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+data-urls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
+  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
   dependencies:
     abab "^2.0.6"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
-
-date-fns@^2.29.1:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+    whatwg-url "^12.0.0"
 
 debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
@@ -3056,20 +2757,15 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
 decamelize@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
   integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
-decimal.js@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
 decompress-response@^6.0.0:
   version "6.0.0"
@@ -3095,18 +2791,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-default-require-extensions@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.0.tgz#e03f93aac9b2b6443fc52e5e4a37b3ad9ad8df96"
-  integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==
-  dependencies:
-    strip-bom "^4.0.0"
-
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -3117,15 +2806,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
-  dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-define-properties@^1.2.0:
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
   integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
@@ -3143,11 +2824,6 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -3418,13 +3094,6 @@ encoding@0.1.12:
   dependencies:
     iconv-lite "~0.4.13"
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3440,28 +3109,26 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
+  integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
 
 err-code@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
 error-stack-parser@^2.0.6:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57"
@@ -3469,36 +3136,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.4.3"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
-es-abstract@^1.20.4:
+es-abstract@^1.19.0, es-abstract@^1.20.4:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
   integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
@@ -3573,137 +3211,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-error@^4.0.1, es6-error@^4.1.1:
+es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-esbuild-android-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#09f12a372eed9743fd77ff6d889ac14f7b340c21"
-  integrity sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==
-
-esbuild-android-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz#f608d00ea03fe26f3b1ab92a30f99220390f3071"
-  integrity sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==
-
-esbuild-darwin-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz#31528daa75b4c9317721ede344195163fae3e041"
-  integrity sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==
-
-esbuild-darwin-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz#247f770d86d90a215fa194f24f90e30a0bd97245"
-  integrity sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==
-
-esbuild-freebsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz#479414d294905055eb396ebe455ed42213284ee0"
-  integrity sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==
-
-esbuild-freebsd-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz#cedeb10357c88533615921ae767a67dc870a474c"
-  integrity sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==
-
-esbuild-linux-32@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz#d9f008c4322d771f3958f59c1eee5a05cdf92485"
-  integrity sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==
-
-esbuild-linux-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz#ba58d7f66858913aeb1ab5c6bde1bbd824731795"
-  integrity sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==
-
-esbuild-linux-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz#708785a30072702b5b1c16b65cf9c25c51202529"
-  integrity sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==
-
-esbuild-linux-arm@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz#4e8b5deaa7ab60d0d28fab131244ef82b40684f4"
-  integrity sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==
-
-esbuild-linux-mips64le@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz#6f3bf3023f711084e5a1e8190487d2020f39f0f7"
-  integrity sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==
-
-esbuild-linux-ppc64le@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz#900e718a4ea3f6aedde8424828eeefdd4b48d4b9"
-  integrity sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==
-
-esbuild-linux-riscv64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz#dcbff622fa37047a75d2ff7a1d8d2949d80277e4"
-  integrity sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==
-
-esbuild-linux-s390x@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz#3f725a7945b419406c99d93744b28552561dcdfd"
-  integrity sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==
-
-esbuild-netbsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz#e10e40b6a765798b90d4eb85901cc85c8b7ff85e"
-  integrity sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==
-
-esbuild-openbsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz#935ec143f75ce10bd9cdb1c87fee00287eb0edbc"
-  integrity sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==
-
-esbuild-sunos-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz#0e7aa82b022a2e6d55b0646738b2582c2d72c3c0"
-  integrity sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==
-
-esbuild-windows-32@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz#3f1538241f31b538545f4b5841b248cac260fa35"
-  integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
-
-esbuild-windows-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz#b100c59f96d3c2da2e796e42fee4900d755d3e03"
-  integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==
-
-esbuild-windows-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz#00268517e665b33c89778d61f144e4256b39f631"
-  integrity sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==
-
-esbuild@^0.14.29:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.39.tgz#c926b2259fe6f6d3a94f528fb42e103c5a6d909a"
-  integrity sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==
-  optionalDependencies:
-    esbuild-android-64 "0.14.39"
-    esbuild-android-arm64 "0.14.39"
-    esbuild-darwin-64 "0.14.39"
-    esbuild-darwin-arm64 "0.14.39"
-    esbuild-freebsd-64 "0.14.39"
-    esbuild-freebsd-arm64 "0.14.39"
-    esbuild-linux-32 "0.14.39"
-    esbuild-linux-64 "0.14.39"
-    esbuild-linux-arm "0.14.39"
-    esbuild-linux-arm64 "0.14.39"
-    esbuild-linux-mips64le "0.14.39"
-    esbuild-linux-ppc64le "0.14.39"
-    esbuild-linux-riscv64 "0.14.39"
-    esbuild-linux-s390x "0.14.39"
-    esbuild-netbsd-64 "0.14.39"
-    esbuild-openbsd-64 "0.14.39"
-    esbuild-sunos-64 "0.14.39"
-    esbuild-windows-32 "0.14.39"
-    esbuild-windows-64 "0.14.39"
-    esbuild-windows-arm64 "0.14.39"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3729,18 +3241,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -3860,12 +3360,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
@@ -3922,11 +3417,6 @@ espree@^9.6.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
@@ -4030,7 +3520,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -4108,15 +3598,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^3.2.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
 find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -4125,7 +3606,7 @@ find-up@5.0.0, find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -4175,14 +3656,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreground-child@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
-  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^3.0.2"
-
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -4201,11 +3674,6 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fromentries@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
-  integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==
-
 fs-extra@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
@@ -4253,7 +3721,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -4309,7 +3777,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4319,16 +3787,7 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
   integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
@@ -4338,11 +3797,6 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -4410,7 +3864,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4422,17 +3876,6 @@ glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -4507,7 +3950,7 @@ got@^11.8.5, got@^9.6.0:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -4556,7 +3999,7 @@ has-proto@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -4585,14 +4028,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hasha@^5.0.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
-  integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
-  dependencies:
-    is-stream "^2.0.0"
-    type-fest "^0.8.0"
-
 he@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -4619,12 +4054,7 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -4646,7 +4076,7 @@ http2-wrapper@^1.0.0-beta.5.2:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -4659,13 +4089,6 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
 hyphenate-style-name@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
@@ -4698,17 +4121,12 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.13, ieee754@^1.2.1:
+ieee754@^1.1.13:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-ignore@^5.2.4:
+ignore@^5.2.0, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
@@ -4756,16 +4174,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4791,16 +4199,7 @@ inline-style-prefixer@^6.0.0:
   dependencies:
     css-in-js-utils "^2.0.0"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.5:
+internal-slot@^1.0.3, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -4847,16 +4246,6 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -4879,16 +4268,11 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-callable@^1.1.3, is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -4910,13 +4294,6 @@ is-core-module@^2.11.0, is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.8.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
-  dependencies:
-    has "^1.0.3"
-
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -4954,11 +4331,6 @@ is-installed-globally@^0.4.0:
     global-dirs "^3.0.0"
     is-path-inside "^3.0.2"
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5066,11 +4438,6 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
 is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -5115,66 +4482,6 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
-
-istanbul-lib-hook@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6"
-  integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==
-  dependencies:
-    append-transform "^2.0.0"
-
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-processinfo@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz#366d454cd0dcb7eb6e0e419378e60072c8626169"
-  integrity sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==
-  dependencies:
-    archy "^1.0.0"
-    cross-spawn "^7.0.3"
-    istanbul-lib-coverage "^3.2.0"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    uuid "^8.3.2"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.0.2:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -5271,50 +4578,38 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
   integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
 
-jsdom@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
-  integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==
+jsdom@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
+  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.5.0"
-    acorn-globals "^6.0.0"
-    cssom "^0.5.0"
-    cssstyle "^2.3.0"
-    data-urls "^3.0.1"
-    decimal.js "^10.3.1"
+    abab "^2.0.6"
+    cssstyle "^3.0.0"
+    data-urls "^4.0.0"
+    decimal.js "^10.4.3"
     domexception "^4.0.0"
-    escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.4"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^10.0.0"
-    ws "^8.2.3"
+    whatwg-url "^12.0.1"
+    ws "^8.13.0"
     xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
@@ -5327,7 +4622,7 @@ json-buffer@3.0.1, json-buffer@~3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -5418,7 +4713,7 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.5, klona@^2.0.6:
+klona@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
@@ -5457,14 +4752,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 "libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz":
   version "0.2.5"
   resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz#e1db928eaca58f22c66494c6179e13bdd4e38cd4"
@@ -5484,11 +4771,6 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.0"
 
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -5534,11 +4816,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5608,40 +4885,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.10.1.tgz#db577f42a94c168f676b638d15da8fb073448cab"
-  integrity sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==
-
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@^10.0.3:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.5.tgz#d975c0a4373de41ea05236d8182f56333511c268"
-  integrity sha512-mucOj2H0Jn/ax7H9K9T1bf0p1nn/mBFa551Os7ed9xRfLEx20aZhZeLslmRYfAaAqXZUGipcs+m5KOKvOH0XKA==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.1.1"
-    ssri "^9.0.0"
-
 map-age-cleaner@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -5753,53 +5003,14 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
   integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -5807,7 +5018,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5862,16 +5073,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mustache@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
-  integrity sha1-QCj3d4sXcIpImTCm5SrDvKDaQdA=
-
 mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
@@ -5881,7 +5087,7 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@^2.14.0, nan@^2.17.0:
+nan@^2.14.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
@@ -5925,11 +5131,6 @@ ncp@~2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
-negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -5973,22 +5174,6 @@ node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
-  integrity sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -5996,25 +5181,11 @@ node-loader@^2.0.0:
   dependencies:
     loader-utils "^2.0.0"
 
-node-preload@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
-  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
-  dependencies:
-    process-on-spawn "^1.0.0"
-
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-  dependencies:
-    abbrev "1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6032,7 +5203,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0, npmlog@^6.0.2:
+npmlog@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -6042,55 +5213,17 @@ npmlog@^6.0.0, npmlog@^6.0.2:
     gauge "^4.0.3"
     set-blocking "^2.0.0"
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-nyc@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
-  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
-  dependencies:
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    caching-transform "^4.0.0"
-    convert-source-map "^1.7.0"
-    decamelize "^1.2.0"
-    find-cache-dir "^3.2.0"
-    find-up "^4.1.0"
-    foreground-child "^2.0.0"
-    get-package-type "^0.1.0"
-    glob "^7.1.6"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-hook "^3.0.0"
-    istanbul-lib-instrument "^4.0.0"
-    istanbul-lib-processinfo "^2.0.2"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    make-dir "^3.0.0"
-    node-preload "^0.2.1"
-    p-map "^3.0.0"
-    process-on-spawn "^1.0.0"
-    resolve-from "^5.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    spawn-wrap "^2.0.0"
-    test-exclude "^6.0.0"
-    yargs "^15.0.2"
+nwsapi@^2.2.4:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
 object-assign@4.x, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.1.tgz#28a661153bad7e470e4b01479ef1cb91ce511191"
-  integrity sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==
-
-object-inspect@^1.12.3:
+object-inspect@^1.12.3, object-inspect@^1.9.0:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
@@ -6100,17 +5233,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.assign@^4.1.4:
+object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -6120,16 +5243,7 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.entries@^1.1.6:
+object.entries@^1.1.5, object.entries@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
   integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
@@ -6195,18 +5309,6 @@ open@^8.3.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -6281,20 +5383,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-retry@^4.2.0:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -6308,16 +5396,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-hash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-4.0.0.tgz#3537f654665ec3cc38827387fc904c163c54f506"
-  integrity sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==
-  dependencies:
-    graceful-fs "^4.1.15"
-    hasha "^5.0.0"
-    lodash.flattendeep "^4.4.0"
-    release-zalgo "^1.0.0"
-
 package-json@^6.3.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
@@ -6335,20 +5413,12 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+parse5@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+    entities "^4.4.0"
 
 patch-package@^6.4.7:
   version "6.4.7"
@@ -6448,7 +5518,7 @@ pixelmatch@^5.2.1:
   dependencies:
     pngjs "^6.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -6502,15 +5572,6 @@ pngjs@^6.0.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
   integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
 
-postcss-loader@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb"
-  integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    klona "^2.0.5"
-    semver "^7.3.8"
-
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -6571,11 +5632,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
 prettier@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1"
@@ -6590,28 +5646,11 @@ pretty-format@^27.2.5, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-process-on-spawn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.0.0.tgz#95b05a23073d30a17acfdc92a440efd2baefdc93"
-  integrity sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==
-  dependencies:
-    fromentries "^1.2.0"
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
 progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -6663,9 +5702,9 @@ proxy-from-env@^1.1.0:
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 psl@^1.1.33, psl@^1.1.7:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pump@^3.0.0:
   version "3.0.0"
@@ -6675,10 +5714,10 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 pupa@^2.1.1:
   version "2.1.1"
@@ -6692,16 +5731,16 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
 
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue-promise@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/queue-promise/-/queue-promise-2.2.1.tgz#8de03fb79ba458efcb5ebf76368ab029d2669752"
-  integrity sha512-C3eyRwLF9m6dPV4MtqMVFX+Xmc7keZ9Ievm3jJ/wWM5t3uVbFnGsJXwpYzZ4LaIEcX9bss/mdaKzyrO6xheRuA==
-
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
@@ -6874,13 +5913,6 @@ react-mentions@^4.4.9:
     prop-types "^15.5.8"
     substyle "^9.1.0"
 
-react-portal@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.2.2.tgz#bff1e024147d6041ba8c530ffc99d4c8248f49fa"
-  integrity sha512-vS18idTmevQxyQpnde0Td6ZcUlv+pD8GTyR42n3CHUQq9OHi1C4jDE4ZWEbEsrbrLRhSECYiao58cvocwMtP7Q==
-  dependencies:
-    prop-types "^15.5.8"
-
 react-qr-svg@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/react-qr-svg/-/react-qr-svg-2.4.0.tgz#c703d95907b9713192730a5bbeffb57e4aa782bd"
@@ -7053,21 +6085,7 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexp.prototype.flags@^1.5.0:
+regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
   integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
@@ -7090,13 +6108,6 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-release-zalgo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  integrity sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==
-  dependencies:
-    es6-error "^4.0.1"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7107,10 +6118,10 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.1.5:
   version "4.1.5"
@@ -7144,16 +6155,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.22.1:
+resolve@^1.20.0, resolve@^1.22.1:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -7233,6 +6235,11 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
 rtl-css-js@^1.14.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
@@ -7252,13 +6259,6 @@ run-script-os@^1.1.6:
   resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347"
   integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==
 
-rxjs@^7.0.0:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
-  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
@@ -7332,10 +6332,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
@@ -7393,30 +6393,18 @@ semver@^5.5.0, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.2.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.5.4:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-error@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
@@ -7477,11 +6465,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -7496,13 +6479,6 @@ signal-exit@^3.0.2, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
-  dependencies:
-    is-arrayish "^0.3.1"
-
 sinon@9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
@@ -7540,7 +6516,7 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-socks-proxy-agent@^6.1.0, socks-proxy-agent@^6.1.1:
+socks-proxy-agent@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
   integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
@@ -7587,7 +6563,7 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -7597,40 +6573,11 @@ sourcemap-codec@^1.4.8:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==
-
-spawn-wrap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
-  integrity sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==
-  dependencies:
-    foreground-child "^2.0.0"
-    is-windows "^1.0.2"
-    make-dir "^3.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    which "^2.0.1"
-
 sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stack-generator@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
@@ -7704,15 +6651,6 @@ string.prototype.trim@^1.2.7:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
 string.prototype.trimend@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
@@ -7722,15 +6660,6 @@ string.prototype.trimend@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
 string.prototype.trimstart@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
@@ -7766,11 +6695,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -7786,11 +6710,6 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
-  integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
-
 styled-components@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
@@ -7827,7 +6746,7 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0:
+supports-color@8.1.1, supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -7873,7 +6792,7 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -7914,15 +6833,6 @@ terser@^5.14.1, terser@^5.14.2:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7971,32 +6881,28 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
+  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.0"
 
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -8024,11 +6930,6 @@ ts-loader@^9.4.2:
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-ts-mock-imports@^1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ts-mock-imports/-/ts-mock-imports-1.3.8.tgz#6b26887c651effe947ea91f928338d1899146fb9"
-  integrity sha512-A5n0iEg4zh2/qToo54XOa/wT31fAI0B8DHYU4RDcA6HIddZQPRkTsYri3Hl69+OSLjOKWjyP3/vYOIp3SAIZXg==
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -8051,13 +6952,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -8073,11 +6967,6 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.8.0:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
 typed-array-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
@@ -8149,20 +7038,6 @@ underscore@>=1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
   integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -8170,11 +7045,16 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
@@ -8225,6 +7105,14 @@ url-join@^4.0.1:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
   integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
 
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
@@ -8245,7 +7133,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -8259,17 +7147,10 @@ verror@^1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
-  integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
     xml-name-validator "^4.0.0"
 
@@ -8298,17 +7179,17 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-cli@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
-  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
+webpack-cli@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
+  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^2.0.1"
-    "@webpack-cli/info" "^2.0.1"
-    "@webpack-cli/serve" "^2.0.1"
+    "@webpack-cli/configtest" "^2.1.1"
+    "@webpack-cli/info" "^2.0.2"
+    "@webpack-cli/serve" "^2.0.5"
     colorette "^2.0.14"
-    commander "^9.4.1"
+    commander "^10.0.1"
     cross-spawn "^7.0.3"
     envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
@@ -8318,9 +7199,9 @@ webpack-cli@^5.0.1:
     webpack-merge "^5.7.3"
 
 webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826"
+  integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
@@ -8372,20 +7253,12 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da"
-  integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==
+whatwg-url@^12.0.0, whatwg-url@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
+  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
   dependencies:
-    tr46 "^3.0.0"
-    webidl-conversions "^7.0.0"
-
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
-  dependencies:
-    tr46 "^3.0.0"
+    tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
@@ -8407,11 +7280,6 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
 which-typed-array@^1.1.10, which-typed-array@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
@@ -8452,29 +7320,15 @@ widest-line@^3.1.0:
     string-width "^4.0.0"
 
 wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
 workerpool@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -8504,10 +7358,10 @@ ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.2.3:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
+ws@^8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -8529,11 +7383,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -8544,24 +7393,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -8595,24 +7431,7 @@ yargs@16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^15.0.2:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.0.1:
+yargs@^17.0.1, yargs@^17.6.0:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -8625,19 +7444,6 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yargs@^17.3.1, yargs@^17.6.0:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From ab946e69b100c1f8e02cc8aeff30f0ee78d50ad9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Aug 2023 06:50:35 +0200
Subject: [PATCH 175/178] fix: finish updating dependencies

---
 package.json                                  |   20 +-
 patches/component-classes+1.2.6.patch         |   13 -
 ts/OS.ts                                      |    2 +-
 .../dialog/OnionStatusPathDialog.tsx          |    3 +-
 ts/components/dialog/SessionConfirm.tsx       |    2 +-
 ts/components/settings/SessionSettings.tsx    |    2 +-
 .../settings/ZoomingSessionSlider.tsx         |   14 +-
 ts/node/attachment_channel.ts                 |    2 +-
 ts/node/migration/signalMigrations.ts         |    2 +-
 ts/node/sql.ts                                |    2 +-
 ts/session/apis/seed_node_api/SeedNodeAPI.ts  |    4 +-
 ts/session/apis/snode_api/onions.ts           |    6 +-
 ts/session/apis/snode_api/sessionRpc.ts       |    2 +-
 .../crypto/DecryptedAttachmentsManager.ts     |    2 +-
 ts/shared/attachments/shared_attachments.ts   |    2 +-
 ts/test/automation/setup/beforeEach.ts        |    4 +-
 ts/test/automation/setup/open.ts              |    2 +-
 ts/test/automation/utilities/utils.ts         |    4 +-
 .../unit/crypto/MessageEncrypter_test.ts      |    2 +-
 .../session/unit/messages/ChatMessage_test.ts |    2 +-
 ts/test/session/unit/privacy/Privacy_test.ts  |    3 +-
 .../session/unit/sending/MessageQueue_test.ts |    3 +-
 .../unit/sending/MessageSender_test.ts        |    2 +-
 ts/test/session/unit/updater/updater_test.ts  |    2 +-
 ts/themes/globals.tsx                         |    1 +
 ts/updater/updater.ts                         |    2 +-
 ts/util/linkPreviewFetch.ts                   |    6 +-
 ts/util/linkPreviews.ts                       |    3 +-
 yarn.lock                                     | 2258 ++++++++---------
 29 files changed, 1143 insertions(+), 1229 deletions(-)
 delete mode 100644 patches/component-classes+1.2.6.patch

diff --git a/package.json b/package.json
index c259527ba..31c6c0d6e 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
     "protobufjs": "^6.11.2",
-    "rc-slider": "^8.7.1",
+    "rc-slider": "^10.2.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
     "react-dom": "^17.0.2",
@@ -119,8 +119,8 @@
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
     "react-toastify": "^6.0.9",
-    "react-use": "^17.2.1",
-    "react-virtualized": "9.22.3",
+    "react-use": "^17.4.0",
+    "react-virtualized": "^9.22.4",
     "read-last-lines-ts": "^1.2.1",
     "redux": "4.2.0",
     "redux-logger": "3.0.6",
@@ -130,7 +130,8 @@
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
     "styled-components": "5.1.1",
-    "uuid": "8.3.2"
+    "uuid": "8.3.2",
+    "webrtc-adapter": "^4.1.1"
   },
   "devDependencies": {
     "@electron/notarize": "^2.1.0",
@@ -155,7 +156,6 @@
     "@types/mocha": "5.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pify": "3.0.2",
-    "@types/rc-slider": "^8.6.5",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
     "@types/react-redux": "^7.1.24",
@@ -168,7 +168,6 @@
     "@types/uuid": "8.3.4",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
-    "asar": "3.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
@@ -339,9 +338,12 @@
       "!build/*.js",
       "build/afterPackHook.js",
       "build/launcher-script.sh",
-      "!node_modules/better-sqlite3/deps/*",
-      "!node_modules/better-sqlite3/src/*",
-      "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "!node_modules/@signalapp/better-sqlite3/deps/*",
+      "!node_modules/@signalapp/better-sqlite3/src/*",
+      "!node_modules/@signalapp/better-sqlite3/build/Release/obj/*",
+      "node_modules/@signalapp/better-sqlite3/build/Release/better_sqlite3.node",
+      "!node_modules/libsession_util_nodejs/libsession-util/*",
+      "!node_modules/libsession_util_nodejs/src/*",
       "ts/webworker/workers/node/libsession/*.node",
       "!dev-app-update.yml"
     ]
diff --git a/patches/component-classes+1.2.6.patch b/patches/component-classes+1.2.6.patch
deleted file mode 100644
index 23db4f91e..000000000
--- a/patches/component-classes+1.2.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/component-classes/index.js b/node_modules/component-classes/index.js
-index eb9d292..752ebf2 100644
---- a/node_modules/component-classes/index.js
-+++ b/node_modules/component-classes/index.js
-@@ -3,7 +3,7 @@
-  */
-
- try {
--  var index = require('indexof');
-+  // var index = require('indexof');
- } catch (err) {
-   var index = require('component-indexof');
- }
diff --git a/ts/OS.ts b/ts/OS.ts
index 6ffa97f37..4ae89178c 100644
--- a/ts/OS.ts
+++ b/ts/OS.ts
@@ -1,5 +1,5 @@
-import _ from 'lodash';
 import os from 'os';
+import _ from 'lodash';
 import semver from 'semver';
 
 export const isMacOS = () => process.platform === 'darwin';
diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx
index c966697b9..5867235da 100644
--- a/ts/components/dialog/OnionStatusPathDialog.tsx
+++ b/ts/components/dialog/OnionStatusPathDialog.tsx
@@ -1,6 +1,5 @@
-import React from 'react';
-
 import { shell } from 'electron';
+import React from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
 import useHover from 'react-use/lib/useHover';
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index c5987d81f..18cec46c9 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -1,5 +1,5 @@
-import { Dispatch } from '@reduxjs/toolkit';
 import { shell } from 'electron';
+import { Dispatch } from '@reduxjs/toolkit';
 import React, { useState } from 'react';
 import { MessageInteraction } from '../../interactions';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx
index e7dc6d2a5..b9226112f 100644
--- a/ts/components/settings/SessionSettings.tsx
+++ b/ts/components/settings/SessionSettings.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { shell } from 'electron';
+import React from 'react';
 import autoBind from 'auto-bind';
 import styled from 'styled-components';
 
diff --git a/ts/components/settings/ZoomingSessionSlider.tsx b/ts/components/settings/ZoomingSessionSlider.tsx
index 11695e71c..cab3ab269 100644
--- a/ts/components/settings/ZoomingSessionSlider.tsx
+++ b/ts/components/settings/ZoomingSessionSlider.tsx
@@ -1,14 +1,17 @@
 import Slider from 'rc-slider';
 import React from 'react';
+import { isNumber } from 'lodash';
 
 import useUpdate from 'react-use/lib/useUpdate';
 import { SessionSettingsItemWrapper } from './SessionSettingListItem';
 
 export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) => void }) => {
   const forceUpdate = useUpdate();
-  const handleSlider = async (valueToForward: number) => {
-    props?.onSliderChange?.(valueToForward);
-    await window.setSettingValue('zoom-factor-setting', valueToForward);
+  const handleSlider = async (val: number | Array<number>) => {
+    const newSetting = isNumber(val) ? val : val?.[0] || 1;
+
+    props?.onSliderChange?.(newSetting);
+    await window.setSettingValue('zoom-factor-setting', newSetting);
     window.updateZoomFactor();
     forceUpdate();
   };
@@ -23,8 +26,9 @@ export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) =
           min={60}
           max={200}
           defaultValue={currentValueFromSettings}
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          onAfterChange={handleSlider}
+          onChange={e => {
+            void handleSlider(e);
+          }}
         />
 
         <div className="slider-info">
diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts
index 17a20b411..f53984dbb 100644
--- a/ts/node/attachment_channel.ts
+++ b/ts/node/attachment_channel.ts
@@ -1,7 +1,7 @@
+import path from 'path';
 import { ipcMain } from 'electron';
 import { isString, map } from 'lodash';
 import rimraf from 'rimraf';
-import path from 'path';
 import fse from 'fs-extra';
 import pify from 'pify';
 // eslint-disable-next-line import/no-named-default
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index 6d7bddcd7..1dc919e46 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -1,6 +1,6 @@
+import path from 'path';
 import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { isNumber } from 'lodash';
-import path from 'path';
 
 import {
   ATTACHMENT_DOWNLOADS_TABLE,
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 493339044..a8414c481 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1,7 +1,7 @@
-import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { app, clipboard, dialog, Notification } from 'electron';
 import fs from 'fs';
 import path from 'path';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import rimraf from 'rimraf';
 
 import {
diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
index bdf6c9848..3a31aedff 100644
--- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts
+++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -1,8 +1,8 @@
+import tls from 'tls';
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
-import https from 'https';
 import _ from 'lodash';
-import tls from 'tls';
 import pRetry from 'p-retry';
 
 import { sha256 } from '../../crypto';
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index d29274a49..58e272c7a 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -1,11 +1,13 @@
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch, RequestInit, Response } from 'node-fetch';
-import https from 'https';
 import ByteBuffer from 'bytebuffer';
 import pRetry from 'p-retry';
 import { cloneDeep, isEmpty, isString, omit } from 'lodash';
 import { AbortSignal } from 'abort-controller';
 import { to_string } from 'libsodium-wrappers-sumo';
+// eslint-disable-next-line import/no-unresolved
+import { AbortSignal as AbortSignalNode } from 'node-fetch/externals';
 
 import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool';
 
@@ -1068,7 +1070,7 @@ const sendOnionRequestNoRetries = async ({
   };
 
   if (abortSignal) {
-    guardFetchOptions.signal = abortSignal;
+    guardFetchOptions.signal = abortSignal as AbortSignalNode;
   }
 
   const guardUrl = `https://${guardNode.ip}:${guardNode.port}/onion_req/v2`;
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index f453402ec..d4e986394 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -1,6 +1,6 @@
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
-import https from 'https';
 import { clone } from 'lodash';
 import pRetry from 'p-retry';
 
diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts
index 88e04b9df..57b0ad57f 100644
--- a/ts/session/crypto/DecryptedAttachmentsManager.ts
+++ b/ts/session/crypto/DecryptedAttachmentsManager.ts
@@ -9,10 +9,10 @@
  *
  *
  */
+import path from 'path';
 import { reject } from 'lodash';
 
 import * as fse from 'fs-extra';
-import path from 'path';
 
 import { DURATION } from '../constants';
 import { makeObjectUrl, urlToBlob } from '../../types/attachments/VisualAttachment';
diff --git a/ts/shared/attachments/shared_attachments.ts b/ts/shared/attachments/shared_attachments.ts
index ff315d53e..f4cfbef56 100644
--- a/ts/shared/attachments/shared_attachments.ts
+++ b/ts/shared/attachments/shared_attachments.ts
@@ -2,8 +2,8 @@
 //                       RelativePath ->
 //                       IO Unit
 
-import { isString } from 'lodash';
 import path from 'path';
+import { isString } from 'lodash';
 import fse from 'fs-extra';
 
 export const createDeleter = (root: string) => {
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index 7ba7bfdee..826ede497 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -1,7 +1,7 @@
-import { Page } from '@playwright/test';
-import { readdirSync, rmdirSync } from 'fs-extra';
 import { join } from 'path';
 import { homedir } from 'os';
+import { Page } from '@playwright/test';
+import { readdirSync, rmdirSync } from 'fs-extra';
 import { isLinux, isMacOS } from '../../../OS';
 import { MULTI_PREFIX, NODE_ENV } from './open';
 
diff --git a/ts/test/automation/setup/open.ts b/ts/test/automation/setup/open.ts
index 35529b6b4..0db2f167b 100644
--- a/ts/test/automation/setup/open.ts
+++ b/ts/test/automation/setup/open.ts
@@ -1,5 +1,5 @@
-import { _electron } from '@playwright/test';
 import { join } from 'path';
+import { _electron } from '@playwright/test';
 import { getAppRootPath } from '../../../node/getRootPath';
 
 export const NODE_ENV = 'production';
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 94e8a10ea..9b0968fa9 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -1,9 +1,7 @@
 /* eslint-disable no-useless-escape */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-await-in-loop */
-import { Page } from 'playwright-core';
-
-import { ElementHandle } from '@playwright/test';
+import { ElementHandle, Page } from '@playwright/test';
 import { sleepFor } from '../../../session/utils/Promise';
 import { loaderType, Strategy } from '../types/testing';
 
diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
index d2de24cfe..27bc167c6 100644
--- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts
+++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
@@ -1,5 +1,5 @@
-import chai, { expect } from 'chai';
 import * as crypto from 'crypto';
+import chai, { expect } from 'chai';
 import Sinon, * as sinon from 'sinon';
 import chaiBytes from 'chai-bytes';
 
diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts
index 7fb84974b..5bb8d32ed 100644
--- a/ts/test/session/unit/messages/ChatMessage_test.ts
+++ b/ts/test/session/unit/messages/ChatMessage_test.ts
@@ -1,6 +1,6 @@
+import { TextEncoder } from 'util';
 import { expect } from 'chai';
 
-import { TextEncoder } from 'util';
 import { toNumber } from 'lodash';
 import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
diff --git a/ts/test/session/unit/privacy/Privacy_test.ts b/ts/test/session/unit/privacy/Privacy_test.ts
index 843ff2a08..44a9b6eae 100644
--- a/ts/test/session/unit/privacy/Privacy_test.ts
+++ b/ts/test/session/unit/privacy/Privacy_test.ts
@@ -1,8 +1,7 @@
+import path from 'path';
 import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 
-import path from 'path';
-
 import chaiAsPromised from 'chai-as-promised';
 import { redactAll } from '../../../../util/privacy';
 
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index 70fa7816c..63cb57cd3 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -6,10 +6,11 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-unreachable-loop */
 /* eslint-disable no-restricted-syntax */
+import { randomBytes } from 'crypto';
+
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
-import { randomBytes } from 'crypto';
 import chaiAsPromised from 'chai-as-promised';
 
 import { GroupUtils, PromiseUtils, UserUtils } from '../../../../session/utils';
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 7cf526c65..3fb0fcf70 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -1,5 +1,5 @@
-import { expect } from 'chai';
 import * as crypto from 'crypto';
+import { expect } from 'chai';
 import _ from 'lodash';
 import Sinon, * as sinon from 'sinon';
 import { SignalService } from '../../../../protobuf';
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index 232c2106b..c3af60023 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -1,6 +1,6 @@
+import path from 'path';
 import { readFileSync } from 'fs-extra';
 import { isEmpty } from 'lodash';
-import path from 'path';
 
 describe('Updater', () => {
   it.skip('isUpdateAvailable', () => {});
diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx
index 795d116c4..dfe0f9387 100644
--- a/ts/themes/globals.tsx
+++ b/ts/themes/globals.tsx
@@ -156,5 +156,6 @@ export function declareCSSVariables(variables: Record<string, string>) {
   for (const [key, value] of Object.entries(variables)) {
     output += `${key}: ${value};\n`;
   }
+
   return output;
 }
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index 785b4d9cd..84f2c8cdf 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-misused-promises */
 /* eslint-disable no-console */
+import * as path from 'path';
 import { app, BrowserWindow } from 'electron';
 import { autoUpdater, UpdateInfo } from 'electron-updater';
 import * as fs from 'fs-extra';
-import * as path from 'path';
 import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
 
 import { windowMarkShouldQuit } from '../node/window_state';
diff --git a/ts/util/linkPreviewFetch.ts b/ts/util/linkPreviewFetch.ts
index 86d1fdc40..4c02b7241 100644
--- a/ts/util/linkPreviewFetch.ts
+++ b/ts/util/linkPreviewFetch.ts
@@ -1,5 +1,7 @@
 import { RequestInit, Response } from 'node-fetch';
 import { AbortSignal } from 'abort-controller';
+// eslint-disable-next-line import/no-unresolved
+import { AbortSignal as AbortSignalNode } from 'node-fetch/externals';
 
 import { IMAGE_GIF, IMAGE_ICO, IMAGE_JPEG, IMAGE_PNG, IMAGE_WEBP, MIMEType } from '../types/MIME';
 
@@ -371,7 +373,7 @@ export async function fetchLinkPreviewMetadata(
         Accept: 'text/html,application/xhtml+xml',
         'User-Agent': 'WhatsApp',
       },
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalNode,
     });
   } catch (err) {
     window?.log?.warn('fetchLinkPreviewMetadata: failed to fetch link preview HTML; bailing');
@@ -456,7 +458,7 @@ export async function fetchLinkPreviewImage(
         'User-Agent': 'WhatsApp',
       },
       size: MAX_IMAGE_CONTENT_LENGTH,
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalNode,
     });
   } catch (err) {
     window?.log?.warn('fetchLinkPreviewImage: failed to fetch image; bailing');
diff --git a/ts/util/linkPreviews.ts b/ts/util/linkPreviews.ts
index ba78f0d6c..21a8c5096 100644
--- a/ts/util/linkPreviews.ts
+++ b/ts/util/linkPreviews.ts
@@ -1,7 +1,6 @@
 /* global URL */
-
-import { compact, isEmpty, isNumber, range } from 'lodash';
 import nodeUrl from 'url';
+import { compact, isEmpty, isNumber, range } from 'lodash';
 import LinkifyIt from 'linkify-it';
 
 const linkify = LinkifyIt();
diff --git a/yarn.lock b/yarn.lock
index 9718a312a..116c6d261 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,284 +12,288 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+"@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
 "@babel/core@^7.14.8":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    json5 "^2.2.2"
+    semver "^6.3.1"
 
-"@babel/generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.9.tgz#68337e9ea8044d6ddc690fb29acae39359cca0a5"
-  integrity sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
-  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236"
+  integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
 
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
-  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
+"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-replace-supers@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
+  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539"
-  integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==
+"@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
 "@babel/plugin-proposal-class-properties@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
-  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-dynamic-import@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-export-namespace-from@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
-  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
-  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
-  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-numeric-separator@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-optional-chaining@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
-  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
-  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-private-property-in-object@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
-  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
@@ -320,6 +324,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -369,40 +380,42 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b"
-  integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==
+"@babel/plugin-syntax-typescript@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.14.5":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.0.tgz#3be575e19fbd273d42adbc84566b1fad3582b3db"
-  integrity sha512-cCeR0VZWtfxWS4YueAK2qtHtBPJRSaJcMlbS8jhSIm/A3E2Kpro4W1Dn4cqJtp59dtWfXjQwK7SPKF8ghs7rlw==
+"@babel/plugin-transform-modules-commonjs@^7.14.5", "@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-simple-access" "^7.17.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.17.12":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.1.tgz#5fd8b86130bad95c4a24377b41ab989a9ccad22d"
-  integrity sha512-F+RJmL479HJmC0KeqqwEGZMg1P7kWArLGbAKfEi9yPthJyMNjF+DjxFF/halfQvq1Q9GFM4TUbYDNV8xe4Ctqg==
+"@babel/plugin-transform-typescript@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz#91e08ad1eb1028ecc62662a842e93ecfbf3c7234"
+  integrity sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-typescript" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
 
 "@babel/preset-typescript@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c"
-  integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
+  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-transform-typescript" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-typescript" "^7.22.5"
 
 "@babel/runtime@7.4.5":
   version "7.4.5"
@@ -411,44 +424,45 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
+  integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
-  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/traverse@^7.16.7", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98"
-  integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
+"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5":
+  version "7.22.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.9.tgz#7148d64ba133d8d73a41b3172ac4b83a1452205f"
-  integrity sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==
+"@babel/types@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@develar/schema-utils@~2.6.5":
@@ -540,15 +554,15 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
-  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
 
-"@eslint/eslintrc@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+"@eslint/eslintrc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -560,10 +574,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.44.0":
-  version "8.44.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+"@eslint/js@^8.46.0":
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
 
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
@@ -590,9 +604,9 @@
   integrity sha512-6AZfvWru20Rl9pXULStkVvTWnua6VG56zOIKdkCzLh25XVeTDEp6f1dL7iX9w+way5+1hI0BBuqTQd61qYaKdg==
 
 "@iconify/react@^3.1.3":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.1.tgz#d18da31cec58c1aa8fdf4def451cc7e3196d88de"
-  integrity sha512-yKzixjC9ct9RC/aSGo1OGxkG2rpfhlr/urRz6k2YZlIBzn92PBTlqtSx8o8dFYEorr3eUFSCBZFzBy1yw5jsAA==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc"
+  integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g==
 
 "@jest/types@^27.2.5", "@jest/types@^27.5.1":
   version "27.5.1"
@@ -605,18 +619,10 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -627,28 +633,33 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
@@ -807,9 +818,9 @@
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -838,9 +849,9 @@
     type-detect "^4.0.8"
 
 "@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+  integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
 
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
@@ -868,9 +879,9 @@
   integrity sha512-IoT8BXBuuWWscQnscGtAYH4dGEOr3uQ85MJdE9LAfperio8FQwyFaigHITPJSy+NSS4w9UHKhzmtQXt5A+544g==
 
 "@types/buffer-crc32@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.0.tgz#a4d94b1a4f01ea414268e9ef7576c7d32a1a14e4"
-  integrity sha512-6lBhJ55o2DKVCxTanyS6ohWRyebCcyivIK7pRHiwZuOYbUhivcByYBrvm2dc9f72LZP12mH5mGxUhG7JQ64lQg==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.2.tgz#e115de47913ce34cc2662be43d708d8bef874ab7"
+  integrity sha512-UpJyUKgG33LVehYtv9k2x4HUEY5ThV62YNGFBbQNBgtoky/0tQCceh8BPI9r3XL5hQ1tGmq34jGWNRBKf2P1UQ==
   dependencies:
     "@types/node" "*"
 
@@ -882,22 +893,22 @@
     "@types/node" "*"
 
 "@types/bytebuffer@^5.0.41":
-  version "5.0.43"
-  resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.43.tgz#b5259fca1412106bcee0cabfbf7c104846d06738"
-  integrity sha512-vQnTYvy4LpSojHjKdmg4nXFI1BAiYPvZ/k3ouczZAQnbDprk1xqxJiFmFHyy8y6MuUq3slz5erNMtn6n87uVKw==
+  version "5.0.44"
+  resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1"
+  integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ==
   dependencies:
-    "@types/long" "*"
+    "@types/long" "^3.0.0"
     "@types/node" "*"
 
 "@types/cacheable-request@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
-  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
   dependencies:
     "@types/http-cache-semantics" "*"
-    "@types/keyv" "*"
+    "@types/keyv" "^3.1.4"
     "@types/node" "*"
-    "@types/responselike" "*"
+    "@types/responselike" "^1.0.0"
 
 "@types/chai-as-promised@^7.1.2":
   version "7.1.5"
@@ -907,9 +918,9 @@
     "@types/chai" "*"
 
 "@types/chai@*":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04"
-  integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
+  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
 
 "@types/chai@4.2.18":
   version "4.2.18"
@@ -927,16 +938,16 @@
   integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ==
 
 "@types/debug@^4.1.6":
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
-  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
+  integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
   dependencies:
     "@types/ms" "*"
 
 "@types/dompurify@^2.0.0":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.3.tgz#c24c92f698f77ed9cc9d9fa7888f90cf2bfaa23f"
-  integrity sha512-nnVQSgRVuZ/843oAfhA25eRSNzUFcBPk/LOiw5gm8mD9/X7CNcbRkQu/OsjCewO8+VIYfPxUnXvPEVGenw14+w==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9"
+  integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==
   dependencies:
     "@types/trusted-types" "*"
 
@@ -956,22 +967,17 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.10"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
-  integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
+  version "8.44.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.1.tgz#d1811559bb6bcd1a76009e3f7883034b78a0415e"
+  integrity sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
-
-"@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/filesize@3.6.0":
   version "3.6.0"
@@ -999,7 +1005,15 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*", "@types/glob@^7.1.1":
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
+"@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
@@ -1040,9 +1054,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jquery@*":
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.14.tgz#ac8e11ee591e94d4d58da602cb3a5a8320dee577"
-  integrity sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==
+  version "3.5.16"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.16.tgz#632131baf30951915b0317d48c98e9890bdf051d"
+  integrity sha512-bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw==
   dependencies:
     "@types/sizzle" "*"
 
@@ -1051,11 +1065,6 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3"
   integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==
 
-"@types/json-buffer@~3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
-  integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
-
 "@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.12"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
@@ -1066,7 +1075,7 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/keyv@*":
+"@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
   integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
@@ -1081,9 +1090,9 @@
     "@types/libsodium-wrappers" "*"
 
 "@types/libsodium-wrappers@*":
-  version "0.7.9"
-  resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#89c3ad2156d5143e64bce86cfeb0045a983aeccc"
-  integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw==
+  version "0.7.10"
+  resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz#a6ebde70d3b4af960fd802af8d0e3c7cfe281eb2"
+  integrity sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==
 
 "@types/linkify-it@^3.0.2":
   version "3.0.2"
@@ -1091,19 +1100,24 @@
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
 
 "@types/lodash@^4.14.194":
-  version "4.14.194"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
-  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+  version "4.14.196"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95"
+  integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==
 
-"@types/long@*", "@types/long@^4.0.1":
+"@types/long@^3.0.0":
+  version "3.0.32"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
+  integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==
+
+"@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+"@types/minimatch@*", "@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/mocha@5.0.0":
   version "5.0.0"
@@ -1116,17 +1130,22 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node-fetch@^2.5.7":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
+  integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=13.7.0", "@types/node@^18.11.18":
-  version "18.16.19"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
-  integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "20.4.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69"
+  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
+
+"@types/node@^18.11.18":
+  version "18.17.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.1.tgz#84c32903bf3a09f7878c391d31ff08f6fe7d8335"
+  integrity sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==
 
 "@types/pify@3.0.2":
   version "3.0.2"
@@ -1146,25 +1165,10 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
-"@types/rc-slider@^8.6.5":
-  version "8.6.6"
-  resolved "https://registry.yarnpkg.com/@types/rc-slider/-/rc-slider-8.6.6.tgz#961ccfd0b8c632a9d8cdcc28b54d6be4781c419f"
-  integrity sha512-2Q3vwKrSm3PbgiMNwzxMkOaMtcAGi0xQ8WPeVKoabk1vNYHiVR44DMC3mr9jC2lhbxCBgGBJWF9sBhmnSDQ8Bg==
-  dependencies:
-    "@types/rc-tooltip" "*"
-    "@types/react" "*"
-
-"@types/rc-tooltip@*":
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/@types/rc-tooltip/-/rc-tooltip-3.7.6.tgz#d3833b3f3e494ab14e4a95158f9f6b321042c97a"
-  integrity sha512-Otouf6HW49RSwtTa3EBdp0+BZoOQy3KDTEcVgLdZEgcYp4HB5nP6N3S6bTUkPtq3H5KmYBzEOaiq0SNMB/MY2g==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-dom@^17.0.2":
-  version "17.0.17"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1"
-  integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==
+  version "17.0.20"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53"
+  integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==
   dependencies:
     "@types/react" "^17"
 
@@ -1176,9 +1180,9 @@
     "@types/react" "*"
 
 "@types/react-redux@^7.1.24":
-  version "7.1.24"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
-  integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
+  version "7.1.25"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.25.tgz#de841631205b24f9dfb4967dd4a7901e048f9a88"
+  integrity sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
@@ -1193,16 +1197,7 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
-  version "17.0.45"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f"
-  integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@17.0.2":
+"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
   integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
@@ -1210,6 +1205,15 @@
     "@types/prop-types" "*"
     csstype "^3.0.2"
 
+"@types/react@^17.0.2":
+  version "17.0.62"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3"
+  integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/redux-logger@3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
@@ -1217,7 +1221,7 @@
   dependencies:
     redux "^3.6.0"
 
-"@types/responselike@*", "@types/responselike@^1.0.0":
+"@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
   integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
@@ -1238,9 +1242,9 @@
     "@types/node" "*"
 
 "@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+  version "0.16.3"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
+  integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
 "@types/semver@5.5.0":
   version "5.5.0"
@@ -1275,23 +1279,23 @@
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/styled-components@^5.1.4":
-  version "5.1.25"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad"
-  integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ==
+  version "5.1.26"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.26.tgz#5627e6812ee96d755028a98dae61d28e57c233af"
+  integrity sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
     csstype "^3.0.2"
 
 "@types/trusted-types@*":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
-  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311"
+  integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==
 
 "@types/underscore@*":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3"
-  integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.6.tgz#266f210e8a1bf8fa714d3c86f3abdc07a8942b96"
+  integrity sha512-G2oC64I/sR817KDL2b2Mc7+diXyxcibyUeLMyexU4K/sG8hyt/YMlbBK0TVhx/YQ1ehfzgXhLuq2YQHIL4bXUQ==
 
 "@types/use-sync-external-store@^0.0.3":
   version "0.0.3"
@@ -1314,9 +1318,9 @@
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^16.0.0":
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
-  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3"
+  integrity sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1335,15 +1339,15 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.1.0.tgz#96f3ca6615717659d06c9f7161a1d14ab0c49c66"
-  integrity sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz#41b79923fee46a745a3a50cba1c33c622aa3c79a"
+  integrity sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/type-utils" "6.1.0"
-    "@typescript-eslint/utils" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/type-utils" "6.2.1"
+    "@typescript-eslint/utils" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -1353,71 +1357,71 @@
     ts-api-utils "^1.0.1"
 
 "@typescript-eslint/parser@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.1.0.tgz#3135bf65dca5340d8650703eb8cb83113e156ee5"
-  integrity sha512-hIzCPvX4vDs4qL07SYzyomamcs2/tQYXg5DtdAfj35AyJ5PIUqhsLf4YrEIFzZcND7R2E8tpQIZKayxg8/6Wbw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.2.1.tgz#e18a31eea1cca8841a565f1701960c8123ed07f9"
+  integrity sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/typescript-estree" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/typescript-estree" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.1.0.tgz#a6cdbe11630614f8c04867858a42dd56590796ed"
-  integrity sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==
+"@typescript-eslint/scope-manager@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz#b6f43a867b84e5671fe531f2b762e0b68f7cf0c4"
+  integrity sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
 
-"@typescript-eslint/type-utils@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.1.0.tgz#21cc6c3bc1980b03f9eb4e64580d0c5be6f08215"
-  integrity sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==
+"@typescript-eslint/type-utils@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz#8eb8a2cccdf39cd7cf93e02bd2c3782dc90b0525"
+  integrity sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.1.0"
-    "@typescript-eslint/utils" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.2.1"
+    "@typescript-eslint/utils" "6.2.1"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.1.0.tgz#2d607c62827bb416ada5c96ebfa2ef84e45a8dfa"
-  integrity sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==
+"@typescript-eslint/types@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.2.1.tgz#7fcdeceb503aab601274bf5e210207050d88c8ab"
+  integrity sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==
 
-"@typescript-eslint/typescript-estree@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.1.0.tgz#ea382f6482ba698d7e993a88ce5391ea7a66c33d"
-  integrity sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==
+"@typescript-eslint/typescript-estree@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz#2af6e90c1e91cb725a5fe1682841a3f74549389e"
+  integrity sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.1.0.tgz#1641843792b4e3451cc692e2c73055df8b26f453"
-  integrity sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==
+"@typescript-eslint/utils@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.2.1.tgz#2aa4279ec13053d05615bcbde2398e1e8f08c334"
+  integrity sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/typescript-estree" "6.2.1"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.1.0.tgz#d2b84dff6b58944d3257ea03687e269a788c73be"
-  integrity sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==
+"@typescript-eslint/visitor-keys@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz#442e7c09fe94b715a54ebe30e967987c3c41fbf4"
+  integrity sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
     eslint-visitor-keys "^3.4.1"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -1425,125 +1429,125 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
 
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
 
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
 
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.1":
@@ -1561,6 +1565,11 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
   integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
+"@xmldom/xmldom@^0.8.8":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
@@ -1593,28 +1602,21 @@ abort-controller@3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
+acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-add-dom-event-listener@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
-  integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==
-  dependencies:
-    object-assign "4.x"
-
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -1634,7 +1636,7 @@ ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
@@ -1651,7 +1653,7 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -1703,9 +1705,9 @@ ansi-styles@^5.0.0:
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1785,9 +1787,9 @@ app-builder-lib@23.6.0:
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 are-we-there-yet@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
-  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
@@ -1821,6 +1823,17 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array.prototype.findlastindex@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
+  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -1864,18 +1877,6 @@ arraybuffer.prototype.slice@^1.0.1:
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
 
-asar@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
-  integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
 asar@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
@@ -1944,44 +1945,24 @@ available-typed-arrays@^1.0.5:
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 axios@^1.3.2:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646"
-  integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
+  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 "babel-plugin-styled-components@>= 1":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086"
-  integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092"
+  integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-module-imports" "^7.16.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    lodash "^4.17.11"
-    picomatch "^2.3.0"
-
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==
-
-babel-runtime@6.x, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    lodash "^4.17.21"
+    picomatch "^2.3.1"
 
 backbone@1.3.3:
   version "1.3.3"
@@ -2085,15 +2066,15 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.14.5, browserslist@^4.20.2:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+browserslist@^4.14.5, browserslist@^4.21.9:
+  version "4.21.10"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
+  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
   dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
+    caniuse-lite "^1.0.30001517"
+    electron-to-chromium "^1.4.477"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.11"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -2229,9 +2210,9 @@ cacheable-lookup@^5.0.3:
   integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
 
 cacheable-request@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
-  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
+  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
@@ -2260,14 +2241,14 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 camelize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
-  integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
+  integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001436"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz#22d7cbdbbbb60cdc4ca1030ccd6dea9f5de4848b"
-  integrity sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==
+caniuse-lite@^1.0.30001517:
+  version "1.0.30001518"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
+  integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
 
 chai-as-promised@^7.1.1:
   version "7.1.1"
@@ -2282,13 +2263,13 @@ chai-bytes@^0.1.2:
   integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA==
 
 chai@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
-  integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
+  integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==
   dependencies:
     assertion-error "^1.1.0"
     check-error "^1.0.2"
-    deep-eql "^3.0.1"
+    deep-eql "^4.1.2"
     get-func-name "^2.0.0"
     loupe "^2.3.1"
     pathval "^1.1.1"
@@ -2305,7 +2286,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2314,7 +2295,7 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2372,10 +2353,10 @@ classnames@2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
   integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA==
 
-classnames@^2.2.5, classnames@^2.2.6:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
-  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+classnames@^2.2.5:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 cli-boxes@^2.2.1:
   version "2.2.1"
@@ -2418,16 +2399,16 @@ clone-deep@^4.0.1:
     shallow-clone "^3.0.0"
 
 clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
+  integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==
   dependencies:
     mimic-response "^1.0.0"
 
 clsx@^1.0.4, clsx@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
-  integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
+  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
 cmake-js@^7.2.1:
   version "7.2.1"
@@ -2465,7 +2446,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -2531,35 +2512,15 @@ compare-version@^0.1.2:
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
   integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==
 
-component-classes@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691"
-  integrity sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=
-  dependencies:
-    component-indexof "0.0.3"
-
-component-indexof@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24"
-  integrity sha1-EdCRMSI5648yyPJa6csAL/6NPCQ=
-
-compress-brotli@^1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
-  integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
-  dependencies:
-    "@types/json-buffer" "~3.0.0"
-    json-buffer "~3.0.1"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 config@1.28.1:
   version "1.28.1"
   resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d"
-  integrity sha1-diXSoeTJDxMdinM0eYLZPDhzKC0=
+  integrity sha512-NT2hna+ec7G1hLB+Jimu6tuzQQqAG81YJM2P4x31hM9qffcOeaMlue6tc/TTEEfRcyzVTJFzBzweRQf0FBHghQ==
   dependencies:
     json5 "0.4.0"
     os-homedir "1.0.2"
@@ -2584,27 +2545,20 @@ confusing-browser-globals@^1.0.10:
 console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 copy-to-clipboard@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
-  integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
+  integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
   dependencies:
     toggle-selection "^1.0.6"
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -2654,45 +2608,36 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-animation@^1.3.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e"
-  integrity sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog==
-  dependencies:
-    babel-runtime "6.x"
-    component-classes "^1.2.5"
-
 css-color-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
-  integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
+  integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==
 
-css-in-js-utils@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99"
-  integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==
+css-in-js-utils@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb"
+  integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==
   dependencies:
-    hyphenate-style-name "^1.0.2"
-    isobject "^3.0.1"
+    hyphenate-style-name "^1.0.3"
 
 css-loader@^6.7.2:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
-  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88"
+  integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.18"
+    postcss "^8.4.21"
     postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-local-by-default "^4.0.3"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
     semver "^7.3.8"
 
 css-to-react-native@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
-  integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32"
+  integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==
   dependencies:
     camelize "^1.0.0"
     css-color-keywords "^1.0.0"
@@ -2719,9 +2664,9 @@ cssstyle@^3.0.0:
     rrweb-cssom "^0.6.0"
 
 csstype@^3.0.2, csstype@^3.0.6:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
-  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 "curve25519-js@https://github.com/oxen-io/curve25519-js":
   version "0.0.4"
@@ -2777,12 +2722,12 @@ decompress-response@^6.0.0:
 deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
-  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
+  integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug==
 
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+deep-eql@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
+  integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
   dependencies:
     type-detect "^4.0.0"
 
@@ -2817,12 +2762,12 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 detect-node@^2.0.4:
   version "2.1.0"
@@ -2917,11 +2862,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-align@^1.7.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.3.tgz#a36d02531dae0eefa2abb0c4db6595250526f103"
-  integrity sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA==
-
 dom-helpers@^5.0.1, dom-helpers@^5.1.3:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
@@ -2938,9 +2878,9 @@ domexception@^4.0.0:
     webidl-conversions "^7.0.0"
 
 dompurify@^2.0.7:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
-  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc"
+  integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==
 
 dot-prop@^5.2.0:
   version "5.3.0"
@@ -2967,9 +2907,9 @@ dtrace-provider@~0.8:
     nan "^2.14.0"
 
 ejs@^3.1.7:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
+  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
   dependencies:
     jake "^10.8.5"
 
@@ -2994,7 +2934,7 @@ electron-builder@23.0.8:
 electron-is-accelerator@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
-  integrity sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=
+  integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==
 
 electron-localshortcut@^3.2.1:
   version "3.2.1"
@@ -3044,10 +2984,10 @@ electron-publish@23.6.0:
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
-electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+electron-to-chromium@^1.4.477:
+  version "1.4.479"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118"
+  integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==
 
 electron-updater@^4.2.2:
   version "4.6.5"
@@ -3063,7 +3003,16 @@ electron-updater@^4.2.2:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@*, electron@25.3.0:
+electron@*:
+  version "25.3.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.2.tgz#4ca096ea85abf05cbbc42e60da9e2c3a7b87dd80"
+  integrity sha512-xiktJvXraaE/ARf2OVHFyTze1TksSbsbJgOaBtdIiBvUduez6ipATEPIec8Msz1n6eQ+xqYb6YF8tDuIZtJSPw==
+  dependencies:
+    "@electron/get" "^2.0.0"
+    "@types/node" "^18.11.18"
+    extract-zip "^2.0.1"
+
+electron@25.3.0:
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.0.tgz#e818ab3ebd3e7a45f8fca0f47e607c9af2dc92c7"
   integrity sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==
@@ -3090,7 +3039,7 @@ emojis-list@^3.0.0:
 encoding@0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  integrity sha512-bl1LAgiQc4ZWr++pNYUdRe/alecaHFeHxIJ/pNciqGdKXghaTCOwKkbKp6ye7pKZGu/GcaSXFk8PBVhgs+dJdA==
   dependencies:
     iconv-lite "~0.4.13"
 
@@ -3101,10 +3050,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3130,13 +3079,13 @@ err-code@^2.0.2:
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
 error-stack-parser@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57"
-  integrity sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
+es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
   integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
@@ -3181,10 +3130,10 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.10"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
+  integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -3234,7 +3183,7 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
@@ -3252,9 +3201,9 @@ eslint-config-airbnb-base@^15.0.0:
     semver "^6.3.0"
 
 eslint-config-prettier@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
+  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==
 
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
@@ -3265,7 +3214,7 @@ eslint-import-resolver-node@^0.3.7:
     is-core-module "^2.11.0"
     resolve "^1.22.1"
 
-eslint-module-utils@^2.7.4:
+eslint-module-utils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
   integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
@@ -3273,25 +3222,28 @@ eslint-module-utils@^2.7.4:
     debug "^3.2.7"
 
 eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz#8d66d6925117b06c4018d491ae84469eb3cb1005"
+  integrity sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==
   dependencies:
     array-includes "^3.1.6"
+    array.prototype.findlastindex "^1.2.2"
     array.prototype.flat "^1.3.1"
     array.prototype.flatmap "^1.3.1"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
+    eslint-module-utils "^2.8.0"
     has "^1.0.3"
-    is-core-module "^2.11.0"
+    is-core-module "^2.12.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
+    object.fromentries "^2.0.6"
+    object.groupby "^1.0.0"
     object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    resolve "^1.22.3"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
 
 eslint-plugin-mocha@^10.1.0:
   version "10.1.0"
@@ -3312,9 +3264,9 @@ eslint-plugin-react-hooks@^4.6.0:
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react@^7.33.0:
-  version "7.33.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz#6c356fb0862fec2cd1b04426c669ea746e9b6eb3"
-  integrity sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==
+  version "7.33.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz#bc27cccf860ae45413a4a4150bf0977345c1ceab"
+  integrity sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.flatmap "^1.3.1"
@@ -3340,10 +3292,10 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.2.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd"
-  integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -3360,32 +3312,32 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
 eslint@^8.45.0:
-  version "8.45.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.1.0"
-    "@eslint/js" "8.44.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.1"
+    "@eslint/js" "^8.46.0"
     "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.1"
-    espree "^9.6.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.2"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -3408,7 +3360,7 @@ eslint@^8.45.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0:
+espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -3505,9 +3457,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.9:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
-  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3523,7 +3475,12 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fast-loops@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75"
+  integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==
 
 fast-shallow-equal@^1.0.0:
   version "1.0.0"
@@ -3550,14 +3507,14 @@ fastq@^1.6.0:
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
 
 fetch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fetch/-/fetch-1.1.0.tgz#0a8279f06be37f9f0ebb567560a30a480da59a2e"
-  integrity sha1-CoJ58Gvjf58Ou1Z1YKMKSA2lmi4=
+  integrity sha512-5O8TwrGzoNblBG/jtK4NFuZwNCkZX6s5GfRNOaGtm+QGJEuNakSC/i2RW0R93KX6E0jVjNXm6O3CRN4Ql3K+yA==
   dependencies:
     biskviit "1.0.1"
     encoding "0.1.12"
@@ -3579,7 +3536,7 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-filelist@^1.0.1:
+filelist@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
   integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
@@ -3624,7 +3581,7 @@ find-yarn-workspace-root@^2.0.0:
 firstline@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae"
-  integrity sha1-uIZzxCAJ+IIfrCkm6ZcgrO6ST64=
+  integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw==
 
 flat-cache@^3.0.4:
   version "3.0.4"
@@ -3640,9 +3597,9 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.15.0:
   version "1.15.2"
@@ -3693,15 +3650,6 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -3731,7 +3679,7 @@ fs-minipass@^2.0.0:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -3785,7 +3733,7 @@ get-caller-file@^2.0.5:
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
@@ -3856,7 +3804,7 @@ glob@7.2.0:
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3934,9 +3882,9 @@ gopd@^1.0.1:
     get-intrinsic "^1.1.3"
 
 got@^11.8.5, got@^9.6.0:
-  version "11.8.5"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
-  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+  version "11.8.6"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
   dependencies:
     "@sindresorhus/is" "^4.0.0"
     "@szmarczak/http-timer" "^4.0.5"
@@ -3951,9 +3899,9 @@ got@^11.8.5, got@^9.6.0:
     responselike "^2.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -3968,7 +3916,7 @@ graphemer@^1.4.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -3980,7 +3928,7 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -4014,7 +3962,7 @@ has-tostringtag@^1.0.0:
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has-yarn@^2.1.0:
   version "2.1.0"
@@ -4089,7 +4037,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-hyphenate-style-name@^1.0.2:
+hyphenate-style-name@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
@@ -4139,14 +4087,14 @@ image-type@^4.1.0:
     file-type "^10.10.0"
 
 immer@^9.0.7:
-  version "9.0.14"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.14.tgz#e05b83b63999d26382bb71676c9d827831248a48"
-  integrity sha512-ubBeqQutOSLIFCUBN03jGeOS6a3DoYlSYwYJTa+gSKEZKU5redJIqkIdZ3JVv/4RZpfcXdAWH5zCNLWPRv2WDw==
+  version "9.0.21"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
+  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
 immutable@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
-  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.1.tgz#17988b356097ab0719e2f741d56f3ec6c317f9dc"
+  integrity sha512-lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A==
 
 import-fresh@^3.2.1:
   version "3.3.0"
@@ -4172,12 +4120,12 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4193,11 +4141,12 @@ ini@2.0.0, ini@^1.3.6, ini@~1.3.0:
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inline-style-prefixer@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.1.tgz#c5c0e43ba8831707afc5f5bbfd97edf45c1fa7ae"
-  integrity sha512-AsqazZ8KcRzJ9YPN1wMH2aNM7lkWQ8tSPrW5uDk1ziYwiAPWSZnUsC7lfZq+BDqLqz0B4Pho5wscWcJzVvRzDQ==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz#4290ed453ab0e4441583284ad86e41ad88384f44"
+  integrity sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==
   dependencies:
-    css-in-js-utils "^2.0.0"
+    css-in-js-utils "^3.1.0"
+    fast-loops "^1.1.3"
 
 internal-slot@^1.0.3, internal-slot@^1.0.5:
   version "1.0.5"
@@ -4232,10 +4181,10 @@ ip2country@1.0.1:
   dependencies:
     asbycountry "^1.4.2"
 
-ip@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
+ip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
 
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"
@@ -4287,7 +4236,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -4309,7 +4258,7 @@ is-docker@^2.0.0, is-docker@^2.1.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -4424,7 +4373,7 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
@@ -4453,7 +4402,7 @@ is-yarn-global@^0.3.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@^2.0.5:
   version "2.0.5"
@@ -4475,22 +4424,22 @@ isbinaryfile@^4.0.10:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 jake@^10.8.5:
-  version "10.8.5"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
-  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
+  version "10.8.7"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
+  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
   dependencies:
     async "^3.2.3"
     chalk "^4.0.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
 
 jest-diff@^27.2.5, jest-diff@^27.5.1:
   version "27.5.1"
@@ -4581,7 +4530,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
-  integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
+  integrity sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg==
 
 jsdom@^22.1.0:
   version "22.1.0"
@@ -4617,7 +4566,7 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-buffer@3.0.1, json-buffer@~3.0.1:
+json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
@@ -4640,14 +4589,14 @@ json-schema-traverse@^1.0.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.2:
+json5@0.4.0, json5@^1.0.2, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -4655,7 +4604,7 @@ json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -4669,9 +4618,9 @@ jsonfile@^6.0.1:
     graceful-fs "^4.1.6"
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9"
-  integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.flat "^1.3.1"
@@ -4694,11 +4643,10 @@ keyboardevents-areequal@^0.2.1:
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
 keyv@^4.0.0:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.3.3.tgz#6c1bcda6353a9e96fc1b4e1aeb803a6e35090ba9"
-  integrity sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
+  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
   dependencies:
-    compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
 kind-of@^6.0.2:
@@ -4713,11 +4661,6 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
-  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
-
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -4759,17 +4702,17 @@ levn@^0.4.1:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"
 
-libsodium-sumo@^0.7.0:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.10.tgz#169756dbf32088f42e30dfb0a7860074663fb0b4"
-  integrity sha512-xvYHwrTPvw9EFvX77x6gFiB7vdTv4+9xpM5DCkg9FJwysHoBO7sYXxXjy5L2gQSuWaINbtjBUry9eCg/+nYwCA==
+libsodium-sumo@^0.7.11:
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.11.tgz#ab0389e2424fca5c1dc8c4fd394906190da88a11"
+  integrity sha512-bY+7ph7xpk51Ez2GbE10lXAQ5sJma6NghcIDaSPbM/G9elfrjLa0COHl/7P6Wb/JizQzl5UQontOOP1z0VwbLA==
 
 libsodium-wrappers-sumo@^0.7.9:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.10.tgz#592b0cc714ddf3954f93e2292ff3aadebd2b282b"
-  integrity sha512-1noz8Mcl/LUzO/iSO/FJzoJyIaPwxl+/+E4CoTIXtsPiEEXQx2sxalmrVWxteLpynqgX0ASo28ChB9NEVRh0Pg==
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.11.tgz#d96329ee3c0e7ec7f5fcf4cdde16cc3a1ae91d82"
+  integrity sha512-DGypHOmJbB1nZn89KIfGOAkDgfv5N6SBGC3Qvmy/On0P0WD1JQvNRS/e3UL3aFF+xC0m+MYz5M+MnRnK2HMrKQ==
   dependencies:
-    libsodium-sumo "^0.7.0"
+    libsodium-sumo "^0.7.11"
 
 linkify-it@^4.0.1:
   version "4.0.1"
@@ -4814,17 +4757,17 @@ lodash-es@^4.2.1:
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
+  integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==
 
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
@@ -4836,7 +4779,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4857,7 +4800,7 @@ long@^4.0.0:
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
+  integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -4867,9 +4810,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loupe@^2.3.1:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
-  integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
+  integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
   dependencies:
     get-func-name "^2.0.0"
 
@@ -4878,6 +4821,13 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -4985,9 +4935,9 @@ mimic-response@^3.1.0:
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
 mini-css-extract-plugin@^2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
-  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -4999,17 +4949,22 @@ mini-css-extract-plugin@^2.7.5:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^3.0.0:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -5066,7 +5021,7 @@ moment@^2.19.3, moment@^2.29.4:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -5081,7 +5036,7 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.2:
 mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
-  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==
   dependencies:
     mkdirp "~0.5.1"
     ncp "~2.0.0"
@@ -5111,10 +5066,10 @@ nanoid@3.3.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
   integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -5124,12 +5079,12 @@ natural-compare-lite@^1.4.0:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 ncp@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+  integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
 
 neo-async@^2.6.2:
   version "2.6.2"
@@ -5168,9 +5123,9 @@ node-api-headers@^0.0.2:
   integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg==
 
 node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -5181,10 +5136,10 @@ node-loader@^2.0.0:
   dependencies:
     loader-utils "^2.0.0"
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -5218,10 +5173,10 @@ nwsapi@^2.2.4:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
-object-assign@4.x, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.12.3, object-inspect@^1.9.0:
   version "1.12.3"
@@ -5233,7 +5188,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
+object.assign@^4.1.2, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -5261,6 +5216,16 @@ object.fromentries@^2.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+object.groupby@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
+  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    get-intrinsic "^1.2.1"
+
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -5281,7 +5246,7 @@ object.values@^1.1.6:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -5301,9 +5266,9 @@ open@^7.4.2:
     is-wsl "^2.1.1"
 
 open@^8.3.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"
@@ -5324,7 +5289,7 @@ optionator@^0.9.3:
 os-homedir@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
 
 os-locale@5.0.0:
   version "5.0.0"
@@ -5338,7 +5303,7 @@ os-locale@5.0.0:
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 p-cancelable@^2.0.0:
   version "2.1.1"
@@ -5348,7 +5313,7 @@ p-cancelable@^2.0.0:
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
 
 p-is-promise@^2.1.0:
   version "2.1.0"
@@ -5421,23 +5386,24 @@ parse5@^7.1.2:
     entities "^4.4.0"
 
 patch-package@^6.4.7:
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
-  integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621"
+  integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
-    chalk "^2.4.2"
+    chalk "^4.1.2"
     cross-spawn "^6.0.5"
     find-yarn-workspace-root "^2.0.0"
-    fs-extra "^7.0.1"
+    fs-extra "^9.0.0"
     is-ci "^2.0.0"
     klaw-sync "^6.0.0"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     open "^7.4.2"
     rimraf "^2.6.3"
     semver "^5.6.0"
     slash "^2.0.0"
     tmp "^0.0.33"
+    yaml "^1.10.2"
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -5447,12 +5413,12 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -5484,19 +5450,14 @@ pathval@^1.1.1:
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -5504,12 +5465,12 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1:
 pify@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pirates@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pixelmatch@^5.2.1:
   version "5.3.0"
@@ -5555,10 +5516,11 @@ playwright@1.16.3:
     playwright-core "=1.16.3"
 
 plist@^3.0.1, plist@^3.0.4:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
-  integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
+  integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
   dependencies:
+    "@xmldom/xmldom" "^0.8.8"
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
@@ -5577,10 +5539,10 @@ postcss-modules-extract-imports@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -5601,9 +5563,9 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -5613,12 +5575,12 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.18:
-  version "8.4.19"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
-  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+postcss@^8.4.21:
+  version "8.4.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -5659,7 +5621,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -5729,7 +5691,7 @@ pupa@^2.1.1:
 qr.js@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
-  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
+  integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==
 
 querystringify@^2.1.1:
   version "2.2.0"
@@ -5746,13 +5708,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-raf@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
 rambda@^7.1.0:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe"
@@ -5765,75 +5720,22 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-rc-align@^2.4.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.5.tgz#c941a586f59d1017f23a428f0b468663fb7102ab"
-  integrity sha512-nv9wYUYdfyfK+qskThf4BQUSIadeI/dCsfaMZfNEoxm9HwOIioQ+LyqmMK6jWHAZQgOzMLaqawhuBXlF63vgjw==
+rc-slider@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.2.1.tgz#9b571d19f740adcacdde271f44901a47717fd8da"
+  integrity sha512-l355C/65iV4UFp7mXq5xBTNX2/tF2g74VWiTVlTpNp+6vjE/xaHHNiQq5Af+Uu28uUiqCuH/QXs5HfADL9KJ/A==
   dependencies:
-    babel-runtime "^6.26.0"
-    dom-align "^1.7.0"
-    prop-types "^15.5.8"
-    rc-util "^4.0.4"
-
-rc-animate@2.x:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.11.1.tgz#2666eeb6f1f2a495a13b2af09e236712278fdb2c"
-  integrity sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==
-  dependencies:
-    babel-runtime "6.x"
-    classnames "^2.2.6"
-    css-animation "^1.3.2"
-    prop-types "15.x"
-    raf "^3.4.0"
-    rc-util "^4.15.3"
-    react-lifecycles-compat "^3.0.4"
-
-rc-slider@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.7.1.tgz#9ed07362dc93489a38e654b21b8122ad70fd3c42"
-  integrity sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==
-  dependencies:
-    babel-runtime "6.x"
+    "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
-    prop-types "^15.5.4"
-    rc-tooltip "^3.7.0"
-    rc-util "^4.0.4"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.1.0"
-    warning "^4.0.3"
+    rc-util "^5.27.0"
 
-rc-tooltip@^3.7.0:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.7.3.tgz#280aec6afcaa44e8dff0480fbaff9e87fc00aecc"
-  integrity sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==
+rc-util@^5.27.0:
+  version "5.35.0"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.35.0.tgz#bed1986248b7be525cc0894109e609ac60207f29"
+  integrity sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==
   dependencies:
-    babel-runtime "6.x"
-    prop-types "^15.5.8"
-    rc-trigger "^2.2.2"
-
-rc-trigger@^2.2.2:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.6.5.tgz#140a857cf28bd0fa01b9aecb1e26a50a700e9885"
-  integrity sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw==
-  dependencies:
-    babel-runtime "6.x"
-    classnames "^2.2.6"
-    prop-types "15.x"
-    rc-align "^2.4.0"
-    rc-animate "2.x"
-    rc-util "^4.4.0"
-    react-lifecycles-compat "^3.0.4"
-
-rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.21.1.tgz#88602d0c3185020aa1053d9a1e70eac161becb05"
-  integrity sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==
-  dependencies:
-    add-dom-event-listener "^1.1.0"
-    prop-types "^15.5.10"
+    "@babel/runtime" "^7.18.3"
     react-is "^16.12.0"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.1.0"
 
 rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
@@ -5870,9 +5772,9 @@ react-draggable@^4.4.4:
     prop-types "^15.8.1"
 
 react-h5-audio-player@^3.2.0:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.4.tgz#94ac1934f4e045bcd973fe09ffc318fd2c610fd1"
-  integrity sha512-SgJFuaQ0KAbPBORGGuGg3UtuffZYOcsgs/AYZOF4xTS63+n81ge/Prp2Ai+MDA/Yr0FJ7eeUB4uF1XcjKJ8xeA==
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.6.tgz#e7ee69ba6c0a82d317d4f987d83bb18b356a4415"
+  integrity sha512-eyViI47jRRybCcCkGdoAMd6yfhg3UMyXp39mqOWCbNQfAYI8U6zC0+0DLZjhrB7//DJtHhZx8h1q99HMxYkMWQ==
   dependencies:
     "@babel/runtime" "^7.10.2"
     "@iconify/icons-mdi" "~1.1.0"
@@ -5904,9 +5806,9 @@ react-lifecycles-compat@^3.0.4:
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-mentions@^4.4.9:
-  version "4.4.9"
-  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.9.tgz#5f68c7978c107518646c5c34c47515c30259e23a"
-  integrity sha512-CUDt8GOVbAmo3o+a8l1UxcJ/gJMdFdqeiJM3U5+krcNoUwyKv7Zcy67WfFZQJfChpJ8LTiD0FtCSRoyEzC6Ysw==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.10.tgz#ae6c1e310a405597e83ce786f12c5bfb93b097ce"
+  integrity sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA==
   dependencies:
     "@babel/runtime" "7.4.5"
     invariant "^2.2.4"
@@ -5943,9 +5845,9 @@ react-toastify@^6.0.9:
     react-transition-group "^4.4.1"
 
 react-transition-group@^4.4.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
-  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
+  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -5957,7 +5859,7 @@ react-universal-interface@^0.6.2:
   resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
   integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
 
-react-use@^17.2.1:
+react-use@^17.4.0:
   version "17.4.0"
   resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d"
   integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q==
@@ -5977,10 +5879,10 @@ react-use@^17.2.1:
     ts-easing "^0.2.0"
     tslib "^2.1.0"
 
-react-virtualized@9.22.3:
-  version "9.22.3"
-  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.3.tgz#f430f16beb0a42db420dbd4d340403c0de334421"
-  integrity sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==
+react-virtualized@^9.22.4:
+  version "9.22.5"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620"
+  integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ==
   dependencies:
     "@babel/runtime" "^7.7.2"
     clsx "^1.0.4"
@@ -6039,7 +5941,7 @@ rechoir@^0.8.0:
 redux-logger@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
-  integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
+  integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg==
   dependencies:
     deep-diff "^0.3.5"
 
@@ -6049,16 +5951,16 @@ redux-persist@^6.0.0:
   integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
 
 redux-promise-middleware@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.2.tgz#1c14222686934be243cbb292e348ef7d5b20d6d2"
-  integrity sha512-ZqZu/nnSzGgwTtNbGoGVontpk7LjTOv0kigtt3CcgXI9gpq+8WlfXTXRZD0WTD5yaohRq0q2nYmJXSTjwXs83Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.3.tgz#315f6a9fcabe1f02a9c2f30fa615f838d7b01b66"
+  integrity sha512-B/Hi5Ct5d9y5d/KG0f6MZUXKA0nrQh5583mHCx13HY3Avte8KfpoRH/TB5QT6k/FcjT6JCxjv7jedymidy2A1A==
 
 redux-thunk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
-  integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
+  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
-redux@4.2.0, redux@^4.0.0, redux@^4.1.2:
+redux@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
@@ -6075,10 +5977,12 @@ redux@^3.6.0:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+redux@^4.0.0, redux@^4.1.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
 
 regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2:
   version "0.13.11"
@@ -6111,7 +6015,7 @@ registry-url@^5.0.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -6124,9 +6028,9 @@ requires-port@^1.0.0:
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
-  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
+  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
 
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
@@ -6155,12 +6059,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0, resolve@^1.22.1:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.3:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
+  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.12.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -6183,7 +6087,7 @@ responselike@^2.0.0:
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 retry@^0.13.1:
   version "0.13.1"
@@ -6219,7 +6123,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
-  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==
   dependencies:
     glob "^6.0.1"
 
@@ -6241,9 +6145,9 @@ rrweb-cssom@^0.6.0:
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
 rtl-css-js@^1.14.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
-  integrity sha512-99Cu4wNNIhrI10xxUaABHsdDqzalrSRTie4GeCmbGVuehm4oj+fIy8fTzB+16pmKe8Bv9rl+hxIBez6KxExTew==
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80"
+  integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==
   dependencies:
     "@babel/runtime" "^7.1.2"
 
@@ -6274,11 +6178,6 @@ safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-json-stringify@~1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
@@ -6311,17 +6210,16 @@ sanitize.css@^12.0.1:
   integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw==
 
 sass-loader@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9"
-  integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6"
+  integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==
   dependencies:
-    klona "^2.0.6"
     neo-async "^2.6.2"
 
 sass@^1.60.0:
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.60.0.tgz#657f0c23a302ac494b09a5ba8497b739fb5b5a81"
-  integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==
+  version "1.64.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.2.tgz#0d9805ad6acf31c59c3acc725fcfb91b7fcc6909"
+  integrity sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -6347,30 +6245,35 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
+    ajv-keywords "^5.1.0"
 
 screenfull@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba"
   integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==
 
+sdp@^2.1.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.12.0.tgz#338a106af7560c86e4523f858349680350d53b22"
+  integrity sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -6389,9 +6292,9 @@ semver@5.4.1:
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
 semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
@@ -6412,17 +6315,24 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
+serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
   integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-harmonic-interval@^1.0.1:
   version "1.0.1"
@@ -6444,7 +6354,7 @@ shallowequal@^1.1.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
@@ -6458,7 +6368,7 @@ shebang-command@^2.0.0:
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
   version "3.0.0"
@@ -6517,20 +6427,20 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 socks-proxy-agent@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
-  integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
     socks "^2.6.2"
 
 socks@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
   dependencies:
-    ip "^1.1.5"
+    ip "^2.0.0"
     smart-buffer "^4.2.0"
 
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
@@ -6556,12 +6466,12 @@ source-map-support@^0.5.19, source-map-support@~0.5.20:
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
 
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
@@ -6579,31 +6489,31 @@ sprintf-js@^1.1.2:
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 stack-generator@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
-  integrity sha512-/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q==
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d"
+  integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
 stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stackframe@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1"
-  integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
 stacktrace-gps@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz#7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"
-  integrity sha512-qIr8x41yZVSldqdqe6jciXEaSCKw1U8XTXpjDuy0ki/apyTn/r3w9hDAAQOhZdxvsC93H+WwwEu5cq5VemzYeg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
+  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
   dependencies:
     source-map "0.5.6"
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
 stacktrace-js@^2.0.2:
   version "2.0.2"
@@ -6679,7 +6589,7 @@ string_decoder@^1.1.1:
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -6693,7 +6603,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
@@ -6708,7 +6618,7 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 styled-components@5.1.1:
   version "5.1.1"
@@ -6727,9 +6637,9 @@ styled-components@5.1.1:
     supports-color "^5.5.0"
 
 stylis@^4.0.6:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12"
-  integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c"
+  integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==
 
 substyle@^9.1.0:
   version "9.4.1"
@@ -6756,7 +6666,7 @@ supports-color@8.1.1, supports-color@^8.0.0:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
@@ -6793,13 +6703,13 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.1.0, tar@^6.1.11:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  version "6.1.15"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^3.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -6812,31 +6722,31 @@ temp-file@^3.4.0:
     async-exit-hook "^2.0.1"
     fs-extra "^10.0.0"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.6"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
-  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
+terser-webpack-plugin@^5.3.7:
+  version "5.3.9"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.14"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    terser "^5.14.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.16.8"
 
-terser@^5.14.1, terser@^5.14.2:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+terser@^5.14.2, terser@^5.16.8:
+  version "5.19.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
+  integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 throttle-debounce@^3.0.1:
   version "3.0.1"
@@ -6867,7 +6777,7 @@ tmp@^0.2.0:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -6879,7 +6789,7 @@ to-regex-range@^5.0.1:
 toggle-selection@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
-  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+  integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
 
 tough-cookie@^4.1.2:
   version "4.1.3"
@@ -6906,7 +6816,7 @@ tr46@~0.0.3:
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==
   dependencies:
     utf8-byte-length "^1.0.1"
 
@@ -6921,29 +6831,29 @@ ts-easing@^0.2.0:
   integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
 
 ts-loader@^9.4.2:
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
-  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4"
+  integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+tsconfig-paths@^3.14.2:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^1.0.2"
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tslib@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
+  integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -7034,9 +6944,9 @@ unbox-primitive@^1.0.2:
     which-boxed-primitive "^1.0.2"
 
 underscore@>=1.8.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
-  integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
 unique-string@^2.0.0:
   version "2.0.0"
@@ -7065,10 +6975,10 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -7116,7 +7026,7 @@ url-parse@^1.5.3:
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
-  integrity sha1-C7gNlPSaSgUZK4Sox9NOlfGn46A=
+  integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ==
 
 use-sync-external-store@^1.0.0:
   version "1.2.0"
@@ -7126,12 +7036,12 @@ use-sync-external-store@^1.0.0:
 utf8-byte-length@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+  integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@8.3.2:
   version "8.3.2"
@@ -7154,13 +7064,6 @@ w3c-xmlserializer@^4.0.0:
   dependencies:
     xml-name-validator "^4.0.0"
 
-warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
-  dependencies:
-    loose-envify "^1.0.0"
-
 watchpack@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -7212,21 +7115,21 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.76.3:
-  version "5.76.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489"
-  integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==
+  version "5.88.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
+  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.15.0"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
@@ -7235,12 +7138,19 @@ webpack@^5.76.3:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
+    terser-webpack-plugin "^5.3.7"
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
+webrtc-adapter@^4.1.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-4.2.2.tgz#17896c047084fd4c567958a0cd4321e17f32773c"
+  integrity sha512-JV2mqgwd8K+n0YrwohZgpZceojJRmC+1CsSTNOTdjDOKwCpffeY49d/0lks7dzw+nMtz8XQs9yaUafXh4iCINg==
+  dependencies:
+    sdp "^2.1.0"
+
 whatwg-encoding@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
@@ -7341,7 +7251,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -7354,9 +7264,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.4.6:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 ws@^8.13.0:
   version "8.13.0"
@@ -7388,11 +7298,21 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
@@ -7447,7 +7367,7 @@ yargs@^17.0.1, yargs@^17.6.0:
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"

From 41ca0666cedc3ac6f1153c9d64c8aa51f6503f60 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Aug 2023 10:19:33 +0200
Subject: [PATCH 176/178] chore: remove () => void for misused promises

---
 ts/components/SessionScrollButton.tsx         |  3 ++-
 ts/components/basic/SessionInput.tsx          |  3 ++-
 ts/components/calling/CallButtons.tsx         |  3 ++-
 ts/components/calling/IncomingCallDialog.tsx  |  5 ++--
 .../SessionMessagesListContainer.tsx          |  3 ++-
 .../conversation/SessionRightPanel.tsx        | 10 ++++----
 .../composition/CompositionBox.tsx            | 24 +++++++++----------
 .../composition/CompositionButtons.tsx        |  9 +++----
 .../message-content/ClickToTrustSender.tsx    |  3 ++-
 .../message/message-content/MessageAvatar.tsx |  7 ++----
 .../MessageContentWithStatus.tsx              |  3 ++-
 .../message-content/MessageContextMenu.tsx    | 11 +++++----
 .../message/message-content/MessageQuote.tsx  |  3 ++-
 ts/components/dialog/EditProfileDialog.tsx    |  3 ++-
 .../conversation-list-item/HeaderItem.tsx     |  3 ++-
 .../leftpane/overlay/OverlayCommunity.tsx     |  6 ++---
 .../overlay/choose-action/ContactRow.tsx      |  3 ++-
 ts/components/menu/Menu.tsx                   | 15 ++++++++----
 ts/components/registration/SignUpTab.tsx      |  5 ++--
 .../settings/SessionSettingListItem.tsx       |  3 ++-
 ts/node/menu.ts                               |  3 ++-
 ts/state/ducks/modalDialog.tsx                |  3 ++-
 ts/types/Util.ts                              |  2 ++
 ts/util/expiringMessages.ts                   |  6 +++--
 24 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/ts/components/SessionScrollButton.tsx b/ts/components/SessionScrollButton.tsx
index 4019faaf2..5c7543da2 100644
--- a/ts/components/SessionScrollButton.tsx
+++ b/ts/components/SessionScrollButton.tsx
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 import { getShowScrollButton } from '../state/selectors/conversations';
 
 import { SessionIconButton } from './icon';
+import { Noop } from '../types/Util';
 
 const SessionScrollButtonDiv = styled.div`
   position: fixed;
@@ -17,7 +18,7 @@ const SessionScrollButtonDiv = styled.div`
   }
 `;
 
-export const SessionScrollButton = (props: { onClickScrollBottom: () => void }) => {
+export const SessionScrollButton = (props: { onClickScrollBottom: Noop }) => {
   const show = useSelector(getShowScrollButton);
 
   return (
diff --git a/ts/components/basic/SessionInput.tsx b/ts/components/basic/SessionInput.tsx
index e3425173d..2143b7413 100644
--- a/ts/components/basic/SessionInput.tsx
+++ b/ts/components/basic/SessionInput.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 
 import classNames from 'classnames';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type Props = {
   label?: string;
@@ -44,7 +45,7 @@ const ErrorItem = (props: { error: string | undefined }) => {
   );
 };
 
-const ShowHideButton = (props: { toggleForceShow: () => void }) => {
+const ShowHideButton = (props: { toggleForceShow: Noop }) => {
   return <SessionIconButton iconType="eye" iconSize="medium" onClick={props.toggleForceShow} />;
 };
 
diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index acb84dae8..a599c3092 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -282,7 +282,8 @@ export const HangUpButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
         iconType="hangup"
         iconColor="var(--danger-color)"
         borderRadius="50%"
-        onClick={() => void handleEndCall()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onClick={handleEndCall}
         margin="10px"
         dataTestId="end-call"
       />
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index 98dd11908..ccaba5c46 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -35,14 +35,15 @@ export const IncomingCallDialog = () => {
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     if (incomingCallFromPubkey) {
-      timeout = global.setTimeout(() => {
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      timeout = global.setTimeout(async () => {
         if (incomingCallFromPubkey) {
           window.log.info(
             `call missed with ${ed25519Str(
               incomingCallFromPubkey
             )} as the dialog was not interacted with for ${callTimeoutMs} ms`
           );
-          void CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
+          await CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
         }
       }, callTimeoutMs);
     }
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 6fde12df2..92941a56d 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -144,7 +144,8 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
         </ScrollToLoadedMessageContext.Provider>
 
         <SessionScrollButton
-          onClickScrollBottom={() => void this.props.scrollToNow()}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClickScrollBottom={this.props.scrollToNow}
           key="scroll-down-button"
         />
       </StyledMessagesContainer>
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 9bbb628de..8117d4e03 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -301,8 +301,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupNameByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -335,8 +336,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupMembersByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index c4b4eb436..689a3025c 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -404,7 +404,8 @@ class CompositionBoxInner extends React.Component<Props, State> {
     return (
       <SessionRecording
         sendVoiceMessage={this.sendVoiceMessage}
-        onLoadVoiceNoteView={() => void this.onLoadVoiceNoteView()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onLoadVoiceNoteView={this.onLoadVoiceNoteView}
         onExitVoiceNoteView={this.onExitVoiceNoteView}
       />
     );
@@ -413,22 +414,20 @@ class CompositionBoxInner extends React.Component<Props, State> {
   private renderCompositionView() {
     const { showEmojiPanel } = this.state;
     const { typingEnabled } = this.props;
+    /* eslint-disable @typescript-eslint/no-misused-promises */
 
     return (
       <>
         {typingEnabled && <AddStagedAttachmentButton onClick={this.onChooseAttachment} />}
-
         <input
           className="hidden"
           placeholder="Attachment"
           multiple={true}
           ref={this.fileInput}
           type="file"
-          onChange={() => void this.onChoseAttachment()}
+          onChange={this.onChoseAttachment}
         />
-
-        {typingEnabled && <StartRecordingButton onClick={() => void this.onLoadVoiceNoteView()} />}
-
+        {typingEnabled && <StartRecordingButton onClick={this.onLoadVoiceNoteView} />}
         <StyledSendMessageInput
           role="main"
           onClick={this.focusCompositionBox} // used to focus on the textarea when clicking in its container
@@ -439,25 +438,24 @@ class CompositionBoxInner extends React.Component<Props, State> {
         >
           {this.renderTextArea()}
         </StyledSendMessageInput>
-
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        <SendMessageButton onClick={() => void this.onSendMessage()} />
-
+        <SendMessageButton onClick={this.onSendMessage} />
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button">
             <SessionEmojiPanel
               ref={this.emojiPanel}
               show={showEmojiPanel}
               onEmojiClicked={this.onEmojiClick}
-              onKeyDown={e => void this.onKeyDown(e)}
+              onKeyDown={this.onKeyDown}
             />
           </StyledEmojiPanelContainer>
         )}
       </>
     );
   }
+  /* eslint-enable @typescript-eslint/no-misused-promises */
 
   private renderTextArea() {
     const { i18n } = window;
@@ -492,8 +490,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
       <MentionsInput
         value={draft}
         onChange={this.onChange}
-        onKeyDown={e => void this.onKeyDown(e)}
-        onKeyUp={() => void this.onKeyUp()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyDown={this.onKeyDown}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyUp={this.onKeyUp}
         placeholder={messagePlaceHolder}
         spellCheck={true}
         inputRef={this.textarea}
diff --git a/ts/components/conversation/composition/CompositionButtons.tsx b/ts/components/conversation/composition/CompositionButtons.tsx
index bd651c3f5..f88cdde7a 100644
--- a/ts/components/conversation/composition/CompositionButtons.tsx
+++ b/ts/components/conversation/composition/CompositionButtons.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { SessionIconButton } from '../../icon';
+import { Noop } from '../../../types/Util';
 
 const StyledChatButtonContainer = styled.div`
   .session-icon-button {
@@ -14,7 +15,7 @@ const StyledChatButtonContainer = styled.div`
   }
 `;
 
-export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
+export const AddStagedAttachmentButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -31,7 +32,7 @@ export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
   );
 };
 
-export const StartRecordingButton = (props: { onClick: () => void }) => {
+export const StartRecordingButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -49,7 +50,7 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
 };
 
 // eslint-disable-next-line react/display-name
-export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: () => void }>(
+export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: Noop }>(
   (props, ref) => {
     return (
       <StyledChatButtonContainer>
@@ -69,7 +70,7 @@ export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: ()
   }
 );
 
-export const SendMessageButton = (props: { onClick: () => void }) => {
+export const SendMessageButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer className="send-message-button">
       <SessionIconButton
diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
index 88cb65155..25afee8a7 100644
--- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
+++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -111,7 +111,8 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
   };
 
   return (
-    <StyledTrustSenderUI onClick={e => void openConfirmationModal(e)}>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <StyledTrustSenderUI onClick={openConfirmationModal}>
       <SessionIcon iconSize="small" iconType="gallery" />
       <ClickToDownload>{window.i18n('clickToTrustContact')}</ClickToDownload>
     </StyledTrustSenderUI>
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 0994be253..375b3158a 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -131,6 +131,7 @@ export const MessageAvatar = (props: Props) => {
   if (!lastMessageOfSeries) {
     return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${sender}`} />;
   }
+  /* eslint-disable @typescript-eslint/no-misused-promises */
 
   return (
     <StyledAvatar
@@ -139,11 +140,7 @@ export const MessageAvatar = (props: Props) => {
         visibility: hideAvatar ? 'hidden' : undefined,
       }}
     >
-      <Avatar
-        size={AvatarSize.S}
-        onAvatarClick={() => void onMessageAvatarClick()}
-        pubkey={sender}
-      />
+      <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
       {isSenderAdmin && <CrownIcon />}
     </StyledAvatar>
   );
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index ad0e1bff9..d3d99fb35 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -147,7 +147,8 @@ export const MessageContentWithStatuses = (props: Props) => {
       {enableReactions && (
         <MessageReactions
           messageId={messageId}
-          onClick={emoji => void handleMessageReaction(emoji)}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={handleMessageReaction}
           popupReaction={popupReaction}
           setPopupReaction={setPopupReaction}
           onPopupClick={handlePopupClick}
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index ec9b45850..407ee8220 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { animation, Item, Menu, useContextMenu } from 'react-contexify';
@@ -200,7 +201,7 @@ const RetryItem = ({ messageId }: MessageId) => {
       await found.retrySend();
     }
   }, [messageId]);
-  return showRetry ? <Item onClick={() => void onRetry()}>{window.i18n('resend')}</Item> : null;
+  return showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null;
 };
 
 export const MessageContextMenu = (props: Props) => {
@@ -349,7 +350,8 @@ export const MessageContextMenu = (props: Props) => {
         <StyledEmojiPanelContainer role="button" x={mouseX} y={mouseY}>
           <SessionEmojiPanel
             ref={emojiPanelRef}
-            onEmojiClicked={e => void onEmojiClick(e)}
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            onEmojiClicked={onEmojiClick}
             show={showEmojiPanel}
             isModal={true}
             onKeyDown={onEmojiKeyDown}
@@ -364,7 +366,8 @@ export const MessageContextMenu = (props: Props) => {
           animation={animation.fade}
         >
           {enableReactions && (
-            <MessageReactBar action={e => void onEmojiClick(e)} additionalAction={onShowEmoji} />
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            <MessageReactBar action={onEmojiClick} additionalAction={onShowEmoji} />
           )}
           <SaveAttachment messageId={messageId} />
 
@@ -373,7 +376,7 @@ export const MessageContextMenu = (props: Props) => {
             <Item onClick={onReply}>{window.i18n('replyToMessage')}</Item>
           )}
           {(!isPublic || isOutgoing) && (
-            <Item onClick={() => void onShowDetail()}>{window.i18n('moreInformation')}</Item>
+            <Item onClick={onShowDetail}>{window.i18n('moreInformation')}</Item>
           )}
           <RetryItem messageId={messageId} />
           {isDeletable ? <Item onClick={onSelect}>{selectMessageText}</Item> : null}
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index 054c9707c..84ab7e082 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -98,7 +98,8 @@ export const MessageQuote = (props: Props) => {
 
   return (
     <Quote
-      onClick={e => void onQuoteClick(e)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={onQuoteClick}
       text={quote?.text}
       attachment={quote?.attachment}
       isIncoming={direction === 'incoming'}
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 32e4e2d8a..a1d38b080 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -163,7 +163,8 @@ export class EditProfileDialog extends React.Component<object, State> {
             <div
               className="image-upload-section"
               role="button"
-              onClick={() => void this.fireInputEvent()}
+              // eslint-disable-next-line @typescript-eslint/no-misused-promises
+              onClick={this.fireInputEvent}
               data-testid="image-upload-section"
             />
             <div
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index 6061382f7..1f435bfb1 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -148,7 +148,8 @@ const AtSymbol = ({ convoId }: { convoId: string }) => {
   return hasMentionedUs && hasUnread ? (
     <MentionAtSymbol
       title="Open to latest mention"
-      onMouseDown={e => void openConvoToLastMention(e, convoId)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onMouseDown={async e => openConvoToLastMention(e, convoId)}
     >
       @
     </MentionAtSymbol>
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index f64d1b3fe..1b6080140 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useState } from 'react';
 import useKey from 'react-use/lib/useKey';
 import { useDispatch, useSelector } from 'react-redux';
@@ -86,7 +87,6 @@ export const OverlayCommunity = () => {
   return (
     <div className="module-left-pane-overlay">
       <OverlayHeader title={title} subtitle={subtitle} />
-
       <div className="create-group-name-input">
         <SessionIdEditable
           editable={true}
@@ -98,11 +98,9 @@ export const OverlayCommunity = () => {
           onPressEnter={onTryJoinRoom}
         />
       </div>
-
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
-
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={url => void onTryJoinRoom(url)} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={onTryJoinRoom} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
index 826d41352..be65ad673 100644
--- a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
+++ b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
@@ -86,7 +86,8 @@ export const ContactRow = (props: Props) => {
   return (
     <StyledRowContainer
       style={style}
-      onClick={() => void openConversationWithMessages({ conversationKey: id, messageId: null })}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={async () => openConversationWithMessages({ conversationKey: id, messageId: null })}
     >
       <AvatarItem id={id} displayName={displayName} />
       <StyledContactRowName data-testid="module-conversation__user__profile-name">
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 80430bbce..2164df87b 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -357,7 +357,10 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
-      <Item onClick={() => void markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      <Item onClick={async () => markAllReadByConvoId(convoId)}>
+        {window.i18n('markAllAsRead')}
+      </Item>
     );
   }
   return null;
@@ -379,8 +382,9 @@ export const BlockMenuItem = (): JSX.Element | null => {
   if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
-      ? () => void unblockConvoById(convoId)
-      : () => void blockConvoById(convoId);
+      ? async () => unblockConvoById(convoId)
+      : async () => blockConvoById(convoId);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     return <Item onClick={blockHandler}>{blockTitle}</Item>;
   }
   return null;
@@ -398,7 +402,10 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   }
 
   return (
-    <Item onClick={() => void clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <Item onClick={async () => clearNickNameByConvoId(convoId)}>
+      {window.i18n('clearNickname')}
+    </Item>
   );
 };
 
diff --git a/ts/components/registration/SignUpTab.tsx b/ts/components/registration/SignUpTab.tsx
index 9a5f27ab8..a54d0a01c 100644
--- a/ts/components/registration/SignUpTab.tsx
+++ b/ts/components/registration/SignUpTab.tsx
@@ -7,6 +7,7 @@ import { RegistrationContext, RegistrationPhase, signUp } from './RegistrationSt
 import { RegistrationUserDetails } from './RegistrationUserDetails';
 import { sanitizeDisplayNameOrToast, SignInMode } from './SignInTab';
 import { TermsAndConditions } from './TermsAndConditions';
+import { Noop } from '../../types/Util';
 
 export enum SignUpMode {
   Default,
@@ -22,7 +23,7 @@ const ContinueSignUpButton = ({ continueSignUp }: { continueSignUp: any }) => {
   return <SessionButton onClick={continueSignUp} text={window.i18n('continue')} />;
 };
 
-const SignUpDefault = (props: { createSessionID: () => void }) => {
+const SignUpDefault = (props: { createSessionID: Noop }) => {
   return (
     <div className="session-registration__content">
       <CreateSessionIdButton createSessionID={props.createSessionID} />
@@ -46,7 +47,7 @@ export const GoBackMainMenuButton = () => {
   );
 };
 
-const SignUpSessionIDShown = (props: { continueSignUp: () => void }) => {
+const SignUpSessionIDShown = (props: { continueSignUp: Noop }) => {
   return (
     <div className="session-registration__content">
       <Flex flexDirection="row" container={true} alignItems="center">
diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx
index c2b111b23..20311ff22 100644
--- a/ts/components/settings/SessionSettingListItem.tsx
+++ b/ts/components/settings/SessionSettingListItem.tsx
@@ -10,6 +10,7 @@ import {
 import { SessionToggle } from '../basic/SessionToggle';
 import { SessionConfirmDialogProps } from '../dialog/SessionConfirm';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type ButtonSettingsProps = {
   title?: string;
@@ -112,7 +113,7 @@ export const SessionSettingsItemWrapper = (props: {
   );
 };
 
-export const SessionSettingsTitleWithLink = (props: { title: string; onClick: () => void }) => {
+export const SessionSettingsTitleWithLink = (props: { title: string; onClick: Noop }) => {
   const { onClick, title } = props;
   return (
     <StyledSettingItemClickable onClick={onClick}>
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index 4c7573b3c..fb2862e1b 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -1,5 +1,6 @@
 import { isString } from 'lodash';
 import { LocaleMessagesType } from './locale';
+import { Noop } from '../types/Util';
 
 export const createTemplate = (
   options: {
@@ -162,7 +163,7 @@ export const createTemplate = (
 function updateForMac(
   template: any,
   messages: LocaleMessagesType,
-  options: { showAbout: () => void; showWindow: () => void }
+  options: { showAbout: Noop; showWindow: Noop }
 ) {
   const { showAbout, showWindow } = options;
 
diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx
index 37053dcfc..be1cb8b92 100644
--- a/ts/state/ducks/modalDialog.tsx
+++ b/ts/state/ducks/modalDialog.tsx
@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
 import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
+import { Noop } from '../../types/Util';
 
 export type BanType = 'ban' | 'unban';
 
@@ -22,7 +23,7 @@ export type OnionPathModalState = EditProfileModalState;
 export type RecoveryPhraseModalState = EditProfileModalState;
 export type DeleteAccountModalState = EditProfileModalState;
 
-export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: () => void } | null;
+export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: Noop } | null;
 
 export type UserDetailsModalState = {
   conversationId: string;
diff --git a/ts/types/Util.ts b/ts/types/Util.ts
index ccea6b792..76f1d6800 100644
--- a/ts/types/Util.ts
+++ b/ts/types/Util.ts
@@ -7,3 +7,5 @@ export type RenderTextCallbackType = (options: {
 }) => JSX.Element;
 
 export type LocalizerType = (key: LocalizerKeys, values?: Array<string>) => string;
+
+export type Noop = () => void;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index e7df1ba95..5d64e282d 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -98,7 +98,8 @@ async function checkExpiringMessages() {
   if (timeout) {
     global.clearTimeout(timeout);
   }
-  timeout = global.setTimeout(() => void destroyExpiredMessages(), wait);
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  timeout = global.setTimeout(async () => destroyExpiredMessages(), wait);
 }
 const throttledCheckExpiringMessages = throttle(checkExpiringMessages, 1000);
 
@@ -111,7 +112,8 @@ const initExpiringMessageListener = () => {
 
   void checkExpiringMessages();
 
-  initWallClockListener(() => void throttledCheckExpiringMessages());
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  initWallClockListener(async () => throttledCheckExpiringMessages());
   isInit = true;
 };
 

From 63228a97ee400269b485886a1a6cce73788b4649 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Sat, 5 Aug 2023 16:18:05 +1000
Subject: [PATCH 177/178] chore: update pbjs package and make integration test
 more reliable

---
 package.json                                  |   5 +-
 ts/test/automation/create_user.spec.ts        |   1 +
 ts/test/automation/linked_device_user.spec.ts |  12 +-
 ts/test/automation/setup/new_user.ts          |   3 +-
 ts/test/automation/utilities/utils.ts         |  31 ++
 yarn.lock                                     | 276 +++++++++++++++---
 6 files changed, 282 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 31c6c0d6e..ac0e63e8f 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "os-locale": "5.0.0",
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
-    "protobufjs": "^6.11.2",
+    "protobufjs": "^7.2.4",
     "rc-slider": "^10.2.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
@@ -128,7 +128,7 @@
     "redux-promise-middleware": "^6.1.2",
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
-    "semver": "5.4.1",
+    "semver": "^7.5.4",
     "styled-components": "5.1.1",
     "uuid": "8.3.2",
     "webrtc-adapter": "^4.1.1"
@@ -194,6 +194,7 @@
     "playwright": "1.16.3",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
+    "protobufjs-cli": "^1.1.1",
     "run-script-os": "^1.1.6",
     "sass": "^1.60.0",
     "sass-loader": "^13.2.2",
diff --git a/ts/test/automation/create_user.spec.ts b/ts/test/automation/create_user.spec.ts
index 6829b93cd..4a74c9a38 100644
--- a/ts/test/automation/create_user.spec.ts
+++ b/ts/test/automation/create_user.spec.ts
@@ -17,6 +17,7 @@ sessionTestOneWindow('Create User', async ([window]) => {
   await waitForTestIdWithText(window, 'your-profile-name', userA.userName);
   // check session id matches
   await waitForTestIdWithText(window, 'your-session-id', userA.sessionid);
+
   // exit profile module
   await window.click('.session-icon-button.small');
   // go to settings section
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index 5ccec8f8c..3b44d92f2 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -12,6 +12,7 @@ import {
   clickOnTestIdWithText,
   hasTextElementBeenDeleted,
   typeIntoInput,
+  waitForMatchingPlaceholder,
   waitForMatchingText,
   waitForTestIdWithText,
   waitForTextMessage,
@@ -161,7 +162,16 @@ test('Check blocked user syncs', async () => {
   await clickOnElement(windowA, 'data-testid', 'three-dots-conversation-options');
   await clickOnMatchingText(windowA, 'Block');
   await waitForTestIdWithText(windowA, 'session-toast', 'Blocked');
-  // await waitForMatchingText(windowA, 'Unblock this contact to send a message.');
+  await waitForMatchingPlaceholder(
+    windowA,
+    'message-input-text-area',
+    'Unblock this contact to send a message.'
+  );
+  await waitForMatchingPlaceholder(
+    windowB,
+    'message-input-text-area',
+    'Unblock this contact to send a message.'
+  ); // reveal-blocked-user-settings is not updated once opened
   // Check linked device for blocked contact in settings screen
   await clickOnTestIdWithText(windowB, 'settings-section');
   await clickOnTestIdWithText(windowB, 'conversations-settings-menu-item');
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 99816bf34..4e9d8e097 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -17,7 +17,8 @@ export const newUser = async (window: Page, userName: string): Promise<User> =>
   await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
 
   // Save session ID to a variable
-  const sessionid = await window.innerText('[data-testid=your-session-id]');
+  let sessionid = await window.innerText('[data-testid=your-session-id]');
+  sessionid = sessionid.replace(/(\r\n|\n|\r)/gm, ''); // remove the new line in the SessionID as it is rendered with one forced
 
   console.info(`${userName}: Session ID: ${sessionid} and Recovery phrase: ${recoveryPhrase}`);
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 9b0968fa9..a3425bf31 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -68,6 +68,37 @@ export async function waitForMatchingText(window: Page, text: string, maxWait?:
   console.info(`got matchingText: ${text}`);
 }
 
+export async function waitForMatchingPlaceholder(
+  window: Page,
+  dataTestId: string,
+  placeholder: string,
+  maxWait: number = 30000
+) {
+  let found = false;
+  const start = Date.now();
+  console.info(`waitForMatchingPlaceholder: ${placeholder} with datatestId: ${dataTestId}`);
+
+  do {
+    try {
+      const elem = await waitForElement(window, 'data-testid', dataTestId);
+      const elemPlaceholder = await elem.getAttribute('placeholder');
+      if (elemPlaceholder === placeholder) {
+        console.info(
+          `waitForMatchingPlaceholder foudn matching element with placeholder: "${placeholder}"`
+        );
+
+        found = true;
+      }
+    } catch (e) {
+      await sleepFor(1000, true);
+      console.info(`waitForMatchingPlaceholder failed with ${e.message}, retrying in 1s`);
+    }
+  } while (!found && Date.now() - start <= maxWait);
+
+  if (!found) {
+    throw new Error(`Failed to find datatestid:"${dataTestId}" with placeholder: "${placeholder}"`);
+  }
+}
 export async function waitForLoadingAnimationToFinish(
   window: Page,
   loader: loaderType,
diff --git a/yarn.lock b/yarn.lock
index 116c6d261..298e95cc9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -216,7 +216,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+"@babel/parser@^7.20.15", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
   version "7.22.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
   integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
@@ -664,6 +664,13 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jsdoc/salty@^0.2.1":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
+  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
+  dependencies:
+    lodash "^4.17.21"
+
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -1094,7 +1101,7 @@
   resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz#a6ebde70d3b4af960fd802af8d0e3c7cfe281eb2"
   integrity sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==
 
-"@types/linkify-it@^3.0.2":
+"@types/linkify-it@*", "@types/linkify-it@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
@@ -1109,10 +1116,18 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
   integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==
 
-"@types/long@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+"@types/markdown-it@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
 
 "@types/minimatch@*", "@types/minimatch@^5.1.2":
   version "5.1.2"
@@ -1197,15 +1212,7 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
-"@types/react@^17.0.2":
+"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
   version "17.0.62"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3"
   integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
@@ -1214,6 +1221,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
 "@types/redux-logger@3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
@@ -2017,7 +2032,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2250,6 +2265,13 @@ caniuse-lite@^1.0.30001517:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
   integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
 
+catharsis@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
+  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
+  dependencies:
+    lodash "^4.17.15"
+
 chai-as-promised@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
@@ -2736,7 +2758,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2985,9 +3007,9 @@ electron-publish@23.6.0:
     mime "^2.5.2"
 
 electron-to-chromium@^1.4.477:
-  version "1.4.479"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118"
-  integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==
+  version "1.4.480"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz#40e32849ca50bc23ce29c1516c5adb3fddac919d"
+  integrity sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw==
 
 electron-updater@^4.2.2:
   version "4.6.5"
@@ -3063,6 +3085,11 @@ entities@^4.4.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -3190,6 +3217,18 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escodegen@^1.13.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -3360,7 +3399,7 @@ eslint@^8.45.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
+espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -3369,6 +3408,11 @@ espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
@@ -3383,7 +3427,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3472,7 +3516,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -3824,6 +3868,17 @@ glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -3898,7 +3953,7 @@ got@^11.8.5, got@^9.6.0:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4527,6 +4582,34 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js2xmlparser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
+  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
+  dependencies:
+    xmlcreate "^2.0.4"
+
+jsdoc@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
+  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@jsdoc/salty" "^0.2.1"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    underscore "~1.13.2"
+
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
@@ -4661,6 +4744,13 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
+klaw@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
+  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
+  dependencies:
+    graceful-fs "^4.1.9"
+
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -4695,6 +4785,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 "libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz":
   version "0.2.5"
   resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz#e1db928eaca58f22c66494c6179e13bdd4e38cd4"
@@ -4714,6 +4812,13 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.11"
 
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -4797,6 +4902,11 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -4849,6 +4959,27 @@ map-age-cleaner@^0.1.3:
   dependencies:
     p-defer "^1.0.0"
 
+markdown-it-anchor@^8.4.1:
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
+  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
+
+markdown-it@^12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^4.0.10:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -4861,6 +4992,11 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+
 mem@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3"
@@ -4973,7 +5109,7 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5274,6 +5410,18 @@ open@^8.3.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -5594,6 +5742,11 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prettier@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1"
@@ -5639,10 +5792,26 @@ proper-lockfile@^4.1.1:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-protobufjs@^6.11.2:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+protobufjs-cli@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
+  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
+  dependencies:
+    chalk "^4.0.0"
+    escodegen "^1.13.0"
+    espree "^9.0.0"
+    estraverse "^5.1.0"
+    glob "^8.0.0"
+    jsdoc "^4.0.0"
+    minimist "^1.2.0"
+    semver "^7.1.2"
+    tmp "^0.2.1"
+    uglify-js "^3.7.7"
+
+protobufjs@^7.2.4:
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.4.tgz#3fc1ec0cdc89dd91aef9ba6037ba07408485c3ae"
+  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5654,9 +5823,8 @@ protobufjs@^6.11.2:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
+    long "^5.0.0"
 
 proxy-from-env@^1.1.0:
   version "1.1.0"
@@ -6027,6 +6195,13 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+requizzle@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
+  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
+  dependencies:
+    lodash "^4.17.21"
+
 reselect@^4.1.5:
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
@@ -6286,11 +6461,6 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver@5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
-
 semver@^5.5.0, semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -6301,7 +6471,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
+semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -6473,7 +6643,7 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -6610,7 +6780,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -6767,7 +6937,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.0:
+tmp@^0.2.0, tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -6862,6 +7032,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -6928,11 +7105,16 @@ typescript@^5.1.6:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
   integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
-uc.micro@^1.0.1:
+uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
+uglify-js@^3.7.7:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -6943,7 +7125,7 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@>=1.8.3:
+underscore@>=1.8.3, underscore@~1.13.2:
   version "1.13.6"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
   integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
@@ -7234,6 +7416,11 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+word-wrap@~1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 workerpool@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
@@ -7293,6 +7480,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xmlcreate@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
+  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

From a23f53286ea486685beb27aa060a286a0909de99 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Sat, 5 Aug 2023 17:52:38 +1000
Subject: [PATCH 178/178] fix: typing bubble relates to current conversation,
 not selected one

---
 ts/components/conversation/TypingBubble.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index f622f0233..0e2ed1fdf 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -1,16 +1,15 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { TypingAnimation } from './TypingAnimation';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { useSelectedIsGroup } from '../../state/selectors/selectedConversation';
+import { TypingAnimation } from './TypingAnimation';
 
 interface TypingBubbleProps {
   conversationType: ConversationTypeEnum;
   isTyping: boolean;
 }
 
-const TypingBubbleContainer = styled.div<TypingBubbleProps>`
+const TypingBubbleContainer = styled.div<Pick<TypingBubbleProps, 'isTyping'>>`
   height: ${props => (props.isTyping ? 'auto' : '0px')};
   display: flow-root;
   padding-bottom: ${props => (props.isTyping ? '4px' : '0px')};
@@ -23,13 +22,13 @@ const TypingBubbleContainer = styled.div<TypingBubbleProps>`
 `;
 
 export const TypingBubble = (props: TypingBubbleProps) => {
-  const isOpenOrClosedGroup = useSelectedIsGroup();
-  if (!isOpenOrClosedGroup || !props.isTyping) {
+  const isPrivate = props.conversationType === ConversationTypeEnum.PRIVATE;
+  if (!isPrivate || !props.isTyping) {
     return null;
   }
 
   return (
-    <TypingBubbleContainer {...props}>
+    <TypingBubbleContainer isTyping={props.isTyping}>
       <TypingAnimation />
     </TypingBubbleContainer>
   );